Dolibarr / dolibarr

htdocs/core/class/google.class.php

Spacing +7 added lines, -7 removed lines

@@ -37,10 +37,10 @@ 
 	 * @param 	DoliDB		$db			Database handler
 	 * @param	string		$key		Google key
 	 */
-	function __construct($db,$key)
+	function __construct($db, $key)
 	{
-		$this->db=$db;
-		$this->key=$key;
+		$this->db = $db;
+		$this->key = $key;
 	}
 
 
@@ -56,7 +56,7 @@ 
 	{
 		global $conf;
 
-		$i=0;
+		$i = 0;
 
 		// Desired address
 		$urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
@@ -66,12 +66,12 @@ 
 
 		$code = strstr($page, '<coordinates>');
 		$code = strstr($code, '>');
-		$val=strpos($code, "<");
-		$code = substr($code, 1, $val-1);
+		$val = strpos($code, "<");
+		$code = substr($code, 1, $val - 1);
 		//print $code;
 		//print "<br>";
 		$latitude = substr($code, 0, strpos($code, ","));
-		$longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
+		$longitude = substr($code, strpos($code, ",") + 1, dol_strlen(strpos($code, ",")) - 3);
 
 		// Output the coordinates
 		//echo "Longitude: $longitude ',' Latitude: $latitude";

htdocs/core/class/menubase.class.php

Braces +59 added lines, -30 removed lines

@@ -96,10 +96,14 @@ 
         $this->enabled=trim($this->enabled);
         $this->user=trim($this->user);
         $this->position=trim($this->position);
-        if (! $this->level) $this->level=0;
+        if (! $this->level) {
+        	$this->level=0;
+        }
 
         // Check parameters
-        if (empty($this->menu_handler)) return -1;
+        if (empty($this->menu_handler)) {
+        	return -1;
+        }
 
         // For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql
         // may use an already used value because its internal cursor does not increase when we do
@@ -114,14 +118,19 @@ 
                $maxrowid=$obj->maxrowid;
 
                // Max rowid can be empty if there is no record yet
-               if(empty($maxrowid)) $maxrowid=1;
+               if(empty($maxrowid)) {
+               	$maxrowid=1;
+               }
 
                $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
                //print $sql; exit;
                $resqlrowidset=$this->db->query($sql);
-               if (! $resqlrowidset) dol_print_error($this->db);
+               if (! $resqlrowidset) {
+               	dol_print_error($this->db);
+               }
+          } else {
+          	dol_print_error($this->db);
           }
-          else dol_print_error($this->db);
         }
 
         // Insert request
@@ -171,8 +180,7 @@ 
             dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);
 
             return $this->id;
-        }
-        else
+        } else
         {
             $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -310,8 +318,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -395,7 +402,9 @@ 
         $newTabMenu=array();
         foreach($tabMenu as $val)
         {
-            if ($val['type']=='top') $newTabMenu[]=$val;
+            if ($val['type']=='top') {
+            	$newTabMenu[]=$val;
+            }
         }
 
         return $newTabMenu;
@@ -443,7 +452,8 @@ 
         foreach($tabMenu as $key => $val)
         {
         	//var_dump($tabMenu);
-        	if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
+        	if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu) {
+        		// We found a menu entry not linked to parent with good mainmenu
         	{
         		//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
         		//var_dump($this->newmenu->liste);exit;
@@ -451,18 +461,20 @@ 
         		if (empty($val['fk_leftmenu']))
         		{
         			$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+        	}
         			//var_dump($this->newmenu->liste);
-        		}
-        		else
+        		} else
         		{
         			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
         			$searchlastsub=0;$lastid=0;$nextid=0;$found=0;
         			foreach($this->newmenu->liste as $keyparent => $valparent)
         			{
         				//var_dump($valparent);
-        				if ($searchlastsub)    // If we started to search for last submenu
+        				if ($searchlastsub) {
+        					// If we started to search for last submenu
         				{
         					if ($valparent['level'] >= $searchlastsub) $lastid=$keyparent;
+        				}
         					if ($valparent['level'] < $searchlastsub)
         					{
         						$nextid=$keyparent;
@@ -479,8 +491,9 @@ 
         				}
         			}
         			//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
-        			if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
-        			else {
+        			if ($found) {
+        				$this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+        			} else {
         			    dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);
         			    //print "Parent menu not found !!<br>";
         			}
@@ -515,8 +528,12 @@ 
         $sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
         $sql.= " WHERE m.entity IN (0,".$conf->entity.")";
         $sql.= " AND m.menu_handler IN ('".$menu_handler."','all')";
-        if ($type_user == 0) $sql.= " AND m.usertype IN (0,2)";
-        if ($type_user == 1) $sql.= " AND m.usertype IN (1,2)";
+        if ($type_user == 0) {
+        	$sql.= " AND m.usertype IN (0,2)";
+        }
+        if ($type_user == 1) {
+        	$sql.= " AND m.usertype IN (1,2)";
+        }
         $sql.= " ORDER BY m.position, m.rowid";
 		//print $sql;
 
@@ -541,7 +558,10 @@ 
                 if ($menu['perms'])
                 {
                 	$tmpcond=$menu['perms'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+                	if ($leftmenu == 'all') {
+                		$tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);
+                	}
+                	// Force part of condition to true
                 	$perms = verifCond($tmpcond);
                     //print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
                 }
@@ -551,7 +571,10 @@ 
                 if ($menu['enabled'])
                 {
                 	$tmpcond=$menu['enabled'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+                	if ($leftmenu == 'all') {
+                		$tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);
+                	}
+                	// Force part of condition to true
                     $enabled = verifCond($tmpcond);
                 }
 
@@ -559,27 +582,31 @@ 
                 if ($enabled)
                 {
                 	$title = $langs->trans($menu['titre']);
-                    if ($title == $menu['titre'])   // Translation not found
+                    if ($title == $menu['titre']) {
+                    	// Translation not found
                     {
                         if (! empty($menu['langs']))    // If there is a dedicated translation file
                         {
                         	//print 'Load file '.$menu['langs'].'<br>';
                             $langs->load($menu['langs']);
+                    }
                         }
 
-                        if (preg_match("/\//",$menu['titre'])) // To manage translation when title is string1/string2
+                        if (preg_match("/\//",$menu['titre'])) {
+                        	// To manage translation when title is string1/string2
                         {
                             $tab_titre = explode("/",$menu['titre']);
-                            $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
                         }
-                        else if (preg_match('/\|\|/',$menu['titre'])) // To manage different translation (Title||AltTitle@ConditionForAltTitle)
+                            $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
+                        } else if (preg_match('/\|\|/',$menu['titre'])) {
+                        	// To manage different translation (Title||AltTitle@ConditionForAltTitle)
                         {
                         	$tab_title = explode("||",$menu['titre']);
+                        }
                         	$alt_title = explode("@",$tab_title[1]);
                         	$title_enabled = verifCond($alt_title[1]);
                         	$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
-                        }
-                        else
+                        } else
                         {
                             $title = $langs->trans($menu['titre']);
                         }
@@ -594,8 +621,11 @@ 
                     $tabMenu[$b]['url']         = $menu['url'];
                     if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b]['url']))
                     {
-                        if (preg_match('/\?/',$tabMenu[$b]['url'])) $tabMenu[$b]['url'].='&amp;idmenu='.$menu['rowid'];
-                        else $tabMenu[$b]['url'].='?idmenu='.$menu['rowid'];
+                        if (preg_match('/\?/',$tabMenu[$b]['url'])) {
+                        	$tabMenu[$b]['url'].='&amp;idmenu='.$menu['rowid'];
+                        } else {
+                        	$tabMenu[$b]['url'].='?idmenu='.$menu['rowid'];
+                        }
                     }
                     $tabMenu[$b]['titre']       = $title;
                     $tabMenu[$b]['target']      = $menu['target'];
@@ -621,8 +651,7 @@ 
             // into the leftMenuCharger later to avoid useless operations.
 
             return 1;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             return -1;

Indentation +610 added lines, -610 removed lines

@@ -28,628 +28,628 @@
  */
 class Menubase
 {
-    public $db;							// To store db handler
-    public $error;							// To return error code (or message)
-    public $errors=array();				// To return several error codes (or messages)
-
-    public $id;
-
-    public $menu_handler;
-    public $module;
-    public $type;
-    public $mainmenu;
-    public $fk_menu;
-    public $fk_mainmenu;
-    public $fk_leftmenu;
-    public $position;
-    public $url;
-    public $target;
-    public $titre;
-    public $langs;
-    public $level;
-    public $leftmenu;		//<! Not used
-    public $perms;
-    public $enabled;
-    public $user;
-    public $tms;
-
-
-    /**
+	public $db;							// To store db handler
+	public $error;							// To return error code (or message)
+	public $errors=array();				// To return several error codes (or messages)
+
+	public $id;
+
+	public $menu_handler;
+	public $module;
+	public $type;
+	public $mainmenu;
+	public $fk_menu;
+	public $fk_mainmenu;
+	public $fk_leftmenu;
+	public $position;
+	public $url;
+	public $target;
+	public $titre;
+	public $langs;
+	public $level;
+	public $leftmenu;		//<! Not used
+	public $perms;
+	public $enabled;
+	public $user;
+	public $tms;
+
+
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db 		    Database handler
-     *  @param     	string		$menu_handler	Menu handler
-     */
-    function __construct($db,$menu_handler='')
-    {
-        $this->db = $db;
-        $this->menu_handler = $menu_handler;
-        return 1;
-    }
-
-
-    /**
-     *      Create menu entry into database
-     *
-     *      @param      User	$user       User that create
-     *      @return     int      			<0 if KO, Id of record if OK
-     */
-    function create($user=null)
-    {
-        global $conf, $langs;
-
-        // Clean parameters
-        $this->menu_handler=trim($this->menu_handler);
-        $this->module=trim($this->module);
-        $this->type=trim($this->type);
-        $this->mainmenu=trim($this->mainmenu);
-        $this->leftmenu=trim($this->leftmenu);
-        $this->fk_menu=trim($this->fk_menu);          // If -1, fk_mainmenu and fk_leftmenu must be defined
-        $this->fk_mainmenu=trim($this->fk_mainmenu);
-        $this->fk_leftmenu=trim($this->fk_leftmenu);
-        $this->position=trim($this->position);
-        $this->url=trim($this->url);
-        $this->target=trim($this->target);
-        $this->titre=trim($this->titre);
-        $this->langs=trim($this->langs);
-        $this->perms=trim($this->perms);
-        $this->enabled=trim($this->enabled);
-        $this->user=trim($this->user);
-        $this->position=trim($this->position);
-        if (! $this->level) $this->level=0;
-
-        // Check parameters
-        if (empty($this->menu_handler)) return -1;
-
-        // For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql
-        // may use an already used value because its internal cursor does not increase when we do
-        // an insert with a forced id.
-        if (in_array($this->db->type,array('pgsql')))
-        {
-          $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
-          $resqlrowid=$this->db->query($sql);
-          if ($resqlrowid)
-          {
-               $obj=$this->db->fetch_object($resqlrowid);
-               $maxrowid=$obj->maxrowid;
-
-               // Max rowid can be empty if there is no record yet
-               if(empty($maxrowid)) $maxrowid=1;
-
-               $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
-               //print $sql; exit;
-               $resqlrowidset=$this->db->query($sql);
-               if (! $resqlrowidset) dol_print_error($this->db);
-          }
-          else dol_print_error($this->db);
-        }
-
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
-        $sql.= "menu_handler,";
-        $sql.= "entity,";
-        $sql.= "module,";
-        $sql.= "type,";
-        $sql.= "mainmenu,";
-        $sql.= "leftmenu,";
-        $sql.= "fk_menu,";
-        $sql.= "fk_mainmenu,";
-        $sql.= "fk_leftmenu,";
-        $sql.= "position,";
-        $sql.= "url,";
-        $sql.= "target,";
-        $sql.= "titre,";
-        $sql.= "langs,";
-        $sql.= "perms,";
-        $sql.= "enabled,";
-        $sql.= "usertype";
-        $sql.= ") VALUES (";
-        $sql.= " '".$this->db->escape($this->menu_handler)."',";
-        $sql.= " '".$this->db->escape($conf->entity)."',";
-        $sql.= " '".$this->db->escape($this->module)."',";
-        $sql.= " '".$this->db->escape($this->type)."',";
-        $sql.= " ".($this->mainmenu?"'".$this->db->escape($this->mainmenu)."'":"''").",";    // Can't be null
-        $sql.= " ".($this->leftmenu?"'".$this->db->escape($this->leftmenu)."'":"null").",";
-        $sql.= " '".$this->db->escape($this->fk_menu)."',";
-        $sql.= " ".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
-        $sql.= " ".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
-        $sql.= " '".(int) $this->position."',";
-        $sql.= " '".$this->db->escape($this->url)."',";
-        $sql.= " '".$this->db->escape($this->target)."',";
-        $sql.= " '".$this->db->escape($this->titre)."',";
-        $sql.= " '".$this->db->escape($this->langs)."',";
-        $sql.= " '".$this->db->escape($this->perms)."',";
-        $sql.= " '".$this->db->escape($this->enabled)."',";
-        $sql.= " '".$this->db->escape($this->user)."'";
-        $sql.= ")";
-
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."menu");
-            dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);
-
-            return $this->id;
-        }
-        else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *  Update menu entry into database.
-     *
-     *  @param	User	$user        	User that modify
-     *  @param  int		$notrigger	    0=no, 1=yes (no update trigger)
-     *  @return int 		        	<0 if KO, >0 if OK
-     */
-    function update($user=null, $notrigger=0)
-    {
-        global $conf, $langs;
-
-        // Clean parameters
-        $this->rowid=trim($this->rowid);
-        $this->menu_handler=trim($this->menu_handler);
-        $this->module=trim($this->module);
-        $this->type=trim($this->type);
-        $this->mainmenu=trim($this->mainmenu);
-        $this->leftmenu=trim($this->leftmenu);
-        $this->fk_menu=trim($this->fk_menu);
-        $this->fk_mainmenu=trim($this->fk_mainmenu);
-        $this->fk_leftmenu=trim($this->fk_leftmenu);
-        $this->position=trim($this->position);
-        $this->url=trim($this->url);
-        $this->target=trim($this->target);
-        $this->titre=trim($this->titre);
-        $this->langs=trim($this->langs);
-        $this->perms=trim($this->perms);
-        $this->enabled=trim($this->enabled);
-        $this->user=trim($this->user);
-
-        // Check parameters
-        // Put here code to add control on parameters values
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
-        $sql.= " menu_handler='".$this->db->escape($this->menu_handler)."',";
-        $sql.= " module='".$this->db->escape($this->module)."',";
-        $sql.= " type='".$this->db->escape($this->type)."',";
-        $sql.= " mainmenu='".$this->db->escape($this->mainmenu)."',";
-        $sql.= " leftmenu='".$this->db->escape($this->leftmenu)."',";
-        $sql.= " fk_menu='".$this->db->escape($this->fk_menu)."',";
-        $sql.= " fk_mainmenu=".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
-        $sql.= " fk_leftmenu=".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
-        $sql.= " position=".($this->position > 0 ? $this->position : 0).",";
-        $sql.= " url='".$this->db->escape($this->url)."',";
-        $sql.= " target='".$this->db->escape($this->target)."',";
-        $sql.= " titre='".$this->db->escape($this->titre)."',";
-        $sql.= " langs='".$this->db->escape($this->langs)."',";
-        $sql.= " perms='".$this->db->escape($this->perms)."',";
-        $sql.= " enabled='".$this->db->escape($this->enabled)."',";
-        $sql.= " usertype='".$this->db->escape($this->user)."'";
-        $sql.= " WHERE rowid=".$this->id;
-
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql)
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-
-        return 1;
-    }
-
-
-    /**
-     *   Load object in memory from database
-     *
-     *   @param		int		$id         Id object
-     *   @param		User    $user       User that load
-     *   @return	int         		<0 if KO, >0 if OK
-     */
-    function fetch($id, $user=null)
-    {
-        global $langs;
-
-        $sql = "SELECT";
-        $sql.= " t.rowid,";
-        $sql.= " t.menu_handler,";
-        $sql.= " t.entity,";
-        $sql.= " t.module,";
-        $sql.= " t.type,";
-        $sql.= " t.mainmenu,";
-        $sql.= " t.leftmenu,";
-        $sql.= " t.fk_menu,";
-        $sql.= " t.fk_mainmenu,";
-        $sql.= " t.fk_leftmenu,";
-        $sql.= " t.position,";
-        $sql.= " t.url,";
-        $sql.= " t.target,";
-        $sql.= " t.titre,";
-        $sql.= " t.langs,";
-        $sql.= " t.perms,";
-        $sql.= " t.enabled,";
-        $sql.= " t.usertype as user,";
-        $sql.= " t.tms";
-        $sql.= " FROM ".MAIN_DB_PREFIX."menu as t";
-        $sql.= " WHERE t.rowid = ".$id;
-
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id    = $obj->rowid;
-
-                $this->menu_handler = $obj->menu_handler;
-                $this->entity = $obj->entity;
-                $this->module = $obj->module;
-                $this->type = $obj->type;
-                $this->mainmenu = $obj->mainmenu;
-                $this->leftmenu = $obj->leftmenu;
-                $this->fk_menu = $obj->fk_menu;
-                $this->fk_mainmenu = $obj->fk_mainmenu;
-                $this->fk_leftmenu = $obj->fk_leftmenu;
-                $this->position = $obj->position;
-                $this->url = $obj->url;
-                $this->target = $obj->target;
-                $this->titre = $obj->titre;
-                $this->langs = $obj->langs;
-                $this->perms = $obj->perms;
-                $this->enabled = str_replace("\"","'",$obj->enabled);
-                $this->user = $obj->user;
-                $this->tms = $this->db->jdate($obj->tms);
-            }
-            $this->db->free($resql);
-
-            return 1;
-        }
-        else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Delete object in database
-     *
-     *	@param	User	$user       User that delete
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    function delete($user)
-    {
-        global $conf, $langs;
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
-        $sql.= " WHERE rowid=".$this->id;
-
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (! $resql)
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-
-        return 1;
-    }
-
-
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    function initAsSpecimen()
-    {
-        $this->id=0;
-
-        $this->menu_handler='all';
-        $this->module='specimen';
-        $this->type='top';
-        $this->mainmenu='';
-        $this->fk_menu='0';
-        $this->position='';
-        $this->url='http://dummy';
-        $this->target='';
-        $this->titre='Specimen menu';
-        $this->langs='';
-        $this->level='';
-        $this->leftmenu='';
-        $this->perms='';
-        $this->enabled='';
-        $this->user='';
-        $this->tms='';
-    }
-
-
-    /**
-     *	Load tabMenu array with top menu entries found into database.
-     *
-     * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (always '')
-     * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
-     * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
-     * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
-     * 	@param  array	$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
-     * 	@return	array					Return array with menu entries for top menu
-     */
-    function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
-    {
-        global $langs, $user, $conf;	// To export to dol_eval function
-        global $mainmenu,$leftmenu;		// To export to dol_eval function
-
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
-
-        $newTabMenu=array();
-        foreach($tabMenu as $val)
-        {
-            if ($val['type']=='top') $newTabMenu[]=$val;
-        }
-
-        return $newTabMenu;
-    }
-
-    /**
-     * 	Load entries found from database (and stored into $tabMenu) in $this->newmenu array.
-     *  Warning: Entries in $tabMenu must have child after parent
-     *
-     * 	@param	Menu	$newmenu        Menu array to complete (in most cases, it's empty, may be already initialized with some menu manager like eldy)
-     * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (often $_SESSION["mainmenu"])
-     * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
-     * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
-     * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
-     * 	@param  array	$tabMenu       Array with menu entries already loaded
-     * 	@return Menu    		       	Menu array for particular mainmenu value or full tabArray
-     */
-    function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
-    {
-        global $langs, $user, $conf; 	// To export to dol_eval function
-        global $mainmenu,$leftmenu; 	// To export to dol_eval function
-
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
+	 *  @param     	string		$menu_handler	Menu handler
+	 */
+	function __construct($db,$menu_handler='')
+	{
+		$this->db = $db;
+		$this->menu_handler = $menu_handler;
+		return 1;
+	}
+
+
+	/**
+	 *      Create menu entry into database
+	 *
+	 *      @param      User	$user       User that create
+	 *      @return     int      			<0 if KO, Id of record if OK
+	 */
+	function create($user=null)
+	{
+		global $conf, $langs;
+
+		// Clean parameters
+		$this->menu_handler=trim($this->menu_handler);
+		$this->module=trim($this->module);
+		$this->type=trim($this->type);
+		$this->mainmenu=trim($this->mainmenu);
+		$this->leftmenu=trim($this->leftmenu);
+		$this->fk_menu=trim($this->fk_menu);          // If -1, fk_mainmenu and fk_leftmenu must be defined
+		$this->fk_mainmenu=trim($this->fk_mainmenu);
+		$this->fk_leftmenu=trim($this->fk_leftmenu);
+		$this->position=trim($this->position);
+		$this->url=trim($this->url);
+		$this->target=trim($this->target);
+		$this->titre=trim($this->titre);
+		$this->langs=trim($this->langs);
+		$this->perms=trim($this->perms);
+		$this->enabled=trim($this->enabled);
+		$this->user=trim($this->user);
+		$this->position=trim($this->position);
+		if (! $this->level) $this->level=0;
+
+		// Check parameters
+		if (empty($this->menu_handler)) return -1;
+
+		// For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql
+		// may use an already used value because its internal cursor does not increase when we do
+		// an insert with a forced id.
+		if (in_array($this->db->type,array('pgsql')))
+		{
+		  $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
+		  $resqlrowid=$this->db->query($sql);
+		  if ($resqlrowid)
+		  {
+			   $obj=$this->db->fetch_object($resqlrowid);
+			   $maxrowid=$obj->maxrowid;
+
+			   // Max rowid can be empty if there is no record yet
+			   if(empty($maxrowid)) $maxrowid=1;
+
+			   $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
+			   //print $sql; exit;
+			   $resqlrowidset=$this->db->query($sql);
+			   if (! $resqlrowidset) dol_print_error($this->db);
+		  }
+		  else dol_print_error($this->db);
+		}
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
+		$sql.= "menu_handler,";
+		$sql.= "entity,";
+		$sql.= "module,";
+		$sql.= "type,";
+		$sql.= "mainmenu,";
+		$sql.= "leftmenu,";
+		$sql.= "fk_menu,";
+		$sql.= "fk_mainmenu,";
+		$sql.= "fk_leftmenu,";
+		$sql.= "position,";
+		$sql.= "url,";
+		$sql.= "target,";
+		$sql.= "titre,";
+		$sql.= "langs,";
+		$sql.= "perms,";
+		$sql.= "enabled,";
+		$sql.= "usertype";
+		$sql.= ") VALUES (";
+		$sql.= " '".$this->db->escape($this->menu_handler)."',";
+		$sql.= " '".$this->db->escape($conf->entity)."',";
+		$sql.= " '".$this->db->escape($this->module)."',";
+		$sql.= " '".$this->db->escape($this->type)."',";
+		$sql.= " ".($this->mainmenu?"'".$this->db->escape($this->mainmenu)."'":"''").",";    // Can't be null
+		$sql.= " ".($this->leftmenu?"'".$this->db->escape($this->leftmenu)."'":"null").",";
+		$sql.= " '".$this->db->escape($this->fk_menu)."',";
+		$sql.= " ".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
+		$sql.= " ".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
+		$sql.= " '".(int) $this->position."',";
+		$sql.= " '".$this->db->escape($this->url)."',";
+		$sql.= " '".$this->db->escape($this->target)."',";
+		$sql.= " '".$this->db->escape($this->titre)."',";
+		$sql.= " '".$this->db->escape($this->langs)."',";
+		$sql.= " '".$this->db->escape($this->perms)."',";
+		$sql.= " '".$this->db->escape($this->enabled)."',";
+		$sql.= " '".$this->db->escape($this->user)."'";
+		$sql.= ")";
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."menu");
+			dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);
+
+			return $this->id;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Update menu entry into database.
+	 *
+	 *  @param	User	$user        	User that modify
+	 *  @param  int		$notrigger	    0=no, 1=yes (no update trigger)
+	 *  @return int 		        	<0 if KO, >0 if OK
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
+
+		// Clean parameters
+		$this->rowid=trim($this->rowid);
+		$this->menu_handler=trim($this->menu_handler);
+		$this->module=trim($this->module);
+		$this->type=trim($this->type);
+		$this->mainmenu=trim($this->mainmenu);
+		$this->leftmenu=trim($this->leftmenu);
+		$this->fk_menu=trim($this->fk_menu);
+		$this->fk_mainmenu=trim($this->fk_mainmenu);
+		$this->fk_leftmenu=trim($this->fk_leftmenu);
+		$this->position=trim($this->position);
+		$this->url=trim($this->url);
+		$this->target=trim($this->target);
+		$this->titre=trim($this->titre);
+		$this->langs=trim($this->langs);
+		$this->perms=trim($this->perms);
+		$this->enabled=trim($this->enabled);
+		$this->user=trim($this->user);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
+		$sql.= " menu_handler='".$this->db->escape($this->menu_handler)."',";
+		$sql.= " module='".$this->db->escape($this->module)."',";
+		$sql.= " type='".$this->db->escape($this->type)."',";
+		$sql.= " mainmenu='".$this->db->escape($this->mainmenu)."',";
+		$sql.= " leftmenu='".$this->db->escape($this->leftmenu)."',";
+		$sql.= " fk_menu='".$this->db->escape($this->fk_menu)."',";
+		$sql.= " fk_mainmenu=".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
+		$sql.= " fk_leftmenu=".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
+		$sql.= " position=".($this->position > 0 ? $this->position : 0).",";
+		$sql.= " url='".$this->db->escape($this->url)."',";
+		$sql.= " target='".$this->db->escape($this->target)."',";
+		$sql.= " titre='".$this->db->escape($this->titre)."',";
+		$sql.= " langs='".$this->db->escape($this->langs)."',";
+		$sql.= " perms='".$this->db->escape($this->perms)."',";
+		$sql.= " enabled='".$this->db->escape($this->enabled)."',";
+		$sql.= " usertype='".$this->db->escape($this->user)."'";
+		$sql.= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql)
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+
+		return 1;
+	}
+
+
+	/**
+	 *   Load object in memory from database
+	 *
+	 *   @param		int		$id         Id object
+	 *   @param		User    $user       User that load
+	 *   @return	int         		<0 if KO, >0 if OK
+	 */
+	function fetch($id, $user=null)
+	{
+		global $langs;
+
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
+		$sql.= " t.menu_handler,";
+		$sql.= " t.entity,";
+		$sql.= " t.module,";
+		$sql.= " t.type,";
+		$sql.= " t.mainmenu,";
+		$sql.= " t.leftmenu,";
+		$sql.= " t.fk_menu,";
+		$sql.= " t.fk_mainmenu,";
+		$sql.= " t.fk_leftmenu,";
+		$sql.= " t.position,";
+		$sql.= " t.url,";
+		$sql.= " t.target,";
+		$sql.= " t.titre,";
+		$sql.= " t.langs,";
+		$sql.= " t.perms,";
+		$sql.= " t.enabled,";
+		$sql.= " t.usertype as user,";
+		$sql.= " t.tms";
+		$sql.= " FROM ".MAIN_DB_PREFIX."menu as t";
+		$sql.= " WHERE t.rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id    = $obj->rowid;
+
+				$this->menu_handler = $obj->menu_handler;
+				$this->entity = $obj->entity;
+				$this->module = $obj->module;
+				$this->type = $obj->type;
+				$this->mainmenu = $obj->mainmenu;
+				$this->leftmenu = $obj->leftmenu;
+				$this->fk_menu = $obj->fk_menu;
+				$this->fk_mainmenu = $obj->fk_mainmenu;
+				$this->fk_leftmenu = $obj->fk_leftmenu;
+				$this->position = $obj->position;
+				$this->url = $obj->url;
+				$this->target = $obj->target;
+				$this->titre = $obj->titre;
+				$this->langs = $obj->langs;
+				$this->perms = $obj->perms;
+				$this->enabled = str_replace("\"","'",$obj->enabled);
+				$this->user = $obj->user;
+				$this->tms = $this->db->jdate($obj->tms);
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param	User	$user       User that delete
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function delete($user)
+	{
+		global $conf, $langs;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
+		$sql.= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (! $resql)
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+
+		return 1;
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	function initAsSpecimen()
+	{
+		$this->id=0;
+
+		$this->menu_handler='all';
+		$this->module='specimen';
+		$this->type='top';
+		$this->mainmenu='';
+		$this->fk_menu='0';
+		$this->position='';
+		$this->url='http://dummy';
+		$this->target='';
+		$this->titre='Specimen menu';
+		$this->langs='';
+		$this->level='';
+		$this->leftmenu='';
+		$this->perms='';
+		$this->enabled='';
+		$this->user='';
+		$this->tms='';
+	}
+
+
+	/**
+	 *	Load tabMenu array with top menu entries found into database.
+	 *
+	 * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (always '')
+	 * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
+	 * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
+	 * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
+	 * 	@param  array	$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+	 * 	@return	array					Return array with menu entries for top menu
+	 */
+	function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
+	{
+		global $langs, $user, $conf;	// To export to dol_eval function
+		global $mainmenu,$leftmenu;		// To export to dol_eval function
+
+		$mainmenu=$mymainmenu;  // To export to dol_eval function
+		$leftmenu=$myleftmenu;  // To export to dol_eval function
+
+		$newTabMenu=array();
+		foreach($tabMenu as $val)
+		{
+			if ($val['type']=='top') $newTabMenu[]=$val;
+		}
+
+		return $newTabMenu;
+	}
+
+	/**
+	 * 	Load entries found from database (and stored into $tabMenu) in $this->newmenu array.
+	 *  Warning: Entries in $tabMenu must have child after parent
+	 *
+	 * 	@param	Menu	$newmenu        Menu array to complete (in most cases, it's empty, may be already initialized with some menu manager like eldy)
+	 * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (often $_SESSION["mainmenu"])
+	 * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
+	 * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
+	 * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
+	 * 	@param  array	$tabMenu       Array with menu entries already loaded
+	 * 	@return Menu    		       	Menu array for particular mainmenu value or full tabArray
+	 */
+	function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
+	{
+		global $langs, $user, $conf; 	// To export to dol_eval function
+		global $mainmenu,$leftmenu; 	// To export to dol_eval function
+
+		$mainmenu=$mymainmenu;  // To export to dol_eval function
+		$leftmenu=$myleftmenu;  // To export to dol_eval function
 
 		// Detect what is top mainmenu id
-        $menutopid='';
-        foreach($tabMenu as $key => $val)
-        {
-        	// Define menutopid of mainmenu
-        	if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu)
-        	{
-        		$menutopid=$val['rowid'];
-        		break;
-        	}
-        }
-
-        // We initialize newmenu with first already found menu entries
-        $this->newmenu = $newmenu;
-
-        // Now complete $this->newmenu->list to add entries found into $tabMenu that are childs of mainmenu=$menutopid, using the fk_menu link that is int (old method)
-        $this->recur($tabMenu, $menutopid, 1);
-
-        // Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)
-        foreach($tabMenu as $key => $val)
-        {
-        	//var_dump($tabMenu);
-        	if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
-        	{
-        		//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
-        		//var_dump($this->newmenu->liste);exit;
-
-        		if (empty($val['fk_leftmenu']))
-        		{
-        			$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
-        			//var_dump($this->newmenu->liste);
-        		}
-        		else
-        		{
-        			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
-        			$searchlastsub=0;$lastid=0;$nextid=0;$found=0;
-        			foreach($this->newmenu->liste as $keyparent => $valparent)
-        			{
-        				//var_dump($valparent);
-        				if ($searchlastsub)    // If we started to search for last submenu
-        				{
-        					if ($valparent['level'] >= $searchlastsub) $lastid=$keyparent;
-        					if ($valparent['level'] < $searchlastsub)
-        					{
-        						$nextid=$keyparent;
-        						break;
-        					}
-        				}
-        				if ($valparent['mainmenu'] == $val['fk_mainmenu'] && $valparent['leftmenu'] == $val['fk_leftmenu'])
-        				{
-        					//print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';
-        					// Now we look to find last subelement of this parent (we add at end)
-        					$searchlastsub=($valparent['level']+1);
-        					$lastid=$keyparent;
-        					$found=1;
-        				}
-        			}
-        			//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
-        			if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
-        			else {
-        			    dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);
-        			    //print "Parent menu not found !!<br>";
-        			}
-        		}
-        	}
-        }
-
-        return $this->newmenu;
-    }
-
-
-    /**
-     *  Load entries found in database into variable $tabMenu. Note that only "database menu entries" are loaded here, hardcoded will not be present into output.
-     *
-     *  @param	string	$mymainmenu     Value for mainmenu that defined mainmenu
-     *  @param	string	$myleftmenu     Value for left that defined leftmenu
-     *  @param  int		$type_user      Looks for menu entry for 0=Internal users, 1=External users
-     *  @param  string	$menu_handler   Name of menu_handler used ('auguria', 'eldy'...)
-     *  @param  array	$tabMenu        Array to store new entries found (in most cases, it's empty, but may be alreay filled)
-     *  @return int     		        >0 if OK, <0 if KO
-     */
-    function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
-    {
-        global $langs, $user, $conf; // To export to dol_eval function
-        global $mainmenu, $leftmenu; // To export to dol_eval function
-
-        $menutopid=0;
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
-
-        $sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
-        $sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
-        $sql.= " WHERE m.entity IN (0,".$conf->entity.")";
-        $sql.= " AND m.menu_handler IN ('".$menu_handler."','all')";
-        if ($type_user == 0) $sql.= " AND m.usertype IN (0,2)";
-        if ($type_user == 1) $sql.= " AND m.usertype IN (1,2)";
-        $sql.= " ORDER BY m.position, m.rowid";
+		$menutopid='';
+		foreach($tabMenu as $key => $val)
+		{
+			// Define menutopid of mainmenu
+			if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu)
+			{
+				$menutopid=$val['rowid'];
+				break;
+			}
+		}
+
+		// We initialize newmenu with first already found menu entries
+		$this->newmenu = $newmenu;
+
+		// Now complete $this->newmenu->list to add entries found into $tabMenu that are childs of mainmenu=$menutopid, using the fk_menu link that is int (old method)
+		$this->recur($tabMenu, $menutopid, 1);
+
+		// Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)
+		foreach($tabMenu as $key => $val)
+		{
+			//var_dump($tabMenu);
+			if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
+			{
+				//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
+				//var_dump($this->newmenu->liste);exit;
+
+				if (empty($val['fk_leftmenu']))
+				{
+					$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+					//var_dump($this->newmenu->liste);
+				}
+				else
+				{
+					// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
+					$searchlastsub=0;$lastid=0;$nextid=0;$found=0;
+					foreach($this->newmenu->liste as $keyparent => $valparent)
+					{
+						//var_dump($valparent);
+						if ($searchlastsub)    // If we started to search for last submenu
+						{
+							if ($valparent['level'] >= $searchlastsub) $lastid=$keyparent;
+							if ($valparent['level'] < $searchlastsub)
+							{
+								$nextid=$keyparent;
+								break;
+							}
+						}
+						if ($valparent['mainmenu'] == $val['fk_mainmenu'] && $valparent['leftmenu'] == $val['fk_leftmenu'])
+						{
+							//print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';
+							// Now we look to find last subelement of this parent (we add at end)
+							$searchlastsub=($valparent['level']+1);
+							$lastid=$keyparent;
+							$found=1;
+						}
+					}
+					//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
+					if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+					else {
+						dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);
+						//print "Parent menu not found !!<br>";
+					}
+				}
+			}
+		}
+
+		return $this->newmenu;
+	}
+
+
+	/**
+	 *  Load entries found in database into variable $tabMenu. Note that only "database menu entries" are loaded here, hardcoded will not be present into output.
+	 *
+	 *  @param	string	$mymainmenu     Value for mainmenu that defined mainmenu
+	 *  @param	string	$myleftmenu     Value for left that defined leftmenu
+	 *  @param  int		$type_user      Looks for menu entry for 0=Internal users, 1=External users
+	 *  @param  string	$menu_handler   Name of menu_handler used ('auguria', 'eldy'...)
+	 *  @param  array	$tabMenu        Array to store new entries found (in most cases, it's empty, but may be alreay filled)
+	 *  @return int     		        >0 if OK, <0 if KO
+	 */
+	function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
+	{
+		global $langs, $user, $conf; // To export to dol_eval function
+		global $mainmenu, $leftmenu; // To export to dol_eval function
+
+		$menutopid=0;
+		$mainmenu=$mymainmenu;  // To export to dol_eval function
+		$leftmenu=$myleftmenu;  // To export to dol_eval function
+
+		$sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
+		$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
+		$sql.= " WHERE m.entity IN (0,".$conf->entity.")";
+		$sql.= " AND m.menu_handler IN ('".$menu_handler."','all')";
+		if ($type_user == 0) $sql.= " AND m.usertype IN (0,2)";
+		if ($type_user == 1) $sql.= " AND m.usertype IN (1,2)";
+		$sql.= " ORDER BY m.position, m.rowid";
 		//print $sql;
 
 //$tmp1=microtime(true);
 //print '>>> 1 0<br>';
-        dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $numa = $this->db->num_rows($resql);
-
-            $a = 0;
-            $b = 0;
-            $oldrowid=0;
-            while ($a < $numa)
-            {
-                //$objm = $this->db->fetch_object($resql);
-                $menu = $this->db->fetch_array($resql);
-
-                // Define $right
-                $perms = true;
-                if ($menu['perms'])
-                {
-                	$tmpcond=$menu['perms'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
-                	$perms = verifCond($tmpcond);
-                    //print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
-                }
-
-                // Define $enabled
-                $enabled = true;
-                if ($menu['enabled'])
-                {
-                	$tmpcond=$menu['enabled'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
-                    $enabled = verifCond($tmpcond);
-                }
-
-                // Define $title
-                if ($enabled)
-                {
-                	$title = $langs->trans($menu['titre']);
-                    if ($title == $menu['titre'])   // Translation not found
-                    {
-                        if (! empty($menu['langs']))    // If there is a dedicated translation file
-                        {
-                        	//print 'Load file '.$menu['langs'].'<br>';
-                            $langs->load($menu['langs']);
-                        }
-
-                        if (preg_match("/\//",$menu['titre'])) // To manage translation when title is string1/string2
-                        {
-                            $tab_titre = explode("/",$menu['titre']);
-                            $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
-                        }
-                        else if (preg_match('/\|\|/',$menu['titre'])) // To manage different translation (Title||AltTitle@ConditionForAltTitle)
-                        {
-                        	$tab_title = explode("||",$menu['titre']);
-                        	$alt_title = explode("@",$tab_title[1]);
-                        	$title_enabled = verifCond($alt_title[1]);
-                        	$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
-                        }
-                        else
-                        {
-                            $title = $langs->trans($menu['titre']);
-                        }
-                    }
+		dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$numa = $this->db->num_rows($resql);
+
+			$a = 0;
+			$b = 0;
+			$oldrowid=0;
+			while ($a < $numa)
+			{
+				//$objm = $this->db->fetch_object($resql);
+				$menu = $this->db->fetch_array($resql);
+
+				// Define $right
+				$perms = true;
+				if ($menu['perms'])
+				{
+					$tmpcond=$menu['perms'];
+					if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+					$perms = verifCond($tmpcond);
+					//print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
+				}
+
+				// Define $enabled
+				$enabled = true;
+				if ($menu['enabled'])
+				{
+					$tmpcond=$menu['enabled'];
+					if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+					$enabled = verifCond($tmpcond);
+				}
+
+				// Define $title
+				if ($enabled)
+				{
+					$title = $langs->trans($menu['titre']);
+					if ($title == $menu['titre'])   // Translation not found
+					{
+						if (! empty($menu['langs']))    // If there is a dedicated translation file
+						{
+							//print 'Load file '.$menu['langs'].'<br>';
+							$langs->load($menu['langs']);
+						}
+
+						if (preg_match("/\//",$menu['titre'])) // To manage translation when title is string1/string2
+						{
+							$tab_titre = explode("/",$menu['titre']);
+							$title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
+						}
+						else if (preg_match('/\|\|/',$menu['titre'])) // To manage different translation (Title||AltTitle@ConditionForAltTitle)
+						{
+							$tab_title = explode("||",$menu['titre']);
+							$alt_title = explode("@",$tab_title[1]);
+							$title_enabled = verifCond($alt_title[1]);
+							$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
+						}
+						else
+						{
+							$title = $langs->trans($menu['titre']);
+						}
+					}
 //$tmp4=microtime(true);
 //print '>>> 3 '.($tmp4 - $tmp3).'<br>';
 
-                    // We complete tabMenu
-                    $tabMenu[$b]['rowid']       = $menu['rowid'];
-                    $tabMenu[$b]['module']      = $menu['module'];
-                    $tabMenu[$b]['fk_menu']     = $menu['fk_menu'];
-                    $tabMenu[$b]['url']         = $menu['url'];
-                    if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b]['url']))
-                    {
-                        if (preg_match('/\?/',$tabMenu[$b]['url'])) $tabMenu[$b]['url'].='&amp;idmenu='.$menu['rowid'];
-                        else $tabMenu[$b]['url'].='?idmenu='.$menu['rowid'];
-                    }
-                    $tabMenu[$b]['titre']       = $title;
-                    $tabMenu[$b]['target']      = $menu['target'];
-                    $tabMenu[$b]['mainmenu']    = $menu['mainmenu'];
-                    $tabMenu[$b]['leftmenu']    = $menu['leftmenu'];
-                    $tabMenu[$b]['perms']       = $perms;
-                    $tabMenu[$b]['enabled']     = $enabled;
-                    $tabMenu[$b]['type']        = $menu['type'];
-                    //$tabMenu[$b]['langs']       = $menu['langs'];
-                    $tabMenu[$b]['fk_mainmenu'] = $menu['fk_mainmenu'];
-                    $tabMenu[$b]['fk_leftmenu'] = $menu['fk_leftmenu'];
-                    $tabMenu[$b]['position']    = (int) $menu['position'];
-
-                    $b++;
-                }
-
-                $a++;
-            }
-            $this->db->free($resql);
-
-            // Currently $tabMenu is sorted on position.
-            // If a child have a position lower that its parent, we can make a loop to fix this here, but we prefer to show a warning
-            // into the leftMenuCharger later to avoid useless operations.
-
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
-
-    /**
-     *  Complete this->newmenu with menu entry found in $tab
-     *
-     *  @param  array	$tab			Tab array with all menu entries
-     *  @param  int		$pere			Id of parent
-     *  @param  int		$level			Level
-     *  @return	void
-     */
-    private function recur($tab, $pere, $level)
-    {
-        // Loop on tab array
-        $num = count($tab);
-        for ($x = 0; $x < $num; $x++)
-        {
-            //si un element a pour pere : $pere
-            if ( (($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])
-            {
-                $this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level-1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);
-                $this->recur($tab, $tab[$x]['rowid'], ($level+1));
-            }
-        }
+					// We complete tabMenu
+					$tabMenu[$b]['rowid']       = $menu['rowid'];
+					$tabMenu[$b]['module']      = $menu['module'];
+					$tabMenu[$b]['fk_menu']     = $menu['fk_menu'];
+					$tabMenu[$b]['url']         = $menu['url'];
+					if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b]['url']))
+					{
+						if (preg_match('/\?/',$tabMenu[$b]['url'])) $tabMenu[$b]['url'].='&amp;idmenu='.$menu['rowid'];
+						else $tabMenu[$b]['url'].='?idmenu='.$menu['rowid'];
+					}
+					$tabMenu[$b]['titre']       = $title;
+					$tabMenu[$b]['target']      = $menu['target'];
+					$tabMenu[$b]['mainmenu']    = $menu['mainmenu'];
+					$tabMenu[$b]['leftmenu']    = $menu['leftmenu'];
+					$tabMenu[$b]['perms']       = $perms;
+					$tabMenu[$b]['enabled']     = $enabled;
+					$tabMenu[$b]['type']        = $menu['type'];
+					//$tabMenu[$b]['langs']       = $menu['langs'];
+					$tabMenu[$b]['fk_mainmenu'] = $menu['fk_mainmenu'];
+					$tabMenu[$b]['fk_leftmenu'] = $menu['fk_leftmenu'];
+					$tabMenu[$b]['position']    = (int) $menu['position'];
+
+					$b++;
+				}
+
+				$a++;
+			}
+			$this->db->free($resql);
+
+			// Currently $tabMenu is sorted on position.
+			// If a child have a position lower that its parent, we can make a loop to fix this here, but we prefer to show a warning
+			// into the leftMenuCharger later to avoid useless operations.
+
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 *  Complete this->newmenu with menu entry found in $tab
+	 *
+	 *  @param  array	$tab			Tab array with all menu entries
+	 *  @param  int		$pere			Id of parent
+	 *  @param  int		$level			Level
+	 *  @return	void
+	 */
+	private function recur($tab, $pere, $level)
+	{
+		// Loop on tab array
+		$num = count($tab);
+		for ($x = 0; $x < $num; $x++)
+		{
+			//si un element a pour pere : $pere
+			if ( (($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])
+			{
+				$this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level-1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);
+				$this->recur($tab, $tab[$x]['rowid'], ($level+1));
+			}
+		}
    }
 
 }

