alxarafe / alixar

dolibarr/htdocs/societe/class/companybankaccount.class.php

Spacing +58 added lines, -58 removed lines

@@ -25,7 +25,7 @@ 
  *		\brief      File of class to manage bank accounts description of third parties
  */
 
-require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 
 /**
@@ -67,37 +67,37 @@ 
 	 * @param   int    $notrigger   1=Disable triggers
 	 * @return	int					<0 if KO, >= 0 if OK
 	 */
-	function create(User $user = null, $notrigger=0)
+	function create(User $user = null, $notrigger = 0)
 	{
 		$now	= dol_now();
-		$error	= 0;
+		$error = 0;
 		// Correct default_rib to be sure to have always one default
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1 AND type = 'ban'";
    		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$numrows=$this->db->num_rows($result);
+			$numrows = $this->db->num_rows($result);
 			if ($this->default_rib && $numrows > 0) $this->default_rib = 0;
 			if (empty($this->default_rib) && $numrows == 0) $this->default_rib = 1;
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, type, datec)";
-		$sql.= " VALUES (".$this->socid.", 'ban', '".$this->db->idate($now)."')";
-		$resql=$this->db->query($sql);
+		$sql .= " VALUES (".$this->socid.", 'ban', '".$this->db->idate($now)."')";
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->affected_rows($resql))
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_rib");
 
