Dolibarr / dolibarr

htdocs/commande/class/api_orders.class.php

Braces +30 added lines, -11 removed lines

@@ -165,18 +165,33 @@ 
 
 		// 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)
+		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."commande 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
+		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 .= ' WHERE t.entity IN ('.getEntity('commande').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc 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)
 		{
@@ -606,14 +621,17 @@ 
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->commande->$field = $value;
 		}
 
 		// Update availability
 		if (!empty($this->commande->availability_id)) {
-			if ($this->commande->availability($this->commande->availability_id) < 0)
-			throw new RestException(400, 'Error while updating availability');
+			if ($this->commande->availability($this->commande->availability_id) < 0) {
+						throw new RestException(400, 'Error while updating availability');
+			}
 		}
 
 		if ($this->commande->update(DolibarrApiAccess::$user) > 0)
@@ -972,8 +990,9 @@ 
 	{
 		$commande = array();
 		foreach (Orders::$FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, $field." field missing");
+			if (!isset($data[$field])) {
+							throw new RestException(400, $field." field missing");
+			}
 			$commande[$field] = $data[$field];
 		}
 		return $commande;

htdocs/loan/class/paymentloan.class.php

Braces +99 added lines, -34 removed lines

@@ -133,23 +133,48 @@ 
 		}
 
 		// Clean parameters