Spacing +201 added lines, -201 removed lines

@@ -28,9 +28,9 @@ 
  */
 class Menubase
 {
-    public $db;							// To store db handler
-    public $error;							// To return error code (or message)
-    public $errors=array();				// To return several error codes (or messages)
+    public $db; // To store db handler
+    public $error; // To return error code (or message)
+    public $errors = array(); // To return several error codes (or messages)
 
     public $id;
 
@@ -47,7 +47,7 @@ 
     public $titre;
     public $langs;
     public $level;
-    public $leftmenu;		//<! Not used
+    public $leftmenu; //<! Not used
     public $perms;
     public $enabled;
     public $user;
@@ -60,7 +60,7 @@ 
 	 *  @param		DoliDB		$db 		    Database handler
      *  @param     	string		$menu_handler	Menu handler
      */
-    function __construct($db,$menu_handler='')
+    function __construct($db, $menu_handler = '')
     {
         $this->db = $db;
         $this->menu_handler = $menu_handler;
@@ -74,29 +74,29 @@ 
      *      @param      User	$user       User that create
      *      @return     int      			<0 if KO, Id of record if OK
      */
-    function create($user=null)
+    function create($user = null)
     {
         global $conf, $langs;
 
         // Clean parameters
-        $this->menu_handler=trim($this->menu_handler);
-        $this->module=trim($this->module);
-        $this->type=trim($this->type);
-        $this->mainmenu=trim($this->mainmenu);
-        $this->leftmenu=trim($this->leftmenu);
-        $this->fk_menu=trim($this->fk_menu);          // If -1, fk_mainmenu and fk_leftmenu must be defined
-        $this->fk_mainmenu=trim($this->fk_mainmenu);
-        $this->fk_leftmenu=trim($this->fk_leftmenu);
-        $this->position=trim($this->position);
-        $this->url=trim($this->url);
-        $this->target=trim($this->target);
-        $this->titre=trim($this->titre);
-        $this->langs=trim($this->langs);
-        $this->perms=trim($this->perms);
-        $this->enabled=trim($this->enabled);
-        $this->user=trim($this->user);
-        $this->position=trim($this->position);
-        if (! $this->level) $this->level=0;
+        $this->menu_handler = trim($this->menu_handler);
+        $this->module = trim($this->module);
+        $this->type = trim($this->type);
+        $this->mainmenu = trim($this->mainmenu);
+        $this->leftmenu = trim($this->leftmenu);
+        $this->fk_menu = trim($this->fk_menu); // If -1, fk_mainmenu and fk_leftmenu must be defined
+        $this->fk_mainmenu = trim($this->fk_mainmenu);
+        $this->fk_leftmenu = trim($this->fk_leftmenu);
+        $this->position = trim($this->position);
+        $this->url = trim($this->url);
+        $this->target = trim($this->target);
+        $this->titre = trim($this->titre);
+        $this->langs = trim($this->langs);
+        $this->perms = trim($this->perms);
+        $this->enabled = trim($this->enabled);
+        $this->user = trim($this->user);
+        $this->position = trim($this->position);
+        if (!$this->level) $this->level = 0;
 
         // Check parameters
         if (empty($this->menu_handler)) return -1;
@@ -104,67 +104,67 @@ 
         // For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql
         // may use an already used value because its internal cursor does not increase when we do
         // an insert with a forced id.
-        if (in_array($this->db->type,array('pgsql')))
+        if (in_array($this->db->type, array('pgsql')))
         {
           $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
-          $resqlrowid=$this->db->query($sql);
+          $resqlrowid = $this->db->query($sql);
           if ($resqlrowid)
           {
-               $obj=$this->db->fetch_object($resqlrowid);
-               $maxrowid=$obj->maxrowid;
+               $obj = $this->db->fetch_object($resqlrowid);
+               $maxrowid = $obj->maxrowid;
 
                // Max rowid can be empty if there is no record yet
-               if(empty($maxrowid)) $maxrowid=1;
+               if (empty($maxrowid)) $maxrowid = 1;
 
                $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
                //print $sql; exit;
-               $resqlrowidset=$this->db->query($sql);
-               if (! $resqlrowidset) dol_print_error($this->db);
+               $resqlrowidset = $this->db->query($sql);
+               if (!$resqlrowidset) dol_print_error($this->db);
           }
           else dol_print_error($this->db);
         }
 
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
-        $sql.= "menu_handler,";
-        $sql.= "entity,";
-        $sql.= "module,";
-        $sql.= "type,";
-        $sql.= "mainmenu,";
-        $sql.= "leftmenu,";
-        $sql.= "fk_menu,";
-        $sql.= "fk_mainmenu,";
-        $sql.= "fk_leftmenu,";
-        $sql.= "position,";
-        $sql.= "url,";
-        $sql.= "target,";
-        $sql.= "titre,";
-        $sql.= "langs,";
-        $sql.= "perms,";
-        $sql.= "enabled,";
-        $sql.= "usertype";
-        $sql.= ") VALUES (";
-        $sql.= " '".$this->db->escape($this->menu_handler)."',";
-        $sql.= " '".$this->db->escape($conf->entity)."',";
-        $sql.= " '".$this->db->escape($this->module)."',";
-        $sql.= " '".$this->db->escape($this->type)."',";
-        $sql.= " ".($this->mainmenu?"'".$this->db->escape($this->mainmenu)."'":"''").",";    // Can't be null
-        $sql.= " ".($this->leftmenu?"'".$this->db->escape($this->leftmenu)."'":"null").",";
-        $sql.= " '".$this->db->escape($this->fk_menu)."',";
-        $sql.= " ".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
-        $sql.= " ".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
-        $sql.= " '".(int) $this->position."',";
-        $sql.= " '".$this->db->escape($this->url)."',";
-        $sql.= " '".$this->db->escape($this->target)."',";
-        $sql.= " '".$this->db->escape($this->titre)."',";
-        $sql.= " '".$this->db->escape($this->langs)."',";
-        $sql.= " '".$this->db->escape($this->perms)."',";
-        $sql.= " '".$this->db->escape($this->enabled)."',";
-        $sql.= " '".$this->db->escape($this->user)."'";
-        $sql.= ")";
+        $sql .= "menu_handler,";
+        $sql .= "entity,";
+        $sql .= "module,";
+        $sql .= "type,";
+        $sql .= "mainmenu,";
+        $sql .= "leftmenu,";
+        $sql .= "fk_menu,";
+        $sql .= "fk_mainmenu,";
+        $sql .= "fk_leftmenu,";
+        $sql .= "position,";
+        $sql .= "url,";
+        $sql .= "target,";
+        $sql .= "titre,";
+        $sql .= "langs,";
+        $sql .= "perms,";
+        $sql .= "enabled,";
+        $sql .= "usertype";
+        $sql .= ") VALUES (";
+        $sql .= " '".$this->db->escape($this->menu_handler)."',";
+        $sql .= " '".$this->db->escape($conf->entity)."',";
+        $sql .= " '".$this->db->escape($this->module)."',";
+        $sql .= " '".$this->db->escape($this->type)."',";
+        $sql .= " ".($this->mainmenu ? "'".$this->db->escape($this->mainmenu)."'" : "''").","; // Can't be null
+        $sql .= " ".($this->leftmenu ? "'".$this->db->escape($this->leftmenu)."'" : "null").",";
+        $sql .= " '".$this->db->escape($this->fk_menu)."',";
+        $sql .= " ".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";
+        $sql .= " ".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";
+        $sql .= " '".(int) $this->position."',";
+        $sql .= " '".$this->db->escape($this->url)."',";
+        $sql .= " '".$this->db->escape($this->target)."',";
+        $sql .= " '".$this->db->escape($this->titre)."',";
+        $sql .= " '".$this->db->escape($this->langs)."',";
+        $sql .= " '".$this->db->escape($this->perms)."',";
+        $sql .= " '".$this->db->escape($this->enabled)."',";
+        $sql .= " '".$this->db->escape($this->user)."'";
+        $sql .= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."menu");
@@ -174,7 +174,7 @@ 
         }
         else
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -186,57 +186,57 @@ 
      *  @param  int		$notrigger	    0=no, 1=yes (no update trigger)
      *  @return int 		        	<0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
         global $conf, $langs;
 
         // Clean parameters
-        $this->rowid=trim($this->rowid);
-        $this->menu_handler=trim($this->menu_handler);
-        $this->module=trim($this->module);
-        $this->type=trim($this->type);
-        $this->mainmenu=trim($this->mainmenu);
-        $this->leftmenu=trim($this->leftmenu);
-        $this->fk_menu=trim($this->fk_menu);
-        $this->fk_mainmenu=trim($this->fk_mainmenu);
-        $this->fk_leftmenu=trim($this->fk_leftmenu);
-        $this->position=trim($this->position);
-        $this->url=trim($this->url);
-        $this->target=trim($this->target);
-        $this->titre=trim($this->titre);
-        $this->langs=trim($this->langs);
-        $this->perms=trim($this->perms);
-        $this->enabled=trim($this->enabled);
-        $this->user=trim($this->user);
+        $this->rowid = trim($this->rowid);
+        $this->menu_handler = trim($this->menu_handler);
+        $this->module = trim($this->module);
+        $this->type = trim($this->type);
+        $this->mainmenu = trim($this->mainmenu);
+        $this->leftmenu = trim($this->leftmenu);
+        $this->fk_menu = trim($this->fk_menu);
+        $this->fk_mainmenu = trim($this->fk_mainmenu);
+        $this->fk_leftmenu = trim($this->fk_leftmenu);
+        $this->position = trim($this->position);
+        $this->url = trim($this->url);
+        $this->target = trim($this->target);
+        $this->titre = trim($this->titre);
+        $this->langs = trim($this->langs);
+        $this->perms = trim($this->perms);
+        $this->enabled = trim($this->enabled);
+        $this->user = trim($this->user);
 
         // Check parameters
         // Put here code to add control on parameters values
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
-        $sql.= " menu_handler='".$this->db->escape($this->menu_handler)."',";
-        $sql.= " module='".$this->db->escape($this->module)."',";
-        $sql.= " type='".$this->db->escape($this->type)."',";
-        $sql.= " mainmenu='".$this->db->escape($this->mainmenu)."',";
-        $sql.= " leftmenu='".$this->db->escape($this->leftmenu)."',";
-        $sql.= " fk_menu='".$this->db->escape($this->fk_menu)."',";
-        $sql.= " fk_mainmenu=".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
-        $sql.= " fk_leftmenu=".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
-        $sql.= " position=".($this->position > 0 ? $this->position : 0).",";
-        $sql.= " url='".$this->db->escape($this->url)."',";
-        $sql.= " target='".$this->db->escape($this->target)."',";
-        $sql.= " titre='".$this->db->escape($this->titre)."',";
-        $sql.= " langs='".$this->db->escape($this->langs)."',";
-        $sql.= " perms='".$this->db->escape($this->perms)."',";
-        $sql.= " enabled='".$this->db->escape($this->enabled)."',";
-        $sql.= " usertype='".$this->db->escape($this->user)."'";
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " menu_handler='".$this->db->escape($this->menu_handler)."',";
+        $sql .= " module='".$this->db->escape($this->module)."',";
+        $sql .= " type='".$this->db->escape($this->type)."',";
+        $sql .= " mainmenu='".$this->db->escape($this->mainmenu)."',";
+        $sql .= " leftmenu='".$this->db->escape($this->leftmenu)."',";
+        $sql .= " fk_menu='".$this->db->escape($this->fk_menu)."',";
+        $sql .= " fk_mainmenu=".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";
+        $sql .= " fk_leftmenu=".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";
+        $sql .= " position=".($this->position > 0 ? $this->position : 0).",";
+        $sql .= " url='".$this->db->escape($this->url)."',";
+        $sql .= " target='".$this->db->escape($this->target)."',";
+        $sql .= " titre='".$this->db->escape($this->titre)."',";
+        $sql .= " langs='".$this->db->escape($this->langs)."',";
+        $sql .= " perms='".$this->db->escape($this->perms)."',";
+        $sql .= " enabled='".$this->db->escape($this->enabled)."',";
+        $sql .= " usertype='".$this->db->escape($this->user)."'";
+        $sql .= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql)
+        if (!$resql)
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
 