-				if (! $notrigger)
+				if (!$notrigger)
 				{
 				   	// Call trigger
-					$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
+					$result = $this->call_trigger('COMPANY_RIB_CREATE', $user);
 					if ($result < 0) $error++;
 					// End call triggers
 
-					if (! $error)
+					if (!$error)
 					{
 						return 1;
 					}
@@ -131,47 +131,47 @@ 
 		global $conf;
 		$error = 0;
 
-		if (! $this->id) return -1;
+		if (!$this->id) return -1;
 
 		if (dol_strlen($this->domiciliation) > 255) $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
 		if (dol_strlen($this->owner_address) > 255) $this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
-		$sql.= " bank = '" .$this->db->escape($this->bank)."'";
-		$sql.= ",code_banque='".$this->db->escape($this->code_banque)."'";
-		$sql.= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
-		$sql.= ",number='".$this->db->escape($this->number)."'";
-		$sql.= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
-		$sql.= ",bic='".$this->db->escape($this->bic)."'";
-		$sql.= ",iban_prefix = '".$this->db->escape($this->iban)."'";
-		$sql.= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
-		$sql.= ",proprio = '".$this->db->escape($this->proprio)."'";
-		$sql.= ",owner_address = '".$this->db->escape($this->owner_address)."'";
-		$sql.= ",default_rib = ".$this->default_rib;
+		$sql .= " bank = '".$this->db->escape($this->bank)."'";
+		$sql .= ",code_banque='".$this->db->escape($this->code_banque)."'";
+		$sql .= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
+		$sql .= ",number='".$this->db->escape($this->number)."'";
+		$sql .= ",cle_rib='".$this->db->escape($this->cle_rib)."'";
+		$sql .= ",bic='".$this->db->escape($this->bic)."'";
+		$sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
+		$sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
+		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
+		$sql .= ",default_rib = ".$this->default_rib;
 		if ($conf->prelevement->enabled)
 		{
-			$sql.= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
-			$sql.= ",rum = '".$this->db->escape($this->rum)."'";
-			$sql.= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
+			$sql .= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
+			$sql .= ",rum = '".$this->db->escape($this->rum)."'";
+			$sql .= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
 		}
 		if (trim($this->label) != '')
-			$sql.= ",label = '".$this->db->escape($this->label)."'";
+			$sql .= ",label = '".$this->db->escape($this->label)."'";
 		else
-			$sql.= ",label = NULL";
-		$sql.= " WHERE rowid = ".$this->id;
+			$sql .= ",label = NULL";
+		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 
 
-		if (! $notrigger)
+		if (!$notrigger)
 		{
 			// Call trigger
-			$result=$this->call_trigger('COMPANY_RIB_MODIFY',$user);
+			$result = $this->call_trigger('COMPANY_RIB_MODIFY', $user);
 			if ($result < 0) $error++;
 			// End call triggers
-			if(! $error )
+			if (!$error)
 			{
 				return 1;
 			}
@@ -201,19 +201,19 @@ 
 	 *  @param	int		$type		If id of company filled, we say if we want record of this type only
 	 * 	@return	int					<0 if KO, >0 if OK
 	 */
-	function fetch($id, $socid=0, $default=1, $type='ban')
+	function fetch($id, $socid = 0, $default = 1, $type = 'ban')
 	{
 		if (empty($id) && empty($socid)) return -1;
 
 		$sql = "SELECT rowid, type, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id)    $sql.= " WHERE rowid = ".$id;
+		$sql .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
+		if ($id)    $sql .= " WHERE rowid = ".$id;
 		if ($socid)
 		{
-			$sql.= " WHERE fk_soc  = ".$socid;
-			if ($default > -1) $sql.=" AND default_rib = ".$this->db->escape($default);
-			if ($type) $sql.= " AND type ='".$this->db->escape($type)."'";
+			$sql .= " WHERE fk_soc  = ".$socid;
+			if ($default > -1) $sql .= " AND default_rib = ".$this->db->escape($default);
+			if ($type) $sql .= " AND type ='".$this->db->escape($type)."'";
 		}
 
 		$resql = $this->db->query($sql);
@@ -223,10 +223,10 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->ref             = $obj->fk_soc.'-'.$obj->label;      // Generate an artificial ref
+				$this->ref = $obj->fk_soc.'-'.$obj->label; // Generate an artificial ref
 
-				$this->id			   = $obj->rowid;
-				$this->type			   = $obj->type;
+				$this->id = $obj->rowid;
+				$this->type = $obj->type;
 				$this->socid           = $obj->fk_soc;
 				$this->bank            = $obj->bank;
 				$this->code_banque     = $obj->code_banque;
@@ -234,7 +234,7 @@ 
 				$this->number          = $obj->number;
 				$this->cle_rib         = $obj->cle_rib;
 				$this->bic             = $obj->bic;
-				$this->iban		       = $obj->iban;
+				$this->iban = $obj->iban;
 				$this->domiciliation   = $obj->domiciliation;
 				$this->proprio         = $obj->proprio;
 				$this->owner_address   = $obj->owner_address;
@@ -263,37 +263,37 @@ 
 	 *	@param  	int		$notrigger	1=Disable triggers
 	 *  @return		int		            <0 if KO, >0 if OK
 	 */
-	function delete(User $user = null, $notrigger=0)
+	function delete(User $user = null, $notrigger = 0)
 	{
 		global $conf;
 
 		$error = 0;
 
-		dol_syslog(get_class($this) . "::delete ".$this->id, LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete ".$this->id, LOG_DEBUG);
 
 		$this->db->begin();
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call trigger
-			$result=$this->call_trigger('COMPANY_RIB_DELETE',$user);
+			$result = $this->call_trigger('COMPANY_RIB_DELETE', $user);
 			if ($result < 0) $error++;
 			// End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "societe_rib";
-			$sql .= " WHERE rowid  = " . $this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib";
+			$sql .= " WHERE rowid  = ".$this->id;
 
-			if (! $this->db->query($sql))
+			if (!$this->db->query($sql))
 			{
 				$error++;
-				$this->errors[]=$this->db->lasterror();
+				$this->errors[] = $this->db->lasterror();
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -301,7 +301,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 	}
 
@@ -315,7 +315,7 @@ 
 	{
 		$rib = '';
 
-		if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib || $this->iban || $this->bic ) {
+		if ($this->code_banque || $this->code_guichet || $this->number || $this->cle_rib || $this->iban || $this->bic) {
 
 			if ($this->label && $displayriblabel) {
 				$rib = $this->label." : ";
@@ -333,10 +333,10 @@ 
 	 * @param   int     $rib    RIB id
 	 * @return  int             0 if KO, 1 if OK
 	 */
-	function setAsDefault($rib=0)
+	function setAsDefault($rib = 0)
 	{
 		$sql1 = "SELECT rowid as id, fk_soc  FROM ".MAIN_DB_PREFIX."societe_rib";
-		$sql1.= " WHERE rowid = ".($rib?$rib:$this->id);
+		$sql1 .= " WHERE rowid = ".($rib ? $rib : $this->id);
 
 		dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 		$result1 = $this->db->query($sql1);
@@ -353,12 +353,12 @@ 
 				$this->db->begin();
 
 				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
-				$sql2.= " WHERE type = 'ban' AND fk_soc = ".$obj->fk_soc;
+				$sql2 .= " WHERE type = 'ban' AND fk_soc = ".$obj->fk_soc;
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result2 = $this->db->query($sql2);
 
 				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
-				$sql3.= " WHERE rowid = ".$obj->id;
+				$sql3 .= " WHERE rowid = ".$obj->id;
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result3 = $this->db->query($sql3);
 
@@ -409,7 +409,7 @@ 
 		$this->country_id      = 1;
 
 		$this->rum             = 'UMR-CU1212-0007-5-1475405262';
-		$this->date_rum        =dol_now() - 10000;
+		$this->date_rum        = dol_now() - 10000;
 		$this->frstrecur       = 'FRST';
 
 		$this->socid = 0;

dolibarr/htdocs/societe/class/api_contacts.class.php

Spacing +22 added lines, -22 removed lines

@@ -81,7 +81,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->_cleanObjectDatas($this->contact);
@@ -122,37 +122,37 @@ 
 			$search_sale = DolibarrApiAccess::$user->id;
 
 		$sql = "SELECT t.rowid";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "socpeople as t";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX . "socpeople_extrafields as te ON te.fk_object = t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as te ON te.fk_object = t.rowid";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
 			// We need this table joined to the select in order to filter by sale
-			$sql.= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
-		$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON t.fk_soc = s.rowid";
-		$sql.= ' WHERE t.entity IN (' . getEntity('socpeople') . ')';
-		if ($socids) $sql.= " AND t.fk_soc IN (" . $socids . ")";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON t.fk_soc = s.rowid";
+		$sql .= ' WHERE t.entity IN ('.getEntity('socpeople').')';
+		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
 
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0)
-			$sql.= " AND t.fk_soc = sc.fk_soc";
+			$sql .= " AND t.fk_soc = sc.fk_soc";
 		if ($search_sale > 0)
-			$sql.= " AND s.rowid = sc.fk_soc";  // Join for the needed table to filter by sale
+			$sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 		// Insert sale filter
 		if ($search_sale > 0)
 		{
-			$sql .= " AND sc.fk_user = " . $search_sale;
+			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 	    // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-		$sql.= $db->order($sortfield, $sortorder);
+		$sql .= $db->order($sortfield, $sortorder);
 
 		if ($limit)
 		{
@@ -162,7 +162,7 @@ 
 			}
 			$offset = $limit * $page;
 
-			$sql.= $db->plimit($limit + 1, $offset);
+			$sql .= $db->plimit($limit + 1, $offset);
 		}
 		$result = $db->query($sql);
 		if ($result)
@@ -181,7 +181,7 @@ 
 			}
 		}
 		else {
-			throw new RestException(503, 'Error when retrieve contacts : ' . $sql);
+			throw new RestException(503, 'Error when retrieve contacts : '.$sql);
 		}
 		if (!count($obj_ret))
 		{
@@ -237,7 +237,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		foreach ($request_data as $field => $value)
@@ -272,7 +272,7 @@ 
 
 		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->contact->delete($id);
@@ -312,19 +312,19 @@ 
 	    }
 
 	    if (!DolibarrApi::_checkAccessToResource('contact', $contact->id, 'socpeople&societe')) {
-	        throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+	        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 	    }
 
 	    // Check mandatory fields
 	    $login = $request_data["login"];
 	    $password = $request_data["password"];
 	    $useraccount = new User($this->db);
-	    $result = $useraccount->create_from_contact($contact,$login,$password);
+	    $result = $useraccount->create_from_contact($contact, $login, $password);
 	    if ($result <= 0) {
 	        throw new RestException(500, "User not created");
 	    }
 	    // password parameter not used in create_from_contact
-	    $useraccount->setPassword($useraccount,$password);
+	    $useraccount->setPassword($useraccount, $password);
 
 	    return $result;
 	}
@@ -344,7 +344,7 @@ 
      */
 	function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 

dolibarr/htdocs/societe/class/societeaccount.class.php

Spacing +55 added lines, -55 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 // Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -77,7 +77,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'default'=>1),
 		'key_account' => array('type'=>'varchar(128)', 'label'=>'KeyAccount', 'visible'=>-1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Key account',),
@@ -97,7 +97,7 @@ 
 		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
 		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>-1,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'default'=>1, 'arrayofkeyval'=>array('1'=>'Active','0'=>'Disabled')),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'default'=>1, 'arrayofkeyval'=>array('1'=>'Active', '0'=>'Disabled')),
 	);
 
 	/**
@@ -186,7 +186,7 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
@@ -271,11 +271,11 @@ 
 	 */
 	public function fetchLines()
 	{
-		$this->lines=array();
+		$this->lines = array();
 
 		// Load lines with object societeAccountLine
 
-		return count($this->lines)?1:0;
+		return count($this->lines) ? 1 : 0;
 	}
 
 	/**
@@ -286,17 +286,17 @@ 
 	 * @param	int		$status		Status (0=test, 1=live)
 	 * @return	string				Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
 	 */
-	public function getCustomerAccount($id, $site, $status=0)
+	public function getCustomerAccount($id, $site, $status = 0)
 	{
 		$sql = "SELECT sa.key_account as key_account, sa.entity";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
-		$sql.= " WHERE sa.fk_soc = " . $id;
-		$sql.= " AND sa.entity IN (".getEntity('societe').")";
-		$sql.= " AND sa.site = '".$this->db->escape($site)."' AND sa.status = ".((int) $status);
-		$sql.= " AND key_account IS NOT NULL AND key_account <> ''";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as sa";
+		$sql .= " WHERE sa.fk_soc = ".$id;
+		$sql .= " AND sa.entity IN (".getEntity('societe').")";
+		$sql .= " AND sa.site = '".$this->db->escape($site)."' AND sa.status = ".((int) $status);
+		$sql .= " AND key_account IS NOT NULL AND key_account <> ''";
 		//$sql.= " ORDER BY sa.key_account DESC";
 
-		dol_syslog(get_class($this) . "::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (exemple: cus_.... for stripe)", LOG_DEBUG);
+		dol_syslog(get_class($this)."::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (exemple: cus_.... for stripe)", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			if ($this->db->num_rows($result)) {
@@ -346,54 +346,54 @@ 
      *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $db, $conf, $langs;
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
         $result = '';
         $companylink = '';
 
         $this->ref = $this->login;
 
-        $label = '<u>' . $langs->trans("SocieteAccount") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Login') . ':</b> ' . $this->ref;
+        $label = '<u>'.$langs->trans("SocieteAccount").'</u>';
+        $label .= '<br>';
+        $label .= '<b>'.$langs->trans('Login').':</b> '.$this->ref;
         //$label.= '<b>' . $langs->trans('WebSite') . ':</b> ' . $this->ref;
 
-        $url = dol_buildpath('/website/websiteaccount_card.php',1).'?id='.$this->id;
+        $url = dol_buildpath('/website/websiteaccount_card.php', 1).'?id='.$this->id;
 
         if ($option != 'nolink')
         {
 	        // Add param to save lastsearch_values or not
-	        $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-	        if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+	        $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+	        if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+	        if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         }
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowsocieteAccount");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowsocieteAccount");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
         }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 
 		return $result;
@@ -405,7 +405,7 @@ 
 	 * @param	int				$withpicto			Add download picto into link
 	 * @return	string			HTML link to file
 	 */
-	function getDirectExternalLink($withpicto=0)
+	function getDirectExternalLink($withpicto = 0)
 	{
 		return 'todo';
 	}
@@ -416,9 +416,9 @@ 
 	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return	string 			       Label of status
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -429,14 +429,14 @@ 
 	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return string 			       	Label of status
 	 */
-	static function LibStatut($status,$mode=0)
+	static function LibStatut($status, $mode = 0)
 	{
         // phpcs:enable
 		global $langs;
 
 		if ($mode == 0)
 		{
-			$prefix='';
+			$prefix = '';
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
 		}
@@ -447,28 +447,28 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
+			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 	}
 
@@ -481,10 +481,10 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -495,7 +495,7 @@ 
 				{
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_valid)
@@ -509,7 +509,7 @@ 
 				{
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture   = $cluser;
+					$this->user_cloture = $cluser;
 				}
 
 				$this->date_creation     = $this->db->jdate($obj->datec);

dolibarr/htdocs/societe/class/client.class.php

Spacing +22 added lines, -22 removed lines

@@ -29,9 +29,9 @@ 
  */
 class Client extends Societe
 {
-    public $next_prev_filter="te.client in (1,2,3)";	// Used to add a filter in Form::showrefnav method
+    public $next_prev_filter = "te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method
 
-    public $cacheprospectstatus=array();
+    public $cacheprospectstatus = array();
 
 
 	/**
@@ -58,28 +58,28 @@ 
         // phpcs:enable
         global $user;
 
-        $this->nb=array("customers" => 0,"prospects" => 0);
+        $this->nb = array("customers" => 0, "prospects" => 0);
         $clause = "WHERE";
 
         $sql = "SELECT count(s.rowid) as nb, s.client";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
         {
-        	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-        	$sql.= " WHERE sc.fk_user = " .$user->id;
+        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+        	$sql .= " WHERE sc.fk_user = ".$user->id;
         	$clause = "AND";
         }
-        $sql.= " ".$clause." s.client IN (1,2,3)";
-        $sql.= ' AND s.entity IN ('.getEntity($this->element).')';
-        $sql.= " GROUP BY s.client";
+        $sql .= " ".$clause." s.client IN (1,2,3)";
+        $sql .= ' AND s.entity IN ('.getEntity($this->element).')';
+        $sql .= " GROUP BY s.client";
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
-                if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"]+=$obj->nb;
-                if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"]+=$obj->nb;
+                if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"] += $obj->nb;
+                if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"] += $obj->nb;
             }
             $this->db->free($resql);
             return 1;
@@ -87,7 +87,7 @@ 
         else
         {
             dol_print_error($this->db);
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -98,19 +98,19 @@ 
 	 *  @param	int		$active     1=Active only, 0=Not active only, -1=All
 	 *  @return int					<0 if KO, >0 if OK
 	 */
-    function loadCacheOfProspStatus($active=1)
+    function loadCacheOfProspStatus($active = 1)
     {
     	global $langs;
 
-   		$sql="SELECT id, code, libelle as label FROM ".MAIN_DB_PREFIX."c_stcomm";
-   		if ($active >= 0) $sql.=" WHERE active = ".$active;
-		$resql=$this->db->query($sql);
-		$num=$this->db->num_rows($resql);
-		$i=0;
+   		$sql = "SELECT id, code, libelle as label FROM ".MAIN_DB_PREFIX."c_stcomm";
+   		if ($active >= 0) $sql .= " WHERE active = ".$active;
+		$resql = $this->db->query($sql);
+		$num = $this->db->num_rows($resql);
+		$i = 0;
 		while ($i < $num)
 		{
-			$obj=$this->db->fetch_object($resql);
-			$this->cacheprospectstatus[$obj->id]=array('id'=>$obj->id, 'code'=>$obj->code, 'label'=> ($langs->trans("ST_".strtoupper($obj->code))=="ST_".strtoupper($obj->code))?$obj->label:$langs->trans("ST_".strtoupper($obj->code)));
+			$obj = $this->db->fetch_object($resql);
+			$this->cacheprospectstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=> ($langs->trans("ST_".strtoupper($obj->code)) == "ST_".strtoupper($obj->code)) ? $obj->label : $langs->trans("ST_".strtoupper($obj->code)));
 			$i++;
 		}
 		return 1;

dolibarr/htdocs/societe/class/api_thirdparties.class.php

Spacing +195 added lines, -195 removed lines

@@ -56,7 +56,7 @@ 
 
 		$this->company = new Societe($this->db);
 
-		if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
+		if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
 			static::$FIELDS[] = 'email';
 		}
 	}
@@ -73,20 +73,20 @@ 
 	 */
 	function get($id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
@@ -117,7 +117,7 @@ 
 	 * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.nom:like:'TheCompany%') and (t.date_creation:<:'20160101')"
 	 * @return  array               Array of thirdparty objects
 	 */
-	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode=0, $sqlfilters = '')
+	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $sqlfilters = '')
     {
 		global $db, $conf;
 
@@ -128,23 +128,23 @@ 
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
 
 		$sql = "SELECT t.rowid";
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as t";
-
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
-		$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-		$sql.= " WHERE t.fk_stcomm = st.id";
-		if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
-		if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
-		if ($mode == 3) $sql.= " AND t.client IN (0)";
-		$sql.= ' AND t.entity IN ('.getEntity('societe').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as t";
+
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		$sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+		$sql .= " WHERE t.fk_stcomm = st.id";
+		if ($mode == 1) $sql .= " AND t.client IN (1, 3)";
+		if ($mode == 2) $sql .= " AND t.client IN (2, 3)";
+		if ($mode == 3) $sql .= " AND t.client IN (0)";
+		$sql .= ' AND t.entity IN ('.getEntity('societe').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc";
 		//if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
-		if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
-		if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+		if ($socid) $sql .= " AND t.rowid IN (".$socids.")";
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 		// Insert sale filter
 		if ($search_sale > 0)
 		{
@@ -153,15 +153,15 @@ 
 		// Add sql filters
 		if ($sqlfilters)
 		{
-			if (! DolibarrApi::_checkFilters($sqlfilters))
+			if (!DolibarrApi::_checkFilters($sqlfilters))
 			{
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
-			$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-			$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
-		$sql.= $db->order($sortfield, $sortorder);
+		$sql .= $db->order($sortfield, $sortorder);
 
 		if ($limit) {
 			if ($page < 0)
@@ -170,7 +170,7 @@ 
 			}
 			$offset = $limit * $page;
 
-			$sql.= $db->plimit($limit + 1, $offset);
+			$sql .= $db->plimit($limit + 1, $offset);
 		}
 
 		$result = $db->query($sql);
@@ -182,7 +182,7 @@ 
 			{
 				$obj = $db->fetch_object($result);
 				$soc_static = new Societe($db);
-				if($soc_static->fetch($obj->rowid)) {
+				if ($soc_static->fetch($obj->rowid)) {
 					$obj_ret[] = $this->_cleanObjectDatas($soc_static);
 				}
 				$i++;
@@ -191,7 +191,7 @@ 
 		else {
 			throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
 		}
-		if( ! count($obj_ret)) {
+		if (!count($obj_ret)) {
 			throw new RestException(404, 'Thirdparties not found');
 		}
 		return $obj_ret;
@@ -205,13 +205,13 @@ 
 	 */
 	function post($request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 		// Check mandatory fields
 		$result = $this->_validate($request_data);
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			$this->company->$field = $value;
 		}
 		if ($this->company->create(DolibarrApiAccess::$user) < 0)
@@ -229,25 +229,25 @@ 
 	 */
 	function put($id, $request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			if ($field == 'id') continue;
 			$this->company->$field = $value;
 		}
 
-		if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
+		if ($this->company->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
 			return $this->get($id);
 
 		return false;
@@ -278,27 +278,27 @@ 
 			throw new RestException(400, 'Try to merge a thirdparty into itself');
 		}
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
-		$result = $this->company->fetch($id);	// include the fetch of extra fields
-		if( ! $result ) {
+		$result = $this->company->fetch($id); // include the fetch of extra fields
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$this->companytoremove = new Societe($db);
 
-		$result = $this->companytoremove->fetch($idtodelete);	// include the fetch of extra fields
-		if( ! $result ) {
+		$result = $this->companytoremove->fetch($idtodelete); // include the fetch of extra fields
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->companytoremove->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->companytoremove->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -315,7 +315,7 @@ 
 		// Recopy some data
 		$object->client = $object->client | $soc_origin->client;
 		$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
-		$listofproperties=array(
+		$listofproperties = array(
 			'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode',
 			'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
 			'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
@@ -329,7 +329,7 @@ 
 		}
 
 		// Concat some data
-		$listofproperties=array(
+		$listofproperties = array(
 			'note_public', 'note_private'
 		);
 		foreach ($listofproperties as $property)
@@ -373,7 +373,7 @@ 
 		}
 
 		// Move links
-		if (! $error)
+		if (!$error)
 		{
 			$objects = array(
 				'Adherent' => '/adherents/class/adherent.class.php',
@@ -428,12 +428,12 @@ 
 		}
 
 
-		if (! $error)
+		if (!$error)
 		{
-			$object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
+			$object->context = array('merge'=>1, 'mergefromid'=>$soc_origin->id);
 
 			// Call trigger
-			$result=$object->call_trigger('COMPANY_MODIFY',$user);
+			$result = $object->call_trigger('COMPANY_MODIFY', $user);
 			if ($result < 0)
 			{
 				//setEventMessages($object->error, $object->errors, 'errors');
@@ -442,7 +442,7 @@ 
 			// End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			//We finally remove the old thirdparty
 			if ($soc_origin->delete($soc_origin->id, $user) < 1)
@@ -475,14 +475,14 @@ 
 	 */
 	function delete($id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->supprimer) {
+		if (!DolibarrApiAccess::$user->rights->societe->supprimer) {
 			throw new RestException(401);
 		}
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		return $this->company->delete($id);
@@ -503,12 +503,12 @@ 
 	 */
 	function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result )
+		if (!$result)
 		{
 			throw new RestException(404, 'Thirdparty not found');
 		}
@@ -542,28 +542,28 @@ 
 	 */
 	function addCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->add_type($this->company,'customer');
+		$category->add_type($this->company, 'customer');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -580,28 +580,28 @@ 
 	 */
 	function deleteCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->del_type($this->company,'customer');
+		$category->del_type($this->company, 'customer');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -621,12 +621,12 @@ 
 	 */
 	function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result )
+		if (!$result)
 		{
 			throw new RestException(404, 'Thirdparty not found');
 		}
@@ -660,28 +660,28 @@ 
 	 */
 	function addSupplierCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->add_type($this->company,'supplier');
+		$category->add_type($this->company, 'supplier');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -698,28 +698,28 @@ 
 	 */
 	function deleteSupplierCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->del_type($this->company,'supplier');
+		$category->del_type($this->company, 'supplier');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -739,24 +739,24 @@ 
 	 * @throws 401
 	 * @throws 404
 	 */
-	function getOutStandingProposals($id, $mode='customer')
+	function getOutStandingProposals($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -783,24 +783,24 @@ 
 	 * @throws 401
 	 * @throws 404
 	 */
-	function getOutStandingOrder($id, $mode='customer')
+	function getOutStandingOrder($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -826,24 +826,24 @@ 
 	 * @throws 401
 	 * @throws 404
 	 */
-	function getOutStandingInvoices($id, $mode='customer')
+	function getOutStandingInvoices($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -872,24 +872,24 @@ 
 	 * @throws 404
 	 * @throws 503
 	 */
-	function getFixedAmountDiscounts($id, $filter="none", $sortfield = "f.type", $sortorder = 'ASC')
+	function getFixedAmountDiscounts($id, $filter = "none", $sortfield = "f.type", $sortorder = 'ASC')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -900,14 +900,14 @@ 
 		if ($filter == "available")  $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
 		if ($filter == "used")  $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
 
-		$sql.= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
 		$result = $this->db->query($sql);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(503, $this->db->lasterror());
 		} else {
 			$num = $this->db->num_rows($result);
-			while ( $obj = $this->db->fetch_object($result) ) {
+			while ($obj = $this->db->fetch_object($result)) {
 				$obj_ret[] = $obj;
 			}
 		}
@@ -932,14 +932,14 @@ 
 	 */
 	function getInvoicesQualifiedForReplacement($id)
     {
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -950,7 +950,7 @@ 
 
 		$invoice = new Facture($this->db);
 		$result = $invoice->list_replacable_invoices($id);
-		if( $result < 0) {
+		if ($result < 0) {
 			throw new RestException(405, $this->thirdparty->error);
 		}
 
@@ -974,14 +974,14 @@ 
 	 */
 	function getInvoicesQualifiedForCreditNote($id)
     {
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -992,7 +992,7 @@ 
 
 		$invoice = new Facture($this->db);
 		$result = $invoice->list_qualified_avoir_invoices($id);
-		if( $result < 0) {
+		if ($result < 0) {
 			throw new RestException(405, $this->thirdparty->error);
 		}
 
@@ -1012,14 +1012,14 @@ 
     {
 		global $db, $conf;
 
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -1028,20 +1028,20 @@ 
 		 */
 
 		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
+		$sql .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
+		if ($id) $sql .= " WHERE fk_soc  = ".$id." ";
 
 
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, 'Account not found');
 		}
 
-		$i=0;
+		$i = 0;
 
-		$accounts =[];
+		$accounts = [];
 
 		if ($result)
 		{
@@ -1050,13 +1050,13 @@ 
 			{
 				$obj = $db->fetch_object($result);
 				$account = new CompanyBankAccount($db);
-				if($account->fetch($obj->rowid)) {
+				if ($account->fetch($obj->rowid)) {
 					$accounts[] = $account;
 				}
 				$i++;
 			}
 		}
-		else{
+		else {
 			throw new RestException(404, 'Account not found');
 		}
 
@@ -1065,10 +1065,10 @@ 
 
 		$returnAccounts = [];
 
-		foreach($accounts as $account){
-			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
+		foreach ($accounts as $account) {
+			$object = [];
+			foreach ($account as $key => $value)
+				if (in_array($key, $fields)) {
 					$object[$key] = $value;
 				}
 			$returnAccounts[] = $object;
@@ -1088,7 +1088,7 @@ 
 	 */
 	function createCompanyBankAccount($id, $request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1096,7 +1096,7 @@ 
 
 		$account->socid = $id;
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			$account->$field = $value;
 		}
 
@@ -1123,7 +1123,7 @@ 
 	 */
 	function updateCompanyBankAccount($id, $bankaccount_id, $request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1131,12 +1131,12 @@ 
 
 		$account->fetch($bankaccount_id, $id, -1, '');
 
-		if($account->socid != $id){
+		if ($account->socid != $id) {
 			throw new RestException(401);
 		}
 
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			$account->$field = $value;
 		}
 
@@ -1158,7 +1158,7 @@ 
 	 */
 	function deleteCompanyBankAccount($id, $bankaccount_id)
     {
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1166,7 +1166,7 @@ 
 
 		$account->fetch($bankaccount_id);
 
-		if(!$account->socid == $id)
+		if (!$account->socid == $id)
 			throw new RestException(401);
 
 		return $account->delete(DolibarrApiAccess::$user);
@@ -1186,12 +1186,12 @@ 
 	{
 		global $conf;
 
-		$this->langs->loadLangs(array("main","dict","commercial","products","companies","banks","bills","withdrawals"));
+		$this->langs->loadLangs(array("main", "dict", "commercial", "products", "companies", "banks", "bills", "withdrawals"));
 
 		$this->company->fetch($id);
 
 		$action = 'builddoc';
-		if(! DolibarrApiAccess::$user->rights->societe->creer)
+		if (!DolibarrApiAccess::$user->rights->societe->creer)
 			throw new RestException(401);
 
 		$this->company->setDocModel(DolibarrApiAccess::$user, $model);
@@ -1199,32 +1199,32 @@ 
 		$this->company->fk_bank = $this->company->fk_account;
 
 		$outputlangs = $this->langs;
-		$newlang='';
+		$newlang = '';
 
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang=$this->company->thirdparty->default_lang;  // for proposal, order, invoice, ...
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang=$this->company->default_lang;                  // for thirdparty
-		if (! empty($newlang)) {
-			$outputlangs = new Translate("",$conf);
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang = $this->company->thirdparty->default_lang; // for proposal, order, invoice, ...
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang = $this->company->default_lang; // for thirdparty
+		if (!empty($newlang)) {
+			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
 
 		// To be sure vars is defined
 		$hidedetails = $hidedesc = $hideref = 0;
-		$moreparams=null;
-		if (empty($hidedetails)) $hidedetails=0;
-		if (empty($hidedesc)) $hidedesc=0;
-		if (empty($hideref)) $hideref=0;
-		if (empty($moreparams)) $moreparams=null;
+		$moreparams = null;
+		if (empty($hidedetails)) $hidedetails = 0;
+		if (empty($hidedesc)) $hidedesc = 0;
+		if (empty($hideref)) $hideref = 0;
+		if (empty($moreparams)) $moreparams = null;
 
 
 		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
-		if ($companybankid) $sql.= " AND id = ".$companybankid."";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
+		if ($id) $sql .= " WHERE fk_soc  = ".$id." ";
+		if ($companybankid) $sql .= " AND id = ".$companybankid."";
 
-		$i=0;
-		$accounts=array();
+		$i = 0;
+		$accounts = array();
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -1281,15 +1281,15 @@ 
 	 *
 	 * @url GET {id}/gateways/
 	 */
-	function getSocieteAccounts($id, $site=null)
+	function getSocieteAccounts($id, $site = null)
     {
 		global $db, $conf;
 
-		if(!DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(!DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -1297,18 +1297,18 @@ 
 		 * We select all the records that match the socid
 		 */
 		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms FROM ".MAIN_DB_PREFIX."societe_account";
-		$sql.= " WHERE fk_soc = $id";
-		if($site) $sql .= " AND site ='$site'";
+		$sql .= " WHERE fk_soc = $id";
+		if ($site) $sql .= " AND site ='$site'";
 
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
 		}
 
-		$i=0;
+		$i = 0;
 
-		$accounts =[];
+		$accounts = [];
 
 		$num = $db->num_rows($result);
 		while ($i < $num)
@@ -1316,7 +1316,7 @@ 
 			$obj = $db->fetch_object($result);
 			$account = new SocieteAccount($db);
 
-			if($account->fetch($obj->rowid)) {
+			if ($account->fetch($obj->rowid)) {
 				$accounts[] = $account;
 			}
 			$i++;
@@ -1326,10 +1326,10 @@ 
 
 		$returnAccounts = [];
 
-		foreach($accounts as $account){
-			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
+		foreach ($accounts as $account) {
+			$object = [];
+			foreach ($account as $key => $value)
+				if (in_array($key, $fields)) {
 					$object[$key] = $value;
 				}
 			$returnAccounts[] = $object;
@@ -1361,25 +1361,25 @@ 
 	{
 		global $db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
-		if(!isset($request_data['site'])) {
+		if (!isset($request_data['site'])) {
 			throw new RestException(422, 'Unprocessable Entity: You must pass the site attribute in your request data !');
 		}
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			$account = new SocieteAccount($this->db);
-			if(!isset($request_data['login'])) {
+			if (!isset($request_data['login'])) {
 				$account->login = "";
 			}
 			$account->fk_soc = $id;
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1420,7 +1420,7 @@ 
 	{
 		global $db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1428,16 +1428,16 @@ 
 		$result = $db->query($sql);
 
 		// We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
-		if($result->num_rows == 0 ){
-			if(!isset($request_data['key_account'])) {
+		if ($result->num_rows == 0) {
+			if (!isset($request_data['key_account'])) {
 				throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
 			}
 			$account = new SocieteAccount($this->db);
-			if(!isset($request_data['login'])) {
+			if (!isset($request_data['login'])) {
 				$account->login = "";
 			}
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1449,12 +1449,12 @@ 
 		// We found an existing SocieteAccount entity, we are replacing it
 		} else {
 
-			if(isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+			if (isset($request_data['site']) && $request_data['site'] !== $site) {
+				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
 				$result = $db->query($sql);
 
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
+				if ($result->num_rows !== 0)
+					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site']." but another SocieteAccount entity already exists with this site key.");
 			}
 
 			$obj = $db->fetch_object($result);
@@ -1463,13 +1463,13 @@ 
 			$account->id = $obj->rowid;
 			$account->fk_soc = $id;
 			$account->site = $site;
-			if(!isset($request_data['login'])) {
+			if (!isset($request_data['login'])) {
 				$account->login = "";
 			}
 			$account->fk_user_creat = $obj->fk_user_creat;
 			$account->date_creation = $obj->date_creation;
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1501,31 +1501,31 @@ 
 	{
 		global $db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
 		} else {
 
 			// If the user tries to edit the site member, we check first if
-			if(isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+			if (isset($request_data['site']) && $request_data['site'] !== $site) {
+				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
 				$result = $db->query($sql);
 
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists for this thirdparty with this site key.");
+				if ($result->num_rows !== 0)
+					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key.");
 			}
 
 			$obj = $db->fetch_object($result);
 			$account = new SocieteAccount($this->db);
 			$account->fetch($obj->rowid);
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1556,21 +1556,21 @@ 
 		global /** @var Database $db */
 		$db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404);
 		} else {
 			$obj = $db->fetch_object($result);
 			$account = new SocieteAccount($this->db);
 			$account->fetch($obj->rowid);
 
-			if($account->delete(DolibarrApiAccess::$user) < 0) {
+			if ($account->delete(DolibarrApiAccess::$user) < 0) {
 				throw new RestException(500, "Error while deleting $site gateway attached to this third party");
 			}
 		}
@@ -1593,7 +1593,7 @@ 
 		global /** @var Database $db */
 		$db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1602,14 +1602,14 @@ 
 		 */
 
 		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id ";
 
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
 		} else {
-			$i=0;
+			$i = 0;
 
 			$num = $db->num_rows($result);
 			while ($i < $num)
@@ -1618,7 +1618,7 @@ 
 				$account = new SocieteAccount($db);
 				$account->fetch($obj->rowid);
 
-				if($account->delete(DolibarrApiAccess::$user) < 0) {
+				if ($account->delete(DolibarrApiAccess::$user) < 0) {
 					throw new RestException(500, 'Error while deleting gateways attached to this third party');
 				}
 				$i++;
@@ -1636,7 +1636,7 @@ 
     {
 		$object = parent::_cleanObjectDatas($object);
 
-		unset($object->nom);	// ->name already defined and nom deprecated
+		unset($object->nom); // ->name already defined and nom deprecated
 
 		unset($object->total_ht);
 		unset($object->total_tva);

dolibarr/htdocs/societe/societecontact.php

Spacing +57 added lines, -57 removed lines

@@ -34,18 +34,18 @@ 
 
 $langs->loadLangs(array("orders", "companies"));
 
-$id=GETPOST('id','int')?GETPOST('id','int'):GETPOST('socid','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe', $id,'');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', $id, '');
 
 $object = new Societe($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contactthirdparty','globalcard'));
+$hookmanager->initHooks(array('contactthirdparty', 'globalcard'));
 
 
 /*
@@ -58,7 +58,7 @@ 
 
     if ($result > 0 && $id > 0)
     {
-    	$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
     }
 
@@ -86,7 +86,7 @@ 
 {
 	if ($object->fetch($id))
 	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
+	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
 	else
 	{
@@ -122,15 +122,15 @@ 
  * View
  */
 
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ThirdParty"),$help_url);
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $langs->trans("ThirdParty"), $help_url);
 
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
 
 
 /* *************************************************************************** */
@@ -139,7 +139,7 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	if ($object->fetch($id, $ref) > 0)
 	{
@@ -154,7 +154,7 @@ 
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     	print '<div class="fichecenter">';
 
@@ -171,7 +171,7 @@ 
     	print yn($object->fournisseur);
     	print '</td></tr>';*/
 
-		if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 		{
 		    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 		}
@@ -201,31 +201,31 @@ 
 		print '<br>';
 
 		// Contacts lines (modules that overwrite templates must declare this into descriptor)
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+		foreach ($dirtpls as $reldir)
 		{
-			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 			if ($res) break;
 		}
 
 		// additionnal list with adherents of company
-		if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
+		if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-			$membertypestatic=new AdherentType($db);
-			$memberstatic=new Adherent($db);
+			$membertypestatic = new AdherentType($db);
+			$memberstatic = new Adherent($db);
 
 			$langs->load("members");
 			$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
-			$sql.= " d.datefin,";
-			$sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
-			$sql.= " t.libelle as type, t.subscription";
-			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
-			$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
-			$sql.= " WHERE d.fk_soc = ".$id;
-			$sql.= " AND d.fk_adherent_type = t.rowid";
+			$sql .= " d.datefin,";
+			$sql .= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
+			$sql .= " t.libelle as type, t.subscription";
+			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+			$sql .= ", ".MAIN_DB_PREFIX."adherent_type as t";
+			$sql .= " WHERE d.fk_soc = ".$id;
+			$sql .= " AND d.fk_adherent_type = t.rowid";
 
 			dol_syslog("get list sql=".$sql);
 			$resql = $db->query($sql);
@@ -233,39 +233,39 @@ 
 			{
 				$num = $db->num_rows($resql);
 
-				if ($num  > 0 )
+				if ($num > 0)
 				{
-					$titre=$langs->trans("MembersListOfTiers");
+					$titre = $langs->trans("MembersListOfTiers");
 					print '<br>';
 
-					print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
+					print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 
 					print "<table class=\"noborder\" width=\"100%\">";
 					print '<tr class="liste_titre">';
-					print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre( $langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Login",$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Person",$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EMail",$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EndSubscription",$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
+					print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"), $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "t.libelle", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Person", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.statut,d.datefin", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("EndSubscription", $_SERVER["PHP_SELF"], "d.datefin", $param, "", 'align="center"', $sortfield, $sortorder);
 					print "</tr>\n";
 
-					$i=0;
+					$i = 0;
 					while ($i < $num && $i < $conf->liste_limit)
 					{
 						$objp = $db->fetch_object($resql);
 
-						$datefin=$db->jdate($objp->datefin);
-						$memberstatic->id=$objp->rowid;
-						$memberstatic->ref=$objp->rowid;
-						$memberstatic->lastname=$objp->lastname;
-						$memberstatic->firstname=$objp->firstname;
-						$memberstatic->statut=$objp->statut;
-						$memberstatic->datefin=$db->jdate($objp->datefin);
+						$datefin = $db->jdate($objp->datefin);
+						$memberstatic->id = $objp->rowid;
+						$memberstatic->ref = $objp->rowid;
+						$memberstatic->lastname = $objp->lastname;
+						$memberstatic->firstname = $objp->firstname;
+						$memberstatic->statut = $objp->statut;
+						$memberstatic->datefin = $db->jdate($objp->datefin);
 
-						$companyname=$objp->company;
+						$companyname = $objp->company;
 
 						print '<tr class="oddeven">';
 
@@ -276,37 +276,37 @@ 
 
 						// Lastname
 						print "<td><a href=\"card.php?rowid=$objp->rowid\">";
-						print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
-						print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
-						print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
+						print ((!empty($objp->lastname) || !empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
+						print (((!empty($objp->lastname) || !empty($objp->firstname)) && !empty($companyname)) ? ' / ' : '');
+						print (!empty($companyname) ? dol_trunc($companyname, 32) : '');
 						print "</a></td>\n";
 
 						// Login
 						print "<td>".$objp->login."</td>\n";
 
 						// Type
-						$membertypestatic->id=$objp->type_id;
-						$membertypestatic->libelle=$objp->type;
+						$membertypestatic->id = $objp->type_id;
+						$membertypestatic->libelle = $objp->type;
 						print '<td class="nowrap">';
-						print $membertypestatic->getNomUrl(1,32);
+						print $membertypestatic->getNomUrl(1, 32);
 						print '</td>';
 
 						// Moral/Physique
 						print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
 
 						// EMail
-						print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
+						print "<td>".dol_print_email($objp->email, 0, 0, 1)."</td>\n";
 
 						// Statut
 						print '<td class="nowrap">';
-						print $memberstatic->LibStatut($objp->statut,$objp->subscription,$datefin,2);
+						print $memberstatic->LibStatut($objp->statut, $objp->subscription, $datefin, 2);
 						print "</td>";
 
 						// End of subscription date
 						if ($datefin)
 						{
 							print '<td align="center" class="nowrap">';
-							print dol_print_date($datefin,'day');
+							print dol_print_date($datefin, 'day');
 							if ($memberstatic->hasDelay()) {
 								print " ".img_warning($langs->trans("SubscriptionLate"));
 							}

dolibarr/htdocs/societe/project.php

Spacing +11 added lines, -11 removed lines

@@ -34,8 +34,8 @@ 
 $langs->loadLangs(array("companies", "projects"));
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -46,8 +46,8 @@ 
  *	Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
@@ -71,25 +71,25 @@ 
 	$object = new Societe($db);
 	$result = $object->fetch($socid);
 
-	$title=$langs->trans("Projects");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-	llxHeader('',$title);
+	$title = $langs->trans("Projects");
+	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$title;
+	llxHeader('', $title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
@@ -143,7 +143,7 @@ 
 
 
 	// Projects list
-	$result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
+	$result = show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
 }
 
 // End of page

dolibarr/htdocs/societe/notify/card.php

Spacing +91 added lines, -91 removed lines

@@ -32,32 +32,32 @@ 
 
 $langs->loadLangs(array("companies", "mails", "admin", "other"));
 
-$socid = GETPOST("socid",'int');
-$action = GETPOST('action','aZ09');
-$contactid=GETPOST('contactid');    // May be an int or 'thirdparty'
-$actionid=GETPOST('actionid');
+$socid = GETPOST("socid", 'int');
+$action = GETPOST('action', 'aZ09');
+$contactid = GETPOST('contactid'); // May be an int or 'thirdparty'
+$actionid = GETPOST('actionid');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe','','');
-
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield=GETPOST("sortfield",'alpha');
-$sortorder=GETPOST("sortorder",'alpha');
-$page=GETPOST("page",'int');
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="n.daten";
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', '', '');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "n.daten";
 if (empty($page) || $page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$now=dol_now();
+$now = dol_now();
 
 $object = new Societe($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartynotification','globalcard'));
+$hookmanager->initHooks(array('thirdpartynotification', 'globalcard'));
 
 
 
@@ -65,29 +65,29 @@ 
  * Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
-    $error=0;
+    $error = 0;
 
     // Add a notification
     if ($action == 'add')
     {
         if (empty($contactid))
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")), null, 'errors');
+    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
             $error++;
         }
         if ($actionid <= 0)
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), null, 'errors');
+    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
             $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
             $db->begin();
 
@@ -98,7 +98,7 @@ 
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
                 $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
 
-                if (! $db->query($sql))
+                if (!$db->query($sql))
                 {
                     $error++;
                     dol_print_error($db);
@@ -109,7 +109,7 @@ 
                 dol_print_error($db);
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $db->commit();
             }
@@ -137,12 +137,12 @@ 
 $form = new Form($db);
 
 $object = new Societe($db);
-$result=$object->fetch($socid);
+$result = $object->fetch($socid);
 
-$title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification");
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$title = $langs->trans("ThirdParty").' - '.$langs->trans("Notification");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Notification");
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
 
 if ($result > 0)
@@ -155,7 +155,7 @@ 
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
@@ -163,7 +163,7 @@ 
     print '<table class="border centpercent">';
 
     // Prefix
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
@@ -177,7 +177,7 @@ 
         print '</td></tr>';
     }
 
-    if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
+    if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
     {
         print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
@@ -218,37 +218,37 @@ 
 
 
     // Add notification form
-    print load_fiche_titre($langs->trans("AddNewNotification"),'','');
+    print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
     print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
 
-    $param="&socid=".$socid;
+    $param = "&socid=".$socid;
 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'"width="45%"',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
     print_liste_field_titre('');
 	print "</tr>\n";
 
-    $var=false;
-    $listofemails=$object->thirdparty_and_contact_email_array();
+    $var = false;
+    $listofemails = $object->thirdparty_and_contact_email_array();
     if (count($listofemails) > 0)
     {
-        $actions=array();
+        $actions = array();
 
         // Load array of available notifications
-        $notificationtrigger=new InterfaceNotification($db);
-        $listofmanagedeventfornotification=$notificationtrigger->getListOfManagedEvents();
+        $notificationtrigger = new InterfaceNotification($db);
+        $listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
 
-        foreach($listofmanagedeventfornotification as $managedeventfornotification)
+        foreach ($listofmanagedeventfornotification as $managedeventfornotification)
         {
- 			$label=($langs->trans("Notify_".$managedeventfornotification['code'])!="Notify_".$managedeventfornotification['code']?$langs->trans("Notify_".$managedeventfornotification['code']):$managedeventfornotification['label']);
-            $actions[$managedeventfornotification['rowid']]=$label;
+ 			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
+            $actions[$managedeventfornotification['rowid']] = $label;
         }
         print '<tr class="oddeven"><td class="maxwidthonsmartphone">';
         print $form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
@@ -257,8 +257,8 @@ 
         print $form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
         print '</td>';
         print '<td>';
-        $type=array('email'=>$langs->trans("EMail"));
-        print $form->selectarray("typeid",$type);
+        $type = array('email'=>$langs->trans("EMail"));
+        print $form->selectarray("typeid", $type);
         print '</td>';
         print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
@@ -279,16 +279,16 @@ 
 
     // List of notifications enabled for contacts
     $sql = "SELECT n.rowid, n.type,";
-    $sql.= " a.code, a.label,";
-    $sql.= " c.rowid as contactid, c.lastname, c.firstname, c.email";
-    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-    $sql.= " ".MAIN_DB_PREFIX."socpeople c";
-    $sql.= " WHERE a.rowid = n.fk_action";
-    $sql.= " AND c.rowid = n.fk_contact";
-    $sql.= " AND c.fk_soc = ".$object->id;
-
-    $resql=$db->query($sql);
+    $sql .= " a.code, a.label,";
+    $sql .= " c.rowid as contactid, c.lastname, c.firstname, c.email";
+    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+    $sql .= " ".MAIN_DB_PREFIX."socpeople c";
+    $sql .= " WHERE a.rowid = n.fk_action";
+    $sql .= " AND c.rowid = n.fk_contact";
+    $sql .= " AND c.fk_soc = ".$object->id;
+
+    $resql = $db->query($sql);
     if ($resql)
     {
         $num = $db->num_rows($resql);
@@ -299,15 +299,15 @@ 
     }
 
     // List of active notifications
-    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')','','');
+    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'"width="45%"',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
-    print_liste_field_titre('','','');
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+    print_liste_field_titre('', '', '');
     print '</tr>';
 
 	$langs->load("errors");
@@ -317,15 +317,15 @@ 
     {
         $i = 0;
 
-        $contactstatic=new Contact($db);
+        $contactstatic = new Contact($db);
 
         while ($i < $num)
         {
             $obj = $db->fetch_object($resql);
 
-            $contactstatic->id=$obj->contactid;
-            $contactstatic->lastname=$obj->lastname;
-            $contactstatic->firstname=$obj->firstname;
+            $contactstatic->id = $obj->contactid;
+            $contactstatic->lastname = $obj->lastname;
+            $contactstatic->firstname = $obj->firstname;
             print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
             if ($obj->type == 'email')
             {
@@ -336,12 +336,12 @@ 
                 else
                 {
                     $langs->load("errors");
-                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email);
+                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
                 }
             }
             print '</td>';
             print '<td>';
-            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
             print $label;
             print '</td>';
             print '<td>';
@@ -414,14 +414,14 @@ 
 
     // List
     $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
-    $sql.= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
-    $sql.= " a.code, a.label";
-    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql.= " ".MAIN_DB_PREFIX."notify as n ";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
-    $sql.= " WHERE a.rowid = n.fk_action";
-    $sql.= " AND n.fk_soc = ".$object->id;
-    $sql.= $db->order($sortfield, $sortorder);
+    $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+    $sql .= " a.code, a.label";
+    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql .= " ".MAIN_DB_PREFIX."notify as n ";
+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
+    $sql .= " WHERE a.rowid = n.fk_action";
+    $sql .= " AND n.fk_soc = ".$object->id;
+    $sql .= $db->order($sortfield, $sortorder);
 
     // Count total nb of records
     $nbtotalofrecords = '';
@@ -436,9 +436,9 @@ 
         }
     }
 
-    $sql.= $db->plimit($limit+1, $offset);
+    $sql .= $db->plimit($limit + 1, $offset);
 
-    $resql=$db->query($sql);
+    $resql = $db->query($sql);
     if ($resql)
     {
         $num = $db->num_rows($resql);
@@ -448,9 +448,9 @@ 
         dol_print_error($db);
     }
 
-    $param='&socid='.$object->id;
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    $param = '&socid='.$object->id;
+    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
     print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -467,18 +467,18 @@ 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'',$sortfield,$sortorder);
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
     //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
-    print_liste_field_titre("Date",$_SERVER["PHP_SELF"],"n.daten",'',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, 'align="right"', $sortfield, $sortorder);
     print '</tr>';
 
     if ($num > 0)
     {
         $i = 0;
 
-        $contactstatic=new Contact($db);
+        $contactstatic = new Contact($db);
 
         while ($i < $num)
         {
@@ -487,11 +487,11 @@ 
             print '<tr class="oddeven"><td>';
             if ($obj->id > 0)
             {
-	            $contactstatic->id=$obj->id;
-	            $contactstatic->lastname=$obj->lastname;
-	            $contactstatic->firstname=$obj->firstname;
+	            $contactstatic->id = $obj->id;
+	            $contactstatic->lastname = $obj->lastname;
+	            $contactstatic->firstname = $obj->firstname;
 	            print $contactstatic->getNomUrl(1);
-	            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
+	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
             }
             else
 			{
@@ -499,7 +499,7 @@ 
             }
             print '</td>';
             print '<td>';
-            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
             print $label;
             print '</td>';
             print '<td>';
@@ -527,7 +527,7 @@ 
 
     print '</form>';
 }
-else dol_print_error('','RecordNotFound');
+else dol_print_error('', 'RecordNotFound');
 
 // End of page
 llxFooter();

dolibarr/htdocs/societe/notify/index.php

Spacing +21 added lines, -21 removed lines

@@ -34,16 +34,16 @@ 
 
 if ($sortorder == "")
 {
-  $sortorder="ASC";
+  $sortorder = "ASC";
 }
 if ($sortfield == "")
 {
-  $sortfield="s.nom";
+  $sortfield = "s.nom";
 }
 
-if ($page == -1 || $page == null) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0; }
 
-$offset = $conf->liste_limit * $page ;
+$offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -56,18 +56,18 @@ 
 llxHeader();
 
 $sql = "SELECT s.nom as name, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid";
-$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
-$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-$sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-$sql.= " WHERE n.fk_contact = c.rowid";
-$sql.= " AND a.rowid = n.fk_action";
-$sql.= " AND n.fk_soc = s.rowid";
-$sql.= " AND s.entity IN (".getEntity('societe').")";
-if ($socid > 0)	$sql.= " AND s.rowid = " . $user->societe_id;
-
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit, $offset);
+$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
+$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+$sql .= " ".MAIN_DB_PREFIX."societe as s";
+$sql .= " WHERE n.fk_contact = c.rowid";
+$sql .= " AND a.rowid = n.fk_action";
+$sql .= " AND n.fk_soc = s.rowid";
+$sql .= " AND s.entity IN (".getEntity('societe').")";
+if ($socid > 0)	$sql .= " AND s.rowid = ".$user->societe_id;
+
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($conf->liste_limit, $offset);
 
 $result = $db->query($sql);
 if ($result)
@@ -75,14 +75,14 @@ 
 	$num = $db->num_rows($result);
 	$i = 0;
 
-	$paramlist='';
-	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield,$sortorder,'',$num);
+	$paramlist = '';
+	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield, $sortorder, '', $num);
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Contact",$_SERVER["PHP_SELF"],"c.lastname","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"a.titre","","",'valign="center"',$sortfield,$sortorder);
+	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "", 'valign="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Contact", $_SERVER["PHP_SELF"], "c.lastname", "", "", 'valign="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "a.titre", "", "", 'valign="center"', $sortfield, $sortorder);
 	print "</tr>\n";
 
 	while ($i < $num)