-		if (isset($this->fk_loan)) $this->fk_loan = (int) $this->fk_loan;
-		if (isset($this->amount_capital))	$this->amount_capital = price2num($this->amount_capital ? $this->amount_capital : 0);
-		if (isset($this->amount_insurance)) $this->amount_insurance = price2num($this->amount_insurance ? $this->amount_insurance : 0);
-		if (isset($this->amount_interest))	$this->amount_interest = price2num($this->amount_interest ? $this->amount_interest : 0);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment = (int) $this->fk_typepayment;
-		if (isset($this->num_payment)) $this->num_payment = (int) $this->num_payment;
-		if (isset($this->note_private))     $this->note_private = trim($this->note_private);
-		if (isset($this->note_public))      $this->note_public = trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_loan)) {
+			$this->fk_loan = (int) $this->fk_loan;
+		}
+		if (isset($this->amount_capital)) {
+			$this->amount_capital = price2num($this->amount_capital ? $this->amount_capital : 0);
+		}
+		if (isset($this->amount_insurance)) {
+			$this->amount_insurance = price2num($this->amount_insurance ? $this->amount_insurance : 0);
+		}
+		if (isset($this->amount_interest)) {
+			$this->amount_interest = price2num($this->amount_interest ? $this->amount_interest : 0);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = (int) $this->fk_typepayment;
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = (int) $this->num_payment;
+		}
+		if (isset($this->note_private)) {
+			$this->note_private = trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
 		$totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
 		$totalamount = price2num($totalamount);
 
 		// Check parameters
-		if ($totalamount == 0) return -1; // Negative amounts are accepted for reject prelevement but not null
+		if ($totalamount == 0) {
+			return -1;
+		}
+		// Negative amounts are accepted for reject prelevement but not null
 
 
 		$this->db->begin();
@@ -276,17 +301,39 @@ 
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_loan)) $this->fk_loan = (int) $this->fk_loan;
-		if (isset($this->amount_capital)) $this->amount_capital = trim($this->amount_capital);
-		if (isset($this->amount_insurance)) $this->amount_insurance = trim($this->amount_insurance);
-		if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment = (int) $this->fk_typepayment;
-		if (isset($this->num_payment)) $this->num_payment = (int) $this->num_payment;
-		if (isset($this->note_private)) $this->note = trim($this->note_private);
-		if (isset($this->note_public)) $this->note = trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_loan)) {
+			$this->fk_loan = (int) $this->fk_loan;
+		}
+		if (isset($this->amount_capital)) {
+			$this->amount_capital = trim($this->amount_capital);
+		}
+		if (isset($this->amount_insurance)) {
+			$this->amount_insurance = trim($this->amount_insurance);
+		}
+		if (isset($this->amount_interest)) {
+			$this->amount_interest = trim($this->amount_interest);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = (int) $this->fk_typepayment;
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = (int) $this->num_payment;
+		}
+		if (isset($this->note_private)) {
+			$this->note = trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note = trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
 		// Check parameters
 
@@ -445,7 +492,9 @@ 
 			$acc->fetch($accountid);
 
 			$total = $this->amount_capital;
-			if ($mode == 'payment_loan') $total = -$total;
+			if ($mode == 'payment_loan') {
+				$total = -$total;
+			}
 
 			// Insert payment into llx_bank
 			$bank_line_id = $acc->addline(
@@ -473,7 +522,9 @@ 
 
 				// Add link 'payment_loan' in bank_url between payment and bank transaction
 				$url = '';
-				if ($mode == 'payment_loan') $url = DOL_URL_ROOT.'/loan/payment/card.php?id=';
+				if ($mode == 'payment_loan') {
+					$url = DOL_URL_ROOT.'/loan/payment/card.php?id=';
+				}
 				if ($url)
 				{
 					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
@@ -489,7 +540,9 @@ 
 				if ($mode == 'payment_loan')
 				{
 					$result = $acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label ? $this->label : ''), 'loan');
-					if ($result <= 0) dol_print_error($this->db);
+					if ($result <= 0) {
+						dol_print_error($this->db);
+					}
 				}
 			} else {
 				$this->error = $acc->error;
@@ -519,8 +572,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -565,27 +617,40 @@ 
 	{
 		global $langs, $conf;
 
-		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 = '';
 		$label = '<u>'.$langs->trans("Loan").'</u>';
 		if (!empty($this->id)) {
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
 		}
-		if ($moretitle) $label .= ' - '.$moretitle;
+		if ($moretitle) {
+			$label .= ' - '.$moretitle;
+		}
 
 		$url = DOL_URL_ROOT.'/loan/payment/card.php?id='.$this->id;
 
 		$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';
+		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';
+		}
 
 		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($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, ($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;

htdocs/core/lib/accounting.lib.php

Braces +34 added lines, -12 removed lines

@@ -94,9 +94,13 @@ 
 {
 	global $conf;
 
-	if ($account < 0 || is_empty($account)) return '';
+	if ($account < 0 || is_empty($account)) {
+		return '';
+	}
 
-	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+		return $account;
+	}
 
 	$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
 	if (!is_empty($g)) {
@@ -129,9 +133,13 @@ 
 {
 	global $conf;
 
-	if ($accounta < 0 || is_empty($accounta)) return '';
+	if ($accounta < 0 || is_empty($accounta)) {
+		return '';
+	}
 
-	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
+	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+		return $accounta;
+	}
 
 	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
 	if (!is_empty($a)) {
@@ -177,7 +185,9 @@ 
 
 	print "\n\n<!-- start banner journal -->\n";
 
-	if (!is_empty($varlink)) $varlink = '?'.$varlink;
+	if (!is_empty($varlink)) {
+		$varlink = '?'.$varlink;
+	}
 
 	$head = array();
 	$h = 0;
@@ -209,10 +219,15 @@ 
 	{
 		print '<tr>';
 		print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
-		if (!$variante) print '<td colspan="3">';
-		else print '<td>';
+		if (!$variante) {
+			print '<td colspan="3">';
+		} else {
+			print '<td>';
+		}
 		print $calcmode;
-		if ($variante) print '</td><td colspan="2">'.$variante;
+		if ($variante) {
+			print '</td><td colspan="2">'.$variante;
+		}
 		print '</td>';
 		print '</tr>';
 	}
@@ -220,10 +235,17 @@ 
 	// Ligne de la periode d'analyse du rapport
 	print '<tr>';
 	print '<td>'.$langs->trans("ReportPeriod").'</td>';
-	if (!$periodlink) print '<td colspan="3">';
-	else print '<td>';
-	if ($period) print $period;
-	if ($periodlink) print '</td><td colspan="2">'.$periodlink;
+	if (!$periodlink) {
+		print '<td colspan="3">';
+	} else {
+		print '<td>';
+	}
+	if ($period) {
+		print $period;
+	}
+	if ($periodlink) {
+		print '</td><td colspan="2">'.$periodlink;
+	}
 	print '</td>';
 	print '</tr>';
 

htdocs/core/class/coreobject.class.php

Braces +49 added lines, -19 removed lines

@@ -63,11 +63,17 @@ 
 		{
 			foreach ($this->fields as $field=>$info)
 			{
-				if ($this->isDate($info)) $this->{$field} = time();
-				elseif ($this->isArray($info)) $this->{$field} = array();
-				elseif ($this->isInt($info)) $this->{$field} = (int) 0;
-				elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
-				else $this->{$field} = '';
+				if ($this->isDate($info)) {
+					$this->{$field} = time();
+				} elseif ($this->isArray($info)) {
+					$this->{$field} = array();
+				} elseif ($this->isInt($info)) {
+					$this->{$field} = (int) 0;
+				} elseif ($this->isFloat($info)) {
+					$this->{$field} = (double) 0;
+				} else {
+					$this->{$field} = '';
+				}
 			}
 
 			$this->to_delete = false;
@@ -107,7 +113,9 @@ 
 	{
 		$res = $this->fetchCommon($id);
 		if ($res > 0) {
-			if ($loadChild) $this->fetchChild();
+			if ($loadChild) {
+				$this->fetchChild();
+			}
 		}
 
 		return $res;
@@ -129,7 +137,9 @@ 
 		{
 			foreach ($this->{$tabName} as $k=>&$object)
 			{
-				if ($object->{$key} === $id) return $k;
+				if ($object->{$key} === $id) {
+					return $k;
+				}
 			}
 		}
 
@@ -222,7 +232,9 @@ 
 						$object->{$this->fk_element} = $this->id;
 
 						$object->update($user);
-						if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) unset($this->{$className}[$i]);
+						if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) {
+							unset($this->{$className}[$i]);
+						}
 					}
 				}
 			}
@@ -238,8 +250,13 @@ 
 	 */
 	public function update(User &$user)
 	{
-		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-		elseif (isset($this->to_delete) && $this->to_delete == true) return $this->delete($user);
+		if (empty($this->id)) {
+			return $this->create($user);
+		}
+		// To test, with that, no need to test on high level object, the core decide it, update just needed
+		elseif (isset($this->to_delete) && $this->to_delete == true) {
+			return $this->delete($user);
+		}
 
 		$error = 0;
 		$this->db->begin();
@@ -248,8 +265,11 @@ 
 		if ($res)
 		{
 			$result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user);
-			if ($result < 0) $error++;
-			else $this->saveChild($user);
+			if ($result < 0) {
+				$error++;
+			} else {
+				$this->saveChild($user);
+			}
 		} else {
 			$error++;
 			$this->error = $this->db->lasterror();
@@ -274,7 +294,9 @@ 
 	 */
 	public function create(User $user)
 	{
-		if ($this->id > 0) return $this->update($user);
+		if ($this->id > 0) {
+			return $this->update($user);
+		}
 
 		$error = 0;
 		$this->db->begin();
@@ -285,8 +307,11 @@ 
 			$this->id = $this->db->last_insert_id($this->table_element);
 
 			$result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user);
-			if ($result < 0) $error++;
-			else $this->saveChild($user);
+			if ($result < 0) {
+				$error++;
+			} else {
+				$this->saveChild($user);
+			}
 		} else {
 			$error++;
 			$this->error = $this->db->lasterror();
@@ -311,13 +336,17 @@ 
 	 */
 	public function delete(User &$user)
 	{
-		if ($this->id <= 0) return 0;
+		if ($this->id <= 0) {
+			return 0;
+		}
 
 		$error = 0;
 		$this->db->begin();
 
 		$result = $this->call_trigger(strtoupper($this->element).'_DELETE', $user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
 		if (!$error)
 		{
@@ -360,8 +389,9 @@ 
 	 */
 	public function getDate($field, $format = '')
 	{
-		if (empty($this->{$field})) return '';
-		else {
+		if (empty($this->{$field})) {
+			return '';
+		} else {
 			return dol_print_date($this->{$field}, $format);
 		}
 	}

htdocs/debugbar/class/autoloader.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
  * Simple autoloader, so we don't need Composer just for this.
  */
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
 	if (preg_match('/^DebugBar/', $class)) {
 		$file = DOL_DOCUMENT_ROOT.'/includes/maximebf/debugbar/src/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
 		//var_dump($class.' - '.file_exists($file).' - '.$file);

htdocs/variants/class/ProductCombination.class.php

Braces +6 added lines, -7 removed lines

@@ -167,8 +167,7 @@ 
 			 */
 			if ($fk_price_level > 0) {
 				$combination_price_levels[$fk_price_level] = ProductCombinationLevel::createFromParent($this->db, $this, $fk_price_level);
-			}
-			else {
+			} else {
 				for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 					$combination_price_levels[$i] = ProductCombinationLevel::createFromParent($this->db, $this, $i);
 				}
@@ -220,8 +219,7 @@ 
 
 		if ($error) {
 			return $error * -1;
-		}
-		else {
+		} else {
 			return 1;
 		}
 	}
@@ -320,7 +318,9 @@ 
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $nb = $obj->nb;
+			if ($obj) {
+				$nb = $obj->nb;
+			}
 		}
 
 		return $nb;
@@ -700,8 +700,7 @@ 
 		//Final price impact
 		if (!is_array($forced_pricevar)) {
 			$price_impact[1] = (float) $forced_pricevar; // If false, return 0
-		}
-		else {
+		} else {
 			$price_impact = $forced_pricevar;
 		}
 

htdocs/accountancy/admin/card.php

Braces +6 added lines, -2 removed lines

@@ -44,8 +44,12 @@
 $accountingaccount = GETPOST('accountingaccount', 'alpha');
 
 // Security check
-if ($user->socid > 0) accessforbidden();
-if (!$user->rights->accounting->chartofaccount) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if (!$user->rights->accounting->chartofaccount) {
+	accessforbidden();
+}
 
 
 $object = new AccountingAccount($db);

htdocs/ticket/class/ticket.class.php

Braces +46 added lines, -15 removed lines

@@ -363,7 +363,9 @@ 
 
 		// Clean parameters
 		$this->datec = dol_now();
-		if (empty($this->track_id)) $this->track_id = generate_random_id(16);
+		if (empty($this->track_id)) {
+			$this->track_id = generate_random_id(16);
+		}
 
 		// Check more parameters
 		// If error, this->errors[] is filled
@@ -944,7 +946,9 @@ 
 		if (!$error) {
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		// Removed extrafields
@@ -1265,7 +1269,10 @@ 
 		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 = '';
 
@@ -1281,8 +1288,12 @@ 
 		{
 			// 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';
+			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 = '';
@@ -1295,15 +1306,21 @@ 
 			}
 			$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>';
 
 		$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;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -2613,7 +2630,9 @@ 
 								}
 
 								if ($info_sendto['email'] != '') {
-									if (!empty($info_sendto['email'])) $sendto[] = trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email'].">";
+									if (!empty($info_sendto['email'])) {
+										$sendto[] = trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email'].">";
+									}
 
 									//Contact type
 									$recipient = dolGetFirstLastname($info_sendto['firstname'], $info_sendto['lastname'], '-1').' ('.strtolower($info_sendto['libelle']).')';
@@ -2629,7 +2648,9 @@ 
 
 							// Add global email address recipient
 							if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)) {
-								if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+								if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) {
+									$sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+								}
 							}
 
 							// altairis: dont try to send email if no recipient
@@ -2687,7 +2708,9 @@ 
 									}
 
 									if ($info_sendto['email'] != '' && $info_sendto['email'] != $object->origin_email) {
-										if (!empty($info_sendto['email'])) $sendto[] = trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email'].">";
+										if (!empty($info_sendto['email'])) {
+											$sendto[] = trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email'].">";
+										}
 
 										$recipient = dolGetFirstLastname($info_sendto['firstname'], $info_sendto['lastname'], '-1').' ('.strtolower($info_sendto['libelle']).')';
 										$message .= (!empty($recipient) ? $langs->trans('TicketNotificationRecipient').' : '.$recipient.'<br>' : '');
@@ -2712,12 +2735,16 @@ 
 								if ($object->fk_soc > 0 && !in_array($object->origin_email, $sendto)) {
 									$object->socid = $object->fk_soc;
 									$object->fetch_thirdparty();
-									if (!empty($object->thirdparty->email)) $sendto[] = $object->thirdparty->email;
+									if (!empty($object->thirdparty->email)) {
+										$sendto[] = $object->thirdparty->email;
+									}
 								}
 
 								// altairis: Add global email address reciepient
 								if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)) {
-									if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+									if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) {
+										$sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+									}
 								}
 
 								// altairis: dont try to send email when no recipient
@@ -2853,8 +2880,12 @@ 
 			$clause = " AND";
 		}
 		$sql .= $clause." p.entity IN (".getEntity('ticket').")";