@@ -251,42 +251,42 @@ 
      *   @param		User    $user       User that load
      *   @return	int         		<0 if KO, >0 if OK
      */
-    function fetch($id, $user=null)
+    function fetch($id, $user = null)
     {
         global $langs;
 
         $sql = "SELECT";
-        $sql.= " t.rowid,";
-        $sql.= " t.menu_handler,";
-        $sql.= " t.entity,";
-        $sql.= " t.module,";
-        $sql.= " t.type,";
-        $sql.= " t.mainmenu,";
-        $sql.= " t.leftmenu,";
-        $sql.= " t.fk_menu,";
-        $sql.= " t.fk_mainmenu,";
-        $sql.= " t.fk_leftmenu,";
-        $sql.= " t.position,";
-        $sql.= " t.url,";
-        $sql.= " t.target,";
-        $sql.= " t.titre,";
-        $sql.= " t.langs,";
-        $sql.= " t.perms,";
-        $sql.= " t.enabled,";
-        $sql.= " t.usertype as user,";
-        $sql.= " t.tms";
-        $sql.= " FROM ".MAIN_DB_PREFIX."menu as t";
-        $sql.= " WHERE t.rowid = ".$id;
+        $sql .= " t.rowid,";
+        $sql .= " t.menu_handler,";
+        $sql .= " t.entity,";
+        $sql .= " t.module,";
+        $sql .= " t.type,";
+        $sql .= " t.mainmenu,";
+        $sql .= " t.leftmenu,";
+        $sql .= " t.fk_menu,";
+        $sql .= " t.fk_mainmenu,";
+        $sql .= " t.fk_leftmenu,";
+        $sql .= " t.position,";
+        $sql .= " t.url,";
+        $sql .= " t.target,";
+        $sql .= " t.titre,";
+        $sql .= " t.langs,";
+        $sql .= " t.perms,";
+        $sql .= " t.enabled,";
+        $sql .= " t.usertype as user,";
+        $sql .= " t.tms";
+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as t";
+        $sql .= " WHERE t.rowid = ".$id;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
+                $this->id = $obj->rowid;
 
                 $this->menu_handler = $obj->menu_handler;
                 $this->entity = $obj->entity;
@@ -303,7 +303,7 @@ 
                 $this->titre = $obj->titre;
                 $this->langs = $obj->langs;
                 $this->perms = $obj->perms;
-                $this->enabled = str_replace("\"","'",$obj->enabled);
+                $this->enabled = str_replace("\"", "'", $obj->enabled);
                 $this->user = $obj->user;
                 $this->tms = $this->db->jdate($obj->tms);
             }
@@ -313,7 +313,7 @@ 
         }
         else
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -330,13 +330,13 @@ 
         global $conf, $langs;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql)
+        if (!$resql)
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
 
@@ -353,24 +353,24 @@ 
      */
     function initAsSpecimen()
     {
-        $this->id=0;
-
-        $this->menu_handler='all';
-        $this->module='specimen';
-        $this->type='top';
-        $this->mainmenu='';
-        $this->fk_menu='0';
-        $this->position='';
-        $this->url='http://dummy';
-        $this->target='';
-        $this->titre='Specimen menu';
-        $this->langs='';
-        $this->level='';
-        $this->leftmenu='';
-        $this->perms='';
-        $this->enabled='';
-        $this->user='';
-        $this->tms='';
+        $this->id = 0;
+
+        $this->menu_handler = 'all';
+        $this->module = 'specimen';
+        $this->type = 'top';
+        $this->mainmenu = '';
+        $this->fk_menu = '0';
+        $this->position = '';
+        $this->url = 'http://dummy';
+        $this->target = '';
+        $this->titre = 'Specimen menu';
+        $this->langs = '';
+        $this->level = '';
+        $this->leftmenu = '';
+        $this->perms = '';
+        $this->enabled = '';
+        $this->user = '';
+        $this->tms = '';
     }
 
 
@@ -386,16 +386,16 @@ 
      */
     function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
     {
-        global $langs, $user, $conf;	// To export to dol_eval function
-        global $mainmenu,$leftmenu;		// To export to dol_eval function
+        global $langs, $user, $conf; // To export to dol_eval function
+        global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
+        $mainmenu = $mymainmenu; // To export to dol_eval function
+        $leftmenu = $myleftmenu; // To export to dol_eval function
 
-        $newTabMenu=array();
-        foreach($tabMenu as $val)
+        $newTabMenu = array();
+        foreach ($tabMenu as $val)
         {
-            if ($val['type']=='top') $newTabMenu[]=$val;
+            if ($val['type'] == 'top') $newTabMenu[] = $val;
         }
 
         return $newTabMenu;
@@ -415,20 +415,20 @@ 
      */
     function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
     {
-        global $langs, $user, $conf; 	// To export to dol_eval function
-        global $mainmenu,$leftmenu; 	// To export to dol_eval function
+        global $langs, $user, $conf; // To export to dol_eval function
+        global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
+        $mainmenu = $mymainmenu; // To export to dol_eval function
+        $leftmenu = $myleftmenu; // To export to dol_eval function
 
 		// Detect what is top mainmenu id
-        $menutopid='';
-        foreach($tabMenu as $key => $val)
+        $menutopid = '';
+        foreach ($tabMenu as $key => $val)
         {
         	// Define menutopid of mainmenu
         	if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu)
         	{
-        		$menutopid=$val['rowid'];
+        		$menutopid = $val['rowid'];
         		break;
         	}
         }
@@ -440,7 +440,7 @@ 
         $this->recur($tabMenu, $menutopid, 1);
 
         // Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)
-        foreach($tabMenu as $key => $val)
+        foreach ($tabMenu as $key => $val)
         {
         	//var_dump($tabMenu);
         	if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
@@ -456,16 +456,16 @@ 
         		else
         		{
         			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
-        			$searchlastsub=0;$lastid=0;$nextid=0;$found=0;
-        			foreach($this->newmenu->liste as $keyparent => $valparent)
+        			$searchlastsub = 0; $lastid = 0; $nextid = 0; $found = 0;
+        			foreach ($this->newmenu->liste as $keyparent => $valparent)
         			{
         				//var_dump($valparent);
         				if ($searchlastsub)    // If we started to search for last submenu
         				{
-        					if ($valparent['level'] >= $searchlastsub) $lastid=$keyparent;
+        					if ($valparent['level'] >= $searchlastsub) $lastid = $keyparent;
         					if ($valparent['level'] < $searchlastsub)
         					{
-        						$nextid=$keyparent;
+        						$nextid = $keyparent;
         						break;
         					}
         				}
@@ -473,9 +473,9 @@ 
         				{
         					//print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';
         					// Now we look to find last subelement of this parent (we add at end)
-        					$searchlastsub=($valparent['level']+1);
-        					$lastid=$keyparent;
-        					$found=1;
+        					$searchlastsub = ($valparent['level'] + 1);
+        					$lastid = $keyparent;
+        					$found = 1;
         				}
         			}
         			//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
@@ -507,17 +507,17 @@ 
         global $langs, $user, $conf; // To export to dol_eval function
         global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $menutopid=0;
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
+        $menutopid = 0;
+        $mainmenu = $mymainmenu; // To export to dol_eval function
+        $leftmenu = $myleftmenu; // To export to dol_eval function
 
         $sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
-        $sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
-        $sql.= " WHERE m.entity IN (0,".$conf->entity.")";
-        $sql.= " AND m.menu_handler IN ('".$menu_handler."','all')";
-        if ($type_user == 0) $sql.= " AND m.usertype IN (0,2)";
-        if ($type_user == 1) $sql.= " AND m.usertype IN (1,2)";
-        $sql.= " ORDER BY m.position, m.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
+        $sql .= " WHERE m.entity IN (0,".$conf->entity.")";
+        $sql .= " AND m.menu_handler IN ('".$menu_handler."','all')";
+        if ($type_user == 0) $sql .= " AND m.usertype IN (0,2)";
+        if ($type_user == 1) $sql .= " AND m.usertype IN (1,2)";
+        $sql .= " ORDER BY m.position, m.rowid";
 		//print $sql;
 
 //$tmp1=microtime(true);
@@ -530,7 +530,7 @@ 
 
             $a = 0;
             $b = 0;
-            $oldrowid=0;
+            $oldrowid = 0;
             while ($a < $numa)
             {
                 //$objm = $this->db->fetch_object($resql);
@@ -540,8 +540,8 @@ 
                 $perms = true;
                 if ($menu['perms'])
                 {
-                	$tmpcond=$menu['perms'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+                	$tmpcond = $menu['perms'];
+                	if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
                 	$perms = verifCond($tmpcond);
                     //print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
                 }
@@ -550,8 +550,8 @@ 
                 $enabled = true;
                 if ($menu['enabled'])
                 {
-                	$tmpcond=$menu['enabled'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+                	$tmpcond = $menu['enabled'];
+                	if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
                     $enabled = verifCond($tmpcond);
                 }
 
@@ -561,21 +561,21 @@ 
                 	$title = $langs->trans($menu['titre']);
                     if ($title == $menu['titre'])   // Translation not found
                     {
-                        if (! empty($menu['langs']))    // If there is a dedicated translation file
+                        if (!empty($menu['langs']))    // If there is a dedicated translation file
                         {
                         	//print 'Load file '.$menu['langs'].'<br>';
                             $langs->load($menu['langs']);
                         }
 
-                        if (preg_match("/\//",$menu['titre'])) // To manage translation when title is string1/string2
+                        if (preg_match("/\//", $menu['titre'])) // To manage translation when title is string1/string2
                         {
-                            $tab_titre = explode("/",$menu['titre']);
+                            $tab_titre = explode("/", $menu['titre']);
                             $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
                         }
-                        else if (preg_match('/\|\|/',$menu['titre'])) // To manage different translation (Title||AltTitle@ConditionForAltTitle)
+                        else if (preg_match('/\|\|/', $menu['titre'])) // To manage different translation (Title||AltTitle@ConditionForAltTitle)
                         {
-                        	$tab_title = explode("||",$menu['titre']);
-                        	$alt_title = explode("@",$tab_title[1]);
+                        	$tab_title = explode("||", $menu['titre']);
+                        	$alt_title = explode("@", $tab_title[1]);
                         	$title_enabled = verifCond($alt_title[1]);
                         	$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
                         }
@@ -592,10 +592,10 @@ 
                     $tabMenu[$b]['module']      = $menu['module'];
                     $tabMenu[$b]['fk_menu']     = $menu['fk_menu'];
                     $tabMenu[$b]['url']         = $menu['url'];
-                    if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b]['url']))
+                    if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url']))
                     {
-                        if (preg_match('/\?/',$tabMenu[$b]['url'])) $tabMenu[$b]['url'].='&amp;idmenu='.$menu['rowid'];
-                        else $tabMenu[$b]['url'].='?idmenu='.$menu['rowid'];
+                        if (preg_match('/\?/', $tabMenu[$b]['url'])) $tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];
+                        else $tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];
                     }
                     $tabMenu[$b]['titre']       = $title;
                     $tabMenu[$b]['target']      = $menu['target'];
@@ -644,10 +644,10 @@ 
         for ($x = 0; $x < $num; $x++)
         {
             //si un element a pour pere : $pere
-            if ( (($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])
+            if ((($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])
             {
-                $this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level-1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);
-                $this->recur($tab, $tab[$x]['rowid'], ($level+1));
+                $this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level - 1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);
+                $this->recur($tab, $tab[$x]['rowid'], ($level + 1));
             }
         }
    }

htdocs/core/class/discount.class.php

Braces +71 added lines, -48 removed lines

@@ -84,8 +84,12 @@ 
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
         $sql.= " WHERE sr.entity = " . $conf->entity;
-        if ($rowid) $sql.= " AND sr.rowid=".$rowid;
-        if ($fk_facture_source) $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
+        if ($rowid) {
+        	$sql.= " AND sr.rowid=".$rowid;
+        }
+        if ($fk_facture_source) {
+        	$sql.= " AND sr.fk_facture_source=".$fk_facture_source;
+        }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -111,14 +115,12 @@ 
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else
+            } else
             {
                 $this->db->free($resql);
                 return 0;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -167,8 +169,7 @@ 
         {
             $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
             return $this->id;
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror().' - sql='.$sql;
             return -1;
@@ -206,8 +207,7 @@ 
                     $this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
                     return -2;
                 }
-            }
-            else
+            } else
             {
                 dol_print_error($this->db);
                 return -1;
@@ -218,8 +218,14 @@ 
 
         // Delete but only if not used
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
-        if ($this->fk_facture_source) $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;	// Delete all lines of same serie
-        else $sql.= " WHERE rowid = ".$this->id;	// Delete only line
+        if ($this->fk_facture_source) {
+        	$sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;
+        }
+        // Delete all lines of same serie
+        else {
+        	$sql.= " WHERE rowid = ".$this->id;
+        }
+        // Delete only line
         $sql.= " AND (fk_facture_line IS NULL";	// Not used as absolute simple discount
         $sql.= " AND fk_facture IS NULL)";		// Not used as credit note and not used as deposit
 
@@ -240,21 +246,18 @@ 
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->error=$this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
+            } else
             {
                 $this->db->commit();
                 return 1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             $this->db->rollback();
@@ -288,8 +291,12 @@ 
         }
 
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
-        if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
+        if ($rowidline) {
+        	$sql.=" SET fk_facture_line = ".$rowidline;
+        }
+        if ($rowidinvoice) {
+        	$sql.=" SET fk_facture = ".$rowidinvoice;
+        }
         $sql.=" WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
@@ -299,8 +306,7 @@ 
             $this->fk_facture_line=$rowidline;
             $this->fk_facture=$rowidinvoice;
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -3;
@@ -325,8 +331,7 @@ 
         if ($resql)
         {
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -3;
@@ -352,12 +357,26 @@ 
         //$sql  = "SELECT rc.amount_ttc as amount";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
         $sql.= " WHERE rc.entity = " . $conf->entity;
-        if ($mode != 'supplier') $sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)";	// Available
-        else $sql.= " AND (rc.fk_suppler_invoice IS NULL AND rc.fk_supplier_invoice IS NULL)";	        // Available
-        if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
-        if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
-        if ($filter)   $sql.=' AND ('.$filter.')';
-        if ($maxvalue) $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+        if ($mode != 'supplier') {
+        	$sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)";
+        }
+        // Available
+        else {
+        	$sql.= " AND (rc.fk_suppler_invoice IS NULL AND rc.fk_supplier_invoice IS NULL)";
+        }
+        // Available
+        if (is_object($company)) {
+        	$sql.= " AND rc.fk_soc = ".$company->id;
+        }
+        if (is_object($user)) {
+        	$sql.= " AND rc.fk_user = ".$user->id;
+        }
+        if ($filter) {
+        	$sql.=' AND ('.$filter.')';
+        }
+        if ($maxvalue) {
+        	$sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+        }
 
         dol_syslog(get_class($this)."::getAvailableDiscounts", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -393,15 +412,13 @@ 
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql.= ' AND f.type = 3';
-        }
-        else if ($invoice->element == 'invoice_supplier')
+        } else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql.= ' AND f.type = 3';
-        }
-        else
+        } else
         {
             $this->error=get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
@@ -412,10 +429,12 @@ 
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        }
-        else
+            if ($multicurrency) {
+            	return $obj->multicurrency_amount;
+            } else {
+				return $obj->amount;
+			}
+        } else
         {
             $this->error = $this->db->lasterror();
             return -1;
@@ -439,15 +458,13 @@ 
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql.= ' AND f.type = 2';
-        }
-        else if ($invoice->element == 'invoice_supplier')
+        } else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql.= ' AND f.type = 2';
-        }
-        else
+        } else
         {
             $this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
@@ -458,10 +475,12 @@ 
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        }
-        else
+            if ($multicurrency) {
+            	return $obj->multicurrency_amount;
+            } else {
+				return $obj->amount;
+			}
+        } else
         {
             $this->error = $this->db->lasterror();
             return -1;
@@ -497,8 +516,12 @@ 
         }
 
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
+        if ($withpicto) {
+        	$result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        }
+        if ($withpicto && $withpicto != 2) {
+        	$result.=' ';
+        }
         $result.=$link.$ref.$linkend;
         return $result;
     }

Indentation +481 added lines, -481 removed lines

