Dolibarr / dolibarr

htdocs/core/modules/printing/printgcp.modules.php

Braces +3 added lines, -1 removed lines

@@ -216,7 +216,9 @@
 			if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
 			{
 				$html .= img_picto($langs->trans("Default"), 'on');
-			} else $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			} else {
+				$html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			}
 			$html .= '</td>';
 			$html .= '</tr>'."\n";
 		}

htdocs/core/modules/modCommande.class.php

Braces +6 added lines, -2 removed lines

@@ -247,7 +247,9 @@ 
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
@@ -262,7 +264,9 @@ 
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('commande').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		}
 		// Imports
 		//--------
 		$r = 0;

htdocs/core/modules/modMrp.class.php

Braces +4 added lines, -1 removed lines

@@ -317,7 +317,10 @@
 		global $conf, $langs;
 
 		$result = $this->_load_tables('/mrp/sql/');
-		if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		if ($result < 0) {
+			return -1;
+		}
+		// Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
 
 		// Create extrafields during init
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

htdocs/core/class/commondocgenerator.class.php

Spacing +1 added lines, -1 removed lines

@@ -1288,7 +1288,7 @@
 		if (!empty($fields))
 		{
 			// Sort extrafields by rank
-			uasort($fields, function ($a, $b) {
+			uasort($fields, function($a, $b) {
 				return  ($a->rank > $b->rank) ? 1 : -1;
 			});
 

Braces +48 added lines, -17 removed lines

@@ -325,8 +325,11 @@ 
 
 		foreach ($conf->global as $key => $val)
 		{
-			if (isASecretKey($key)) $newval = '*****forbidden*****';
-			else $newval = $val;
+			if (isASecretKey($key)) {
+				$newval = '*****forbidden*****';
+			} else {
+				$newval = $val;
+			}
 			$array_other['__['.$key.']__'] = $newval;
 		}
 
@@ -473,12 +476,16 @@ 
 			foreach ($object->lines as $line)
 			{
 				// $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward compatibility
-				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) {
+					$resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+				}
 				$resarray[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx] = price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
 				// $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
 				$vatformated = vatrate($line->tva_tx);
-				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated] = 0;
+				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) {
+					$resarray[$array_key.'_total_vat_'.$vatformated] = 0;
+				}
 				$resarray[$array_key.'_total_vat_'.$vatformated] += $line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$vatformated] = price($resarray[$array_key.'_total_vat_'.$vatformated]);
 
@@ -626,8 +633,9 @@ 
 		{
 			$tmpproduct = new Product($this->db);
 			$result = $tmpproduct->fetch($line->fk_product);
-			foreach ($tmpproduct->array_options as $key=>$label)
-				$resarray["line_product_".$key] = $label;
+			foreach ($tmpproduct->array_options as $key=>$label) {
+							$resarray["line_product_".$key] = $label;
+			}
 		}
 
 		return $resarray;
@@ -677,7 +685,9 @@ 
 		// Add vat by rates
 		foreach ($object->lines as $line)
 		{
-			if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+			if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) {
+				$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+			}
 			$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
 		}
 
@@ -877,9 +887,13 @@ 
 	 */
 	public function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
 	{
-		if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
+		if (empty($hidetop) || $hidetop == -1) {
+			$pdf->line($x, $y, $x + $l, $y);
+		}
 		$pdf->line($x + $l, $y, $x + $l, $y + $h);
-		if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
+		if (empty($hidebottom)) {
+			$pdf->line($x + $l, $y + $h, $x, $y + $h);
+		}
 		$pdf->line($x, $y + $h, $x, $y);
 	}
 