-		if ($mode == 'opened') $sql .= " AND p.fk_statut NOT IN (".Ticket::STATUS_CLOSED.", ".Ticket::STATUS_CANCELED.")";
-		if ($user->socid) $sql .= " AND p.fk_soc = ".$user->socid;
+		if ($mode == 'opened') {
+			$sql .= " AND p.fk_statut NOT IN (".Ticket::STATUS_CLOSED.", ".Ticket::STATUS_CANCELED.")";
+		}
+		if ($user->socid) {
+			$sql .= " AND p.fk_soc = ".$user->socid;
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)

htdocs/core/boxes/box_graph_product_distribution.php

Braces +47 added lines, -17 removed lines

@@ -102,17 +102,31 @@ 
 			$showordernb = $tmparray['showordernb'];
 		}
 		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb = 1; $showinvoicenb = 1; $showordernb = 1; }
-		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb = 0;
-		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb = 0;
-		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb = 0;
+		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) {
+			$showinvoicenb = 0;
+		}
+		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) {
+			$showpropalnb = 0;
+		}
+		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) {
+			$showordernb = 0;
+		}
 
 		$nowarray = dol_getdate(dol_now(), true);
-		if (empty($year)) $year = $nowarray['year'];
+		if (empty($year)) {
+			$year = $nowarray['year'];
+		}
 
 		$nbofgraph = 0;