@@ -29,494 +29,494 @@
  */
 class DiscountAbsolute
 {
-    public $db;
-    public $error;
-
-    public $id;					// Id discount
-    public $fk_soc;
-    public $amount_ht;				//
-    public $amount_tva;			//
-    public $amount_ttc;			//
-    public $tva_tx;				// Vat rate
-    public $fk_user;				// Id utilisateur qui accorde la remise
-    public $description;			// Description libre
-    public $datec;					// Date creation
-    public $fk_facture_line;  		// Id invoice line when a discount is used into an invoice line (for absolute discounts)
-    public $fk_facture;			    // Id invoice when a discount line is used into an invoice (for credit note)
-    public $fk_facture_source;		// Id facture avoir a l'origine de la remise
-    public $ref_facture_source;	    // Ref facture avoir a l'origine de la remise
-
-    /**
-     *	Constructor
-     *
-     *  @param  	DoliDB		$db		Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-    }
-
-
-    /**
-     *	Load object from database into memory
-     *
-     *  @param      int		$rowid       		id discount to load
-     *  @param      int		$fk_facture_source	fk_facture_source
-     *	@return		int							<0 if KO, =0 if not found, >0 if OK
-     */
-    function fetch($rowid, $fk_facture_source=0)
-    {
-    	global $conf;
-
-        // Check parameters
-        if (! $rowid && ! $fk_facture_source)
-        {
-            $this->error='ErrorBadParameters';
-            return -1;
-        }
-
-        $sql = "SELECT sr.rowid, sr.fk_soc,";
-        $sql.= " sr.fk_user,";
-        $sql.= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx,";
-        $sql.= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
-        $sql.= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.description,";
-        $sql.= " sr.datec,";
-        $sql.= " f.facnumber as ref_facture_source";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
-        $sql.= " WHERE sr.entity = " . $conf->entity;
-        if ($rowid) $sql.= " AND sr.rowid=".$rowid;
-        if ($fk_facture_source) $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
-
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id = $obj->rowid;
-                $this->fk_soc = $obj->fk_soc;
-
-                $this->amount_ht = $obj->amount_ht;
-                $this->amount_tva = $obj->amount_tva;
-                $this->amount_ttc = $obj->amount_ttc;
-
-                $this->multicurrency_amount_ht = $obj->multicurrency_amount_ht;
-                $this->multicurrency_amount_tva = $obj->multicurrency_amount_tva;
-                $this->multicurrency_amount_ttc = $obj->multicurrency_amount_ttc;
-
-                $this->tva_tx = $obj->tva_tx;
-                $this->fk_user = $obj->fk_user;
-                $this->fk_facture_line = $obj->fk_facture_line;
-                $this->fk_facture = $obj->fk_facture;
-                $this->fk_facture_source = $obj->fk_facture_source;		// Id avoir source
-                $this->ref_facture_source = $obj->ref_facture_source;	// Ref avoir source
-                $this->description = $obj->description;
-                $this->datec = $this->db->jdate($obj->datec);
-
-                $this->db->free($resql);
-                return 1;
-            }
-            else
-            {
-                $this->db->free($resql);
-                return 0;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-
-    /**
-     *      Create a discount into database
-     *
-     *      @param      User	$user       User that create
-     *      @return     int         		<0 if KO, >0 if OK
-     */
-    function create($user)
-    {
-        global $conf, $langs;
-
-        // Clean parameters
-        $this->amount_ht=price2num($this->amount_ht);
-        $this->amount_tva=price2num($this->amount_tva);
-        $this->amount_ttc=price2num($this->amount_ttc);
-        $this->tva_tx=price2num($this->tva_tx);
-
-        // Check parameters
-        if (empty($this->description))
-        {
-            $this->error='BadValueForPropertyDescription';
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-            return -1;
-        }
-
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";
-        $sql.= " (entity, datec, fk_soc, fk_user, description,";
-        $sql.= " amount_ht, amount_tva, amount_ttc, tva_tx,";
-        $sql.= " fk_facture_source";
-        $sql.= ")";
-        $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec!=''?$this->datec:dol_now())."', ".$this->fk_soc.", ".$user->id.", '".$this->db->escape($this->description)."',";
-        $sql.= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
-        $sql.= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'":"null");
-        $sql.= ")";
-
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
-            return $this->id;
-        }
-        else
-        {
-            $this->error=$this->db->lasterror().' - sql='.$sql;
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Delete object in database. If fk_facture_source is defined, we delete all familiy with same fk_facture_source. If not, only with id is removed
-     *
-     * 	@param		User	$user		Object of user asking to delete
-     *	@return		int					<0 if KO, >0 if OK
-     */
-    function delete($user)
-    {
-        global $conf, $langs;
-
-        // Check if we can remove the discount
-        if ($this->fk_facture_source)
-        {
-            $sql="SELECT COUNT(rowid) as nb";
-            $sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
-            $sql.=" WHERE (fk_facture_line IS NOT NULL";	// Not used as absolute simple discount
-            $sql.=" OR fk_facture IS NOT NULL)"; 			// Not used as credit note and not used as deposit
-            $sql.=" AND fk_facture_source = ".$this->fk_facture_source;
-            //$sql.=" AND rowid != ".$this->id;
-
-            dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if ($resql)
-            {
-                $obj = $this->db->fetch_object($resql);
-                if ($obj->nb > 0)
-                {
-                    $this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
-                    return -2;
-                }
-            }
-            else
-            {
-                dol_print_error($this->db);
-                return -1;
-            }
-        }
-
-        $this->db->begin();
-
-        // Delete but only if not used
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
-        if ($this->fk_facture_source) $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;	// Delete all lines of same serie
-        else $sql.= " WHERE rowid = ".$this->id;	// Delete only line
-        $sql.= " AND (fk_facture_line IS NULL";	// Not used as absolute simple discount
-        $sql.= " AND fk_facture IS NULL)";		// Not used as credit note and not used as deposit
-
-        dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            // If source of discount was a credit note or deposit, we change source statut.
-            if ($this->fk_facture_source)
-            {
-                $sql = "UPDATE ".MAIN_DB_PREFIX."facture";
-                $sql.=" set paye=0, fk_statut=1";
-                $sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
-
-                dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-                $result=$this->db->query($sql);
-                if ($result)
-                {
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->error=$this->db->lasterror();
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->db->commit();
-                return 1;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-
-    /**
-     *	Link the discount to a particular invoice line or a particular invoice.
-     *	When discount is a global discount used as an invoice line, we link using rowidline.
-     *	When discount is from a credit note used to reduce payment of an invoice, we link using rowidinvoice
-     *
-     *	@param		int		$rowidline		Invoice line id (To use discount into invoice lines)
-     *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    function link_to_invoice($rowidline,$rowidinvoice)
-    {
-        // Check parameters
-        if (! $rowidline && ! $rowidinvoice)
-        {
-            $this->error='ErrorBadParameters';
-            return -1;
-        }
-        if ($rowidline && $rowidinvoice)
-        {
-            $this->error='ErrorBadParameters';
-            return -2;
-        }
-
-        $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
-        if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
-        $sql.=" WHERE rowid = ".$this->id;
-
-        dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->fk_facture_line=$rowidline;
-            $this->fk_facture=$rowidinvoice;
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -3;
-        }
-    }
-
-
-    /**
-     *	Link the discount to a particular invoice line or a particular invoice.
-     *	Do not call this if discount is linked to a reconcialiated invoice
-     *
-     *	@return		int							<0 if KO, >0 if OK
-     */
-    function unlink_invoice()
-    {
-        $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        $sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
-        $sql.=" WHERE rowid = ".$this->id;
-
-        dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -3;
-        }
-    }
-
-
-    /**
-     *  Return amount (with tax) of discounts currently available for a company, user or other criteria
-     *
-     *	@param		Societe		$company	Object third party for filter
-     *	@param		User		$user		Filtre sur un user auteur des remises
-     * 	@param		string		$filter		Filtre autre
-     * 	@param		int			$maxvalue	Filter on max value for discount
-     *  @param      string      $mode       'customer' = discounts the customer has, 'supplier' = discount i have at this supplier
-     * 	@return		int						<0 if KO, amount otherwise
-     */
-    function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0, $mode='customer')
-    {
-    	global $conf;
-
-        $sql  = "SELECT SUM(rc.amount_ttc) as amount";
-        //$sql  = "SELECT rc.amount_ttc as amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
-        $sql.= " WHERE rc.entity = " . $conf->entity;
-        if ($mode != 'supplier') $sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)";	// Available
-        else $sql.= " AND (rc.fk_suppler_invoice IS NULL AND rc.fk_supplier_invoice IS NULL)";	        // Available
-        if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
-        if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
-        if ($filter)   $sql.=' AND ('.$filter.')';
-        if ($maxvalue) $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
-
-        dol_syslog(get_class($this)."::getAvailableDiscounts", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            //while ($obj)
-            //{
-            //print 'zz'.$obj->amount;
-            //$obj = $this->db->fetch_object($resql);
-            //}
-            return $obj->amount;
-        }
-        return -1;
-    }
-
-
-    /**
-     *  Return amount (with tax) of all deposits invoices used by invoice as a payment.
-     *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
-     *
-     *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)
+	public $db;
+	public $error;
+
+	public $id;					// Id discount
+	public $fk_soc;
+	public $amount_ht;				//
+	public $amount_tva;			//
+	public $amount_ttc;			//
+	public $tva_tx;				// Vat rate
+	public $fk_user;				// Id utilisateur qui accorde la remise
+	public $description;			// Description libre
+	public $datec;					// Date creation
+	public $fk_facture_line;  		// Id invoice line when a discount is used into an invoice line (for absolute discounts)
+	public $fk_facture;			    // Id invoice when a discount line is used into an invoice (for credit note)
+	public $fk_facture_source;		// Id facture avoir a l'origine de la remise
+	public $ref_facture_source;	    // Ref facture avoir a l'origine de la remise
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param  	DoliDB		$db		Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+
+	/**
+	 *	Load object from database into memory
+	 *
+	 *  @param      int		$rowid       		id discount to load
+	 *  @param      int		$fk_facture_source	fk_facture_source
+	 *	@return		int							<0 if KO, =0 if not found, >0 if OK
+	 */
+	function fetch($rowid, $fk_facture_source=0)
+	{
+		global $conf;
+
+		// Check parameters
+		if (! $rowid && ! $fk_facture_source)
+		{
+			$this->error='ErrorBadParameters';
+			return -1;
+		}
+
+		$sql = "SELECT sr.rowid, sr.fk_soc,";
+		$sql.= " sr.fk_user,";
+		$sql.= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx,";
+		$sql.= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
+		$sql.= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.description,";
+		$sql.= " sr.datec,";
+		$sql.= " f.facnumber as ref_facture_source";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
+		$sql.= " WHERE sr.entity = " . $conf->entity;
+		if ($rowid) $sql.= " AND sr.rowid=".$rowid;
+		if ($fk_facture_source) $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+				$this->fk_soc = $obj->fk_soc;
+
+				$this->amount_ht = $obj->amount_ht;
+				$this->amount_tva = $obj->amount_tva;
+				$this->amount_ttc = $obj->amount_ttc;
+
+				$this->multicurrency_amount_ht = $obj->multicurrency_amount_ht;
+				$this->multicurrency_amount_tva = $obj->multicurrency_amount_tva;
+				$this->multicurrency_amount_ttc = $obj->multicurrency_amount_ttc;
+
+				$this->tva_tx = $obj->tva_tx;
+				$this->fk_user = $obj->fk_user;
+				$this->fk_facture_line = $obj->fk_facture_line;
+				$this->fk_facture = $obj->fk_facture;
+				$this->fk_facture_source = $obj->fk_facture_source;		// Id avoir source
+				$this->ref_facture_source = $obj->ref_facture_source;	// Ref avoir source
+				$this->description = $obj->description;
+				$this->datec = $this->db->jdate($obj->datec);
+
+				$this->db->free($resql);
+				return 1;
+			}
+			else
+			{
+				$this->db->free($resql);
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *      Create a discount into database
+	 *
+	 *      @param      User	$user       User that create
+	 *      @return     int         		<0 if KO, >0 if OK
+	 */
+	function create($user)
+	{
+		global $conf, $langs;
+
+		// Clean parameters
+		$this->amount_ht=price2num($this->amount_ht);
+		$this->amount_tva=price2num($this->amount_tva);
+		$this->amount_ttc=price2num($this->amount_ttc);
+		$this->tva_tx=price2num($this->tva_tx);
+
+		// Check parameters
+		if (empty($this->description))
+		{
+			$this->error='BadValueForPropertyDescription';
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+			return -1;
+		}
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";
+		$sql.= " (entity, datec, fk_soc, fk_user, description,";
+		$sql.= " amount_ht, amount_tva, amount_ttc, tva_tx,";
+		$sql.= " fk_facture_source";
+		$sql.= ")";
+		$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec!=''?$this->datec:dol_now())."', ".$this->fk_soc.", ".$user->id.", '".$this->db->escape($this->description)."',";
+		$sql.= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
+		$sql.= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'":"null");
+		$sql.= ")";
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
+			return $this->id;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror().' - sql='.$sql;
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Delete object in database. If fk_facture_source is defined, we delete all familiy with same fk_facture_source. If not, only with id is removed
+	 *
+	 * 	@param		User	$user		Object of user asking to delete
+	 *	@return		int					<0 if KO, >0 if OK
+	 */
+	function delete($user)
+	{
+		global $conf, $langs;
+
+		// Check if we can remove the discount
+		if ($this->fk_facture_source)
+		{
+			$sql="SELECT COUNT(rowid) as nb";
+			$sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
+			$sql.=" WHERE (fk_facture_line IS NOT NULL";	// Not used as absolute simple discount
+			$sql.=" OR fk_facture IS NOT NULL)"; 			// Not used as credit note and not used as deposit
+			$sql.=" AND fk_facture_source = ".$this->fk_facture_source;
+			//$sql.=" AND rowid != ".$this->id;
+
+			dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if ($resql)
+			{
+				$obj = $this->db->fetch_object($resql);
+				if ($obj->nb > 0)
+				{
+					$this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+					return -2;
+				}
+			}
+			else
+			{
+				dol_print_error($this->db);
+				return -1;
+			}
+		}
+
+		$this->db->begin();
+
+		// Delete but only if not used
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
+		if ($this->fk_facture_source) $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;	// Delete all lines of same serie
+		else $sql.= " WHERE rowid = ".$this->id;	// Delete only line
+		$sql.= " AND (fk_facture_line IS NULL";	// Not used as absolute simple discount
+		$sql.= " AND fk_facture IS NULL)";		// Not used as credit note and not used as deposit
+
+		dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			// If source of discount was a credit note or deposit, we change source statut.
+			if ($this->fk_facture_source)
+			{
+				$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
+				$sql.=" set paye=0, fk_statut=1";
+				$sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
+
+				dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
+				$result=$this->db->query($sql);
+				if ($result)
+				{
+					$this->db->commit();
+					return 1;
+				}
+				else
+				{
+					$this->error=$this->db->lasterror();
+					$this->db->rollback();
+					return -1;
+				}
+			}
+			else
+			{
+				$this->db->commit();
+				return 1;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+
+	/**
+	 *	Link the discount to a particular invoice line or a particular invoice.
+	 *	When discount is a global discount used as an invoice line, we link using rowidline.
+	 *	When discount is from a credit note used to reduce payment of an invoice, we link using rowidinvoice
+	 *
+	 *	@param		int		$rowidline		Invoice line id (To use discount into invoice lines)
+	 *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	function link_to_invoice($rowidline,$rowidinvoice)
+	{
+		// Check parameters
+		if (! $rowidline && ! $rowidinvoice)
+		{
+			$this->error='ErrorBadParameters';
+			return -1;
+		}
+		if ($rowidline && $rowidinvoice)
+		{
+			$this->error='ErrorBadParameters';
+			return -2;
+		}
+
+		$sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+		if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
+		if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
+		$sql.=" WHERE rowid = ".$this->id;
+
+		dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->fk_facture_line=$rowidline;
+			$this->fk_facture=$rowidinvoice;
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -3;
+		}
+	}
+
+
+	/**
+	 *	Link the discount to a particular invoice line or a particular invoice.
+	 *	Do not call this if discount is linked to a reconcialiated invoice
+	 *
+	 *	@return		int							<0 if KO, >0 if OK
+	 */
+	function unlink_invoice()
+	{
+		$sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+		$sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
+		$sql.=" WHERE rowid = ".$this->id;
+
+		dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -3;
+		}
+	}
+
+
+	/**
+	 *  Return amount (with tax) of discounts currently available for a company, user or other criteria
+	 *
+	 *	@param		Societe		$company	Object third party for filter
+	 *	@param		User		$user		Filtre sur un user auteur des remises
+	 * 	@param		string		$filter		Filtre autre
+	 * 	@param		int			$maxvalue	Filter on max value for discount
+	 *  @param      string      $mode       'customer' = discounts the customer has, 'supplier' = discount i have at this supplier
+	 * 	@return		int						<0 if KO, amount otherwise
+	 */
+	function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0, $mode='customer')
+	{
+		global $conf;
+
+		$sql  = "SELECT SUM(rc.amount_ttc) as amount";
+		//$sql  = "SELECT rc.amount_ttc as amount";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql.= " WHERE rc.entity = " . $conf->entity;
+		if ($mode != 'supplier') $sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)";	// Available
+		else $sql.= " AND (rc.fk_suppler_invoice IS NULL AND rc.fk_supplier_invoice IS NULL)";	        // Available
+		if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
+		if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
+		if ($filter)   $sql.=' AND ('.$filter.')';
+		if ($maxvalue) $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+
+		dol_syslog(get_class($this)."::getAvailableDiscounts", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			//while ($obj)
+			//{
+			//print 'zz'.$obj->amount;
+			//$obj = $this->db->fetch_object($resql);
+			//}
+			return $obj->amount;
+		}
+		return -1;
+	}
+
+
+	/**
+	 *  Return amount (with tax) of all deposits invoices used by invoice as a payment.
+	 *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
+	 *
+	 *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)
 	 *  @param 		int 		    $multicurrency 	Return multicurrency_amount instead of amount
-     *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
-     */
-    function getSumDepositsUsed($invoice, $multicurrency=0)
-    {
-        dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
-
-        if ($invoice->element == 'facture' || $invoice->element == 'invoice')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql.= ' AND f.type = 3';
-        }
-        else if ($invoice->element == 'invoice_supplier')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql.= ' AND f.type = 3';
-        }
-        else
-        {
-            $this->error=get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
-            dol_print_error($this->error);
-            return -1;
-        }
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
+	 *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
+	 */
+	function getSumDepositsUsed($invoice, $multicurrency=0)
+	{
+		dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
+
+		if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+			$sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+			$sql.= ' AND f.type = 3';
+		}
+		else if ($invoice->element == 'invoice_supplier')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+			$sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+			$sql.= ' AND f.type = 3';
+		}
+		else
+		{
+			$this->error=get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
+			dol_print_error($this->error);
+			return -1;
+		}
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($multicurrency) return $obj->multicurrency_amount;
 			else return $obj->amount;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *  Return amount (with tax) of all credit notes and deposits invoices used by invoice as a payment
-     *
-     *	@param		CommonInvoice	  $invoice	    	Object invoice
+		}
+		else
+		{
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Return amount (with tax) of all credit notes and deposits invoices used by invoice as a payment
+	 *
+	 *	@param		CommonInvoice	  $invoice	    	Object invoice
 	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
-     *	@return		int					        		<0 if KO, Sum of credit notes and deposits amount otherwise
-     */
-    function getSumCreditNotesUsed($invoice, $multicurrency=0)
-    {
-        dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
-
-        if ($invoice->element == 'facture' || $invoice->element == 'invoice')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql.= ' AND f.type = 2';
-        }
-        else if ($invoice->element == 'invoice_supplier')
-        {
-            $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql.= ' AND f.type = 2';
-        }
-        else
-        {
-            $this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
-            dol_print_error($this->error);
-            return -1;
-        }
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
+	 *	@return		int					        		<0 if KO, Sum of credit notes and deposits amount otherwise
+	 */
+	function getSumCreditNotesUsed($invoice, $multicurrency=0)
+	{
+		dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
+
+		if ($invoice->element == 'facture' || $invoice->element == 'invoice')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+			$sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+			$sql.= ' AND f.type = 2';
+		}
+		else if ($invoice->element == 'invoice_supplier')
+		{
+			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
+			$sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+			$sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+			$sql.= ' AND f.type = 2';
+		}
+		else
+		{
+			$this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
+			dol_print_error($this->error);
+			return -1;
+		}
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($multicurrency) return $obj->multicurrency_amount;
 			else return $obj->amount;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *	Return clickable ref of object (with picto or not)
-     *
-     *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only
-     *	@param		string	$option			Where to link to ('invoice' or 'discount')
-     *	@return		string					String with URL
-     */
-    function getNomUrl($withpicto,$option='invoice')
-    {
-        global $langs;
-
-        $result='';
-
-        if ($option == 'invoice') {
-            $label=$langs->trans("ShowDiscount").': '.$this->ref_facture_source;
-            $link = '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->fk_facture_source.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend='</a>';
-            $ref=$this->ref_facture_source;
-            $picto='bill';
-        }
-        if ($option == 'discount') {
-            $label=$langs->trans("Discount");
-            $link = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->fk_soc.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend='</a>';
-            $ref=$langs->trans("Discount");
-            $picto='generic';
-        }
-
-
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        $result.=$link.$ref.$linkend;
-        return $result;
-    }
+		}
+		else
+		{
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Return clickable ref of object (with picto or not)
+	 *
+	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Picto only
+	 *	@param		string	$option			Where to link to ('invoice' or 'discount')
+	 *	@return		string					String with URL
+	 */
+	function getNomUrl($withpicto,$option='invoice')
+	{
+		global $langs;
+
+		$result='';
+
+		if ($option == 'invoice') {
+			$label=$langs->trans("ShowDiscount").': '.$this->ref_facture_source;
+			$link = '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->fk_facture_source.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+			$linkend='</a>';
+			$ref=$this->ref_facture_source;
+			$picto='bill';
+		}
+		if ($option == 'discount') {
+			$label=$langs->trans("Discount");
+			$link = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->fk_soc.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+			$linkend='</a>';
+			$ref=$langs->trans("Discount");
+			$picto='generic';
+		}
+
+
+		if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto && $withpicto != 2) $result.=' ';
+		$result.=$link.$ref.$linkend;
+		return $result;
+	}
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	function initAsSpecimen()
 	{

Spacing +120 added lines, -120 removed lines

@@ -32,19 +32,19 @@ 
     public $db;
     public $error;
 
-    public $id;					// Id discount
+    public $id; // Id discount
     public $fk_soc;
-    public $amount_ht;				//
-    public $amount_tva;			//
-    public $amount_ttc;			//
-    public $tva_tx;				// Vat rate
-    public $fk_user;				// Id utilisateur qui accorde la remise
-    public $description;			// Description libre
-    public $datec;					// Date creation
-    public $fk_facture_line;  		// Id invoice line when a discount is used into an invoice line (for absolute discounts)
-    public $fk_facture;			    // Id invoice when a discount line is used into an invoice (for credit note)
-    public $fk_facture_source;		// Id facture avoir a l'origine de la remise
-    public $ref_facture_source;	    // Ref facture avoir a l'origine de la remise
+    public $amount_ht; //
+    public $amount_tva; //
+    public $amount_ttc; //
+    public $tva_tx; // Vat rate
+    public $fk_user; // Id utilisateur qui accorde la remise
+    public $description; // Description libre
+    public $datec; // Date creation
+    public $fk_facture_line; // Id invoice line when a discount is used into an invoice line (for absolute discounts)
+    public $fk_facture; // Id invoice when a discount line is used into an invoice (for credit note)
+    public $fk_facture_source; // Id facture avoir a l'origine de la remise
+    public $ref_facture_source; // Ref facture avoir a l'origine de la remise
 
     /**
      *	Constructor
@@ -64,29 +64,29 @@ 
      *  @param      int		$fk_facture_source	fk_facture_source
      *	@return		int							<0 if KO, =0 if not found, >0 if OK
      */
-    function fetch($rowid, $fk_facture_source=0)
+    function fetch($rowid, $fk_facture_source = 0)
     {
     	global $conf;
 
         // Check parameters
-        if (! $rowid && ! $fk_facture_source)
+        if (!$rowid && !$fk_facture_source)
         {
-            $this->error='ErrorBadParameters';
+            $this->error = 'ErrorBadParameters';
             return -1;
         }
 
         $sql = "SELECT sr.rowid, sr.fk_soc,";
-        $sql.= " sr.fk_user,";
-        $sql.= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx,";
-        $sql.= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
-        $sql.= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.description,";
-        $sql.= " sr.datec,";
-        $sql.= " f.facnumber as ref_facture_source";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
-        $sql.= " WHERE sr.entity = " . $conf->entity;
-        if ($rowid) $sql.= " AND sr.rowid=".$rowid;
-        if ($fk_facture_source) $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
+        $sql .= " sr.fk_user,";
+        $sql .= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx,";
+        $sql .= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
+        $sql .= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.description,";
+        $sql .= " sr.datec,";
+        $sql .= " f.facnumber as ref_facture_source";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
+        $sql .= " WHERE sr.entity = ".$conf->entity;
+        if ($rowid) $sql .= " AND sr.rowid=".$rowid;
+        if ($fk_facture_source) $sql .= " AND sr.fk_facture_source=".$fk_facture_source;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -111,8 +111,8 @@ 
                 $this->fk_user = $obj->fk_user;
                 $this->fk_facture_line = $obj->fk_facture_line;
                 $this->fk_facture = $obj->fk_facture;
-                $this->fk_facture_source = $obj->fk_facture_source;		// Id avoir source
-                $this->ref_facture_source = $obj->ref_facture_source;	// Ref avoir source
+                $this->fk_facture_source = $obj->fk_facture_source; // Id avoir source
+                $this->ref_facture_source = $obj->ref_facture_source; // Ref avoir source
                 $this->description = $obj->description;
                 $this->datec = $this->db->jdate($obj->datec);
 
@@ -127,7 +127,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -144,40 +144,40 @@ 
         global $conf, $langs;
 
         // Clean parameters
-        $this->amount_ht=price2num($this->amount_ht);
-        $this->amount_tva=price2num($this->amount_tva);
-        $this->amount_ttc=price2num($this->amount_ttc);
-        $this->tva_tx=price2num($this->tva_tx);
+        $this->amount_ht = price2num($this->amount_ht);
+        $this->amount_tva = price2num($this->amount_tva);
+        $this->amount_ttc = price2num($this->amount_ttc);
+        $this->tva_tx = price2num($this->tva_tx);
 
         // Check parameters
         if (empty($this->description))
         {
-            $this->error='BadValueForPropertyDescription';
+            $this->error = 'BadValueForPropertyDescription';
             dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -1;
         }
 
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";
-        $sql.= " (entity, datec, fk_soc, fk_user, description,";
-        $sql.= " amount_ht, amount_tva, amount_ttc, tva_tx,";
-        $sql.= " fk_facture_source";
-        $sql.= ")";
-        $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec!=''?$this->datec:dol_now())."', ".$this->fk_soc.", ".$user->id.", '".$this->db->escape($this->description)."',";
-        $sql.= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
-        $sql.= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'":"null");
-        $sql.= ")";
+        $sql .= " (entity, datec, fk_soc, fk_user, description,";
+        $sql .= " amount_ht, amount_tva, amount_ttc, tva_tx,";
+        $sql .= " fk_facture_source";
+        $sql .= ")";
+        $sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec != '' ? $this->datec : dol_now())."', ".$this->fk_soc.", ".$user->id.", '".$this->db->escape($this->description)."',";
+        $sql .= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
+        $sql .= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'" : "null");
+        $sql .= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
             return $this->id;
         }
         else
         {
-            $this->error=$this->db->lasterror().' - sql='.$sql;
+            $this->error = $this->db->lasterror().' - sql='.$sql;
             return -1;
         }
     }
