alxarafe / alixar

dolibarr/htdocs/core/class/canvas.class.php

Spacing +21 added lines, -21 removed lines

@@ -36,7 +36,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -45,13 +45,13 @@ 
 
 	public $actiontype;
 
-    public $dirmodule;			// Module directory
-    public $targetmodule;      // Module concerned by canvas (ex: thirdparty, contact, ...)
-    public $canvas;            // Name of canvas (ex: company, individual, product, service, ...)
-    public $card;              // Tab (sub-canvas)
+    public $dirmodule; // Module directory
+    public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
+    public $canvas; // Name of canvas (ex: company, individual, product, service, ...)
+    public $card; // Tab (sub-canvas)
 
-    public $template_dir;		// Initialized by getCanvas with templates directory
-    public $control;           	// Initialized by getCanvas with controller instance
+    public $template_dir; // Initialized by getCanvas with templates directory
+    public $control; // Initialized by getCanvas with controller instance
 
 
    /**
@@ -60,7 +60,7 @@ 
 	*   @param     DoliDB	$db          	Database handler
 	*   @param     string   $actiontype		Action type ('create', 'view', 'edit', 'list')
 	*/
-	function __construct($db, $actiontype='view')
+	function __construct($db, $actiontype = 'view')
 	{
 		$this->db = $db;
 
@@ -76,9 +76,9 @@ 
 	private function _cleanaction($action)
 	{
 	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction='create';
-	    if ($newaction == 'update') $newaction='edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
+	    if ($newaction == 'add')    $newaction = 'create';
+	    if ($newaction == 'update') $newaction = 'edit';
+	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction = 'view';
 	    return $newaction;
 	}
 
@@ -101,7 +101,7 @@ 
         $this->card = $card;
         $this->dirmodule = $module;
         // Correct values if canvas is into an external module
-		if (preg_match('/^([^@]+)@([^@]+)$/i',$canvas,$regs))
+		if (preg_match('/^([^@]+)@([^@]+)$/i', $canvas, $regs))
 		{
             $this->canvas = $regs[1];
 		    $this->dirmodule = $regs[2];
@@ -114,7 +114,7 @@ 
 		if (file_exists($controlclassfile))
 		{
             // Include actions class (controller)
-            $this->control_file=$controlclassfile;
+            $this->control_file = $controlclassfile;
             require_once $controlclassfile;
 
             // Instantiate actions class (controller)
@@ -124,9 +124,9 @@ 
 
 		// Template dir
 		$this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
-        if (! is_dir($this->template_dir))
+        if (!is_dir($this->template_dir))
         {
-            $this->template_dir='';
+            $this->template_dir = '';
         }
 
         //print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
@@ -142,10 +142,10 @@ 
 	 * 	@param		string		$ref		Object ref (if id not provided)
 	 * 	@return		void
 	 */
-	function assign_values(&$action='view', $id=0, $ref='')
+	function assign_values(&$action = 'view', $id = 0, $ref = '')
 	{
         // phpcs:enable
-		if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
+		if (method_exists($this->control, 'assign_values')) $this->control->assign_values($action, $id, $ref);
 	}
 
     /**
@@ -158,7 +158,7 @@ 
     {
         if (empty($this->template_dir)) return 0;
 
-        if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
+        if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) return 1;
         else return 0;
     }
 
@@ -176,7 +176,7 @@ 
 		global $db, $conf, $langs, $user, $canvas;
 		global $form, $formfile;
 
-		include $this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php';        // Include native PHP template
+		include $this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php'; // Include native PHP template
 	}
 
 
@@ -204,9 +204,9 @@ 
 	 * 	@return		mixed					Return return code of doActions of canvas
 	 * 	@see		http://wiki.dolibarr.org/index.php/Canvas_development
 	 */
-	function doActions(&$action='view', $id=0)
+	function doActions(&$action = 'view', $id = 0)
 	{
-		if (method_exists($this->control,'doActions'))
+		if (method_exists($this->control, 'doActions'))
 		{
 			$ret = $this->control->doActions($action, $id);
 			return $ret;

dolibarr/htdocs/core/class/coreobject.class.php

Spacing +36 added lines, -36 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 *  @var Array $_fields Fields to synchronize with Database
 	 */
-	protected $fields=array();
+	protected $fields = array();
 
     /**
 	 *  Constructor
@@ -66,8 +66,8 @@ 
 				else $this->{$field} = '';
 		    }
 
-            $this->to_delete=false;
-            $this->is_clone=false;
+            $this->to_delete = false;
+            $this->is_clone = false;
 
 			return true;
 		}
@@ -106,7 +106,7 @@ 
 	public function fetch($id, $loadChild = true)
     {
     	$res = $this->fetchCommon($id);
-    	if($res>0) {
+    	if ($res > 0) {
     		if ($loadChild) $this->fetchChild();
     	}
 
@@ -123,13 +123,13 @@ 
      * @param   bool    $try_to_load    Force the fetch if an id is given
      * @return                          int
      */
-    public function addChild($tabName, $id=0, $key='id', $try_to_load = false)
+    public function addChild($tabName, $id = 0, $key = 'id', $try_to_load = false)
     {
-		if(!empty($id))
+		if (!empty($id))
 		{
-			foreach($this->{$tabName} as $k=>&$object)
+			foreach ($this->{$tabName} as $k=>&$object)
 			{
-				if($object->{$key} === $id) return $k;
+				if ($object->{$key} === $id) return $k;
 			}
 		}
 
@@ -137,7 +137,7 @@ 
 
 		$className = ucfirst($tabName);
 		$this->{$tabName}[$k] = new $className($this->db);
-		if($id>0 && $key==='id' && $try_to_load)
+		if ($id > 0 && $key === 'id' && $try_to_load)
 		{
 			$this->{$tabName}[$k]->fetch($id);
 		}
@@ -154,7 +154,7 @@ 
      * @param   string  $key            Attribute name of the object id
      * @return                          bool
      */
-    public function removeChild($tabName, $id, $key='id')
+    public function removeChild($tabName, $id, $key = 'id')
     {
 		foreach ($this->{$tabName} as &$object)
 		{
@@ -175,22 +175,22 @@ 
      */
     public function fetchChild()
     {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
 		{
-			foreach($this->childtables as &$childTable)
+			foreach ($this->childtables as &$childTable)
 			{
                 $className = ucfirst($childTable);
 
-                $this->{$className}=array();
+                $this->{$className} = array();
 
                 $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;
                 $res = $this->db->query($sql);
 
-                if($res)
+                if ($res)
                 {
-                    while($obj = $this->db->fetch_object($res))
+                    while ($obj = $this->db->fetch_object($res))
                     {
-                        $o=new $className($this->db);
+                        $o = new $className($this->db);
                         $o->fetch($obj->rowid);
 
                         $this->{$className}[] = $o;
@@ -212,19 +212,19 @@ 
      */
 	public function saveChild(User &$user)
     {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
 		{
-			foreach($this->childtables as &$childTable)
+			foreach ($this->childtables as &$childTable)
 			{
 				$className = ucfirst($childTable);
-				if(!empty($this->{$className}))
+				if (!empty($this->{$className}))
 				{
-					foreach($this->{$className} as $i => &$object)
+					foreach ($this->{$className} as $i => &$object)
 					{
 						$object->{$this->fk_element} = $this->id;
 
 						$object->update($user);
-						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+						if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) unset($this->{$className}[$i]);
 					}
 				}
 			}
@@ -241,7 +241,7 @@ 
     public function update(User &$user)
     {
 		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-        elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
+        elseif (isset($this->to_delete) && $this->to_delete == true) return $this->delete($user);
 
         $error = 0;
         $this->db->begin();
@@ -249,7 +249,7 @@ 
         $res = $this->updateCommon($user);
         if ($res)
         {
-            $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
+            $result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
         }
@@ -280,17 +280,17 @@ 
      */
     public function create(User &$user)
     {
-		if($this->id > 0) return $this->update($user);
+		if ($this->id > 0) return $this->update($user);
 
         $error = 0;
         $this->db->begin();
 
         $res = $this->createCommon($user);
-		if($res)
+		if ($res)
 		{
 			$this->id = $this->db->last_insert_id($this->table_element);
 
-			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
+			$result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
 		}
@@ -326,20 +326,20 @@ 
         $error = 0;
         $this->db->begin();
 
-        $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
+        $result = $this->call_trigger(strtoupper($this->element).'_DELETE', $user);
         if ($result < 0) $error++;
 
         if (!$error)
         {
             $this->deleteCommon($user);
-            if($this->withChild && !empty($this->childtables))
+            if ($this->withChild && !empty($this->childtables))
             {
-                foreach($this->childtables as &$childTable)
+                foreach ($this->childtables as &$childTable)
                 {
                     $className = ucfirst($childTable);
                     if (!empty($this->{$className}))
                     {
-                        foreach($this->{$className} as &$object)
+                        foreach ($this->{$className} as &$object)
                         {
                             $object->delete($user);
                         }
@@ -370,9 +370,9 @@ 
      * @param   string  $format Output date format
      * @return          string
      */
-    public function getDate($field, $format='')
+    public function getDate($field, $format = '')
     {
-		if(empty($this->{$field})) return '';
+		if (empty($this->{$field})) return '';
 		else
         {
 			return dol_print_date($this->{$field}, $format);
@@ -412,19 +412,19 @@ 
     {
 		foreach ($Tab as $key => $value)
 		{
-			if($this->checkFieldType($key, 'date'))
+			if ($this->checkFieldType($key, 'date'))
 			{
 				$this->setDate($key, $value);
 			}
-			else if( $this->checkFieldType($key, 'array'))
+			else if ($this->checkFieldType($key, 'array'))
 			{
 				$this->{$key} = $value;
 			}
-			else if( $this->checkFieldType($key, 'float') )
+			else if ($this->checkFieldType($key, 'float'))
 			{
 				$this->{$key} = (double) price2num($value);
 			}
-			else if( $this->checkFieldType($key, 'int') ) {
+			else if ($this->checkFieldType($key, 'int')) {
 				$this->{$key} = (int) price2num($value);
 			}
 			else

dolibarr/htdocs/core/class/cstate.class.php

Spacing +60 added lines, -60 removed lines

@@ -40,7 +40,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -62,12 +62,12 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='';
+	public $nom = '';
 
 	/**
 	 * @var string name
 	 */
-	public $name='';
+	public $name = '';
 
 	public $active;
 
@@ -92,43 +92,43 @@ 
      *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return     int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement);
+		if (isset($this->nom)) $this->nom = trim($this->nom);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements(";
-		$sql.= "rowid,";
-		$sql.= "code_departement,";
-		$sql.= "nom,";
-		$sql.= "active";
-        $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->code_departement)?'NULL':"'".$this->db->escape($this->code_departement)."'").",";
-		$sql.= " ".(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
-		$sql.= ")";
+		$sql .= "rowid,";
+		$sql .= "code_departement,";
+		$sql .= "nom,";
+		$sql .= "active";
+        $sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
+		$sql .= " ".(!isset($this->code_departement) ? 'NULL' : "'".$this->db->escape($this->code_departement)."'").",";
+		$sql .= " ".(!isset($this->nom) ? 'NULL' : "'".$this->db->escape($this->nom)."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'")."";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -145,13 +145,13 @@ 
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -168,27 +168,27 @@ 
      *  @param		string	$code	Code
      *  @return     int          	<0 if KO, >0 if OK
      */
-    function fetch($id,$code='')
+    function fetch($id, $code = '')
     {
     	global $langs;
         $sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code_departement,";
-		$sql.= " t.nom,";
-		$sql.= " t.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_departements as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+		$sql .= " t.rowid,";
+		$sql .= " t.code_departement,";
+		$sql .= " t.nom,";
+		$sql .= " t.active";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_departements as t";
+        if ($id)   $sql .= " WHERE t.rowid = ".$id;
+        elseif ($code) $sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'";
 
     	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->code_departement = $obj->code_departement;
 				$this->nom = $obj->nom;
 				$this->active = $obj->active;
@@ -199,7 +199,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -212,15 +212,15 @@ 
      *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return     int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement);
+		if (isset($this->nom)) $this->nom = trim($this->nom);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 
 		// Check parameters
@@ -228,20 +228,20 @@ 
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
-		$sql.= " code_departement=".(isset($this->code_departement)?"'".$this->db->escape($this->code_departement)."'":"null").",";
-		$sql.= " nom=".(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
-        $sql.= " WHERE rowid=".$this->id;
+		$sql .= " code_departement=".(isset($this->code_departement) ? "'".$this->db->escape($this->code_departement)."'" : "null").",";
+		$sql .= " nom=".(isset($this->nom) ? "'".$this->db->escape($this->nom)."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
+        $sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -258,13 +258,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -281,23 +281,23 @@ 
      *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_departements";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action call a trigger.
@@ -314,13 +314,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{

dolibarr/htdocs/core/class/link.class.php

Spacing +56 added lines, -56 removed lines

@@ -72,11 +72,11 @@ 
      *    @param	User	$user       Object of user that ask creation
      *    @return   int         		>= 0 if OK, < 0 if KO
      */
-    public function create($user='')
+    public function create($user = '')
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
-        $error=0;
+        $error = 0;
         $langs->load("errors");
         // Clean parameters
         if (empty($this->label)) {
@@ -99,34 +99,34 @@ 
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."links (entity, datea, url, label, objecttype, objectid)";
         $sql .= " VALUES ('".$conf->entity."', '".$this->db->idate($this->datea)."'";
-        $sql .= ", '" . $this->db->escape($this->url) . "'";
-        $sql .= ", '" . $this->db->escape($this->label) . "'";
-        $sql .= ", '" . $this->db->escape($this->objecttype) . "'";
-        $sql .= ", " . $this->objectid . ")";
+        $sql .= ", '".$this->db->escape($this->url)."'";
+        $sql .= ", '".$this->db->escape($this->label)."'";
+        $sql .= ", '".$this->db->escape($this->objecttype)."'";
+        $sql .= ", ".$this->objectid.")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result) {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "links");
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."links");
 
             if ($this->id > 0) {
                 // Call trigger
-                $result=$this->call_trigger('LINK_CREATE',$user);
+                $result = $this->call_trigger('LINK_CREATE', $user);
                 if ($result < 0) $error++;
                 // End call triggers
             } else {
                 $error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
-                dol_syslog(get_class($this)."::Create success id=" . $this->id);
+                dol_syslog(get_class($this)."::Create success id=".$this->id);
                 $this->db->commit();
                 return $this->id;
             }
             else
             {
-                dol_syslog(get_class($this)."::Create echec update " . $this->error, LOG_ERR);
+                dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -3;
             }
@@ -136,13 +136,13 @@ 
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
 
-                $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);
-                $result=-1;
+                $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);
+                $result = -1;
             }
             else
             {
-                $this->error=$this->db->lasterror();
-                $result=-2;
+                $this->error = $this->db->lasterror();
+                $result = -2;
             }
             $this->db->rollback();
             return $result;
@@ -156,15 +156,15 @@ 
      *      @param  int		$call_trigger    			0=no, 1=yes
      *      @return int  			           			<0 if KO, >=0 if OK
      */
-    public function update($user='', $call_trigger=1)
+    public function update($user = '', $call_trigger = 1)
     {
-        global $langs,$conf;
+        global $langs, $conf;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
         $langs->load("errors");
-        $error=0;
+        $error = 0;
 
-        dol_syslog(get_class($this)."::Update id = " . $this->id . " call_trigger = " . $call_trigger);
+        dol_syslog(get_class($this)."::Update id = ".$this->id." call_trigger = ".$call_trigger);
 
         // Check parameters
         if (empty($this->url))
@@ -174,37 +174,37 @@ 
         }
 
         // Clean parameters
-        $this->url       = clean_url($this->url,1);
+        $this->url       = clean_url($this->url, 1);
         if (empty($this->label)) $this->label = basename($this->url);
         $this->label     = trim($this->label);
 
 
         $this->db->begin();
 
-        $sql  = "UPDATE " . MAIN_DB_PREFIX . "links SET ";
-        $sql .= "entity = '" . $conf->entity ."'";
-        $sql .= ", datea = '" . $this->db->idate(dol_now()) . "'";
-        $sql .= ", url = '" . $this->db->escape($this->url) . "'";
-        $sql .= ", label = '" . $this->db->escape($this->label) . "'";
-        $sql .= ", objecttype = '" . $this->db->escape($this->objecttype) . "'";
-        $sql .= ", objectid = " . $this->objectid;
-        $sql .= " WHERE rowid = " . $this->id;
+        $sql  = "UPDATE ".MAIN_DB_PREFIX."links SET ";
+        $sql .= "entity = '".$conf->entity."'";
+        $sql .= ", datea = '".$this->db->idate(dol_now())."'";
+        $sql .= ", url = '".$this->db->escape($this->url)."'";
+        $sql .= ", label = '".$this->db->escape($this->label)."'";
+        $sql .= ", objecttype = '".$this->db->escape($this->objecttype)."'";
+        $sql .= ", objectid = ".$this->objectid;
+        $sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::update sql = " .$sql);
+        dol_syslog(get_class($this)."::update sql = ".$sql);
         $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($call_trigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('LINK_MODIFY',$user);
+                $result = $this->call_trigger('LINK_MODIFY', $user);
                 if ($result < 0) $error++;
                 // End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
-                dol_syslog(get_class($this) . "::Update success");
+                dol_syslog(get_class($this)."::Update success");
                 $this->db->commit();
                 return 1;
             } else {
@@ -219,12 +219,12 @@ 
             {
                 // Doublon
                 $this->error = $langs->trans("ErrorDuplicateField");
-                $result =  -1;
+                $result = -1;
             }
             else
             {
-                $this->error = $langs->trans("Error sql = " . $sql);
-                $result =  -2;
+                $this->error = $langs->trans("Error sql = ".$sql);
+                $result = -2;
             }
             $this->db->rollback();
             return $result;
@@ -241,18 +241,18 @@ 
      *  @param  string  $sortorder  sort order
      *  @return int                 1 if ok, 0 if no records, -1 if error
      **/
-    public function fetchAll(&$links, $objecttype, $objectid, $sortfield=null, $sortorder=null)
+    public function fetchAll(&$links, $objecttype, $objectid, $sortfield = null, $sortorder = null)
     {
         global $conf;
 
-        $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM " . MAIN_DB_PREFIX . "links";
-        $sql .= " WHERE objecttype = '" . $objecttype . "' AND objectid = " . $objectid;
-        if ($conf->entity != 0) $sql .= " AND entity = " . $conf->entity;
+        $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
+        $sql .= " WHERE objecttype = '".$objecttype."' AND objectid = ".$objectid;
+        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
         if ($sortfield) {
             if (empty($sortorder)) {
                 $sortorder = "ASC";
             }
-            $sql .= " ORDER BY " . $sortfield . " " . $sortorder;
+            $sql .= " ORDER BY ".$sortfield." ".$sortorder;
         }
 
         dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
@@ -260,7 +260,7 @@ 
         if ($resql)
         {
             $num = $this->db->num_rows($resql);
-            dol_syslog(get_class($this)."::fetchAll " . $num . "records", LOG_DEBUG);
+            dol_syslog(get_class($this)."::fetchAll ".$num."records", LOG_DEBUG);
             if ($num > 0)
             {
                 while ($obj = $this->db->fetch_object($resql))
@@ -296,9 +296,9 @@ 
     {
         global $conf;
 
-        $sql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "links";
-        $sql .= " WHERE objecttype = '" . $objecttype . "' AND objectid = " . $objectid;
-        if ($conf->entity != 0) $sql .= " AND entity = " . $conf->entity;
+        $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."links";
+        $sql .= " WHERE objecttype = '".$objecttype."' AND objectid = ".$objectid;
+        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
 
         $resql = $db->query($sql);
         if ($resql)
@@ -315,7 +315,7 @@ 
      *  @param 	int		$rowid 		Id of link to load
      *  @return int 				1 if ok, 0 if no record found, -1 if error
      **/
-    public function fetch($rowid=null)
+    public function fetch($rowid = null)
     {
         global $conf;
 
@@ -323,15 +323,15 @@ 
             $rowid = $this->id;
         }
 
-        $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM " . MAIN_DB_PREFIX . "links";
-        $sql .= " WHERE rowid = " . $rowid;
-        if($conf->entity != 0) $sql .= " AND entity = " . $conf->entity;
+        $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
+        $sql .= " WHERE rowid = ".$rowid;
+        if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
-            if($this->db->num_rows($resql) > 0)
+            if ($this->db->num_rows($resql) > 0)
             {
                 $obj = $this->db->fetch_object($resql);
                 $this->entity = $obj->entity;
@@ -347,7 +347,7 @@ 
                 return 0;
             }
         } else {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -365,24 +365,24 @@ 
         $error = 0;
 
         // Call trigger
-        $result=$this->call_trigger('LINK_DELETE',$user);
+        $result = $this->call_trigger('LINK_DELETE', $user);
         if ($result < 0) return -1;
         // End call triggers
 
         $this->db->begin();
 
         // Remove link
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "links";
-        $sql.= " WHERE rowid = " . $this->id;
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."links";
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        if (! $this->db->query($sql))
+        if (!$this->db->query($sql))
         {
             $error++;
             $this->error = $this->db->lasterror();
         }
 
-        if (! $error) {
+        if (!$error) {
             $this->db->commit();
 
             return 1;

dolibarr/htdocs/core/class/utils.class.php

Spacing +196 added lines, -196 removed lines

@@ -32,8 +32,8 @@ 
      */
     public $db;
 
-	var $output;   // Used by Cron method to return message
-	var $result;   // Used by Cron method to return data
+	var $output; // Used by Cron method to return message
+	var $result; // Used by Cron method to return data
 
 	/**
 	 *	Constructor
@@ -53,7 +53,7 @@ 
 	 *  @param	string		$choice		Choice of purge mode ('tempfiles', '' or 'tempfilesold' to purge temp older than 24h, 'allfiles', 'logfile')
 	 *  @return	int						0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
-	function purgeFiles($choice='tempfilesold')
+	function purgeFiles($choice = 'tempfilesold')
 	{
 		global $conf, $langs, $dolibarr_main_data_root;
 
@@ -62,80 +62,80 @@ 
 		dol_syslog("Utils::purgeFiles choice=".$choice, LOG_DEBUG);
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$filesarray=array();
-		if (empty($choice)) $choice='tempfilesold';
+		$filesarray = array();
+		if (empty($choice)) $choice = 'tempfilesold';
 
-		if ($choice=='tempfiles' || $choice=='tempfilesold')
+		if ($choice == 'tempfiles' || $choice == 'tempfilesold')
 		{
 			// Delete temporary files
 			if ($dolibarr_main_data_root)
 			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1);	// Do not follow symlinks
+				$filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks
 				if ($choice == 'tempfilesold')
 				{
 					$now = dol_now();
-					foreach($filesarray as $key => $val)
+					foreach ($filesarray as $key => $val)
 					{
-						if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]);	// Discard files not older than 24h
+						if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]); // Discard files not older than 24h
 					}
 				}
 			}
 		}
 
-		if ($choice=='allfiles')
+		if ($choice == 'allfiles')
 		{
 			// Delete all files (except install.lock, do not follow symbolic links)
 			if ($dolibarr_main_data_root)
 			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+				$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
 			}
 		}
 
-		if ($choice=='logfile')
+		if ($choice == 'logfile')
 		{
 			// Define files log
 			if ($dolibarr_main_data_root)
 			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+				$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
 			}
 
-			$filelog='';
-			if (! empty($conf->syslog->enabled))
+			$filelog = '';
+			if (!empty($conf->syslog->enabled))
 			{
-				$filelog=$conf->global->SYSLOG_FILE;
-				$filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog);
+				$filelog = $conf->global->SYSLOG_FILE;
+				$filelog = preg_replace('/DOL_DATA_ROOT/i', DOL_DATA_ROOT, $filelog);
 
-				$alreadyincluded=false;
+				$alreadyincluded = false;
 				foreach ($filesarray as $tmpcursor)
 				{
-					if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded=true; }
+					if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded = true; }
 				}
-				if (! $alreadyincluded) $filesarray[]=array('fullname'=>$filelog,'type'=>'file');
+				if (!$alreadyincluded) $filesarray[] = array('fullname'=>$filelog, 'type'=>'file');
 			}
 		}
 
-		$count=0;
-		$countdeleted=0;
-		$counterror=0;
+		$count = 0;
+		$countdeleted = 0;
+		$counterror = 0;
 		if (count($filesarray))
 		{
-			foreach($filesarray as $key => $value)
+			foreach ($filesarray as $key => $value)
 			{
 				//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
 				if ($filesarray[$key]['type'] == 'dir')
 				{
-					$startcount=0;
-					$tmpcountdeleted=0;
-					$result=dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
-					$count+=$result;
-					$countdeleted+=$tmpcountdeleted;
+					$startcount = 0;
+					$tmpcountdeleted = 0;
+					$result = dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
+					$count += $result;
+					$countdeleted += $tmpcountdeleted;
 				}
 				elseif ($filesarray[$key]['type'] == 'file')
 				{
 					// If (file that is not logfile) or (if mode is logfile)
-					if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
+					if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile')
 					{
-						$result=dol_delete_file($filesarray[$key]['fullname'], 1, 1);
+						$result = dol_delete_file($filesarray[$key]['fullname'], 1, 1);
 						if ($result)
 						{
 							$count++;
@@ -150,7 +150,7 @@ 
 			}
 
 			// Update cachenbofdoc
-			if (! empty($conf->ecm->enabled) && $choice=='allfiles')
+			if (!empty($conf->ecm->enabled) && $choice == 'allfiles')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 				$ecmdirstatic = new EcmDirectory($this->db);
@@ -160,13 +160,13 @@ 
 
 		if ($count > 0)
 		{
-			$this->output=$langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
-			if ($count > $countdeleted) $this->output.='<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
+			$this->output = $langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
+			if ($count > $countdeleted) $this->output .= '<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
 		}
-		else $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':'');
+		else $this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');
 
 		//return $count;
-		return 0;     // This function can be called by cron so must return 0 if OK
+		return 0; // This function can be called by cron so must return 0 if OK
 	}
 
 
@@ -182,7 +182,7 @@ 
 	 *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
 	 *  @return	int						       0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
-	function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='auto', $keeplastnfiles=0, $execmethod=0)
+	function dumpDatabase($compression = 'none', $type = 'auto', $usedefault = 1, $file = 'auto', $keeplastnfiles = 0, $execmethod = 0)
 	{
 		global $db, $conf, $langs, $dolibarr_main_data_root;
 		global $dolibarr_main_db_name, $dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_port, $dolibarr_main_db_pass;
@@ -193,112 +193,112 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		// Check compression parameter
-		if (! in_array($compression, array('none', 'gz', 'bz', 'zip')))
+		if (!in_array($compression, array('none', 'gz', 'bz', 'zip')))
 		{
 			$langs->load("errors");
-			$this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression");
+			$this->error = $langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression");
 			return -1;
 		}
 
 		// Check type parameter
 		if ($type == 'auto') $type = $db->type;
-		if (! in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
+		if (!in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
 		{
 			$langs->load("errors");
-			$this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");
+			$this->error = $langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");
 			return -1;
 		}
 
 		// Check file parameter
 		if ($file == 'auto')
 		{
-			$prefix='dump';
-			$ext='sql';
-			if (in_array($type, array('mysql', 'mysqli')))  { $prefix='mysqldump'; $ext='sql'; }
+			$prefix = 'dump';
+			$ext = 'sql';
+			if (in_array($type, array('mysql', 'mysqli'))) { $prefix = 'mysqldump'; $ext = 'sql'; }
 			//if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='dump'; }
-			if (in_array($type, array('pgsql'))) { $prefix='pg_dump'; $ext='sql'; }
-			$file=$prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
+			if (in_array($type, array('pgsql'))) { $prefix = 'pg_dump'; $ext = 'sql'; }
+			$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
 		}
 
-		$outputdir  = $conf->admin->dir_output.'/backup';
-		$result=dol_mkdir($outputdir);
+		$outputdir = $conf->admin->dir_output.'/backup';
+		$result = dol_mkdir($outputdir);
 
 
 		// MYSQL
 		if ($type == 'mysql' || $type == 'mysqli')
 		{
-			$cmddump=$conf->global->SYSTEMTOOLS_MYSQLDUMP;
+			$cmddump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
 
 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			$compression = $compression ? $compression : 'none';
+			if ($compression == 'gz') $outputfile .= '.gz';
+			if ($compression == 'bz') $outputfile .= '.bz2';
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
 			// Parameteres execution
-			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+			$command = $cmddump;
+			if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // Use quotes on command
 
 			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
-			$param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
-			$param.=" -u ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
-			if (! GETPOST("use_transaction"))    $param.=" -l --single-transaction";
-			if (GETPOST("disable_fk") || $usedefault) $param.=" -K";
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat","alpha"));
-			if (GETPOST("drop_database"))        $param.=" --add-drop-database";
+			$param = $dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
+			$param .= " -u ".$dolibarr_main_db_user;
+			if (!empty($dolibarr_main_db_port)) $param .= " -P ".$dolibarr_main_db_port;
+			if (!GETPOST("use_transaction"))    $param .= " -l --single-transaction";
+			if (GETPOST("disable_fk") || $usedefault) $param .= " -K";
+			if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param .= " --compatible=".escapeshellarg(GETPOST("sql_compat", "alpha"));
+			if (GETPOST("drop_database"))        $param .= " --add-drop-database";
 			if (GETPOST("sql_structure") || $usedefault)
 			{
-				if (GETPOST("drop") || $usedefault)	$param.=" --add-drop-table=TRUE";
-				else 							    $param.=" --add-drop-table=FALSE";
+				if (GETPOST("drop") || $usedefault)	$param .= " --add-drop-table=TRUE";
+				else 							    $param .= " --add-drop-table=FALSE";
 			}
 			else
 			{
-				$param.=" -t";
+				$param .= " -t";
 			}
-			if (GETPOST("disable-add-locks")) $param.=" --add-locks=FALSE";
+			if (GETPOST("disable-add-locks")) $param .= " --add-locks=FALSE";
 			if (GETPOST("sql_data") || $usedefault)
 			{
-				$param.=" --tables";
-				if (GETPOST("showcolumns") || $usedefault)	 $param.=" -c";
-				if (GETPOST("extended_ins") || $usedefault) $param.=" -e";
-				else $param.=" --skip-extended-insert";
-				if (GETPOST("delayed"))	 	 $param.=" --delayed-insert";
-				if (GETPOST("sql_ignore"))	 $param.=" --insert-ignore";
-				if (GETPOST("hexforbinary") || $usedefault) $param.=" --hex-blob";
+				$param .= " --tables";
+				if (GETPOST("showcolumns") || $usedefault)	 $param .= " -c";
+				if (GETPOST("extended_ins") || $usedefault) $param .= " -e";
+				else $param .= " --skip-extended-insert";
+				if (GETPOST("delayed"))	 	 $param .= " --delayed-insert";
+				if (GETPOST("sql_ignore"))	 $param .= " --insert-ignore";
+				if (GETPOST("hexforbinary") || $usedefault) $param .= " --hex-blob";
 			}
 			else
 			{
-				$param.=" -d";    // No row information (no data)
+				$param .= " -d"; // No row information (no data)
 			}
-			$param.=" --default-character-set=utf8";    // We always save output into utf8 charset
-			$paramcrypted=$param;
-			$paramclear=$param;
-			if (! empty($dolibarr_main_db_pass))
+			$param .= " --default-character-set=utf8"; // We always save output into utf8 charset
+			$paramcrypted = $param;
+			$paramclear = $param;
+			if (!empty($dolibarr_main_db_pass))
 			{
-				$paramcrypted.=' -p"'.preg_replace('/./i','*',$dolibarr_main_db_pass).'"';
-				$paramclear.=' -p"'.str_replace(array('"','`'),array('\"','\`'),$dolibarr_main_db_pass).'"';
+				$paramcrypted .= ' -p"'.preg_replace('/./i', '*', $dolibarr_main_db_pass).'"';
+				$paramclear .= ' -p"'.str_replace(array('"', '`'), array('\"', '\`'), $dolibarr_main_db_pass).'"';
 			}
 
-			$errormsg='';
+			$errormsg = '';
 			$handle = '';
 
 			// Start call method to execute dump
-			$fullcommandcrypted=$command." ".$paramcrypted." 2>&1";
-			$fullcommandclear=$command." ".$paramclear." 2>&1";
+			$fullcommandcrypted = $command." ".$paramcrypted." 2>&1";
+			$fullcommandclear = $command." ".$paramclear." 2>&1";
 			if ($compression == 'none') $handle = fopen($outputfile, 'w');
 			if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');
 			if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');
 
 			if ($handle)
 			{
-				if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-				if (empty($execmethod)) $execmethod=1;
+				if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
+				if (empty($execmethod)) $execmethod = 1;
 
-				$ok=0;
+				$ok = 0;
 				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG);
 
 				// TODO Replace with executeCLI function
@@ -312,35 +312,35 @@ 
 						$langs->load("errors");
 						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
 						$error = 'Error '.$retval;
-						$ok=0;
+						$ok = 0;
 					}
 					else
 					{
-						$i=0;
+						$i = 0;
 						if (!empty($readt))
-						foreach($readt as $key=>$read)
+						foreach ($readt as $key=>$read)
 						{
-							$i++;   // output line number
+							$i++; // output line number
 							if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
 							fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
-							if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-							elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+							if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok = 1;
+							elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok = 1;
 						}
 					}
 				}
 				if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
 				{
 					$handlein = popen($fullcommandclear, 'r');
-					$i=0;
+					$i = 0;
 					while (!feof($handlein))
 					{
-						$i++;   // output line number
+						$i++; // output line number
 						$read = fgets($handlein);
 						// Exclude warning line we don't want
 						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
-						fwrite($handle,$read);
-						if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+						fwrite($handle, $read);
+						if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok = 1;
+						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok = 1;
 					}
 					pclose($handlein);
 				}
@@ -350,14 +350,14 @@ 
 				if ($compression == 'gz')   gzclose($handle);
 				if ($compression == 'bz')   bzclose($handle);
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 			}
 			else
 			{
 				$langs->load("errors");
-				dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-				$errormsg=$langs->trans("ErrorFailedToWriteInDir");
+				dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+				$errormsg = $langs->trans("ErrorFailedToWriteInDir");
 			}
 
 			// Get errorstring
@@ -367,23 +367,23 @@ 
 			if ($handle)
 			{
 				// Get 2048 first chars of error message.
-				$errormsg = fgets($handle,2048);
+				$errormsg = fgets($handle, 2048);
 				// Close file
 				if ($compression == 'none') fclose($handle);
 				if ($compression == 'gz')   gzclose($handle);
 				if ($compression == 'bz')   bzclose($handle);
-				if ($ok && preg_match('/^-- MySql/i',$errormsg)) $errormsg='';	// Pas erreur
+				if ($ok && preg_match('/^-- MySql/i', $errormsg)) $errormsg = ''; // Pas erreur
 				else
 				{
 					// Renommer fichier sortie en fichier erreur
 					//print "$outputfile -> $outputerror";
 					@dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
-					@rename($outputfile,$outputerror);
+					@rename($outputfile, $outputerror);
 					// Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
-					if (! $errormsg)
+					if (!$errormsg)
 					{
 						$langs->load("errors");
-						$errormsg=$langs->trans("ErrorFailedToRunExternalCommand");
+						$errormsg = $langs->trans("ErrorFailedToRunExternalCommand");
 					}
 				}
 			}
@@ -401,9 +401,9 @@ 
 			$outputfile = $outputdir.'/'.$file;
 			$outputfiletemp = $outputfile.'-TMP.sql';
 			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			$compression = $compression ? $compression : 'none';
+			if ($compression == 'gz') $outputfile .= '.gz';
+			if ($compression == 'bz') $outputfile .= '.bz2';
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
@@ -425,51 +425,51 @@ 
 		// POSTGRESQL
 		if ($type == 'postgresql' || $type == 'pgsql')
 		{
-			$cmddump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
+			$cmddump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			$compression = $compression ? $compression : 'none';
+			if ($compression == 'gz') $outputfile .= '.gz';
+			if ($compression == 'bz') $outputfile .= '.bz2';
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
 			// Parameteres execution
-			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+			$command = $cmddump;
+			if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // Use quotes on command
 
 			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
 			//$param="-F c";
-			$param="-F p";
-			$param.=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
-			$param.=" -U ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param.="  --disable-dollar-quoting";
-			if (GETPOST("drop_database"))        $param.=" -c -C";
+			$param = "-F p";
+			$param .= " --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
+			$param .= " -U ".$dolibarr_main_db_user;
+			if (!empty($dolibarr_main_db_port)) $param .= " -p ".$dolibarr_main_db_port;
+			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param .= "  --disable-dollar-quoting";
+			if (GETPOST("drop_database"))        $param .= " -c -C";
 			if (GETPOST("sql_structure"))
 			{
-				if (GETPOST("drop"))			 $param.=" --add-drop-table";
-				if (! GETPOST("sql_data"))       $param.=" -s";
+				if (GETPOST("drop"))			 $param .= " --add-drop-table";
+				if (!GETPOST("sql_data"))       $param .= " -s";
 			}
 			if (GETPOST("sql_data"))
 			{
-				if (! GETPOST("sql_structure"))	 $param.=" -a";
-				if (GETPOST("showcolumns"))	     $param.=" -c";
+				if (!GETPOST("sql_structure"))	 $param .= " -a";
+				if (GETPOST("showcolumns"))	     $param .= " -c";
 			}
-			$param.=' -f "'.$outputfile.'"';
+			$param .= ' -f "'.$outputfile.'"';
 			//if ($compression == 'none')
-			if ($compression == 'gz')   $param.=' -Z 9';
+			if ($compression == 'gz')   $param .= ' -Z 9';
 			//if ($compression == 'bz')
-			$paramcrypted=$param;
-			$paramclear=$param;
+			$paramcrypted = $param;
+			$paramclear = $param;
 			/*if (! empty($dolibarr_main_db_pass))
 			 {
 			 $paramcrypted.=" -W".preg_replace('/./i','*',$dolibarr_main_db_pass);
 			 $paramclear.=" -W".$dolibarr_main_db_pass;
 			 }*/
-			$paramcrypted.=" -w ".$dolibarr_main_db_name;
-			$paramclear.=" -w ".$dolibarr_main_db_name;
+			$paramcrypted .= " -w ".$dolibarr_main_db_name;
+			$paramclear .= " -w ".$dolibarr_main_db_name;
 
 			$this->output = "";
 			$this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => $command." ".$paramcrypted);
@@ -479,8 +479,8 @@ 
 		if ($keeplastnfiles > 0)
 		{
 			$tmpfiles = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '(\.err|\.old|\.sav)$', 'date', SORT_DESC);
-			$i=0;
-			foreach($tmpfiles as $key => $val)
+			$i = 0;
+			foreach ($tmpfiles as $key => $val)
 			{
 				$i++;
 				if ($i <= $keeplastnfiles) continue;
@@ -501,7 +501,7 @@ 
 	 * @param	int		$execmethod		0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
 	 * @return	array					array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.
 	 */
-	function executeCLI($command, $outputfile, $execmethod=0)
+	function executeCLI($command, $outputfile, $execmethod = 0)
 	{
 		global $conf, $langs;
 
@@ -509,15 +509,15 @@ 
 		$output = '';
 		$error = '';
 
-		$command=escapeshellcmd($command);
-		$command.=" 2>&1";
+		$command = escapeshellcmd($command);
+		$command .= " 2>&1";
 
-		if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-		if (empty($execmethod)) $execmethod=1;
+		if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
+		if (empty($execmethod)) $execmethod = 1;
 		//$execmethod=1;
 
 		dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
-		$output_arr=array();
+		$output_arr = array();
 
 		if ($execmethod == 1)
 		{
@@ -532,7 +532,7 @@ 
 		}
 		if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
 		{
-			$ok=0;
+			$ok = 0;
 			$handle = fopen($outputfile, 'w+b');
 			if ($handle)
 			{
@@ -541,21 +541,21 @@ 
 				while (!feof($handlein))
 				{
 					$read = fgets($handlein);
-					fwrite($handle,$read);
-					$output_arr[]=$read;
+					fwrite($handle, $read);
+					$output_arr[] = $read;
 				}
 				pclose($handlein);
 				fclose($handle);
 			}
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (!empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 
 		// Update with result
-		if (is_array($output_arr) && count($output_arr)>0)
+		if (is_array($output_arr) && count($output_arr) > 0)
 		{
-			foreach($output_arr as $val)
+			foreach ($output_arr as $val)
 			{
-				$output.=$val.($execmethod == 2 ? '' : "\n");
+				$output .= $val.($execmethod == 2 ? '' : "\n");
 			}
 		}
 
@@ -577,23 +577,23 @@ 
 
 		$error = 0;
 
-		$modulelowercase=strtolower($module);
+		$modulelowercase = strtolower($module);
 
 		// Dir for module
 		$dir = $dirins.'/'.$modulelowercase;
 		// Zip file to build
-		$FILENAMEDOC='';
+		$FILENAMEDOC = '';
 
 		// Load module
 		dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
-		$class='mod'.$module;
+		$class = 'mod'.$module;
 
 		if (class_exists($class))
 		{
 			try {
 				$moduleobj = new $class($this->db);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				$error++;
 				dol_print_error($e->getMessage());
@@ -607,41 +607,41 @@ 
 			exit;
 		}
 
-		$arrayversion=explode('.',$moduleobj->version,3);
+		$arrayversion = explode('.', $moduleobj->version, 3);
 		if (count($arrayversion))
 		{
-			$FILENAMEASCII=strtolower($module).'.asciidoc';
-			$FILENAMEDOC=strtolower($module).'.html';			// TODO Use/text PDF
+			$FILENAMEASCII = strtolower($module).'.asciidoc';
+			$FILENAMEDOC = strtolower($module).'.html'; // TODO Use/text PDF
 
 			$dirofmodule = dol_buildpath(strtolower($module), 0).'/doc';
 			$dirofmoduletmp = dol_buildpath(strtolower($module), 0).'/doc/temp';
 			$outputfiledoc = $dirofmodule.'/'.$FILENAMEDOC;
 			if ($dirofmodule)
 			{
-				if (! dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
-				if (! dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);
-				if (! is_writable($dirofmoduletmp))
+				if (!dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
+				if (!dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);
+				if (!is_writable($dirofmoduletmp))
 				{
 					$this->error = 'Dir '.$dirofmoduletmp.' does not exists or is not writable';
 					return -1;
 				}
 
-				$destfile=$dirofmoduletmp.'/'.$FILENAMEASCII;
+				$destfile = $dirofmoduletmp.'/'.$FILENAMEASCII;
 
 				$fhandle = fopen($destfile, 'w+');
 				if ($fhandle)
 				{
-					$specs=dol_dir_list(dol_buildpath(strtolower($module).'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/'));
+					$specs = dol_dir_list(dol_buildpath(strtolower($module).'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/'));
 
 					$i = 0;
 					foreach ($specs as $spec)
 					{
-						if (preg_match('/notindoc/', $spec['relativename'])) continue;	// Discard file
-						if (preg_match('/disabled/', $spec['relativename'])) continue;	// Discard file
+						if (preg_match('/notindoc/', $spec['relativename'])) continue; // Discard file
+						if (preg_match('/disabled/', $spec['relativename'])) continue; // Discard file
 
 						$pathtofile = strtolower($module).'/doc/'.$spec['relativename'];
-						$format='asciidoc';
-						if (preg_match('/\.md$/i', $spec['name'])) $format='markdown';
+						$format = 'asciidoc';
+						if (preg_match('/\.md$/i', $spec['name'])) $format = 'markdown';
 
 						$filecursor = @file_get_contents($spec['fullname']);
 						if ($filecursor)
@@ -665,15 +665,15 @@ 
 					fclose($fhandle);
 				}
 
-				$conf->global->MODULEBUILDER_ASCIIDOCTOR='asciidoctor';
+				$conf->global->MODULEBUILDER_ASCIIDOCTOR = 'asciidoctor';
 				if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR))
 				{
 					dol_print_error('', 'Module setup not complete');
 					exit;
 				}
 
-				$command=$conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmodule.'/'.$FILENAMEDOC;
-				$outfile=$dirofmoduletmp.'/out.tmp';
+				$command = $conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmodule.'/'.$FILENAMEDOC;
+				$outfile = $dirofmoduletmp.'/out.tmp';
 
 				require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
 				$utils = new Utils($db);
@@ -721,18 +721,18 @@ 
     {
 		global $conf;
 
-		if(empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled
+		if (empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled
 			return 0;
 		}
 
-		if(! function_exists('gzopen')) {
+		if (!function_exists('gzopen')) {
 			$this->error = 'Support for gzopen not available in this PHP';
 			return -1;
 		}
 
 		dol_include_once('/core/lib/files.lib.php');
 
-		$nbSaves = ! empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14;
+		$nbSaves = !empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14;
 
 		if (empty($conf->global->SYSLOG_FILE)) {
 			$mainlogdir = DOL_DATA_ROOT;
@@ -746,7 +746,7 @@ 
 		$tabfiles = dol_dir_list(DOL_DATA_ROOT, 'files', 0, '^(dolibarr_.+|odt2pdf)\.log$'); // Also handle other log files like dolibarr_install.log
 		$tabfiles[] = array('name' => $mainlog, 'path' => $mainlogdir);
 
-		foreach($tabfiles as $file) {
+		foreach ($tabfiles as $file) {
 
 			$logname = $file['name'];
 			$logpath = $file['path'];
@@ -760,7 +760,7 @@ 
 				$gzfilestmp = dol_dir_list($logpath, 'files', 0, $filter);
 				$gzfiles = array();
 
-				foreach($gzfilestmp as $gzfile) {
+				foreach ($gzfilestmp as $gzfile) {
 					$tabmatches = array();
 					preg_match('/'.$filter.'/i', $gzfile['name'], $tabmatches);
 
@@ -771,15 +771,15 @@ 
 
 				krsort($gzfiles, SORT_NUMERIC);
 
-				foreach($gzfiles as $numsave => $dummy) {
-					if (dol_is_file($logpath.'/'.$logname.'.'.($numsave+1).'.gz')) {
+				foreach ($gzfiles as $numsave => $dummy) {
+					if (dol_is_file($logpath.'/'.$logname.'.'.($numsave + 1).'.gz')) {
 						return -2;
 					}
 
-					if($numsave >= $nbSaves) {
+					if ($numsave >= $nbSaves) {
 						dol_delete_file($logpath.'/'.$logname.'.'.$numsave.'.gz', 0, 0, 0, null, false, 0);
 					} else {
-						dol_move($logpath.'/'.$logname.'.'.$numsave.'.gz', $logpath.'/'.$logname.'.'.($numsave+1).'.gz', 0, 1, 0, 0);
+						dol_move($logpath.'/'.$logname.'.'.$numsave.'.gz', $logpath.'/'.$logname.'.'.($numsave + 1).'.gz', 0, 1, 0, 0);
 					}
 				}
 
@@ -800,14 +800,14 @@ 
 						return -4;
 					}
 
-					while(! feof($sourcehandle)) {
+					while (!feof($sourcehandle)) {
 						gzwrite($gzfilehandle, fread($sourcehandle, 512 * 1024)); // Read 512 kB at a time
 					}
 
 					fclose($sourcehandle);
 					gzclose($gzfilehandle);
 
-					@chmod($logpath.'/'.$logname.'.1.gz', octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+					@chmod($logpath.'/'.$logname.'.1.gz', octdec(empty($conf->global->MAIN_UMASK) ? '0664' : $conf->global->MAIN_UMASK));
 				}
 
 				dol_delete_file($logpath.'/'.$logname, 0, 0, 0, null, false, 0);
@@ -817,7 +817,7 @@ 
 				fclose($newlog);
 
 				//var_dump($logpath.'/'.$logname." - ".octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
-				@chmod($logpath.'/'.$logname, octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+				@chmod($logpath.'/'.$logname, octdec(empty($conf->global->MAIN_UMASK) ? '0664' : $conf->global->MAIN_UMASK));
 			}
 		}
 
@@ -835,7 +835,7 @@ 
 	 *	@param	string	$tables			Table name or '*' for all
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function backupTables($outputfile, $tables='*')
+	function backupTables($outputfile, $tables = '*')
 	{
 		global $db, $langs;
 		global $errormsg;
@@ -855,14 +855,14 @@ 
 		{
 			$tables = array();
 			$result = $db->query('SHOW FULL TABLES WHERE Table_type = \'BASE TABLE\'');
-			while($row = $db->fetch_row($result))
+			while ($row = $db->fetch_row($result))
 			{
 				$tables[] = $row[0];
 			}
 		}
 		else
 		{
-			$tables = is_array($tables) ? $tables : explode(',',$tables);
+			$tables = is_array($tables) ? $tables : explode(',', $tables);
 		}
 
 		//cycle through
@@ -870,8 +870,8 @@ 
 		if (fwrite($handle, '') === false)
 		{
 			$langs->load("errors");
-			dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-			$errormsg=$langs->trans("ErrorFailedToWriteInDir");
+			dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+			$errormsg = $langs->trans("ErrorFailedToWriteInDir");
 			return -1;
 		}
 
@@ -908,15 +908,15 @@ 
 		if (GETPOST("nobin_delayed")) $delayed = 'DELAYED ';
 
 		// Process each table and print their definition + their datas
-		foreach($tables as $table)
+		foreach ($tables as $table)
 		{
 			// Saving the table structure
 			fwrite($handle, "\n--\n-- Table structure for table `".$table."`\n--\n");
 
-			if (GETPOST("nobin_drop")) fwrite($handle,"DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
-			fwrite($handle,"/*!40101 SET @saved_cs_client     = @@character_set_client */;\n");
-			fwrite($handle,"/*!40101 SET character_set_client = utf8 */;\n");
-			$resqldrop=$db->query('SHOW CREATE TABLE '.$table);
+			if (GETPOST("nobin_drop")) fwrite($handle, "DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
+			fwrite($handle, "/*!40101 SET @saved_cs_client     = @@character_set_client */;\n");
+			fwrite($handle, "/*!40101 SET character_set_client = utf8 */;\n");
+			$resqldrop = $db->query('SHOW CREATE TABLE '.$table);
 			$row2 = $db->fetch_row($resqldrop);
 			if (empty($row2[1]))
 			{
@@ -924,7 +924,7 @@ 
 			}
 			else
 			{
-				fwrite($handle,$row2[1].";\n");
+				fwrite($handle, $row2[1].";\n");
 				//fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
 
 				// Dumping the data (locking the table and disabling the keys check while doing the process)
@@ -933,22 +933,22 @@ 
 				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
 				else fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
 
-				$sql='SELECT * FROM '.$table;
+				$sql = 'SELECT * FROM '.$table;
 				$result = $db->query($sql);
-				while($row = $db->fetch_row($result))
+				while ($row = $db->fetch_row($result))
 				{
 					// For each row of data we print a line of INSERT
-					fwrite($handle,'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');
+					fwrite($handle, 'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');
 					$columns = count($row);
-					for($j=0; $j<$columns; $j++) {
+					for ($j = 0; $j < $columns; $j++) {
 						// Processing each columns of the row to ensure that we correctly save the value (eg: add quotes for string - in fact we add quotes for everything, it's easier)
 						if ($row[$j] == null && !is_string($row[$j])) {
 							// IMPORTANT: if the field is NULL we set it NULL
 							$row[$j] = 'NULL';
-						} elseif(is_string($row[$j]) && $row[$j] == '') {
+						} elseif (is_string($row[$j]) && $row[$j] == '') {
 							// if it's an empty string, we set it as an empty string
 							$row[$j] = "''";
-						} elseif(is_numeric($row[$j]) && !strcmp($row[$j], $row[$j]+0) ) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
+						} elseif (is_numeric($row[$j]) && !strcmp($row[$j], $row[$j] + 0)) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
 							// if it's a number, we return it as-is
 							//	                    $row[$j] = $row[$j];
 						} else { // else for all other cases we escape the value and put quotes around
@@ -957,11 +957,11 @@ 
 							$row[$j] = "'".$row[$j]."'";
 						}
 					}
-					fwrite($handle,implode(',', $row).");\n");
+					fwrite($handle, implode(',', $row).");\n");
 				}
 				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking
 				if (!GETPOST("nobin_nolocks")) fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table
-				fwrite($handle,"\n\n\n");
+				fwrite($handle, "\n\n\n");
 			}
 		}
 
@@ -985,10 +985,10 @@ 
 		/* Backup Procedure structure*/
 
 		// Write the footer (restore the previous database settings)
-		$sqlfooter="\n\n";
+		$sqlfooter = "\n\n";
 		if (GETPOST("nobin_use_transaction")) $sqlfooter .= "COMMIT;\n";
 		if (GETPOST("nobin_disable_fk")) $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
-		$sqlfooter.="\n\n-- Dump completed on ".date('Y-m-d G-i-s');
+		$sqlfooter .= "\n\n-- Dump completed on ".date('Y-m-d G-i-s');
 		fwrite($handle, $sqlfooter);
 
 		fclose($handle);

dolibarr/htdocs/core/class/html.formcontract.class.php

Spacing +28 added lines, -28 removed lines

@@ -35,7 +35,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**
@@ -60,35 +60,35 @@ 
 	 *	@param	int		$showempty	Show empty line
 	 *	@return int         		Nbr of project if OK, <0 if KO
 	 */
-	function select_contract($socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
+	function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1)
 	{
         // phpcs:enable
-		global $db,$user,$conf,$langs;
+		global $db, $user, $conf, $langs;
 
 		$hideunselectables = false;
-		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
 		// Search all contacts
 		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'contrat as c';
-		$sql.= " WHERE c.entity = ".$conf->entity;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'contrat as c';
+		$sql .= " WHERE c.entity = ".$conf->entity;
 		//if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";
 		if ($socid > 0)
 		{
 			// CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 		    	if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))
-			    $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
+			    $sql .= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
 		    	else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')
 			{
-		        	$sql.= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
-				$sql.= " OR c.fk_soc IS NULL)";
+		        	$sql .= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
+				$sql .= " OR c.fk_soc IS NULL)";
 		    	}
 		}
-		if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
-		$sql.= " ORDER BY c.ref ";
+		if ($socid == 0) $sql .= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
+		$sql .= " ORDER BY c.ref ";
 
 		dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			print '<select class="flat" name="'.$htmlname.'">';
@@ -101,13 +101,13 @@ 
 				{
 					$obj = $db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
 					}
 					else
 					{
-						$labeltoshow=dol_trunc($obj->ref,18);
+						$labeltoshow = dol_trunc($obj->ref, 18);
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
@@ -116,30 +116,30 @@ 
 						}
 						else
 						{
-							$disabled=0;
-							if ( $obj->statut ==  0)
+							$disabled = 0;
+							if ($obj->statut == 0)
 							{
-								$disabled=1;
-								$labeltoshow.=' ('.$langs->trans("Draft").')';
+								$disabled = 1;
+								$labeltoshow .= ' ('.$langs->trans("Draft").')';
 							}
-							if ( empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+								$disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
 
 							if ($hideunselectables && $disabled)
 							{
-								$resultat='';
+								$resultat = '';
 							}
 							else
 							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								$resultat = '<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat.='>'.$labeltoshow;
-								$resultat.='</option>';
+								$resultat .= '>'.$labeltoshow;
+								$resultat .= '</option>';
 							}
 							print $resultat;
 						}
@@ -153,7 +153,7 @@ 
 			if (!empty($conf->use_javascript_ajax))
 			{
 				// Make select dynamic
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				print ajax_combobox($htmlname);
 			}
 
@@ -177,7 +177,7 @@ 
 	 *	@param	int		$showempty	Show empty line
 	 *	@return int                 Nbr of project if OK, <0 if KO
 	 */
-	function formSelectContract($page, $socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
+	function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1)
 	{
         global $langs;
 

dolibarr/htdocs/core/class/html.formmargin.class.php

Spacing +36 added lines, -36 removed lines

@@ -36,7 +36,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**
@@ -59,7 +59,7 @@ 
 	 * 	@param 	boolean			$force_price	True of not
 	 * 	@return array							Array with info
 	 */
-	function getMarginInfosArray($object, $force_price=false)
+	function getMarginInfosArray($object, $force_price = false)
 	{
 		global $conf, $db;
 
@@ -82,7 +82,7 @@ 
 				'total_mark_rate' => ''
 		);
 
-		foreach($object->lines as $line)
+		foreach ($object->lines as $line)
 		{
 			if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price)
 			{
@@ -97,7 +97,7 @@ 
 			}
 
 			$pv = $line->qty * $line->subprice * (1 - $line->remise_percent / 100);
-			$pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht);      // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
+			$pa_ht = ($pv < 0 ? -$line->pa_ht : $line->pa_ht); // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
 			$pa = $line->qty * $pa_ht;
 
 			// calcul des marges
@@ -105,8 +105,8 @@ 
 				if ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '1') { // remise globale considérée comme produit
 					$marginInfos['pa_products'] += $pa;
 					$marginInfos['pv_products'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//{
@@ -118,8 +118,8 @@ 
 				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
@@ -132,12 +132,12 @@ 
 				}
 			}
 			else {
-				$type=$line->product_type?$line->product_type:$line->fk_product_type;
+				$type = $line->product_type ? $line->product_type : $line->fk_product_type;
 				if ($type == 0) {  // product
 					$marginInfos['pa_products'] += $pa;
 					$marginInfos['pv_products'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//{
@@ -151,8 +151,8 @@ 
 				elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
@@ -191,24 +191,24 @@ 
 	 * 	@param 	boolean			$force_price	Force price
 	 * 	@return	void
 	 */
-	function displayMarginInfos($object, $force_price=false)
+	function displayMarginInfos($object, $force_price = false)
 	{
 		global $langs, $conf, $user;
 
-    	if (! empty($user->societe_id)) return;
+    	if (!empty($user->societe_id)) return;
 
-    	if (! $user->rights->margins->liretous) return;
+    	if (!$user->rights->margins->liretous) return;
 
         $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
 		$marginInfo = $this->getMarginInfosArray($object, $force_price);
 
-		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
+		if (!empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
 		{
 			print $langs->trans('ShowMarginInfos').' : ';
 	        $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];
-	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'':'hideobject').'">'.img_picto($langs->trans("Disabled"),'switch_off').'</span>';
-	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'hideobject':'').'">'.img_picto($langs->trans("Enabled"),'switch_on').'</span>';
+	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? '' : 'hideobject').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</span>';
+	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? 'hideobject' : '').'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</span>';
 
     	    print '<script>$(document).ready(function() {
         	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
@@ -229,13 +229,13 @@ 
 		else
 			print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
 		print '<td class="liste_titre" align="right">'.$langs->trans('Margin').'</td>';
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+		if (!empty($conf->global->DISPLAY_MARGIN_RATES))
 			print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
-		if (! empty($conf->global->DISPLAY_MARK_RATES))
+		if (!empty($conf->global->DISPLAY_MARK_RATES))
 			print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
 		print '</tr>';
 
-		if (! empty($conf->product->enabled))
+		if (!empty($conf->product->enabled))
 		{
 			//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
 			print '<tr class="oddeven">';
@@ -243,38 +243,38 @@ 
 			print '<td align="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+				print '<td align="right">'.(($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARK_RATES))
+				print '<td align="right">'.(($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
 			print '</tr>';
 		}
 
-		if (! empty($conf->service->enabled))
+		if (!empty($conf->service->enabled))
 		{
 			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnServices').'</td>';
 			print '<td align="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+				print '<td align="right">'.(($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARK_RATES))
+				print '<td align="right">'.(($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
 			print '</tr>';
 		}
 
-		if (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
+		if (!empty($conf->product->enabled) && !empty($conf->service->enabled))
 		{
 			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans('TotalMargin').'</td>';
 			print '<td align="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+				print '<td align="right">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARK_RATES))
+				print '<td align="right">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
 			print '</tr>';
 		}
 		print '</table>';

dolibarr/htdocs/core/actions_addupdatedelete.inc.php

Spacing +49 added lines, -49 removed lines

@@ -32,128 +32,128 @@ 
 
 if ($cancel)
 {
-	if (! empty($backtopage))
+	if (!empty($backtopage))
 	{
 		header("Location: ".$backtopage);
 		exit;
 	}
-	$action='';
+	$action = '';
 }
 
 // Action to add record
-if ($action == 'add' && ! empty($permissiontoadd))
+if ($action == 'add' && !empty($permissiontoadd))
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue; // Ignore special fields
 
 		// Set value to insert
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
+			$value = GETPOST($key, 'none');
+		} elseif ($object->fields[$key]['type'] == 'date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
+		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
+		} elseif ($object->fields[$key]['type'] == 'price') {
 			$value = price2num(GETPOST($key));
 		} else {
-			$value = GETPOST($key,'alpha');
+			$value = GETPOST($key, 'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value = ''; // This is an implicit foreign key field
+		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') $value = ''; // This is an explicit foreign key field
 
-		$object->$key=$value;
+		$object->$key = $value;
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
 		{
 			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$result=$object->create($user);
+		$result = $object->create($user);
 		if ($result > 0)
 		{
 			// Creation OK
-			$urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
+			$urltogo = $backtopage ?str_replace('__ID__', $result, $backtopage) : $backurlforlist;
 			header("Location: ".$urltogo);
 			exit;
 		}
 		else
 		{
 			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 			else  setEventMessages($object->error, null, 'errors');
-			$action='create';
+			$action = 'create';
 		}
 	}
 	else
 	{
-		$action='create';
+		$action = 'create';
 	}
 }
 
 // Action to update record
-if ($action == 'update' && ! empty($permissiontoadd))
+if ($action == 'update' && !empty($permissiontoadd))
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue; // Ignore special fields
 
 		// Set value to update
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
+			$value = GETPOST($key, 'none');
+		} elseif ($object->fields[$key]['type'] == 'date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
+		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
+		} elseif ($object->fields[$key]['type'] == 'price') {
 			$value = price2num(GETPOST($key));
 		} else {
-			$value = GETPOST($key,'alpha');
+			$value = GETPOST($key, 'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value = ''; // This is an implicit foreign key field
+		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') $value = ''; // This is an explicit foreign key field
 
-		$object->$key=$value;
+		$object->$key = $value;
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
 		{
 			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$result=$object->update($user);
+		$result = $object->update($user);
 		if ($result > 0)
 		{
-			$action='view';
+			$action = 'view';
 		}
 		else
 		{
 			// Creation KO
 			setEventMessages($object->error, $object->errors, 'errors');
-			$action='edit';
+			$action = 'edit';
 		}
 	}
 	else
 	{
-		$action='edit';
+		$action = 'edit';
 	}
 }
 
 // Action to update one extrafield
-if ($action == "update_extras" && ! empty($permissiontoadd))
+if ($action == "update_extras" && !empty($permissiontoadd))
 {
-	$object->fetch(GETPOST('id','int'));
-	$attributekey = GETPOST('attribute','alpha');
+	$object->fetch(GETPOST('id', 'int'));
+	$attributekey = GETPOST('attribute', 'alpha');
 	$attributekeylong = 'options_'.$attributekey;
-	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong,' alpha');
+	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong, ' alpha');
 
-	$result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
+	$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
 	if ($result > 0)
 	{
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
@@ -167,9 +167,9 @@ 
 }
 
 // Action to delete
-if ($action == 'confirm_delete' && ! empty($permissiontodelete))
+if ($action == 'confirm_delete' && !empty($permissiontodelete))
 {
-	$result=$object->delete($user);
+	$result = $object->delete($user);
 	if ($result > 0)
 	{
 		// Delete OK
@@ -179,15 +179,15 @@ 
 	}
 	else
 	{
-		if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 		else setEventMessages($object->error, null, 'errors');
 	}
 }
 
 // Action clone object
-if ($action == 'confirm_clone' && $confirm == 'yes' && ! empty($permissiontoadd))
+if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 {
-	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 	}
@@ -198,20 +198,20 @@ 
 			// Because createFromClone modifies the object, we must clone it so that we can restore it later
 			$orig = clone $object;
 
-			$result=$object->createFromClone($user, $object->id);
+			$result = $object->createFromClone($user, $object->id);
 			if ($result > 0)
 			{
 				$newid = 0;
 				if (is_object($result)) $newid = $result->id;
 				else $newid = $result;
-				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
+				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
 				exit;
 			}
 			else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$object = $orig;
-				$action='';
+				$action = '';
 			}
 		}
 	}

dolibarr/htdocs/core/actions_comments.inc.php

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';
 
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $comment = new Comment($db);
 
 /*
@@ -40,20 +40,20 @@ 
 	{
 		$comment->description = $description;
 		$comment->datec = time();
-		$comment->fk_element = GETPOST('id','int');
-		$comment->element_type = GETPOST('comment_element_type','alpha');
+		$comment->fk_element = GETPOST('id', 'int');
+		$comment->element_type = GETPOST('comment_element_type', 'alpha');
 		$comment->fk_user_author = $user->id;
 		$comment->entity = $conf->entity;
 		if ($comment->create($user) > 0)
 		{
 			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
-			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
+			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
 		}
 		else
 		{
-			setEventMessages($comment->error, $comment->errors,'errors');
-			$action='';
+			setEventMessages($comment->error, $comment->errors, 'errors');
+			$action = '';
 		}
 	}
 }
@@ -64,13 +64,13 @@ 
 		if ($comment->delete($user) > 0)
 		{
 			setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
-			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
+			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
 		}
 		else
 		{
-			setEventMessages($comment->error, $comment->errors,'errors');
-			$action='';
+			setEventMessages($comment->error, $comment->errors, 'errors');
+			$action = '';
 		}
 	}
 }
\ No newline at end of file