@@ -932,7 +946,10 @@ 
 		$countFlexCol = 0;
 		foreach ($this->cols as $colKey =>& $colDef)
 		{
-			if (!$this->getColumnStatus($colKey)) continue; // continue if disabled
+			if (!$this->getColumnStatus($colKey)) {
+				continue;
+			}
+			// continue if disabled
 
 			if (!empty($colDef['scale'])) {
 				// In case of column width is defined by percentage
@@ -1011,7 +1028,9 @@ 
 	 */
 	public function getColumnRank($colKey)
 	{
-		if (!isset($this->cols[$colKey]['rank'])) return -1;
+		if (!isset($this->cols[$colKey]['rank'])) {
+			return -1;
+		}
 		return  $this->cols[$colKey]['rank'];
 	}
 
@@ -1078,10 +1097,14 @@ 
 			'pdf' => &$pdf,
 		);
 		$reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
 		if (!$reshook)
 		{
-			if (empty($columnText)) return;
+			if (empty($columnText)) {
+				return;
+			}
 			$pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
 			$colDef = $this->cols[$colKey];
 			// save curent cell padding
@@ -1183,7 +1206,9 @@ 
 			'extrafieldOutputContent' =>& $extrafieldOutputContent
 		);
 		$reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
 		if ($reshook)
 		{
 			$extrafieldOutputContent = $hookmanager->resPrint;
@@ -1380,7 +1405,9 @@ 
 	{
 		if (!empty($this->cols[$colKey]['status'])) {
 			return true;
-		} else return  false;
+		} else {
+			return  false;
+		}
 	}
 
 	/**
@@ -1411,7 +1438,9 @@ 
 			if ($reshook < 0) {
 				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 			} elseif (empty($reshook)) {
-				if (!$this->getColumnStatus($colKey)) continue;
+				if (!$this->getColumnStatus($colKey)) {
+					continue;
+				}
 
 				// get title label
 				$colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
@@ -1508,7 +1537,9 @@ 
 				if (!$enabled) { continue; } // don't wast resourses if we don't need them...
 
 				// Load language if required
-				if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
+				if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) {
+					$outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
+				}
 
 				// TODO : add more extrafield customisation capacities for PDF like width, rank...
 

htdocs/core/class/menubase.class.php

Braces +61 added lines, -21 removed lines

@@ -173,7 +173,9 @@ 
 		global $conf, $langs;
 
 		// Clean parameters
-		if (!isset($this->enabled)) $this->enabled = '1';
+		if (!isset($this->enabled)) {
+			$this->enabled = '1';
+		}
 		$this->menu_handler = trim($this->menu_handler);
 		$this->module = trim($this->module);
 		$this->type = trim($this->type);
@@ -190,11 +192,17 @@ 
 		$this->perms = trim($this->perms);
 		$this->enabled = trim($this->enabled);
 		$this->user = (int) $this->user;
-		if (empty($this->position)) $this->position = 0;
-		if (!$this->level) $this->level = 0;
+		if (empty($this->position)) {
+			$this->position = 0;
+		}
+		if (!$this->level) {
+			$this->level = 0;
+		}
 
 		// Check parameters
-		if (empty($this->menu_handler)) return -1;
+		if (empty($this->menu_handler)) {
+			return -1;
+		}
 
 		// For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql
 		// may use an already used value because its internal cursor does not increase when we do
@@ -208,13 +216,19 @@ 
 				$maxrowid = $obj->maxrowid;
 
 				// Max rowid can be empty if there is no record yet
-				if (empty($maxrowid)) $maxrowid = 1;
+				if (empty($maxrowid)) {
+					$maxrowid = 1;
+				}
 
 				$sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
 				//print $sql; exit;
 				$resqlrowidset = $this->db->query($sql);
-				if (!$resqlrowidset) dol_print_error($this->db);
-			} else dol_print_error($this->db);
+				if (!$resqlrowidset) {
+					dol_print_error($this->db);
+				}
+			} else {
+				dol_print_error($this->db);
+			}
 		}
 
 		// Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
@@ -231,10 +245,12 @@ 
 		{
 			$row = $this->db->fetch_row($result);
 
-			if ($row[0] == 0)   // If not found
+			if ($row[0] == 0) {
+				// If not found
 			{
 				// Insert request
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
+			}
 				$sql .= "menu_handler,";
 				$sql .= "entity,";
 				$sql .= "module,";
@@ -507,7 +523,9 @@ 
 		$newTabMenu = array();
 		foreach ($tabMenu as $val)
 		{
-			if ($val['type'] == 'top') $newTabMenu[] = $val;
+			if ($val['type'] == 'top') {
+				$newTabMenu[] = $val;
+			}
 		}
 
 		return $newTabMenu;
@@ -555,7 +573,8 @@ 
 		foreach ($tabMenu as $key => $val)
 		{
 			//var_dump($tabMenu);
-			if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
+			if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu) {
+				// We found a menu entry not linked to parent with good mainmenu
 			{
 				//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
 				//var_dump($this->newmenu->liste);exit;
@@ -563,6 +582,7 @@ 
 				if (empty($val['fk_leftmenu']))
 				{
 					$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+			}
 					//var_dump($this->newmenu->liste);
 				} else {
 					// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
@@ -570,9 +590,11 @@ 
 					foreach ($this->newmenu->liste as $keyparent => $valparent)
 					{
 						//var_dump($valparent);
-						if ($searchlastsub)    // If we started to search for last submenu
+						if ($searchlastsub) {
+							// If we started to search for last submenu
 						{
 							if ($valparent['level'] >= $searchlastsub) $lastid = $keyparent;
+						}
 							if ($valparent['level'] < $searchlastsub)
 							{
 								$nextid = $keyparent;
@@ -589,8 +611,9 @@ 
 						}
 					}
 					//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
-					if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
-					else {
+					if ($found) {
+						$this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+					} else {
 						dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);
 						//print "Parent menu not found !!<br>";
 					}
@@ -624,8 +647,12 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
 		$sql .= " WHERE m.entity IN (0,".$conf->entity.")";
 		$sql .= " AND m.menu_handler IN ('".$this->db->escape($menu_handler)."','all')";
-		if ($type_user == 0) $sql .= " AND m.usertype IN (0,2)";
-		if ($type_user == 1) $sql .= " AND m.usertype IN (1,2)";
+		if ($type_user == 0) {
+			$sql .= " AND m.usertype IN (0,2)";
+		}
+		if ($type_user == 1) {
+			$sql .= " AND m.usertype IN (1,2)";
+		}
 		$sql .= " ORDER BY m.position, m.rowid";
 		//print $sql;
 
@@ -647,7 +674,10 @@ 
 				if (isset($menu['perms']))
 				{
 					$tmpcond = $menu['perms'];
-					if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
+					if ($leftmenu == 'all') {
+						$tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond);
+					}
+					// Force part of condition to true
 					$perms = verifCond($tmpcond);
 					//print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
 				}
@@ -657,7 +687,10 @@ 
 				if (isset($menu['enabled']))
 				{
 					$tmpcond = $menu['enabled'];
-					if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
+					if ($leftmenu == 'all') {
+						$tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond);
+					}
+					// Force part of condition to true
 					$enabled = verifCond($tmpcond);
 				}
 
@@ -666,20 +699,24 @@ 
 				{
 					$title = $langs->trans($menu['titre']); // If $menu['titre'] start with $, a dol_eval is done.
 					//var_dump($title.'-'.$menu['titre']);
-					if ($title == $menu['titre'])   // Translation not found
+					if ($title == $menu['titre']) {
+						// Translation not found
 					{
 						if (!empty($menu['langs']))    // If there is a dedicated translation file
 						{
 							//print 'Load file '.$menu['langs'].'<br>';
 							$langs->load($menu['langs']);
+					}
 						}
 
 						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
 						$menu['titre'] = make_substitutions($menu['titre'], $substitarray);
 
-						if (preg_match("/\//", $menu['titre'])) // To manage translation when title is string1/string2
+						if (preg_match("/\//", $menu['titre'])) {
+							// To manage translation when title is string1/string2
 						{
 							$tab_titre = explode("/", $menu['titre']);
+						}
 							$title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
 						} elseif (preg_match('/\|\|/', $menu['titre']))
 						{
@@ -702,8 +739,11 @@ 
 					$tabMenu[$b]['url']         = $menu['url'];
 					if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url']))
 					{
-						if (preg_match('/\?/', $tabMenu[$b]['url'])) $tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];
-						else $tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];
+						if (preg_match('/\?/', $tabMenu[$b]['url'])) {
+							$tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];
+						} else {
+							$tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];
+						}
 					}
 					$tabMenu[$b]['titre']       = $title;
 					$tabMenu[$b]['target']      = $menu['target'];

htdocs/core/boxes/box_activity.php

Braces +33 added lines, -12 removed lines

@@ -88,7 +88,9 @@ 
 		$now = dol_now();
 		$nbofperiod = 3;
 
-		if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
+		if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) {
+			$nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
+		}
 		$textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
 		$this->info_box_head = array(
 			'text' => $textHead,
@@ -113,12 +115,18 @@ 
 			{
 				$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
 				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				if (!$user->rights->societe->client->voir && !$user->socid) {
+					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				}
 				$sql .= ")";
 				$sql .= " WHERE p.entity IN (".getEntity('propal').")";
 				$sql .= " AND p.fk_soc = s.rowid";
-				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				if (!$user->rights->societe->client->voir && !$user->socid) {
+					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				}
+				if ($user->socid) {
+					$sql .= " AND s.rowid = ".$user->socid;
+				}
 				$sql .= " AND p.datep >= '".$this->db->idate($tmpdate)."'";
 				$sql .= " AND p.date_cloture IS NULL"; // just unclosed
 				$sql .= " GROUP BY p.fk_statut";
@@ -200,12 +208,18 @@ 
 			if ($refresh) {
 				$sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
 				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				if (!$user->rights->societe->client->voir && !$user->socid) {
+					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				}
 				$sql .= ")";
 				$sql .= " WHERE c.entity IN (".getEntity('commande').")";
 				$sql .= " AND c.fk_soc = s.rowid";
-				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				if (!$user->rights->societe->client->voir && !$user->socid) {
+					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				}
+				if ($user->socid) {
+					$sql .= " AND s.rowid = ".$user->socid;
+				}
 				$sql .= " AND c.date_commande >= '".$this->db->idate($tmpdate)."'";
 				$sql .= " GROUP BY c.fk_statut";
 				$sql .= " ORDER BY c.fk_statut DESC";
@@ -284,11 +298,17 @@ 
 			{
 				$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
 				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				if (!$user->rights->societe->client->voir && !$user->socid) {
+					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				}
 				$sql .= ")";
 				$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
-				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				if (!$user->rights->societe->client->voir && !$user->socid) {
+					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				}
+				if ($user->socid) {
+					$sql .= " AND s.rowid = ".$user->socid;
+				}
 				$sql .= " AND f.fk_soc = s.rowid";
 				$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=1";
 				$sql .= " GROUP BY f.fk_statut";
@@ -351,11 +371,12 @@ 
 					$line++;
 					$j++;
 				}
-				if (count($data) == 0)
-					$this->info_box_contents[$line][0] = array(
+				if (count($data) == 0) {
+									$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
 						'text'=>$langs->trans("NoRecordedInvoices"),
 					);
+				}
 			}
 
 			// part 2

htdocs/admin/ecm_directories_extrafields.php

Braces +2 added lines, -1 removed lines

@@ -33,8 +33,9 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'ecm'));

htdocs/admin/defaultvalues.php

Braces +70 added lines, -26 removed lines

@@ -34,7 +34,9 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'products', 'admin', 'sms', 'other', 'errors'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $id = GETPOST('rowid', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -50,8 +52,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'page,param';
-if (!$sortorder) $sortorder = 'ASC';
+if (!$sortfield) {
+	$sortfield = 'page,param';
+}
+if (!$sortorder) {
+	$sortorder = 'ASC';
+}
 
 $defaulturl = GETPOST('defaulturl', 'alphanohtml');
 $defaultkey = GETPOST('defaultkey', 'alphanohtml');
@@ -76,14 +82,18 @@ 
 
 $parameters = array('socid'=>$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 ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// All tests are required to be compatible with all browsers
 {
 	$defaulturl = '';
+}
 	$defaultkey = '';
 	$defaultvalue = '';
 	$toselect = '';
@@ -92,9 +102,12 @@ 
 
 if ($action == 'setMAIN_ENABLE_DEFAULT_VALUES')
 {
-	if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
-	else dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
-}
+	if (GETPOST('value')) {
+		dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
+	} else {
+		dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
+	}
+	}
 
 if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('actionmodify'))
 {
@@ -205,16 +218,30 @@ 
 print '<span class="opacitymedium">'.$langs->trans("DefaultValuesDesc")."</span><br>\n";
 print "<br>\n";
 
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-if ($defaulturl)      $param .= '&defaulturl='.urlencode($defaulturl);
-if ($defaultkey)      $param .= '&defaultkey='.urlencode($defaultkey);
-if ($defaultvalue)    $param .= '&defaultvalue='.urlencode($defaultvalue);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+if ($defaulturl) {
+	$param .= '&defaulturl='.urlencode($defaulturl);
+}
+if ($defaultkey) {
+	$param .= '&defaultkey='.urlencode($defaultkey);
+}
+if ($defaultvalue) {
+	$param .= '&defaultvalue='.urlencode($defaultvalue);
+}
 
 
 print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug) ? '?debug=1' : '').'" method="POST">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -244,8 +271,11 @@ 
 print '<tr class="liste_titre">';
 // Page
 $texthelp = $langs->trans("PageUrlForDefaultValues");
-if ($mode == 'createform') $texthelp .= $langs->trans("PageUrlForDefaultValuesCreate", 'societe/card.php', 'societe/card.php?abc=val1&def=val2');
-else $texthelp .= $langs->trans("PageUrlForDefaultValuesList", 'societe/list.php', 'societe/list.php?abc=val1&def=val2');
+if ($mode == 'createform') {
+	$texthelp .= $langs->trans("PageUrlForDefaultValuesCreate", 'societe/card.php', 'societe/card.php?abc=val1&def=val2');
+} else {
+	$texthelp .= $langs->trans("PageUrlForDefaultValuesList", 'societe/list.php', 'societe/list.php?abc=val1&def=val2');
+}
 $texthelp .= '<br><br>'.$langs->trans("AlsoDefaultValuesAreEffectiveForActionCreate");
 $texturl = $form->textwithpicto($langs->trans("RelativeURL"), $texthelp);
 print_liste_field_titre($texturl, $_SERVER["PHP_SELF"], 'page,param', '', $param, '', $sortfield, $sortorder);
@@ -279,8 +309,11 @@ 
 	print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
 }
 // Entity
-if (!empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,page', '', $param, '', $sortfield, $sortorder);
-else print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($conf->multicompany->enabled) && !$user->entity) {
+	print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,page', '', $param, '', $sortfield, $sortorder);
+} else {
+	print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+}
 // Actions
 print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
 print "</tr>\n";
@@ -318,7 +351,9 @@ 
 }
 print '<td class="center">';
 $disabled = '';
-if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled = ' disabled="disabled"';
+if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) {
+	$disabled = ' disabled="disabled"';
+}
 print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add">';
 print "</td>\n";
 print '</tr>';
@@ -348,14 +383,20 @@ 
 
 		// Page
 		print '<td>';
-		if ($action != 'edit' || GETPOST('rowid', 'int') != $obj->rowid) print $obj->page;
-		else print '<input type="text" name="urlpage" value="'.dol_escape_htmltag($obj->page).'">';
+		if ($action != 'edit' || GETPOST('rowid', 'int') != $obj->rowid) {
+			print $obj->page;
+		} else {
+			print '<input type="text" name="urlpage" value="'.dol_escape_htmltag($obj->page).'">';
+		}
 		print '</td>'."\n";
 
 		// Field
 		print '<td>';
-		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->param;
-		else print '<input type="text" name="key" value="'.dol_escape_htmltag($obj->param).'">';
+		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) {
+			print $obj->param;
+		} else {
+			print '<input type="text" name="key" value="'.dol_escape_htmltag($obj->param).'">';
+		}
 		print '</td>'."\n";
 
 		// Value
@@ -367,8 +408,11 @@ 
     		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
     		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
     		*/
-			if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print dol_escape_htmltag($obj->value);
-			else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
+			if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) {
+				print dol_escape_htmltag($obj->value);
+			} else {
+				print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
+			}
 			print '</td>';
 		}
 