@@ -196,21 +196,21 @@ 
         // Check if we can remove the discount
         if ($this->fk_facture_source)
         {
-            $sql="SELECT COUNT(rowid) as nb";
-            $sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
-            $sql.=" WHERE (fk_facture_line IS NOT NULL";	// Not used as absolute simple discount
-            $sql.=" OR fk_facture IS NOT NULL)"; 			// Not used as credit note and not used as deposit
-            $sql.=" AND fk_facture_source = ".$this->fk_facture_source;
+            $sql = "SELECT COUNT(rowid) as nb";
+            $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
+            $sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount
+            $sql .= " OR fk_facture IS NOT NULL)"; // Not used as credit note and not used as deposit
+            $sql .= " AND fk_facture_source = ".$this->fk_facture_source;
             //$sql.=" AND rowid != ".$this->id;
 
             dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if ($resql)
             {
                 $obj = $this->db->fetch_object($resql);
                 if ($obj->nb > 0)
                 {
-                    $this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+                    $this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
                     return -2;
                 }
             }
@@ -225,24 +225,24 @@ 
 
         // Delete but only if not used
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
-        if ($this->fk_facture_source) $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;	// Delete all lines of same serie
-        else $sql.= " WHERE rowid = ".$this->id;	// Delete only line
-        $sql.= " AND (fk_facture_line IS NULL";	// Not used as absolute simple discount
-        $sql.= " AND fk_facture IS NULL)";		// Not used as credit note and not used as deposit
+        if ($this->fk_facture_source) $sql .= " WHERE fk_facture_source = ".$this->fk_facture_source; // Delete all lines of same serie
+        else $sql .= " WHERE rowid = ".$this->id; // Delete only line
+        $sql .= " AND (fk_facture_line IS NULL"; // Not used as absolute simple discount
+        $sql .= " AND fk_facture IS NULL)"; // Not used as credit note and not used as deposit
 
         dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             // If source of discount was a credit note or deposit, we change source statut.
             if ($this->fk_facture_source)
             {
                 $sql = "UPDATE ".MAIN_DB_PREFIX."facture";
-                $sql.=" set paye=0, fk_statut=1";
-                $sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
+                $sql .= " set paye=0, fk_statut=1";
+                $sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
 
                 dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-                $result=$this->db->query($sql);
+                $result = $this->db->query($sql);
                 if ($result)
                 {
                     $this->db->commit();
@@ -250,7 +250,7 @@ 
                 }
                 else
                 {
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
@@ -263,7 +263,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -280,36 +280,36 @@ 
      *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)
      *	@return		int						<0 if KO, >0 if OK
      */
-    function link_to_invoice($rowidline,$rowidinvoice)
+    function link_to_invoice($rowidline, $rowidinvoice)
     {
         // Check parameters
-        if (! $rowidline && ! $rowidinvoice)
+        if (!$rowidline && !$rowidinvoice)
         {
-            $this->error='ErrorBadParameters';
+            $this->error = 'ErrorBadParameters';
             return -1;
         }
         if ($rowidline && $rowidinvoice)
         {
-            $this->error='ErrorBadParameters';
+            $this->error = 'ErrorBadParameters';
             return -2;
         }
 
-        $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
-        if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
-        $sql.=" WHERE rowid = ".$this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+        if ($rowidline)    $sql .= " SET fk_facture_line = ".$rowidline;
+        if ($rowidinvoice) $sql .= " SET fk_facture = ".$rowidinvoice;
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
-            $this->fk_facture_line=$rowidline;
-            $this->fk_facture=$rowidinvoice;
+            $this->fk_facture_line = $rowidline;
+            $this->fk_facture = $rowidinvoice;
             return 1;
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -3;
         }
     }
@@ -323,9 +323,9 @@ 
      */
     function unlink_invoice()
     {
-        $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        $sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
-        $sql.=" WHERE rowid = ".$this->id;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+        $sql .= " SET fk_facture_line = NULL, fk_facture = NULL";
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -335,7 +335,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -3;
         }
     }
@@ -351,23 +351,23 @@ 
      *  @param      string      $mode       'customer' = discounts the customer has, 'supplier' = discount i have at this supplier
      * 	@return		int						<0 if KO, amount otherwise
      */
-    function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0, $mode='customer')
+    function getAvailableDiscounts($company = '', $user = '', $filter = '', $maxvalue = 0, $mode = 'customer')
     {
     	global $conf;
 
-        $sql  = "SELECT SUM(rc.amount_ttc) as amount";
+        $sql = "SELECT SUM(rc.amount_ttc) as amount";
         //$sql  = "SELECT rc.amount_ttc as amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
-        $sql.= " WHERE rc.entity = " . $conf->entity;
-        if ($mode != 'supplier') $sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)";	// Available
-        else $sql.= " AND (rc.fk_suppler_invoice IS NULL AND rc.fk_supplier_invoice IS NULL)";	        // Available
-        if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
-        if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
-        if ($filter)   $sql.=' AND ('.$filter.')';
-        if ($maxvalue) $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
+        $sql .= " WHERE rc.entity = ".$conf->entity;
+        if ($mode != 'supplier') $sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available
+        else $sql .= " AND (rc.fk_suppler_invoice IS NULL AND rc.fk_supplier_invoice IS NULL)"; // Available
+        if (is_object($company)) $sql .= " AND rc.fk_soc = ".$company->id;
+        if (is_object($user))    $sql .= " AND rc.fk_user = ".$user->id;
+        if ($filter)   $sql .= ' AND ('.$filter.')';
+        if ($maxvalue) $sql .= ' AND rc.amount_ttc <= '.price2num($maxvalue);
 
         dol_syslog(get_class($this)."::getAvailableDiscounts", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
@@ -390,32 +390,32 @@ 
 	 *  @param 		int 		    $multicurrency 	Return multicurrency_amount instead of amount
      *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
      */
-    function getSumDepositsUsed($invoice, $multicurrency=0)
+    function getSumDepositsUsed($invoice, $multicurrency = 0)
     {
         dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
 
         if ($invoice->element == 'facture' || $invoice->element == 'invoice')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql.= ' AND f.type = 3';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+            $sql .= ' AND f.type = 3';
         }
         else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql.= ' AND f.type = 3';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+            $sql .= ' AND f.type = 3';
         }
         else
         {
-            $this->error=get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
+            $this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
         }
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
@@ -436,32 +436,32 @@ 
 	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
      *	@return		int					        		<0 if KO, Sum of credit notes and deposits amount otherwise
      */
-    function getSumCreditNotesUsed($invoice, $multicurrency=0)
+    function getSumCreditNotesUsed($invoice, $multicurrency = 0)
     {
         dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
 
         if ($invoice->element == 'facture' || $invoice->element == 'invoice')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql.= ' AND f.type = 2';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+            $sql .= ' AND f.type = 2';
         }
         else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql.= ' AND f.type = 2';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+            $sql .= ' AND f.type = 2';
         }
         else
         {
-            $this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
+            $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
         }
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
@@ -482,31 +482,31 @@ 
      *	@param		string	$option			Where to link to ('invoice' or 'discount')
      *	@return		string					String with URL
      */
-    function getNomUrl($withpicto,$option='invoice')
+    function getNomUrl($withpicto, $option = 'invoice')
     {
         global $langs;
 
-        $result='';
+        $result = '';
 
         if ($option == 'invoice') {
-            $label=$langs->trans("ShowDiscount").': '.$this->ref_facture_source;
+            $label = $langs->trans("ShowDiscount").': '.$this->ref_facture_source;
             $link = '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->fk_facture_source.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend='</a>';
-            $ref=$this->ref_facture_source;
-            $picto='bill';
+            $linkend = '</a>';
+            $ref = $this->ref_facture_source;
+            $picto = 'bill';
         }
         if ($option == 'discount') {
-            $label=$langs->trans("Discount");
+            $label = $langs->trans("Discount");
             $link = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->fk_soc.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend='</a>';
-            $ref=$langs->trans("Discount");
-            $picto='generic';
+            $linkend = '</a>';
+            $ref = $langs->trans("Discount");
+            $picto = 'generic';
         }
 
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        $result.=$link.$ref.$linkend;
+        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        if ($withpicto && $withpicto != 2) $result .= ' ';
+        $result .= $link.$ref.$linkend;
         return $result;
     }
 
@@ -520,7 +520,7 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
 		$this->fk_soc         = 1;
 		$this->amount_ht      = 10;

htdocs/core/class/genericobject.class.php

Indentation +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 */
 	function __construct($db)
 	{
-	    $this->db=$db;
+		$this->db=$db;
 	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
  *	\ingroup    core
  *	\brief      File of class of generic business class
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
 /**
@@ -36,7 +36,7 @@ 
 	 */
 	function __construct($db)
 	{
-	    $this->db=$db;
+	    $this->db = $db;
 	}
 
 }

htdocs/core/class/html.formbarcode.class.php

Indentation +144 added lines, -144 removed lines

@@ -28,156 +28,156 @@
  */
 class FormBarCode
 {
-    var $db;
-    var $error;
-
-
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB		$db		Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
-
-
-    /**
-     *	Return HTML select with list of bar code generators
-     *
-     *  @param	int		$selected       Id code pre-selected
-     *  @param 	array	$barcodelist	Array of barcodes generators
-     *  @param  int		$code_id        Id du code barre
-     *  @param  int		$idForm			Id du formulaire
-     * 	@return	string					HTML select string
-     */
-    function setBarcodeEncoder($selected,$barcodelist,$code_id,$idForm='formbarcode')
-    {
-        global $conf, $langs;
-
-        $disable = '';
-
-        if ($conf->use_javascript_ajax)
-        {
-            print "\n".'<script type="text/javascript" language="javascript">';
-            print 'jQuery(document).ready(function () {
+	var $db;
+	var $error;
+
+
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB		$db		Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+
+	/**
+	 *	Return HTML select with list of bar code generators
+	 *
+	 *  @param	int		$selected       Id code pre-selected
+	 *  @param 	array	$barcodelist	Array of barcodes generators
+	 *  @param  int		$code_id        Id du code barre
+	 *  @param  int		$idForm			Id du formulaire
+	 * 	@return	string					HTML select string
+	 */
+	function setBarcodeEncoder($selected,$barcodelist,$code_id,$idForm='formbarcode')
+	{
+		global $conf, $langs;
+
+		$disable = '';
+
+		if ($conf->use_javascript_ajax)
+		{
+			print "\n".'<script type="text/javascript" language="javascript">';
+			print 'jQuery(document).ready(function () {
                         jQuery("#select'.$idForm.'").change(function() {
                             var formName = document.getElementById("form'.$idForm.'");
                             formName.action.value="setcoder";
                             formName.submit();
                         });
                });';
-            print '</script>'."\n";
-            //onChange="barcode_coder_save(\''.$idForm.'\')
-        }
-
-        // We check if barcode is already selected by default
-        if (((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
-        (! empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
-        {
-            $disable = 'disabled';
-        }
-
-        $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="post" id="form'.$idForm.'">';
-        $select_encoder.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        $select_encoder.= '<input type="hidden" name="action" value="update">';
-        $select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
-        $select_encoder.= '<select id="select'.$idForm.'" class="flat" name="coder">';
-        $select_encoder.= '<option value="0"'.($selected==0?' selected':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
-        $select_encoder.= '<option value="-1" disabled>--------------------</option>';
-        foreach($barcodelist as $key => $value)
-        {
-            $select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected':'').'>'.$value.'</option>';
-        }
-        $select_encoder.= '</select></form>';
-
-        return $select_encoder;
-    }
-
-    /**
-     *	Return form to select type of barcode
-     *
-     *	@param	int		$selected          Id code pre-selected
-     *  @param	string	$htmlname          Name of HTML select field
-     *  @param  int		$useempty          Affiche valeur vide dans liste
-     *  @return	void
-     */
-    function select_barcode_type($selected='',$htmlname='barcodetype_id',$useempty=0)
-    {
-        global $langs,$conf;
-
-        $sql = "SELECT rowid, code, libelle";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-        $sql.= " WHERE coder <> '0'";
-        $sql.= " AND entity = ".$conf->entity;
-        $sql.= " ORDER BY code";
-
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-
-            if ($useempty && $num > 0)
-            {
-                print '<select class="flat" name="'.$htmlname.'" id="select_'.$htmlname.'">';
-                print '<option value="0">&nbsp;</option>';
-            }
-            else
-            {
-                $langs->load("errors");
-                print '<select disabled class="flat" name="'.$htmlname.'" id="select_'.$htmlname.'">';
-                print '<option value="0" selected>'.$langs->trans('ErrorNoActivatedBarcode').'</option>';
-            }
-
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                if ($selected == $obj->rowid)
-                {
-                    print '<option value="'.$obj->rowid.'" selected>';
-                }
-                else
-                {
-                    print '<option value="'.$obj->rowid.'">';
-                }
-                print $obj->libelle;
-                print '</option>';
-                $i++;
-            }
-            print "</select>";
-        }
-        else {
-            dol_print_error($this->db);
-        }
-    }
-
-    /**
-     *  Show form to select type of barcode
-     *
-     *  @param  string		$page        	Page
-     *  @param  int			$selected    	Id condition preselected
-     *  @param  string		$htmlname    	Nom du formulaire select
-     *  @return	void
-     */
-    function form_barcode_type($page, $selected='', $htmlname='barcodetype_id')
-    {
-        global $langs,$conf;
-        if ($htmlname != "none")
-        {
-            print '<form method="post" action="'.$page.'">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="set'.$htmlname.'">';
-            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-            print '<tr><td>';
-            $this->select_barcode_type($selected, $htmlname, 1);
-            print '</td>';
-            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-            print '</td></tr></table></form>';
-        }
-    }
+			print '</script>'."\n";
+			//onChange="barcode_coder_save(\''.$idForm.'\')
+		}
+
+		// We check if barcode is already selected by default
+		if (((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
+		(! empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
+		{
+			$disable = 'disabled';
+		}
+
+		$select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="post" id="form'.$idForm.'">';
+		$select_encoder.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$select_encoder.= '<input type="hidden" name="action" value="update">';
+		$select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
+		$select_encoder.= '<select id="select'.$idForm.'" class="flat" name="coder">';
+		$select_encoder.= '<option value="0"'.($selected==0?' selected':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
+		$select_encoder.= '<option value="-1" disabled>--------------------</option>';
+		foreach($barcodelist as $key => $value)
+		{
+			$select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected':'').'>'.$value.'</option>';
+		}
+		$select_encoder.= '</select></form>';
+
+		return $select_encoder;
+	}
+
+	/**
+	 *	Return form to select type of barcode
+	 *
+	 *	@param	int		$selected          Id code pre-selected
+	 *  @param	string	$htmlname          Name of HTML select field
+	 *  @param  int		$useempty          Affiche valeur vide dans liste
+	 *  @return	void
+	 */
+	function select_barcode_type($selected='',$htmlname='barcodetype_id',$useempty=0)
+	{
+		global $langs,$conf;
+
+		$sql = "SELECT rowid, code, libelle";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+		$sql.= " WHERE coder <> '0'";
+		$sql.= " AND entity = ".$conf->entity;
+		$sql.= " ORDER BY code";
+
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+
+			if ($useempty && $num > 0)
+			{
+				print '<select class="flat" name="'.$htmlname.'" id="select_'.$htmlname.'">';
+				print '<option value="0">&nbsp;</option>';
+			}
+			else
+			{
+				$langs->load("errors");
+				print '<select disabled class="flat" name="'.$htmlname.'" id="select_'.$htmlname.'">';
+				print '<option value="0" selected>'.$langs->trans('ErrorNoActivatedBarcode').'</option>';
+			}
+
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				if ($selected == $obj->rowid)
+				{
+					print '<option value="'.$obj->rowid.'" selected>';
+				}
+				else
+				{
+					print '<option value="'.$obj->rowid.'">';
+				}
+				print $obj->libelle;
+				print '</option>';
+				$i++;
+			}
+			print "</select>";
+		}
+		else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 *  Show form to select type of barcode
+	 *
+	 *  @param  string		$page        	Page
+	 *  @param  int			$selected    	Id condition preselected
+	 *  @param  string		$htmlname    	Nom du formulaire select
+	 *  @return	void
+	 */
+	function form_barcode_type($page, $selected='', $htmlname='barcodetype_id')
+	{
+		global $langs,$conf;
+		if ($htmlname != "none")
+		{
+			print '<form method="post" action="'.$page.'">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="set'.$htmlname.'">';
+			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			print '<tr><td>';
+			$this->select_barcode_type($selected, $htmlname, 1);
+			print '</td>';
+			print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+			print '</td></tr></table></form>';
+		}
+	}
 
 }
 

Spacing +20 added lines, -20 removed lines

@@ -53,7 +53,7 @@ 
      *  @param  int		$idForm			Id du formulaire
      * 	@return	string					HTML select string
      */
-    function setBarcodeEncoder($selected,$barcodelist,$code_id,$idForm='formbarcode')
+    function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode')
     {
         global $conf, $langs;
 
@@ -74,24 +74,24 @@ 
         }
 
         // We check if barcode is already selected by default
-        if (((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
-        (! empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
+        if (((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
+        (!empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
         {
             $disable = 'disabled';
         }
 
         $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="post" id="form'.$idForm.'">';
-        $select_encoder.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        $select_encoder.= '<input type="hidden" name="action" value="update">';
-        $select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
-        $select_encoder.= '<select id="select'.$idForm.'" class="flat" name="coder">';
-        $select_encoder.= '<option value="0"'.($selected==0?' selected':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
-        $select_encoder.= '<option value="-1" disabled>--------------------</option>';
-        foreach($barcodelist as $key => $value)
+        $select_encoder .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $select_encoder .= '<input type="hidden" name="action" value="update">';
+        $select_encoder .= '<input type="hidden" name="code_id" value="'.$code_id.'">';
+        $select_encoder .= '<select id="select'.$idForm.'" class="flat" name="coder">';
+        $select_encoder .= '<option value="0"'.($selected == 0 ? ' selected' : '').' '.$disable.'>'.$langs->trans('Disable').'</option>';
+        $select_encoder .= '<option value="-1" disabled>--------------------</option>';
+        foreach ($barcodelist as $key => $value)
         {
-            $select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected':'').'>'.$value.'</option>';
+            $select_encoder .= '<option value="'.$key.'"'.($selected == $key ? ' selected' : '').'>'.$value.'</option>';
         }
-        $select_encoder.= '</select></form>';
+        $select_encoder .= '</select></form>';
 
         return $select_encoder;
     }
@@ -104,15 +104,15 @@ 
      *  @param  int		$useempty          Affiche valeur vide dans liste
      *  @return	void
      */
-    function select_barcode_type($selected='',$htmlname='barcodetype_id',$useempty=0)
+    function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
         $sql = "SELECT rowid, code, libelle";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-        $sql.= " WHERE coder <> '0'";
-        $sql.= " AND entity = ".$conf->entity;
-        $sql.= " ORDER BY code";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+        $sql .= " WHERE coder <> '0'";
+        $sql .= " AND entity = ".$conf->entity;
+        $sql .= " ORDER BY code";
 
         $result = $this->db->query($sql);
         if ($result)
@@ -162,9 +162,9 @@ 
      *  @param  string		$htmlname    	Nom du formulaire select
      *  @return	void
      */
-    function form_barcode_type($page, $selected='', $htmlname='barcodetype_id')
+    function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id')
     {
-        global $langs,$conf;
+        global $langs, $conf;
         if ($htmlname != "none")
         {
             print '<form method="post" action="'.$page.'">';

Braces +3 added lines, -6 removed lines

@@ -124,8 +124,7 @@ 
             {
                 print '<select class="flat" name="'.$htmlname.'" id="select_'.$htmlname.'">';
                 print '<option value="0">&nbsp;</option>';
-            }
-            else
+            } else
             {
                 $langs->load("errors");
                 print '<select disabled class="flat" name="'.$htmlname.'" id="select_'.$htmlname.'">';
@@ -138,8 +137,7 @@ 
                 if ($selected == $obj->rowid)
                 {
                     print '<option value="'.$obj->rowid.'" selected>';
-                }
-                else
+                } else
                 {
                     print '<option value="'.$obj->rowid.'">';
                 }
@@ -148,8 +146,7 @@ 
                 $i++;
             }
             print "</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }

htdocs/core/class/fileupload.class.php

Indentation +16 added lines, -16 removed lines

@@ -504,26 +504,26 @@
 			// param_name is an array identifier like "files[]",
 			// $_FILES is a multi-dimensional array:
 			foreach ($upload['tmp_name'] as $index => $value) {
-                $info[] = $this->handleFileUpload(
-                    $upload['tmp_name'][$index],
-                    isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index],
-                    isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index],
-                    isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index],
-                    $upload['error'][$index],
-                    $index
-                );
+				$info[] = $this->handleFileUpload(
+					$upload['tmp_name'][$index],
+					isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index],
+					isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index],
+					isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index],
+					$upload['error'][$index],
+					$index
+				);
 			}
 		} elseif ($upload || isset($_SERVER['HTTP_X_FILE_NAME'])) {
 			// param_name is a single object identifier like "file",
 			// $_FILES is a one-dimensional array:
-            $info[] = $this->handleFileUpload(
-                isset($upload['tmp_name']) ? $upload['tmp_name'] : null,
-                isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? $upload['name'] : null),
-                isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ? $upload['size'] : null),
-                isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ? $upload['type'] : null),
-                isset($upload['error']) ? $upload['error'] : null,
-                0
-            );
+			$info[] = $this->handleFileUpload(
+				isset($upload['tmp_name']) ? $upload['tmp_name'] : null,
+				isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? $upload['name'] : null),
+				isset($_SERVER['HTTP_X_FILE_SIZE']) ? $_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ? $upload['size'] : null),
+				isset($_SERVER['HTTP_X_FILE_TYPE']) ? $_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ? $upload['type'] : null),
+				isset($upload['error']) ? $upload['error'] : null,
+				0
+			);
 		}
 		header('Vary: Accept');
 		$json = json_encode($info);

Spacing +36 added lines, -36 removed lines

@@ -41,16 +41,16 @@ 
 	 * @param int		$fk_element		fk_element
 	 * @param string	$element		element
 	 */