-		if ($showinvoicenb) $nbofgraph++;
-		if ($showpropalnb)  $nbofgraph++;
-		if ($showordernb)   $nbofgraph++;
+		if ($showinvoicenb) {
+			$nbofgraph++;
+		}
+		if ($showpropalnb) {
+			$nbofgraph++;
+		}
+		if ($showordernb) {
+			$nbofgraph++;
+		}
 
 		$text = $langs->trans("BoxProductDistribution", $max).' - '.$langs->trans("Year").': '.$year;
 		$this->info_box_head = array(
@@ -170,7 +184,9 @@ 
 					$px2->SetData($data2);
 					unset($data2);
 
-					if ($nocolor) $px2->SetDataColor(array(array(220, 220, 220)));
+					if ($nocolor) {
+						$px2->SetDataColor(array(array(220, 220, 220)));
+					}
 					$px2->SetLegend($legend);
 					$px2->setShowLegend(2);
 					$px2->setShowPointValue($showpointvalue);
@@ -230,7 +246,9 @@ 
 					$px3->SetData($data3);
 					unset($data3);
 
-					if ($nocolor) $px3->SetDataColor(array(array(220, 220, 220)));
+					if ($nocolor) {
+						$px3->SetDataColor(array(array(220, 220, 220)));
+					}
 					$px3->SetLegend($legend);
 					$px3->setShowLegend(2);
 					$px3->setShowPointValue($showpointvalue);
@@ -291,7 +309,9 @@ 
 					$px1->SetData($data1);
 					unset($data1);
 
-					if ($nocolor) $px1->SetDataColor(array(array(220, 220, 220)));
+					if ($nocolor) {
+						$px1->SetDataColor(array(array(220, 220, 220)));
+					}
 					$px1->SetLegend($legend);
 					$px1->setShowLegend(2);
 					$px1->setShowPointValue($showpointvalue);
@@ -362,18 +382,28 @@ 
 
 			if ($nbofgraph == 1)
 			{
-				if ($showpropalnb) $stringtoshow .= $px2->show();
-				elseif ($showordernb) $stringtoshow .= $px3->show();
-				else $stringtoshow .= $px1->show();
+				if ($showpropalnb) {
+					$stringtoshow .= $px2->show();
+				} elseif ($showordernb) {
+					$stringtoshow .= $px3->show();
+				} else {
+					$stringtoshow .= $px1->show();
+				}
 			}
 			if ($nbofgraph == 2)
 			{
 				$stringtoshow .= '<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				if ($showpropalnb) $stringtoshow .= $px2->show();
-				elseif ($showordernb) $stringtoshow .= $px3->show();
+				if ($showpropalnb) {
+					$stringtoshow .= $px2->show();
+				} elseif ($showordernb) {
+					$stringtoshow .= $px3->show();
+				}
 				$stringtoshow .= '</div><div class="fichehalfright">';
-				if ($showinvoicenb) $stringtoshow .= $px1->show();
-				elseif ($showordernb) $stringtoshow .= $px3->show();
+				if ($showinvoicenb) {
+					$stringtoshow .= $px1->show();
+				} elseif ($showordernb) {
+					$stringtoshow .= $px3->show();
+				}
 				$stringtoshow .= '</div></div></div>';
 			}
 			if ($nbofgraph == 3)