[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 08/17: Cut at the 80th column
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 08/17: Cut at the 80th column |
Date: |
Fri, 02 Oct 2015 10:22:18 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 3556208fa886d7e737d861799bf693230385c087
Author: Dany De Bontridder <address@hidden>
Date: Tue Sep 15 11:31:41 2015 +0200
Cut at the 80th column
---
include/class/class_dossier.php | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/include/class/class_dossier.php b/include/class/class_dossier.php
index 2682f49..ca3e93a 100644
--- a/include/class/class_dossier.php
+++ b/include/class/class_dossier.php
@@ -75,7 +75,12 @@ class Dossier
$str_limit=($limit==0)?'':' limit '.$limit;
if ($p_type=="A")
{
- $l_sql="select *, 'W' as priv_priv from ac_dossier where dos_name
~* $2 or dos_description ~* $2 ORDER BY dos_name $str_limit ";
+ $l_sql="select *, 'W' as priv_priv "
+ . "from ac_dossier "
+ . "where "
+ . "dos_name ~* $2 "
+ . "or dos_description ~* $2 "
+ . "ORDER BY dos_name $str_limit ";
$a_row=$cn->get_array($l_sql, $p_text);
return $a_row;
}
@@ -139,10 +144,12 @@ class Dossier
ag_dossier
from
ac_users as ac
- left join (select array_to_string(array_agg(dos_name),',') as
ag_dossier,jt.use_id as jt_use_id
- from ac_dossier as ds
- join jnt_use_dos as jt on (jt.dos_id=ds.dos_id)
- group by jt.use_id) as dossier_name on
(jt_use_id=ac.use_id)
+ left join
+ (select array_to_string(array_agg(dos_name),',') as ag_dossier,
+ jt.use_id as jt_use_id
+ from ac_dossier as ds
+ join jnt_use_dos as jt on (jt.dos_id=ds.dos_id)
+ group by jt.use_id) as dossier_name on
(jt_use_id=ac.use_id)
where
use_login!='phpcompta'
$sql
@@ -234,7 +241,8 @@ class Dossier
if (strlen(trim($this->dos_name))==0)
return;
- if ($this->cn->get_value("select count(*) from ac_dossier where
dos_name=$1 and dos_id<>$2",
+ if ($this->cn->get_value("select count(*) from ac_dossier "
+ . " where dos_name=$1 and dos_id<>$2",
array($this->dos_name, $this->dos_id))!=0)
return;
@@ -309,7 +317,8 @@ class Dossier
for ($i=0; $i<count($a_admin); $i++)
{
$exist=$cn->get_value("select p_id from profile_user
- where user_name=$1",
array($a_admin[$i]['use_login']));
+ where user_name=$1",
+ array($a_admin[$i]['use_login']));
if ($exist=="")
{
$cn->exec_sql("insert into profile_user(user_name,p_id)
values($1,1)",
- [Noalyss-commit] [noalyss] branch master updated (91e9218 -> b3cb736), Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 01/17: if there is no contact show a warning, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 05/17: restructure files and folders, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 03/17: restructure files and folders, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 11/17: Use Dossier::connect (singleton) instead of new Databass(dossier_id), Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 04/17: restructure files and folders, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 06/17: Use error_log with exception to log getTraceAsString, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 13/17: Fix problem in Bilan Belge, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 02/17: restructure files and folders, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 08/17: Cut at the 80th column,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 12/17: Fix problem in Bilan Belge, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 14/17: Fix problem in Bilan Belge, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 15/17: Translate, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 10/17: Security : clean cookie and global variables when logging out, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 07/17: Dossier:connect : database singleton Indentation Add error_log to catch block, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 16/17: restructure : move export file to include/export, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 09/17: Use Dossier::connect, Dany De Bontridder, 2015/10/08
- [Noalyss-commit] [noalyss] 17/17: Merge branch 'rel69_rewrite', Dany De Bontridder, 2015/10/08