-	function __construct($options=null,$fk_element=null,$element=null)
+	function __construct($options = null, $fk_element = null, $element = null)
 	{
 		global $db, $conf;
 		global $object;
 
-		$this->fk_element=$fk_element;
-		$this->element=$element;
+		$this->fk_element = $fk_element;
+		$this->element = $element;
 
-		$pathname=$filename=$element;
-		if (preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+		$pathname = $filename = $element;
+		if (preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
 		{
 			$pathname = $regs[1];
 			$filename = $regs[2];
@@ -61,48 +61,48 @@ 
 		// For compatibility
 		if ($element == 'propal') {
 			$pathname = 'comm/propal';
-			$dir_output=$conf->$element->dir_output;
+			$dir_output = $conf->$element->dir_output;
 		}
 		elseif ($element == 'facture') {
 			$pathname = 'compta/facture';
-			$dir_output=$conf->$element->dir_output;
+			$dir_output = $conf->$element->dir_output;
 		}
 		elseif ($element == 'project') {
 			$element = $pathname = 'projet';
-			$dir_output=$conf->$element->dir_output;
+			$dir_output = $conf->$element->dir_output;
 		}
 		elseif ($element == 'project_task') {
-			$pathname = 'projet'; $filename='task';
-			$dir_output=$conf->projet->dir_output;
+			$pathname = 'projet'; $filename = 'task';
+			$dir_output = $conf->projet->dir_output;
 			$parentForeignKey = 'fk_project';
 			$parentClass = 'Project';
 			$parentElement = 'projet';
 			$parentObject = 'project';
 		}
 		elseif ($element == 'fichinter') {
-			$element='ficheinter';
-			$dir_output=$conf->$element->dir_output;
+			$element = 'ficheinter';
+			$dir_output = $conf->$element->dir_output;
 		}
 		elseif ($element == 'order_supplier') {
-			$pathname = 'fourn'; $filename='fournisseur.commande';
-			$dir_output=$conf->fournisseur->commande->dir_output;
+			$pathname = 'fourn'; $filename = 'fournisseur.commande';
+			$dir_output = $conf->fournisseur->commande->dir_output;
 		}
 		elseif ($element == 'invoice_supplier') {
-			$pathname = 'fourn'; $filename='fournisseur.facture';
-			$dir_output=$conf->fournisseur->facture->dir_output;
+			$pathname = 'fourn'; $filename = 'fournisseur.facture';
+			$dir_output = $conf->fournisseur->facture->dir_output;
 		}
 		elseif ($element == 'product') {
 			$dir_output = $conf->product->multidir_output[$conf->entity];
 		}
 		elseif ($element == 'action') {
-			$pathname = 'comm/action'; $filename='actioncomm';
-			$dir_output=$conf->agenda->dir_output;
+			$pathname = 'comm/action'; $filename = 'actioncomm';
+			$dir_output = $conf->agenda->dir_output;
 		}
 		elseif ($element == 'chargesociales') {
-			$pathname = 'compta/sociales'; $filename='chargesociales';
-			$dir_output=$conf->tax->dir_output;
+			$pathname = 'compta/sociales'; $filename = 'chargesociales';
+			$dir_output = $conf->tax->dir_output;
 		} else {
-			$dir_output=$conf->$element->dir_output;
+			$dir_output = $conf->$element->dir_output;
 		}
 
 		dol_include_once('/'.$pathname.'/class/'.$filename.'.class.php');
@@ -132,14 +132,14 @@ 
 
 		$object_ref = dol_sanitizeFileName($object->ref);
 		if ($element == 'invoice_supplier') {
-			$object_ref = get_exdir($object->id,2,0,0,$object,'invoice_supplier') . $object_ref;
+			$object_ref = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$object_ref;
 		} else if ($element == 'project_task') {
-			$object_ref = $object->project->ref . '/' . $object_ref;
+			$object_ref = $object->project->ref.'/'.$object_ref;
 		}
 
 		$this->options = array(
 				'script_url' => $_SERVER['PHP_SELF'],
-				'upload_dir' => $dir_output . '/' . $object_ref . '/',
+				'upload_dir' => $dir_output.'/'.$object_ref.'/',
 				'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object_ref.'/',
 				'param_name' => 'files',
 				// Set the following option to 'POST', if your server does not support
@@ -173,7 +173,7 @@ 
 		),
 		*/
 						'thumbnail' => array(
-								'upload_dir' => $dir_output . '/' . $object_ref . '/thumbs/',
+								'upload_dir' => $dir_output.'/'.$object_ref.'/thumbs/',
 								'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object_ref.'/thumbs/',
 								'max_width' => 80,
 								'max_height' => 80
@@ -199,7 +199,7 @@ 
 		(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME'].
 				($https && $_SERVER['SERVER_PORT'] === 443 ||
 						$_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))).
-						substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/'));
+						substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/'));
 	}
 
 	/**
@@ -231,12 +231,12 @@ 
 		{
 			$file = new stdClass();
 			$file->name = $file_name;
-			$file->mime = dol_mimetype($file_name,'',2);
+			$file->mime = dol_mimetype($file_name, '', 2);
 			$file->size = filesize($file_path);
 			$file->url = $this->options['upload_url'].rawurlencode($file->name);
-			foreach($this->options['image_versions'] as $version => $options) {
+			foreach ($this->options['image_versions'] as $version => $options) {
 				if (is_file($options['upload_dir'].$file_name)) {
-					$tmp=explode('.',$file->name);
+					$tmp = explode('.', $file->name);
 					$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
 				}
 			}
@@ -277,9 +277,9 @@ 
 				return false;
 			}
 
-			$res=vignette($file_path,$maxwidthmini,$maxheightmini,'_mini');  // We don't use ->addThumbs here because there is no object and we don't need all thumbs, only the "mini".
+			$res = vignette($file_path, $maxwidthmini, $maxheightmini, '_mini'); // We don't use ->addThumbs here because there is no object and we don't need all thumbs, only the "mini".
 
-			if (preg_match('/error/i',$res)) return false;
+			if (preg_match('/error/i', $res)) return false;
 			return true;
 		}
 		else
@@ -395,7 +395,7 @@ 
 		}
 		if ($this->options['discard_aborted_uploads'])
 		{
-			while(is_file($this->options['upload_dir'].$file_name))
+			while (is_file($this->options['upload_dir'].$file_name))
 			{
 				$file_name = $this->upcountName($file_name);
 			}
@@ -418,7 +418,7 @@ 
 	{
 		$file = new stdClass();
 		$file->name = $this->trimFileName($name, $type, $index);
-		$file->mime = dol_mimetype($file->name,'',2);
+		$file->mime = dol_mimetype($file->name, '', 2);
 		$file->size = intval($size);
 		$file->type = $type;
 		if ($this->validate($uploaded_file, $file, $error, $index) && dol_mkdir($this->options['upload_dir']) >= 0)
@@ -444,11 +444,11 @@ 
 			if ($file_size === $file->size)
 			{
 				$file->url = $this->options['upload_url'].rawurlencode($file->name);
-				foreach($this->options['image_versions'] as $version => $options)
+				foreach ($this->options['image_versions'] as $version => $options)
 				{
 					if ($this->createScaledImage($file->name, $options))
 					{
-						$tmp=explode('.',$file->name);
+						$tmp = explode('.', $file->name);
 						$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
 					}
 				}
@@ -555,7 +555,7 @@ 
 		$success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
 		if ($success)
 		{
-			foreach($this->options['image_versions'] as $version => $options)
+			foreach ($this->options['image_versions'] as $version => $options)
 			{
 				$file = $options['upload_dir'].$file_name;
 				if (is_file($file))

Braces +16 added lines, -27 removed lines

@@ -62,43 +62,34 @@ 
 		if ($element == 'propal') {
 			$pathname = 'comm/propal';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'facture') {
+		} elseif ($element == 'facture') {
 			$pathname = 'compta/facture';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'project') {
+		} elseif ($element == 'project') {
 			$element = $pathname = 'projet';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'project_task') {
+		} elseif ($element == 'project_task') {
 			$pathname = 'projet'; $filename='task';
 			$dir_output=$conf->projet->dir_output;
 			$parentForeignKey = 'fk_project';
 			$parentClass = 'Project';
 			$parentElement = 'projet';
 			$parentObject = 'project';
-		}
-		elseif ($element == 'fichinter') {
+		} elseif ($element == 'fichinter') {
 			$element='ficheinter';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'order_supplier') {
+		} elseif ($element == 'order_supplier') {
 			$pathname = 'fourn'; $filename='fournisseur.commande';
 			$dir_output=$conf->fournisseur->commande->dir_output;
-		}
-		elseif ($element == 'invoice_supplier') {
+		} elseif ($element == 'invoice_supplier') {
 			$pathname = 'fourn'; $filename='fournisseur.facture';
 			$dir_output=$conf->fournisseur->facture->dir_output;
-		}
-		elseif ($element == 'product') {
+		} elseif ($element == 'product') {
 			$dir_output = $conf->product->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'action') {
+		} elseif ($element == 'action') {
 			$pathname = 'comm/action'; $filename='actioncomm';
 			$dir_output=$conf->agenda->dir_output;
-		}
-		elseif ($element == 'chargesociales') {
+		} elseif ($element == 'chargesociales') {
 			$pathname = 'compta/sociales'; $filename='chargesociales';
 			$dir_output=$conf->tax->dir_output;
 		} else {
@@ -279,10 +270,11 @@ 
 
 			$res=vignette($file_path,$maxwidthmini,$maxheightmini,'_mini');  // We don't use ->addThumbs here because there is no object and we don't need all thumbs, only the "mini".
 
-			if (preg_match('/error/i',$res)) return false;
+			if (preg_match('/error/i',$res)) {
+				return false;
+			}
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -434,8 +426,7 @@ 
 				} else {
 					dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');
 				}
-			}
-			else
+			} else
 			{
 				// Non-multipart uploads (PUT method support)
 				file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);
@@ -452,8 +443,7 @@ 
 						$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
 					}
 				}
-			}
-			else if ($this->options['discard_aborted_uploads'])
+			} else if ($this->options['discard_aborted_uploads'])
 			{
 				unlink($file_path);
 				$file->error = 'abort';
@@ -476,8 +466,7 @@ 
 		if ($file_name)
 		{
 			$info = $this->getFileObject($file_name);
-		}
-		else
+		} else
 		{
 			$info = $this->getFileObjects();
 		}

htdocs/core/class/cookie.class.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	 * @param	int			$secure		0 or 1
 	 * @return	void
 	 */
-	public function setCookie($cookie, $value, $expire=0, $path="/", $domain="", $secure=0)
+	public function setCookie($cookie, $value, $expire = 0, $path = "/", $domain = "", $secure = 0)
 	{
 		$this->myCookie = $cookie;
 		$this->myValue = $value;

Braces +2 added lines, -4 removed lines

@@ -69,8 +69,7 @@ 
 		{
 			$valuecrypt = base64_encode($this->myValue);
 			$this->cookie = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $this->_myKey, $valuecrypt, MCRYPT_MODE_CBC, $this->_iv));
-		}
-		else
+		} else
 		{
 			$this->cookie = $this->myValue;
 		}
@@ -91,8 +90,7 @@ 
 			$this->myValue = trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $this->_myKey, base64_decode($this->cookie), MCRYPT_MODE_CBC, $this->_iv));
 
 			return(base64_decode($this->myValue));
-		}
-		else
+		} else
 		{
 			return($_COOKIE[$this->myCookie]);
 		}

htdocs/core/class/dolexception.class.php

Indentation +6 added lines, -6 removed lines

@@ -27,10 +27,10 @@
  */
 class DolException extends Exception
 {
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-    }
+	/**
+	 * Constructor
+	 */
+	function __construct()
+	{
+	}
 }

htdocs/core/class/notify.class.php

Indentation +432 added lines, -432 removed lines

@@ -30,55 +30,55 @@ 
  */
 class Notify
 {
-    var $id;
-    var $db;
-    var $error;
-    var $errors=array();
-
-    var $author;
-    var $ref;
-    var $date;
-    var $duree;
-    var $note;
-    var $fk_project;
+	var $id;
+	var $db;
+	var $error;
+	var $errors=array();
+
+	var $author;
+	var $ref;
+	var $date;
+	var $duree;
+	var $note;
+	var $fk_project;
 
 	// Les codes actions sont definis dans la table llx_notify_def
 
-    // codes actions supported are
-    public $arrayofnotifsupported = array(
-        'BILL_VALIDATE',
-        'BILL_PAYED',
-        'ORDER_VALIDATE',
-        'PROPAL_VALIDATE',
-        'FICHINTER_VALIDATE',
-        'FICHINTER_ADD_CONTACT',
-        'ORDER_SUPPLIER_VALIDATE',
-        'ORDER_SUPPLIER_APPROVE',
-        'ORDER_SUPPLIER_REFUSE',
-        'SHIPPING_VALIDATE'
-    );
+	// codes actions supported are
+	public $arrayofnotifsupported = array(
+		'BILL_VALIDATE',
+		'BILL_PAYED',
+		'ORDER_VALIDATE',
+		'PROPAL_VALIDATE',
+		'FICHINTER_VALIDATE',
+		'FICHINTER_ADD_CONTACT',
+		'ORDER_SUPPLIER_VALIDATE',
+		'ORDER_SUPPLIER_APPROVE',
+		'ORDER_SUPPLIER_REFUSE',
+		'SHIPPING_VALIDATE'
+	);
 
     
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *	@param 		DoliDB		$db		Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-    }
-
-
-    /**
-     *  Return message that say how many notification (and to which email) will occurs on requested event.
-     *	This is to show confirmation messages before event is recorded.
-     *
-     * 	@param	string	$action		Id of action in llx_c_action_trigger
-     * 	@param	int		$socid		Id of third party
-     *  @param	Object	$object		Object the notification is about
-     *	@return	string				Message
-     */
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+
+	/**
+	 *  Return message that say how many notification (and to which email) will occurs on requested event.
+	 *	This is to show confirmation messages before event is recorded.
+	 *
+	 * 	@param	string	$action		Id of action in llx_c_action_trigger
+	 * 	@param	int		$socid		Id of third party
+	 *  @param	Object	$object		Object the notification is about
+	 *	@return	string				Message
+	 */
 	function confirmMessage($action,$socid,$object)
 	{
 		global $langs;
@@ -95,175 +95,175 @@ 
 		
    		if (is_array($listofnotiftodo))
    		{
-    		$i=0;
-    		foreach ($listofnotiftodo as $key => $val)
-    		{
-    			if ($i) $texte.=', ';
-    			else $texte.=' (';
-    			if ($val['isemailvalid']) $texte.=$val['email'];
-    			else $texte.=$val['emaildesc'];
-    			$i++;
-    		}
-    		if ($i) $texte.=')';
+			$i=0;
+			foreach ($listofnotiftodo as $key => $val)
+			{
+				if ($i) $texte.=', ';
+				else $texte.=' (';
+				if ($val['isemailvalid']) $texte.=$val['email'];
+				else $texte.=$val['emaildesc'];
+				$i++;
+			}
+			if ($i) $texte.=')';
    		}
    		
 		return $texte;
 	}
 
-    /**
-     * Return number of notifications activated for action code (and third party)
-     *
-     * @param	string	$notifcode		Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage)
-     * @param	int		$socid			Id of third party or 0 for all thirdparties or -1 for no thirdparties
-     * @param	Object	$object			Object the notification is about (need it to check threshold value of some notifications)
-     * @param	int		$userid         Id of user or 0 for all users or -1 for no users
-     * @param   array   $scope          Scope where to search
-     * @return	array|int				<0 if KO, array of notifications to send if OK
-     */
+	/**
+	 * Return number of notifications activated for action code (and third party)
+	 *
+	 * @param	string	$notifcode		Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage)
+	 * @param	int		$socid			Id of third party or 0 for all thirdparties or -1 for no thirdparties
+	 * @param	Object	$object			Object the notification is about (need it to check threshold value of some notifications)
+	 * @param	int		$userid         Id of user or 0 for all users or -1 for no users
+	 * @param   array   $scope          Scope where to search
+	 * @return	array|int				<0 if KO, array of notifications to send if OK
+	 */
 	function getNotificationsArray($notifcode, $socid=0, $object=null, $userid=0, $scope=array('thirdparty', 'user', 'global'))
 	{
 		global $conf, $user;
 
 		$error=0;
-        $resarray=array();
-
-        $valueforthreshold = 0;
-        if (is_object($object)) $valueforthreshold = $object->total_ht;
-
-        if (! $error)
-        {
-            if ($socid >= 0 && in_array('thirdparty', $scope))
-            {
-    	        $sql = "SELECT a.code, c.email, c.rowid";
-    	        $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
-                $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
-    	        $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    	        $sql.= " ".MAIN_DB_PREFIX."societe as s";
-    	        $sql.= " WHERE n.fk_contact = c.rowid";
-    	        $sql.= " AND a.rowid = n.fk_action";
-    	        $sql.= " AND n.fk_soc = s.rowid";
-    	        if ($notifcode)
-    	        {
-    		        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-    		        else $sql.= " AND a.code = '".$notifcode."'";			// New usage
-    	        }
-    	        $sql.= " AND s.entity IN (".getEntity('societe').")";
-    	        if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
+		$resarray=array();
+
+		$valueforthreshold = 0;
+		if (is_object($object)) $valueforthreshold = $object->total_ht;
+
+		if (! $error)
+		{
+			if ($socid >= 0 && in_array('thirdparty', $scope))
+			{
+				$sql = "SELECT a.code, c.email, c.rowid";
+				$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
+				$sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+				$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+				$sql.= " ".MAIN_DB_PREFIX."societe as s";
+				$sql.= " WHERE n.fk_contact = c.rowid";
+				$sql.= " AND a.rowid = n.fk_action";
+				$sql.= " AND n.fk_soc = s.rowid";
+				if ($notifcode)
+				{
+					if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
+					else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+				}
+				$sql.= " AND s.entity IN (".getEntity('societe').")";
+				if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
     
-    			dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
+				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
     
-    	        $resql = $this->db->query($sql);
-    	        if ($resql)
-    	        {
-    	        	$num = $this->db->num_rows($resql);
-    	            $i=0;
-    	            while ($i < $num)
-    	            {
-    	        		$obj = $this->db->fetch_object($resql);
-    	            	if ($obj)
-    	            	{
-    	            	    $newval2=trim($obj->email);
-    	            		$isvalid=isValidEmail($newval2);
-    	            		if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
-    	            	}
-    	            	$i++;
-    	            }
-    			}
-    			else
-    			{
-    				$error++;
-    				$this->error=$this->db->lasterror();
-    			}
-            }
-        }
+				$resql = $this->db->query($sql);
+				if ($resql)
+				{
+					$num = $this->db->num_rows($resql);
+					$i=0;
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($resql);
+						if ($obj)
+						{
+							$newval2=trim($obj->email);
+							$isvalid=isValidEmail($newval2);
+							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+						}
+						$i++;
+					}
+				}
+				else
+				{
+					$error++;
+					$this->error=$this->db->lasterror();
+				}
+			}
+		}
         
-        if (! $error)
-        {
-            if ($userid >= 0 && in_array('user', $scope))
-            {
-    			$sql = "SELECT a.code, c.email, c.rowid";
-    			$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
-    			$sql.= " ".MAIN_DB_PREFIX."user as c,";
-    			$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a";
-    			$sql.= " WHERE n.fk_user = c.rowid";
-    			$sql.= " AND a.rowid = n.fk_action";
-    			if ($notifcode)
-    			{
-    			    if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-    			    else $sql.= " AND a.code = '".$notifcode."'";			// New usage
-    			}
-    			$sql.= " AND c.entity IN (".getEntity('user').")";
-    			if ($userid > 0) $sql.= " AND c.rowid = ".$userid;
+		if (! $error)
+		{
+			if ($userid >= 0 && in_array('user', $scope))
+			{
+				$sql = "SELECT a.code, c.email, c.rowid";
+				$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
+				$sql.= " ".MAIN_DB_PREFIX."user as c,";
+				$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a";
+				$sql.= " WHERE n.fk_user = c.rowid";
+				$sql.= " AND a.rowid = n.fk_action";
+				if ($notifcode)
+				{
+					if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
+					else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+				}
+				$sql.= " AND c.entity IN (".getEntity('user').")";
+				if ($userid > 0) $sql.= " AND c.rowid = ".$userid;
     			
-    			dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
+				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
     			
-    			$resql = $this->db->query($sql);
-    			if ($resql)
-    			{
-    			    $num = $this->db->num_rows($resql);
-    			    $i=0;
-    			    while ($i < $num)
-    			    {
-    			        $obj = $this->db->fetch_object($resql);
-    			        if ($obj)
-    			        {
-    	            	    $newval2=trim($obj->email);
-    			            $isvalid=isValidEmail($newval2);
-    			            if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
-    			        }
-    			        $i++;
-    			    }
-    			}
-    			else
-    			{
-    			    $error++;
-    			    $this->error=$this->db->lasterror();
-    			}
-            }
-        }
+				$resql = $this->db->query($sql);
+				if ($resql)
+				{
+					$num = $this->db->num_rows($resql);
+					$i=0;
+					while ($i < $num)
+					{
+						$obj = $this->db->fetch_object($resql);
+						if ($obj)
+						{
+							$newval2=trim($obj->email);
+							$isvalid=isValidEmail($newval2);
+							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+						}
+						$i++;
+					}
+				}
+				else
+				{
+					$error++;
+					$this->error=$this->db->lasterror();
+				}
+			}
+		}
 
 		if (! $error)
 		{
-		    if (in_array('global', $scope))
-		    {
-    		    // List of notifications enabled for fixed email
-    		    foreach($conf->global as $key => $val)
-    		    {
-    		    	if ($notifcode)
-    		    	{
-    		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-    		    	}
-    		    	else
-    		    	{
-    		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-    		    	}
+			if (in_array('global', $scope))
+			{
+				// List of notifications enabled for fixed email
+				foreach($conf->global as $key => $val)
+				{
+					if ($notifcode)
+					{
+						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+					}
+					else
+					{
+						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+					}
     
-        			$threshold = (float) $reg[1];
-        			if ($valueforthreshold < $threshold) continue;
+					$threshold = (float) $reg[1];
+					if ($valueforthreshold < $threshold) continue;
     
-    		    	$tmpemail=explode(',',$val);
-    		    	foreach($tmpemail as $key2 => $val2)
-    		    	{
-    		    		$newval2=trim($val2);
-    		    		if ($newval2 == '__SUPERVISOREMAIL__')
-    		    		{
-    		    			if ($user->fk_user > 0)
-    		    			{
-    							$tmpuser=new User($this->db);
-    							$tmpuser->fetch($user->fk_user);
-    							if ($tmpuser->email) $newval2=trim($tmpuser->email);
-    							else $newval2='';
-    		    			}
-    		    			else $newval2='';
-    		    		}
-    		    		if ($newval2)
-    		    		{
-    		    			$isvalid=isValidEmail($newval2, 0);
-    		    			if (empty($resarray[$newval2])) $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
-    		    		}
-    		    	}
-    		    }
-		    }
+					$tmpemail=explode(',',$val);
+					foreach($tmpemail as $key2 => $val2)
+					{
+						$newval2=trim($val2);
+						if ($newval2 == '__SUPERVISOREMAIL__')
+						{
+							if ($user->fk_user > 0)
+							{
+								$tmpuser=new User($this->db);
+								$tmpuser->fetch($user->fk_user);
+								if ($tmpuser->email) $newval2=trim($tmpuser->email);
+								else $newval2='';
+							}
+							else $newval2='';
+						}
+						if ($newval2)
+						{
+							$isvalid=isValidEmail($newval2, 0);
+							if (empty($resarray[$newval2])) $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+						}
+					}
+				}
+			}
 		}
 
 		if ($error) return -1;
@@ -272,47 +272,47 @@ 
 		return $resarray;
 	}
 