htdocs/admin/oauthlogintokens.php

Braces +27 added lines, -9 removed lines

@@ -32,7 +32,9 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'printing', 'oauth'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha');
@@ -40,9 +42,13 @@ 
 $varname = GETPOST('varname', 'alpha');
 $driver = GETPOST('driver', 'alpha');
 
-if (!empty($driver)) $langs->load($driver);
+if (!empty($driver)) {
+	$langs->load($driver);
+}
 
-if (!$mode) $mode = 'setup';
+if (!$mode) {
+	$mode = 'setup';
+}
 
 
 /*
@@ -72,7 +78,9 @@ 
 		$constnote = dol_escape_htmltag($setupconst['note']);
 
 		$result = dolibarr_set_const($db, $constname, $constvalue, $consttype, 0, $constnote, $conf->entity);
-		if (!$result > 0) $error++;
+		if (!$result > 0) {
+			$error++;
+		}
 	}
 
 	if (!$error)
@@ -91,7 +99,9 @@ 
 	$db->begin();
 
 	$result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) $error++;
+	if (!$result > 0) {
+		$error++;
+	}
 
 	if (!$error)
 	{
@@ -136,8 +146,13 @@ 
 	foreach ($list as $key)
 	{
 		$supported = 0;
-		if (in_array($key[0], array_keys($supportedoauth2array))) $supported = 1;
-		if (!$supported) continue; // show only supported
+		if (in_array($key[0], array_keys($supportedoauth2array))) {
+			$supported = 1;
+		}
+		if (!$supported) {
+			continue;
+		}
+		// show only supported
 
 
 		$OAUTH_SERVICENAME = 'Unknown';
@@ -255,8 +270,11 @@ 
 		print $langs->trans("IsTokenGenerated");
 		print '</td>';
 		print '<td>';
-		if (is_object($tokenobj)) print $langs->trans("HasAccessToken");
-		else print $langs->trans("NoAccessToken");
+		if (is_object($tokenobj)) {
+			print $langs->trans("HasAccessToken");
+		} else {
+			print $langs->trans("NoAccessToken");
+		}
 		print '</td>';
 		print '<td>';
 		// Links to delete/checks token