-    /**
-     *  Check if notification are active for couple action/company.
-     * 	If yes, send mail and save trace into llx_notify.
-     *
-     * 	@param	string	$notifcode		Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage)
-     * 	@param	Object	$object			Object the notification deals on
-     *	@return	int						<0 if KO, or number of changes if OK
-     */
-    function send($notifcode, $object)
-    {
-        global $user,$conf,$langs,$mysoc;
-        global $hookmanager;
-        global $dolibarr_main_url_root;
+	/**
+	 *  Check if notification are active for couple action/company.
+	 * 	If yes, send mail and save trace into llx_notify.
+	 *
+	 * 	@param	string	$notifcode		Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage)
+	 * 	@param	Object	$object			Object the notification deals on
+	 *	@return	int						<0 if KO, or number of changes if OK
+	 */
+	function send($notifcode, $object)
+	{
+		global $user,$conf,$langs,$mysoc;
+		global $hookmanager;
+		global $dolibarr_main_url_root;
 
 		if (! in_array($notifcode, $this->arrayofnotifsupported)) return 0;
 
-	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	    if (! is_object($hookmanager))
-	    {
-	        include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-	        $hookmanager=new HookManager($this->db);
-	    }
-	    $hookmanager->initHooks(array('notification'));
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('notification'));
 	    
-	    dol_syslog(get_class($this)."::send notifcode=".$notifcode.", object=".$object->id);
+		dol_syslog(get_class($this)."::send notifcode=".$notifcode.", object=".$object->id);
 
-    	$langs->load("other");
+		$langs->load("other");
 
 		// Define $urlwithroot
-	    $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
 
 		// Define some vars
-	    $application = 'Dolibarr';
-	    if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
-	    $replyto = $conf->notification->email_from;
-	    $filename = basename($file);
-        $mimefile = dol_mimetype($file);
+		$application = 'Dolibarr';
+		if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
+		$replyto = $conf->notification->email_from;
+		$filename = basename($file);
+		$mimefile = dol_mimetype($file);
 		$object_type = '';
-        $link = '';
+		$link = '';
 		$num = 0;
 
 		$oldref=(empty($object->oldref)?$object->ref:$object->oldref);
@@ -321,56 +321,56 @@ 
 		// Check notification per third party
 		$sql = "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
 		$sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
-        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
-        $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-        $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-        $sql.= " ".MAIN_DB_PREFIX."societe as s";
-        $sql.= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
-        $sql.= " AND n.fk_soc = s.rowid";
-        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-        else $sql.= " AND a.code = '".$notifcode."'";	// New usage
-        $sql .= " AND s.rowid = ".$object->socid;
+		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
+		$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+		$sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
+		$sql.= " ".MAIN_DB_PREFIX."societe as s";
+		$sql.= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
+		$sql.= " AND n.fk_soc = s.rowid";
+		if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
+		else $sql.= " AND a.code = '".$notifcode."'";	// New usage
+		$sql .= " AND s.rowid = ".$object->socid;
 
 		// Check notification per user
-        $sql.= "\nUNION\n";
-
-        $sql.= "SELECT 'touserid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.lang as default_lang,";
-        $sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
-        $sql.= " FROM ".MAIN_DB_PREFIX."user as c,";
-        $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-        $sql.= " ".MAIN_DB_PREFIX."notify_def as n";
-        $sql.= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
-        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-        else $sql.= " AND a.code = '".$notifcode."'";	// New usage
+		$sql.= "\nUNION\n";
+
+		$sql.= "SELECT 'touserid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.lang as default_lang,";
+		$sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
+		$sql.= " FROM ".MAIN_DB_PREFIX."user as c,";
+		$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+		$sql.= " ".MAIN_DB_PREFIX."notify_def as n";
+		$sql.= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
+		if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
+		else $sql.= " AND a.code = '".$notifcode."'";	// New usage
         
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-
-            if ($num > 0)
-            {
-	            $i = 0;
-	            while ($i < $num && ! $error)	// For each notification couple defined (third party/actioncode)
-	            {
-	                $obj = $this->db->fetch_object($result);
-
-	                $sendto = dolGetFirstLastname($obj->firstname,$obj->lastname) . " <".$obj->email.">";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+
+			if ($num > 0)
+			{
+				$i = 0;
+				while ($i < $num && ! $error)	// For each notification couple defined (third party/actioncode)
+				{
+					$obj = $this->db->fetch_object($result);
+
+					$sendto = dolGetFirstLastname($obj->firstname,$obj->lastname) . " <".$obj->email.">";
 					$notifcodedefid = $obj->adid;
 
-	                if (dol_strlen($obj->email))
-	                {
-	                	// Set output language
-	                	$outputlangs = $langs;
-	                	if ($obj->default_lang && $obj->default_lang != $langs->defaultlang)
-	                	{
-	                		$outputlangs = new Translate('', $conf);
-	                		$outputlangs->setDefaultLang($obj->default_lang);
-	                	}
-
-	                	$subject = '['.$mysoc->name.'] '.$outputlangs->transnoentitiesnoconv("DolibarrNotification");
+					if (dol_strlen($obj->email))
+					{
+						// Set output language
+						$outputlangs = $langs;
+						if ($obj->default_lang && $obj->default_lang != $langs->defaultlang)
+						{
+							$outputlangs = new Translate('', $conf);
+							$outputlangs->setDefaultLang($obj->default_lang);
+						}
+
+						$subject = '['.$mysoc->name.'] '.$outputlangs->transnoentitiesnoconv("DolibarrNotification");
 	                	
-	                    switch ($notifcode) {
+						switch ($notifcode) {
 							case 'BILL_VALIDATE':
 								$link='/compta/facture/card.php?facid='.$object->id;
 								$dir_output = $conf->facture->dir_output;
@@ -437,7 +437,7 @@ 
 								$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref);
 								break;
 						}
-                    	$ref = dol_sanitizeFileName($newref);
+						$ref = dol_sanitizeFileName($newref);
 						$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
 						if (! dol_is_file($pdf_path))
 						{
@@ -449,104 +449,104 @@ 
 							$filepdf = $pdf_path;
 						}
 
-	                	$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
-	                	$message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
-	                	$message.= "\n";
-	                    $message.= $mesg;
-	                    if ($link) $message=dol_concatdesc($message,$urlwithroot.$link);
-
-	                    $parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$file, 'mimefile'=>$mimefile, 'filename'=>$filename);
-	                    $reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-	                    if (empty($reshook))
-	                    {
-	                        if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-	                        if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
-	                    }
+						$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
+						$message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
+						$message.= "\n";
+						$message.= $mesg;
+						if ($link) $message=dol_concatdesc($message,$urlwithroot.$link);
+
+						$parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$file, 'mimefile'=>$mimefile, 'filename'=>$filename);
+						$reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+						if (empty($reshook))
+						{
+							if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
+							if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+						}
 	                     
-	                    $mailfile = new CMailFile(
-	                        $subject,
-	                        $sendto,
-	                        $replyto,
-	                        $message,
-	                        array($file),
-	                        array($mimefile),
-	                        array($filename[count($filename)-1]),
-	                        '',
-	                        '',
-	                        0,
-	                        -1
-	                    );
-
-	                    if ($mailfile->sendfile())
-	                    {   
-	                        if ($obj->type_target == 'touserid') {
-     	                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
-    	                        $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
+						$mailfile = new CMailFile(
+							$subject,
+							$sendto,
+							$replyto,
+							$message,
+							array($file),
+							array($mimefile),
+							array($filename[count($filename)-1]),
+							'',
+							'',
+							0,
+							-1
+						);
+
+						if ($mailfile->sendfile())
+						{   
+							if ($obj->type_target == 'touserid') {
+	 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
+								$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
                            
-                            }
-                            else {
-    	                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
-    	                        $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
+							}
+							else {
+								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
+								$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
                                 
-                            }
-	                        if (! $this->db->query($sql))
-	                        {
-	                            dol_print_error($this->db);
-	                        }
-	                    }
-	                    else
+							}
+							if (! $this->db->query($sql))
+							{
+								dol_print_error($this->db);
+							}
+						}
+						else
 						{
 							$error++;
-	                        $this->errors[]=$mailfile->error;
-	                    }
-	                }
-	                else
-	              {
-	                	dol_syslog("No notification sent for ".$sendto." because email is empty");
-	                }
-	                $i++;
-	            }
-            }
-            else
+							$this->errors[]=$mailfile->error;
+						}
+					}
+					else
+				  {
+						dol_syslog("No notification sent for ".$sendto." because email is empty");
+					}
+					$i++;
+				}
+			}
+			else
 			{
-	            dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
+				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
 			}
-        }
-        else
-        {
-       		$error++;
-            $this->errors[]=$this->db->lasterror();
-            dol_syslog("Failed to get list of notification to send ".$this->db->lasterror(), LOG_ERR);
-       		return -1;
-        }
-
-        // Check notification using fixed email
-        if (! $error)
-        {
-        	foreach($conf->global as $key => $val)
-    		{
-    			if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-
-    			$threshold = (float) $reg[1];
-    			if (!empty($object->total_ht) && $object->total_ht <= $threshold)
-    			{
-    				dol_syslog("A notification is requested for notifcode = ".$notifcode." but amount = ".$object->total_ht." so lower than threshold = ".$threshold.". We discard this notification");
-    				continue;
-    			}
-
-		        $param='NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_'.$reg[1];
-
-		        $sendto = $conf->global->$param;
-		        $notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid');
-		        if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code');
-
-		        $object_type = '';
-		        $link = '';
-		        $num++;
-
-		        $subject = '['.$mysoc->name.'] '.$langs->transnoentitiesnoconv("DolibarrNotification");
-
-		        switch ($notifcode) {
+		}
+		else
+		{
+	   		$error++;
+			$this->errors[]=$this->db->lasterror();
+			dol_syslog("Failed to get list of notification to send ".$this->db->lasterror(), LOG_ERR);
+	   		return -1;
+		}
+
+		// Check notification using fixed email
+		if (! $error)
+		{
+			foreach($conf->global as $key => $val)
+			{
+				if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+
+				$threshold = (float) $reg[1];
+				if (!empty($object->total_ht) && $object->total_ht <= $threshold)
+				{
+					dol_syslog("A notification is requested for notifcode = ".$notifcode." but amount = ".$object->total_ht." so lower than threshold = ".$threshold.". We discard this notification");
+					continue;
+				}
+
+				$param='NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_'.$reg[1];
+
+				$sendto = $conf->global->$param;
+				$notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid');
+				if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code');
+
+				$object_type = '';
+				$link = '';
+				$num++;
+
+				$subject = '['.$mysoc->name.'] '.$langs->transnoentitiesnoconv("DolibarrNotification");
+
+				switch ($notifcode) {
 					case 'BILL_VALIDATE':
 						$link='/compta/facture/card.php?facid='.$object->id;
 						$dir_output = $conf->facture->dir_output;
@@ -571,26 +571,26 @@ 
 						$object_type = 'propal';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$newref);
 						break;
-                    case 'FICHINTER_ADD_CONTACT':
-                        $link='/fichinter/card.php?id='.$object->id;
-                        $dir_output = $conf->facture->dir_output;
-                        $object_type = 'ficheinter';
-                        $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact",$newref);
-                        break;
+					case 'FICHINTER_ADD_CONTACT':
+						$link='/fichinter/card.php?id='.$object->id;
+						$dir_output = $conf->facture->dir_output;
+						$object_type = 'ficheinter';
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact",$newref);
+						break;
 					case 'FICHINTER_VALIDATE':
 						$link='/fichinter/card.php?id='.$object->id;
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'ficheinter';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$newref);
 						break;
-		        	case 'ORDER_SUPPLIER_VALIDATE':
-		        		$link='/fourn/commande/card.php?id='.$object->id;
-		        		$dir_output = $conf->fournisseur->dir_output.'/commande/';
-		        		$object_type = 'order_supplier';
-		        		$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-		        		$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$newref,$user->getFullName($langs));
-		        		$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
-		        		break;
+					case 'ORDER_SUPPLIER_VALIDATE':
+						$link='/fourn/commande/card.php?id='.$object->id;
+						$dir_output = $conf->fournisseur->dir_output.'/commande/';
+						$object_type = 'order_supplier';
+						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
+						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$newref,$user->getFullName($langs));
+						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+						break;
 					case 'ORDER_SUPPLIER_APPROVE':
 						$link='/fourn/commande/card.php?id='.$object->id;
 						$dir_output = $conf->fournisseur->dir_output.'/commande/';
@@ -633,73 +633,73 @@ 
 					$filepdf = $pdf_path;
 				}
 
-		        $message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
-		        $message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
-		        $message.= "\n";
-		        $message.= $mesg;
-		        if ($link) $message=dol_concatdesc($message,$urlwithroot.$link);
-
-		        // Replace keyword __SUPERVISOREMAIL__
-		        if (preg_match('/__SUPERVISOREMAIL__/', $sendto))
-		        {
-		        	$newval='';
-		        	if ($user->fk_user > 0)
-		        	{
-		        		$supervisoruser=new User($this->db);
-		        		$supervisoruser->fetch($user->fk_user);
-		        		if ($supervisoruser->email) $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
-		        	}
-		        	dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);
-		        	$sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);
-		        	$sendto = preg_replace('/^[\s,]+/','',$sendto);	// Clean start of string
-		        	$sendto = preg_replace('/[\s,]+$/','',$sendto);	// Clean end of string
-		        }
-
-		        if ($sendto)
-		        {
-       		        $parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$file, 'mimefile'=>$mimefile, 'filename'=>$filename);
-			        $reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			        if (empty($reshook))
-			        {
-		    	        if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-		        	    if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
-			        }
+				$message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
+				$message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
+				$message.= "\n";
+				$message.= $mesg;
+				if ($link) $message=dol_concatdesc($message,$urlwithroot.$link);
+
+				// Replace keyword __SUPERVISOREMAIL__
+				if (preg_match('/__SUPERVISOREMAIL__/', $sendto))
+				{
+					$newval='';
+					if ($user->fk_user > 0)
+					{
+						$supervisoruser=new User($this->db);
+						$supervisoruser->fetch($user->fk_user);
+						if ($supervisoruser->email) $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+					}
+					dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);
+					$sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);
+					$sendto = preg_replace('/^[\s,]+/','',$sendto);	// Clean start of string
+					$sendto = preg_replace('/[\s,]+$/','',$sendto);	// Clean end of string
+				}
+
+				if ($sendto)
+				{
+	   				$parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$file, 'mimefile'=>$mimefile, 'filename'=>$filename);
+					$reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+					if (empty($reshook))
+					{
+						if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
+						if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+					}
 		        
-		            $mailfile = new CMailFile(
-		        		$subject,
-		        		$sendto,
-		        		$replyto,
-		        		$message,
-		        		array($file),
-		        		array($mimefile),
-		        		array($filename[count($filename)-1]),
-		        		'',
-		        		'',
-		        		0,
-		        		-1
-		        	);
-
-		        	if ($mailfile->sendfile())
-		        	{
-		        		$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, type_target, objet_type, objet_id, email)";
-		        		$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", null, 'email', 'tofixedemail', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";
-		        		if (! $this->db->query($sql))
-		        		{
-		        			dol_print_error($this->db);
-		        		}
-		        	}
-		        	else
-		        	{
-		        		$error++;
-		        		$this->errors[]=$mailfile->error;
-		        	}
-		        }
-    		}
-        }
+					$mailfile = new CMailFile(
+						$subject,
+						$sendto,
+						$replyto,
+						$message,
+						array($file),
+						array($mimefile),
+						array($filename[count($filename)-1]),
+						'',
+						'',
+						0,
+						-1
+					);
+
+					if ($mailfile->sendfile())
+					{
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, type_target, objet_type, objet_id, email)";
+						$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", null, 'email', 'tofixedemail', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";
+						if (! $this->db->query($sql))
+						{
+							dol_print_error($this->db);
+						}
+					}
+					else
+					{
+						$error++;
+						$this->errors[]=$mailfile->error;
+					}
+				}
+			}
+		}
 
 		if (! $error) return $num;
 		else return -1 * $error;
-    }
+	}
 
 }
 

Spacing +179 added lines, -179 removed lines

@@ -22,7 +22,7 @@ 
  *      \ingroup    notification
  *      \brief      File of class to manage notifications
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/CMailFile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 
 
 /**
@@ -33,7 +33,7 @@ 
     var $id;
     var $db;
     var $error;
-    var $errors=array();
+    var $errors = array();
 
     var $author;
     var $ref;
@@ -79,32 +79,32 @@ 
      *  @param	Object	$object		Object the notification is about
      *	@return	string				Message
      */
-	function confirmMessage($action,$socid,$object)
+	function confirmMessage($action, $socid, $object)
 	{
 		global $langs;
 		$langs->load("mails");
 
-		$listofnotiftodo=$this->getNotificationsArray($action,$socid,$object,0);
+		$listofnotiftodo = $this->getNotificationsArray($action, $socid, $object, 0);
 		
-		$nb=-1;
-		if (is_array($listofnotiftodo)) $nb=count($listofnotiftodo);
-		if ($nb < 0)  $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
-		if ($nb == 0) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("NoNotificationsWillBeSent");
-   		if ($nb == 1) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ANotificationsWillBeSent");
-   		if ($nb >= 2) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("SomeNotificationsWillBeSent",$nb);
+		$nb = -1;
+		if (is_array($listofnotiftodo)) $nb = count($listofnotiftodo);
+		if ($nb < 0)  $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
+		if ($nb == 0) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("NoNotificationsWillBeSent");
+   		if ($nb == 1) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("ANotificationsWillBeSent");
+   		if ($nb >= 2) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("SomeNotificationsWillBeSent", $nb);
 		
    		if (is_array($listofnotiftodo))
    		{
-    		$i=0;
+    		$i = 0;
     		foreach ($listofnotiftodo as $key => $val)
     		{
-    			if ($i) $texte.=', ';
-    			else $texte.=' (';
-    			if ($val['isemailvalid']) $texte.=$val['email'];
-    			else $texte.=$val['emaildesc'];
+    			if ($i) $texte .= ', ';
+    			else $texte .= ' (';
+    			if ($val['isemailvalid']) $texte .= $val['email'];
+    			else $texte .= $val['emaildesc'];
     			$i++;
     		}
-    		if ($i) $texte.=')';
+    		if ($i) $texte .= ')';
    		}
    		
 		return $texte;
@@ -120,35 +120,35 @@ 
      * @param   array   $scope          Scope where to search
      * @return	array|int				<0 if KO, array of notifications to send if OK
      */
-	function getNotificationsArray($notifcode, $socid=0, $object=null, $userid=0, $scope=array('thirdparty', 'user', 'global'))
+	function getNotificationsArray($notifcode, $socid = 0, $object = null, $userid = 0, $scope = array('thirdparty', 'user', 'global'))
 	{
 		global $conf, $user;
 
-		$error=0;
-        $resarray=array();
+		$error = 0;
+        $resarray = array();
 
         $valueforthreshold = 0;
         if (is_object($object)) $valueforthreshold = $object->total_ht;
 
-        if (! $error)
+        if (!$error)
         {
             if ($socid >= 0 && in_array('thirdparty', $scope))
             {
     	        $sql = "SELECT a.code, c.email, c.rowid";
-    	        $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
-                $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
-    	        $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    	        $sql.= " ".MAIN_DB_PREFIX."societe as s";
-    	        $sql.= " WHERE n.fk_contact = c.rowid";
-    	        $sql.= " AND a.rowid = n.fk_action";
-    	        $sql.= " AND n.fk_soc = s.rowid";
+    	        $sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
+                $sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+    	        $sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    	        $sql .= " ".MAIN_DB_PREFIX."societe as s";
+    	        $sql .= " WHERE n.fk_contact = c.rowid";
+    	        $sql .= " AND a.rowid = n.fk_action";
+    	        $sql .= " AND n.fk_soc = s.rowid";
     	        if ($notifcode)
     	        {
-    		        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-    		        else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+    		        if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
+    		        else $sql .= " AND a.code = '".$notifcode."'"; // New usage
     	        }
-    	        $sql.= " AND s.entity IN (".getEntity('societe').")";
-    	        if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
+    	        $sql .= " AND s.entity IN (".getEntity('societe').")";
+    	        if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
     
     			dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
     
@@ -156,14 +156,14 @@ 
     	        if ($resql)
     	        {
     	        	$num = $this->db->num_rows($resql);
-    	            $i=0;
+    	            $i = 0;
     	            while ($i < $num)
     	            {
     	        		$obj = $this->db->fetch_object($resql);
     	            	if ($obj)
     	            	{
-    	            	    $newval2=trim($obj->email);
-    	            		$isvalid=isValidEmail($newval2);
+    	            	    $newval2 = trim($obj->email);
+    	            		$isvalid = isValidEmail($newval2);
     	            		if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
     	            	}
     	            	$i++;
@@ -172,28 +172,28 @@ 
     			else
     			{
     				$error++;
-    				$this->error=$this->db->lasterror();
+    				$this->error = $this->db->lasterror();
     			}
             }
         }
         
-        if (! $error)
+        if (!$error)
         {
             if ($userid >= 0 && in_array('user', $scope))
             {
     			$sql = "SELECT a.code, c.email, c.rowid";
-    			$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
-    			$sql.= " ".MAIN_DB_PREFIX."user as c,";
-    			$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a";
-    			$sql.= " WHERE n.fk_user = c.rowid";
-    			$sql.= " AND a.rowid = n.fk_action";
+    			$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
+    			$sql .= " ".MAIN_DB_PREFIX."user as c,";
+    			$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a";
+    			$sql .= " WHERE n.fk_user = c.rowid";
+    			$sql .= " AND a.rowid = n.fk_action";
     			if ($notifcode)
     			{
-    			    if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-    			    else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+    			    if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
+    			    else $sql .= " AND a.code = '".$notifcode."'"; // New usage
     			}
-    			$sql.= " AND c.entity IN (".getEntity('user').")";
-    			if ($userid > 0) $sql.= " AND c.rowid = ".$userid;
+    			$sql .= " AND c.entity IN (".getEntity('user').")";
+    			if ($userid > 0) $sql .= " AND c.rowid = ".$userid;
     			
     			dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
     			
@@ -201,14 +201,14 @@ 
     			if ($resql)
     			{
     			    $num = $this->db->num_rows($resql);
-    			    $i=0;
+    			    $i = 0;
     			    while ($i < $num)
     			    {
     			        $obj = $this->db->fetch_object($resql);
     			        if ($obj)
     			        {
-    	            	    $newval2=trim($obj->email);
-    			            $isvalid=isValidEmail($newval2);
+    	            	    $newval2 = trim($obj->email);
+    			            $isvalid = isValidEmail($newval2);
     			            if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
     			        }
     			        $i++;
@@ -217,49 +217,49 @@ 
     			else
     			{
     			    $error++;
-    			    $this->error=$this->db->lasterror();
+    			    $this->error = $this->db->lasterror();
     			}
             }
         }
 
-		if (! $error)
+		if (!$error)
 		{
 		    if (in_array('global', $scope))
 		    {
     		    // List of notifications enabled for fixed email
-    		    foreach($conf->global as $key => $val)
+    		    foreach ($conf->global as $key => $val)
     		    {
     		    	if ($notifcode)
     		    	{
-    		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+    		    		if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
     		    	}
     		    	else
     		    	{
-    		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+    		    		if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
     		    	}
     
         			$threshold = (float) $reg[1];
         			if ($valueforthreshold < $threshold) continue;
     
-    		    	$tmpemail=explode(',',$val);
-    		    	foreach($tmpemail as $key2 => $val2)
+    		    	$tmpemail = explode(',', $val);
+    		    	foreach ($tmpemail as $key2 => $val2)
     		    	{
-    		    		$newval2=trim($val2);
+    		    		$newval2 = trim($val2);
     		    		if ($newval2 == '__SUPERVISOREMAIL__')
     		    		{
     		    			if ($user->fk_user > 0)
     		    			{
-    							$tmpuser=new User($this->db);
+    							$tmpuser = new User($this->db);
     							$tmpuser->fetch($user->fk_user);
-    							if ($tmpuser->email) $newval2=trim($tmpuser->email);
-    							else $newval2='';
+    							if ($tmpuser->email) $newval2 = trim($tmpuser->email);
+    							else $newval2 = '';
     		    			}
-    		    			else $newval2='';
+    		    			else $newval2 = '';
     		    		}
     		    		if ($newval2)
     		    		{
-    		    			$isvalid=isValidEmail($newval2, 0);
-    		    			if (empty($resarray[$newval2])) $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+    		    			$isvalid = isValidEmail($newval2, 0);
+    		    			if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
     		    		}
     		    	}
     		    }
@@ -282,17 +282,17 @@ 
      */
     function send($notifcode, $object)
     {
-        global $user,$conf,$langs,$mysoc;
+        global $user, $conf, $langs, $mysoc;
         global $hookmanager;
         global $dolibarr_main_url_root;
 
-		if (! in_array($notifcode, $this->arrayofnotifsupported)) return 0;
+		if (!in_array($notifcode, $this->arrayofnotifsupported)) return 0;
 
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	    if (! is_object($hookmanager))
+	    if (!is_object($hookmanager))
 	    {
 	        include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-	        $hookmanager=new HookManager($this->db);
+	        $hookmanager = new HookManager($this->db);
 	    }
 	    $hookmanager->initHooks(array('notification'));
 	    
@@ -301,13 +301,13 @@ 
     	$langs->load("other");
 
 		// Define $urlwithroot
-	    $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
+	    $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
 
 		// Define some vars
 	    $application = 'Dolibarr';
-	    if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
+	    if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
 	    $replyto = $conf->notification->email_from;
 	    $filename = basename($file);
         $mimefile = dol_mimetype($file);
@@ -315,33 +315,33 @@ 
         $link = '';
 		$num = 0;
 
-		$oldref=(empty($object->oldref)?$object->ref:$object->oldref);
-		$newref=(empty($object->newref)?$object->ref:$object->newref);
+		$oldref = (empty($object->oldref) ? $object->ref : $object->oldref);
+		$newref = (empty($object->newref) ? $object->ref : $object->newref);
 
 		// Check notification per third party
 		$sql = "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
-		$sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
-        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
-        $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-        $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-        $sql.= " ".MAIN_DB_PREFIX."societe as s";
-        $sql.= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
-        $sql.= " AND n.fk_soc = s.rowid";
-        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-        else $sql.= " AND a.code = '".$notifcode."'";	// New usage
+		$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
+        $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
+        $sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+        $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+        $sql .= " ".MAIN_DB_PREFIX."societe as s";
+        $sql .= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
+        $sql .= " AND n.fk_soc = s.rowid";
+        if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
+        else $sql .= " AND a.code = '".$notifcode."'"; // New usage
         $sql .= " AND s.rowid = ".$object->socid;
 
 		// Check notification per user
-        $sql.= "\nUNION\n";
-
-        $sql.= "SELECT 'touserid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.lang as default_lang,";
-        $sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
-        $sql.= " FROM ".MAIN_DB_PREFIX."user as c,";
-        $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-        $sql.= " ".MAIN_DB_PREFIX."notify_def as n";
-        $sql.= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
-        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-        else $sql.= " AND a.code = '".$notifcode."'";	// New usage
+        $sql .= "\nUNION\n";
+
+        $sql .= "SELECT 'touserid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.lang as default_lang,";
+        $sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
+        $sql .= " FROM ".MAIN_DB_PREFIX."user as c,";
+        $sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+        $sql .= " ".MAIN_DB_PREFIX."notify_def as n";
+        $sql .= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
+        if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
+        else $sql .= " AND a.code = '".$notifcode."'"; // New usage
         
         $result = $this->db->query($sql);
         if ($result)
@@ -351,11 +351,11 @@ 
             if ($num > 0)
             {
 	            $i = 0;
-	            while ($i < $num && ! $error)	// For each notification couple defined (third party/actioncode)
+	            while ($i < $num && !$error)	// For each notification couple defined (third party/actioncode)
 	            {
 	                $obj = $this->db->fetch_object($result);
 
-	                $sendto = dolGetFirstLastname($obj->firstname,$obj->lastname) . " <".$obj->email.">";
+	                $sendto = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
 					$notifcodedefid = $obj->adid;
 
 	                if (dol_strlen($obj->email))
@@ -372,74 +372,74 @@ 
 	                	
 	                    switch ($notifcode) {
 							case 'BILL_VALIDATE':
-								$link='/compta/facture/card.php?facid='.$object->id;
+								$link = '/compta/facture/card.php?facid='.$object->id;
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated", $newref);
 								break;
 							case 'BILL_PAYED':
-								$link='/compta/facture/card.php?facid='.$object->id;
+								$link = '/compta/facture/card.php?facid='.$object->id;
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed",$newref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed", $newref);
 								break;
 							case 'ORDER_VALIDATE':
-								$link='/commande/card.php?id='.$object->id;
+								$link = '/commande/card.php?id='.$object->id;
 								$dir_output = $conf->commande->dir_output;
 								$object_type = 'order';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$newref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated", $newref);
 								break;
 							case 'PROPAL_VALIDATE':
-								$link='/comm/propal/card.php?id='.$object->id;
+								$link = '/comm/propal/card.php?id='.$object->id;
 								$dir_output = $conf->propal->dir_output;
 								$object_type = 'propal';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$newref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated", $newref);
 								break;
 							case 'FICHINTER_ADD_CONTACT':
-								$link='/fichinter/card.php?id='.$object->id;
+								$link = '/fichinter/card.php?id='.$object->id;
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'ficheinter';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact",$object->ref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact", $object->ref);
 								break;
 							case 'FICHINTER_VALIDATE':
-								$link='/fichinter/card.php?id='.$object->id;
+								$link = '/fichinter/card.php?id='.$object->id;
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'ficheinter';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated", $object->ref);
 								break;
 							case 'ORDER_SUPPLIER_VALIDATE':
-								$link='/fourn/commande/card.php?id='.$object->id;
+								$link = '/fourn/commande/card.php?id='.$object->id;
 								$dir_output = $conf->fournisseur->dir_output.'/commande/';
 								$object_type = 'order_supplier';
 								$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$object->ref,$user->getFullName($langs));
-								$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+								$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $object->ref, $user->getFullName($langs));
+								$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'ORDER_SUPPLIER_APPROVE':
-								$link='/fourn/commande/card.php?id='.$object->id;
+								$link = '/fourn/commande/card.php?id='.$object->id;
 								$dir_output = $conf->fournisseur->dir_output.'/commande/';
 								$object_type = 'order_supplier';
 								$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$newref,$user->getFullName($langs));
-								$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+								$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $newref, $user->getFullName($langs));
+								$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'ORDER_SUPPLIER_REFUSE':
-								$link='/fourn/commande/card.php?id='.$object->id;
+								$link = '/fourn/commande/card.php?id='.$object->id;
 								$dir_output = $conf->fournisseur->dir_output.'/commande/';
 								$object_type = 'order_supplier';
 								$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$newref,$user->getFullName($langs));
-								$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+								$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy", $newref, $user->getFullName($langs));
+								$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'SHIPPING_VALIDATE':
 								$dir_output = $conf->expedition->dir_output.'/sending/';
 								$object_type = 'order_supplier';
-								$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref);
+								$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated", $newref);
 								break;
 						}
                     	$ref = dol_sanitizeFileName($newref);
 						$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
-						if (! dol_is_file($pdf_path))
+						if (!dol_is_file($pdf_path))
 						{
 							// We can't add PDF as it is not generated yet.
 							$filepdf = '';
@@ -449,18 +449,18 @@ 
 							$filepdf = $pdf_path;
 						}
 
-	                	$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
-	                	$message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
-	                	$message.= "\n";
-	                    $message.= $mesg;
-	                    if ($link) $message=dol_concatdesc($message,$urlwithroot.$link);
+	                	$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification", $application, $mysoc->name)."\n";
+	                	$message .= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
+	                	$message .= "\n";
+	                    $message .= $mesg;
+	                    if ($link) $message = dol_concatdesc($message, $urlwithroot.$link);
 
-	                    $parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$file, 'mimefile'=>$mimefile, 'filename'=>$filename);
-	                    $reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+	                    $parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$file, 'mimefile'=>$mimefile, 'filename'=>$filename);
+	                    $reshook = $hookmanager->executeHooks('formatNotificationMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 	                    if (empty($reshook))
 	                    {
-	                        if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-	                        if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+	                        if (!empty($hookmanager->resArray['subject'])) $subject .= $hookmanager->resArray['subject'];
+	                        if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];
 	                    }
 	                     
 	                    $mailfile = new CMailFile(
@@ -470,7 +470,7 @@ 
 	                        $message,
 	                        array($file),
 	                        array($mimefile),
-	                        array($filename[count($filename)-1]),
+	                        array($filename[count($filename) - 1]),
 	                        '',
 	                        '',
 	                        0,
@@ -481,15 +481,15 @@ 
 	                    {   
 	                        if ($obj->type_target == 'touserid') {
      	                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
-    	                        $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
+    	                        $sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
                            
                             }
                             else {
     	                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
-    	                        $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
+    	                        $sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
                                 
                             }
-	                        if (! $this->db->query($sql))
+	                        if (!$this->db->query($sql))
 	                        {
 	                            dol_print_error($this->db);
 	                        }
@@ -497,7 +497,7 @@ 
 	                    else
 						{
 							$error++;
-	                        $this->errors[]=$mailfile->error;
+	                        $this->errors[] = $mailfile->error;
 	                    }
 	                }
 	                else
@@ -515,17 +515,17 @@ 
         else
         {
        		$error++;
-            $this->errors[]=$this->db->lasterror();
+            $this->errors[] = $this->db->lasterror();
             dol_syslog("Failed to get list of notification to send ".$this->db->lasterror(), LOG_ERR);
        		return -1;
         }
 
         // Check notification using fixed email
-        if (! $error)
+        if (!$error)
         {
-        	foreach($conf->global as $key => $val)
+        	foreach ($conf->global as $key => $val)
     		{
-    			if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+    			if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
 
     			$threshold = (float) $reg[1];
     			if (!empty($object->total_ht) && $object->total_ht <= $threshold)
@@ -534,7 +534,7 @@ 
     				continue;
     			}
 
-		        $param='NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_'.$reg[1];
+		        $param = 'NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_'.$reg[1];
 
 		        $sendto = $conf->global->$param;
 		        $notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid');
@@ -548,82 +548,82 @@ 
 
 		        switch ($notifcode) {
 					case 'BILL_VALIDATE':
-						$link='/compta/facture/card.php?facid='.$object->id;
+						$link = '/compta/facture/card.php?facid='.$object->id;
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'facture';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated", $newref);
 						break;
 					case 'BILL_PAYED':
-						$link='/compta/facture/card.php?facid='.$object->id;
+						$link = '/compta/facture/card.php?facid='.$object->id;
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'facture';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed",$newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed", $newref);
 						break;
 					case 'ORDER_VALIDATE':
-						$link='/commande/card.php?id='.$object->id;
+						$link = '/commande/card.php?id='.$object->id;
 						$dir_output = $conf->commande->dir_output;
 						$object_type = 'order';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated", $newref);
 						break;
 					case 'PROPAL_VALIDATE':
-						$link='/comm/propal/card.php?id='.$object->id;
+						$link = '/comm/propal/card.php?id='.$object->id;
 						$dir_output = $conf->propal->dir_output;
 						$object_type = 'propal';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated", $newref);
 						break;
                     case 'FICHINTER_ADD_CONTACT':
-                        $link='/fichinter/card.php?id='.$object->id;
+                        $link = '/fichinter/card.php?id='.$object->id;
                         $dir_output = $conf->facture->dir_output;
                         $object_type = 'ficheinter';
-                        $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact",$newref);
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact", $newref);
                         break;
 					case 'FICHINTER_VALIDATE':
-						$link='/fichinter/card.php?id='.$object->id;
+						$link = '/fichinter/card.php?id='.$object->id;
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'ficheinter';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated", $newref);
 						break;
 		        	case 'ORDER_SUPPLIER_VALIDATE':
-		        		$link='/fourn/commande/card.php?id='.$object->id;
+		        		$link = '/fourn/commande/card.php?id='.$object->id;
 		        		$dir_output = $conf->fournisseur->dir_output.'/commande/';
 		        		$object_type = 'order_supplier';
 		        		$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-		        		$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$newref,$user->getFullName($langs));
-		        		$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+		        		$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $newref, $user->getFullName($langs));
+		        		$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 		        		break;
 					case 'ORDER_SUPPLIER_APPROVE':
-						$link='/fourn/commande/card.php?id='.$object->id;
+						$link = '/fourn/commande/card.php?id='.$object->id;
 						$dir_output = $conf->fournisseur->dir_output.'/commande/';
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$newref,$user->getFullName($langs));
-						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $newref, $user->getFullName($langs));
+						$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'ORDER_SUPPLIER_APPROVE2':
-						$link='/fourn/commande/card.php?id='.$object->id;
+						$link = '/fourn/commande/card.php?id='.$object->id;
 						$dir_output = $conf->fournisseur->dir_output.'/commande/';
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$newref,$user->getFullName($langs));
-						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $newref, $user->getFullName($langs));
+						$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'ORDER_SUPPLIER_REFUSE':
-						$link='/fourn/commande/card.php?id='.$object->id;
+						$link = '/fourn/commande/card.php?id='.$object->id;
 						$dir_output = $conf->fournisseur->dir_output.'/commande/';
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$newref,$user->getFullName($langs));
-						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy", $newref, $user->getFullName($langs));
+						$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'SHIPPING_VALIDATE':
 						$dir_output = $conf->expedition->dir_output.'/sending/';
 						$object_type = 'order_supplier';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated", $newref);
 						break;
 				}
 				$ref = dol_sanitizeFileName($newref);
 				$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
-				if (! dol_is_file($pdf_path))
+				if (!dol_is_file($pdf_path))
 				{
 					// We can't add PDF as it is not generated yet.
 					$filepdf = '';
@@ -633,36 +633,36 @@ 
 					$filepdf = $pdf_path;
 				}
 
-		        $message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
-		        $message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
-		        $message.= "\n";
-		        $message.= $mesg;
-		        if ($link) $message=dol_concatdesc($message,$urlwithroot.$link);
+		        $message = $langs->transnoentities("YouReceiveMailBecauseOfNotification", $application, $mysoc->name)."\n";
+		        $message .= $langs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
+		        $message .= "\n";
+		        $message .= $mesg;
+		        if ($link) $message = dol_concatdesc($message, $urlwithroot.$link);
 
 		        // Replace keyword __SUPERVISOREMAIL__
 		        if (preg_match('/__SUPERVISOREMAIL__/', $sendto))
 		        {
-		        	$newval='';
+		        	$newval = '';
 		        	if ($user->fk_user > 0)
 		        	{
-		        		$supervisoruser=new User($this->db);
+		        		$supervisoruser = new User($this->db);
 		        		$supervisoruser->fetch($user->fk_user);
-		        		if ($supervisoruser->email) $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+		        		if ($supervisoruser->email) $newval = trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
 		        	}
 		        	dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);
 		        	$sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);
-		        	$sendto = preg_replace('/^[\s,]+/','',$sendto);	// Clean start of string
-		        	$sendto = preg_replace('/[\s,]+$/','',$sendto);	// Clean end of string
+		        	$sendto = preg_replace('/^[\s,]+/', '', $sendto); // Clean start of string
+		        	$sendto = preg_replace('/[\s,]+$/', '', $sendto); // Clean end of string
 		        }
 
 		        if ($sendto)
 		        {
-       		        $parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$file, 'mimefile'=>$mimefile, 'filename'=>$filename);
-			        $reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+       		        $parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$file, 'mimefile'=>$mimefile, 'filename'=>$filename);
+			        $reshook = $hookmanager->executeHooks('formatNotificationMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 			        if (empty($reshook))
 			        {
-		    	        if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-		        	    if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+		    	        if (!empty($hookmanager->resArray['subject'])) $subject .= $hookmanager->resArray['subject'];
+		        	    if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];
 			        }
 		        
 		            $mailfile = new CMailFile(
@@ -672,7 +672,7 @@ 
 		        		$message,
 		        		array($file),
 		        		array($mimefile),
-		        		array($filename[count($filename)-1]),
+		        		array($filename[count($filename) - 1]),
 		        		'',
 		        		'',
 		        		0,
@@ -682,8 +682,8 @@ 
 		        	if ($mailfile->sendfile())
 		        	{
 		        		$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, type_target, objet_type, objet_id, email)";
-		        		$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", null, 'email', 'tofixedemail', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";
-		        		if (! $this->db->query($sql))
+		        		$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", null, 'email', 'tofixedemail', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";
+		        		if (!$this->db->query($sql))
 		        		{
 		        			dol_print_error($this->db);
 		        		}
@@ -691,13 +691,13 @@ 
 		        	else
 		        	{
 		        		$error++;
-		        		$this->errors[]=$mailfile->error;
+		        		$this->errors[] = $mailfile->error;
 		        	}
 		        }
     		}
         }
 
-		if (! $error) return $num;
+		if (!$error) return $num;
 		else return -1 * $error;
     }
 

Braces +149 added lines, -67 removed lines

@@ -87,24 +87,42 @@ 
 		$listofnotiftodo=$this->getNotificationsArray($action,$socid,$object,0);
 		
 		$nb=-1;
-		if (is_array($listofnotiftodo)) $nb=count($listofnotiftodo);
-		if ($nb < 0)  $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
-		if ($nb == 0) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("NoNotificationsWillBeSent");
-   		if ($nb == 1) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ANotificationsWillBeSent");
-   		if ($nb >= 2) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("SomeNotificationsWillBeSent",$nb);
+		if (is_array($listofnotiftodo)) {
+			$nb=count($listofnotiftodo);
+		}
+		if ($nb < 0) {
+			$texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
+		}
+		if ($nb == 0) {
+			$texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("NoNotificationsWillBeSent");
+		}
+   		if ($nb == 1) {
+   			$texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ANotificationsWillBeSent");
+   		}
+   		if ($nb >= 2) {
+   			$texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("SomeNotificationsWillBeSent",$nb);
+   		}
 		
    		if (is_array($listofnotiftodo))
    		{
     		$i=0;
     		foreach ($listofnotiftodo as $key => $val)
     		{
-    			if ($i) $texte.=', ';
-    			else $texte.=' (';
-    			if ($val['isemailvalid']) $texte.=$val['email'];
-    			else $texte.=$val['emaildesc'];
+    			if ($i) {
+    				$texte.=', ';
+    			} else {
+    				$texte.=' (';
+    			}
+    			if ($val['isemailvalid']) {
+    				$texte.=$val['email'];
+    			} else {
+    				$texte.=$val['emaildesc'];
+    			}
     			$i++;
     		}
-    		if ($i) $texte.=')';
+    		if ($i) {
+    			$texte.=')';
+    		}
    		}
    		
 		return $texte;
@@ -128,7 +146,9 @@ 
         $resarray=array();
 
         $valueforthreshold = 0;
-        if (is_object($object)) $valueforthreshold = $object->total_ht;
+        if (is_object($object)) {
+        	$valueforthreshold = $object->total_ht;
+        }
 
         if (! $error)
         {
@@ -144,11 +164,19 @@ 
     	        $sql.= " AND n.fk_soc = s.rowid";
     	        if ($notifcode)
     	        {
-    		        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-    		        else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+    		        if (is_numeric($notifcode)) {
+    		        	$sql.= " AND n.fk_action = ".$notifcode;
+    		        }
+    		        // Old usage
+    		        else {
+    		        	$sql.= " AND a.code = '".$notifcode."'";
+    		        }
+    		        // New usage
     	        }
     	        $sql.= " AND s.entity IN (".getEntity('societe').")";
-    	        if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
+    	        if ($socid > 0) {
+    	        	$sql.= " AND s.rowid = ".$socid;
+    	        }
     
     			dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
     
@@ -164,12 +192,13 @@ 
     	            	{
     	            	    $newval2=trim($obj->email);
     	            		$isvalid=isValidEmail($newval2);
-    	            		if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+    	            		if (empty($resarray[$newval2])) {
+    	            			$resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+    	            		}
     	            	}
     	            	$i++;
     	            }
-    			}
-    			else
+    			} else
     			{
     				$error++;
     				$this->error=$this->db->lasterror();
@@ -189,11 +218,19 @@ 
     			$sql.= " AND a.rowid = n.fk_action";
     			if ($notifcode)
     			{
-    			    if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-    			    else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+    			    if (is_numeric($notifcode)) {
+    			    	$sql.= " AND n.fk_action = ".$notifcode;
+    			    }
+    			    // Old usage
+    			    else {
+    			    	$sql.= " AND a.code = '".$notifcode."'";
+    			    }
+    			    // New usage
     			}
     			$sql.= " AND c.entity IN (".getEntity('user').")";
-    			if ($userid > 0) $sql.= " AND c.rowid = ".$userid;
+    			if ($userid > 0) {
+    				$sql.= " AND c.rowid = ".$userid;
+    			}
     			
     			dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
     			
@@ -209,12 +246,13 @@ 
     			        {
     	            	    $newval2=trim($obj->email);
     			            $isvalid=isValidEmail($newval2);
-    			            if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+    			            if (empty($resarray[$newval2])) {
+    			            	$resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+    			            }
     			        }
     			        $i++;
     			    }
-    			}
-    			else
+    			} else
     			{
     			    $error++;
     			    $this->error=$this->db->lasterror();
@@ -231,15 +269,20 @@ 
     		    {
     		    	if ($notifcode)
     		    	{
-    		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-    		    	}
-    		    	else
+    		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+    		    			continue;
+    		    		}
+    		    	} else
     		    	{
-    		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+    		    		if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+    		    			continue;
+    		    		}
     		    	}
     
         			$threshold = (float) $reg[1];
-        			if ($valueforthreshold < $threshold) continue;
+        			if ($valueforthreshold < $threshold) {
+        				continue;
+        			}
     
     		    	$tmpemail=explode(',',$val);
     		    	foreach($tmpemail as $key2 => $val2)
@@ -251,22 +294,30 @@ 
     		    			{
     							$tmpuser=new User($this->db);
     							$tmpuser->fetch($user->fk_user);
-    							if ($tmpuser->email) $newval2=trim($tmpuser->email);
-    							else $newval2='';
+    							if ($tmpuser->email) {
+    								$newval2=trim($tmpuser->email);
+    							} else {
+    								$newval2='';
+    							}
+    		    			} else {
+    		    				$newval2='';
     		    			}
-    		    			else $newval2='';
     		    		}
     		    		if ($newval2)
     		    		{
     		    			$isvalid=isValidEmail($newval2, 0);
-    		    			if (empty($resarray[$newval2])) $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+    		    			if (empty($resarray[$newval2])) {
+    		    				$resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+    		    			}
     		    		}
     		    	}
     		    }
 		    }
 		}
 
-		if ($error) return -1;
+		if ($error) {
+			return -1;
+		}
 
 		//var_dump($resarray);
 		return $resarray;
@@ -286,7 +337,9 @@ 
         global $hookmanager;
         global $dolibarr_main_url_root;
 
-		if (! in_array($notifcode, $this->arrayofnotifsupported)) return 0;
+		if (! in_array($notifcode, $this->arrayofnotifsupported)) {
+			return 0;
+		}
 
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	    if (! is_object($hookmanager))
@@ -307,7 +360,9 @@ 
 
 		// Define some vars
 	    $application = 'Dolibarr';
-	    if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
+	    if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
+	    	$application = $conf->global->MAIN_APPLICATION_TITLE;
+	    }
 	    $replyto = $conf->notification->email_from;
 	    $filename = basename($file);
         $mimefile = dol_mimetype($file);
@@ -327,8 +382,14 @@ 
         $sql.= " ".MAIN_DB_PREFIX."societe as s";
         $sql.= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
         $sql.= " AND n.fk_soc = s.rowid";
-        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-        else $sql.= " AND a.code = '".$notifcode."'";	// New usage
+        if (is_numeric($notifcode)) {
+        	$sql.= " AND n.fk_action = ".$notifcode;
+        }
+        // Old usage
+        else {
+        	$sql.= " AND a.code = '".$notifcode."'";
+        }
+        // New usage
         $sql .= " AND s.rowid = ".$object->socid;
 
 		// Check notification per user
@@ -340,8 +401,14 @@ 
         $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
         $sql.= " ".MAIN_DB_PREFIX."notify_def as n";
         $sql.= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
-        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-        else $sql.= " AND a.code = '".$notifcode."'";	// New usage
+        if (is_numeric($notifcode)) {
+        	$sql.= " AND n.fk_action = ".$notifcode;
+        }
+        // Old usage
+        else {
+        	$sql.= " AND a.code = '".$notifcode."'";
+        }
+        // New usage
         
         $result = $this->db->query($sql);
         if ($result)
@@ -351,9 +418,11 @@ 
             if ($num > 0)
             {
 	            $i = 0;
-	            while ($i < $num && ! $error)	// For each notification couple defined (third party/actioncode)
+	            while ($i < $num && ! $error) {
+	            	// For each notification couple defined (third party/actioncode)
 	            {
 	                $obj = $this->db->fetch_object($result);
+	            }
 
 	                $sendto = dolGetFirstLastname($obj->firstname,$obj->lastname) . " <".$obj->email.">";
 					$notifcodedefid = $obj->adid;
@@ -443,8 +512,7 @@ 
 						{
 							// We can't add PDF as it is not generated yet.
 							$filepdf = '';
-						}
-						else
+						} else
 						{
 							$filepdf = $pdf_path;
 						}
@@ -453,14 +521,20 @@ 
 	                	$message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
 	                	$message.= "\n";
 	                    $message.= $mesg;
-	                    if ($link) $message=dol_concatdesc($message,$urlwithroot.$link);
+	                    if ($link) {
+	                    	$message=dol_concatdesc($message,$urlwithroot.$link);
+	                    }
 
 	                    $parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$file, 'mimefile'=>$mimefile, 'filename'=>$filename);
 	                    $reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 	                    if (empty($reshook))
 	                    {
-	                        if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-	                        if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+	                        if (! empty($hookmanager->resArray['subject'])) {
+	                        	$subject.=$hookmanager->resArray['subject'];
+	                        }
+	                        if (! empty($hookmanager->resArray['message'])) {
+	                        	$message.=$hookmanager->resArray['message'];
+	                        }
 	                    }
 	                     
 	                    $mailfile = new CMailFile(
@@ -483,8 +557,7 @@ 
      	                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
     	                        $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
                            
-                            }
-                            else {
+                            } else {
     	                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
     	                        $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
                                 
@@ -493,26 +566,22 @@ 
 	                        {
 	                            dol_print_error($this->db);
 	                        }
-	                    }
-	                    else
+	                    } else
 						{
 							$error++;
 	                        $this->errors[]=$mailfile->error;
 	                    }
-	                }
-	                else
+	                } else
 	              {
 	                	dol_syslog("No notification sent for ".$sendto." because email is empty");
 	                }
 	                $i++;
 	            }
-            }
-            else
+            } else
 			{
 	            dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
 			}
-        }
-        else
+        } else
         {
        		$error++;
             $this->errors[]=$this->db->lasterror();
@@ -525,7 +594,9 @@ 
         {
         	foreach($conf->global as $key => $val)
     		{
-    			if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+    			if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+    				continue;
+    			}
 
     			$threshold = (float) $reg[1];
     			if (!empty($object->total_ht) && $object->total_ht <= $threshold)
@@ -538,7 +609,9 @@ 
 
 		        $sendto = $conf->global->$param;
 		        $notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid');
-		        if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code');
+		        if ($notifcodedefid <= 0) {
+		        	dol_print_error($this->db, 'Failed to get id from code');
+		        }
 
 		        $object_type = '';
 		        $link = '';
@@ -627,8 +700,7 @@ 
 				{
 					// We can't add PDF as it is not generated yet.
 					$filepdf = '';
-				}
-				else
+				} else
 				{
 					$filepdf = $pdf_path;
 				}
@@ -637,7 +709,9 @@ 
 		        $message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
 		        $message.= "\n";
 		        $message.= $mesg;
-		        if ($link) $message=dol_concatdesc($message,$urlwithroot.$link);
+		        if ($link) {
+		        	$message=dol_concatdesc($message,$urlwithroot.$link);
+		        }
 
 		        // Replace keyword __SUPERVISOREMAIL__
 		        if (preg_match('/__SUPERVISOREMAIL__/', $sendto))
@@ -647,7 +721,9 @@ 
 		        	{
 		        		$supervisoruser=new User($this->db);
 		        		$supervisoruser->fetch($user->fk_user);
-		        		if ($supervisoruser->email) $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+		        		if ($supervisoruser->email) {
+		        			$newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+		        		}
 		        	}
 		        	dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);
 		        	$sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);
@@ -661,8 +737,12 @@ 
 			        $reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 			        if (empty($reshook))
 			        {
-		    	        if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-		        	    if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+		    	        if (! empty($hookmanager->resArray['subject'])) {
+		    	        	$subject.=$hookmanager->resArray['subject'];
+		    	        }
+		        	    if (! empty($hookmanager->resArray['message'])) {
+		        	    	$message.=$hookmanager->resArray['message'];
+		        	    }
 			        }
 		        
 		            $mailfile = new CMailFile(
@@ -687,8 +767,7 @@ 
 		        		{
 		        			dol_print_error($this->db);
 		        		}
-		        	}
-		        	else
+		        	} else
 		        	{
 		        		$error++;
 		        		$this->errors[]=$mailfile->error;
@@ -697,8 +776,11 @@ 
     		}
         }
 
-		if (! $error) return $num;
-		else return -1 * $error;
+		if (! $error) {
+			return $num;
+		} else {
+			return -1 * $error;
+		}
     }
 
 }