alxarafe / alixar

dolibarr/htdocs/expedition/contact.php

Braces +8 added lines, -6 removed lines

@@ -42,7 +42,9 @@ 
 $action=GETPOST('action','alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'expedition', $id,'');
 
 $object = new Expedition($db);
@@ -87,8 +89,7 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
+	} else
 	{
 		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
@@ -117,8 +118,7 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -263,7 +263,9 @@ 
 	foreach($dirtpls as $reldir)
 	{
 	    $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-	    if ($res) break;
+	    if ($res) {
+	        break;
+	    }
 	}
 }
 

dolibarr/htdocs/expedition/list.php

Braces +208 added lines, -71 removed lines

@@ -38,7 +38,9 @@ 
 $socid=GETPOST('socid','int');
 // Security check
 $expeditionid = GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'expedition',$expeditionid,'');
 
 $diroutputmassaction=$conf->expedition->dir_output . '/temp/massgeneration/'.$user->id;
@@ -60,8 +62,12 @@ 
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
-if (! $sortfield) $sortfield="e.ref";
-if (! $sortorder) $sortorder="DESC";
+if (! $sortfield) {
+    $sortfield="e.ref";
+}
+if (! $sortorder) {
+    $sortorder="DESC";
+}
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -85,7 +91,9 @@ 
 	's.nom'=>"ThirdParty",
 	'e.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["e.note_private"]="NotePrivate";
+if (empty($user->socid)) {
+    $fieldstosearchall["e.note_private"]="NotePrivate";
+}
 
 $checkedtypetiers=0;
 $arrayfields=array(
@@ -111,7 +119,9 @@ 
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		if (! empty($extrafields->attribute_list[$key])) {
+		    $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		}
 	}
 }
 
@@ -125,14 +135,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
 {
 	$search_ref_exp='';
+}
 	$search_ref_liv='';
 	$search_ref_customer='';
 	$search_company='';
@@ -185,27 +199,35 @@ 
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= ' e.date_creation as date_creation, e.tms as date_update';
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) {
+    $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+}
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expedition_extrafields as ef on (e.rowid = ef.fk_object)";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expedition_extrafields as ef on (e.rowid = ef.fk_object)";
+}
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target";
-if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
+if (!$user->rights->societe->client->voir && !$socid) {
+    // Internal user with no permission to see all
 {
 	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
+}
 $sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
+if (!$user->rights->societe->client->voir && !$socid) {
+    // Internal user with no permission to see all
 {
 	$sql.= " AND e.fk_soc = sc.fk_soc";
+}
 	$sql.= " AND sc.fk_user = " .$user->id;
 }
 if ($socid)
@@ -215,17 +237,39 @@ 
 if ($viewstatut <> '' && $viewstatut >= 0) {
 	$sql.= " AND e.fk_statut = ".$viewstatut;
 }
-if ($search_ref_customer != '') $sql.=natural_search('e.ref_customer', $search_ref_customer);
-if ($search_billed != '' && $search_billed >= 0) $sql.=' AND e.billed = '.$search_billed;
-if ($search_town)  $sql.= natural_search('s.town', $search_town);
-if ($search_zip)   $sql.= natural_search("s.zip",$search_zip);
-if ($search_state) $sql.= natural_search("state.nom",$search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
-if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
-if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv);
-if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_ref_customer != '') {
+    $sql.=natural_search('e.ref_customer', $search_ref_customer);
+}
+if ($search_billed != '' && $search_billed >= 0) {
+    $sql.=' AND e.billed = '.$search_billed;
+}
+if ($search_town) {
+    $sql.= natural_search('s.town', $search_town);
+}
+if ($search_zip) {
+    $sql.= natural_search("s.zip",$search_zip);
+}
+if ($search_state) {
+    $sql.= natural_search("state.nom",$search_state);
+}
+if ($search_country) {
+    $sql .= " AND s.fk_pays IN (".$search_country.')';
+}
+if ($search_type_thirdparty) {
+    $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+}
+if ($search_ref_exp) {
+    $sql .= natural_search('e.ref', $search_ref_exp);
+}
+if ($search_ref_liv) {
+    $sql .= natural_search('l.ref', $search_ref_liv);
+}
+if ($search_company) {
+    $sql .= natural_search('s.nom', $search_company);
+}
+if ($sall) {
+    $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -242,9 +286,11 @@ 
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+	    // if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -260,17 +306,39 @@ 
 	$expedition = new Expedition($db);
 
 	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($sall) $param.= "&amp;sall=".urlencode($sall);
-	if ($search_ref_exp)  $param.= "&amp;search_ref_exp=".urlencode($search_ref_exp);
-	if ($search_ref_liv)  $param.= "&amp;search_ref_liv=".urlencode($search_ref_liv);
-	if ($search_ref_customer) $param.= "&amp;search_ref_customer=".urlencode($search_ref_customer);
-	if ($search_company)   $param.= "&amp;search_company=".urlencode($search_company);
-	if ($search_town)      $param.= '&search_town='.urlencode($search_town);
-	if ($search_zip)       $param.= '&search_zip='.urlencode($search_zip);
-	if ($viewstatut != '') $param.= '&viewstatut='.urlencode($viewstatut);
-	if ($optioncss != '')  $param.='&amp;optioncss='.urlencode($optioncss);
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	    $param.='&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+	    $param.='&limit='.urlencode($limit);
+	}
+	if ($sall) {
+	    $param.= "&amp;sall=".urlencode($sall);
+	}
+	if ($search_ref_exp) {
+	    $param.= "&amp;search_ref_exp=".urlencode($search_ref_exp);
+	}
+	if ($search_ref_liv) {
+	    $param.= "&amp;search_ref_liv=".urlencode($search_ref_liv);
+	}
+	if ($search_ref_customer) {
+	    $param.= "&amp;search_ref_customer=".urlencode($search_ref_customer);
+	}
+	if ($search_company) {
+	    $param.= "&amp;search_company=".urlencode($search_company);
+	}
+	if ($search_town) {
+	    $param.= '&search_town='.urlencode($search_town);
+	}
+	if ($search_zip) {
+	    $param.= '&search_zip='.urlencode($search_zip);
+	}
+	if ($viewstatut != '') {
+	    $param.= '&viewstatut='.urlencode($viewstatut);
+	}
+	if ($optioncss != '') {
+	    $param.='&amp;optioncss='.urlencode($optioncss);
+	}
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -286,7 +354,9 @@ 
 
 	$i = 0;
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-	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="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -298,7 +368,9 @@ 
 
 	if ($sall)
 	{
-		foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+		foreach($fieldstosearchall as $key => $val) {
+		    $fieldstosearchall[$key]=$langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 	}
 
@@ -343,9 +415,13 @@ 
 		print '</td>';
 	}
 	// Town
-	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	if (! empty($arrayfields['s.town']['checked'])) {
+	    print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	}
 	// Zip
-	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+	if (! empty($arrayfields['s.zip']['checked'])) {
+	    print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+	}
 	// State
 	if (! empty($arrayfields['state.nom']['checked']))
 	{
@@ -425,17 +501,39 @@ 
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
-	if (! empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.ref']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['e.ref_customer']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['s.nom']['checked'])) {
+	    print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['s.town']['checked'])) {
+	    print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['s.zip']['checked'])) {
+	    print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['state.nom']['checked'])) {
+	    print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['country.code_iso']['checked'])) {
+	    print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['typent.code']['checked'])) {
+	    print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['e.date_delivery']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['l.ref']['checked'])) {
+	    print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['l.date_delivery']['checked'])) {
+	    print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+	}
 	// Extra fields
 	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
@@ -445,7 +543,9 @@ 
 			{
 				$align=$extrafields->getAlignFlag($key);
 				$sortonfield = "ef.".$key;
-				if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+				if (! empty($extrafields->attribute_computed[$key])) {
+				    $sortonfield='';
+				}
 				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
 			}
 		}
@@ -454,10 +554,18 @@ 
 	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (! empty($arrayfields['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'],$_SERVER["PHP_SELF"],"e.billed","",$param,'align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['e.datec']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['e.tms']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['e.fk_statut']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	}
+	if (! empty($arrayfields['e.billed']['checked'])) {
+	    print_liste_field_titre($arrayfields['e.billed']['label'],$_SERVER["PHP_SELF"],"e.billed","",$param,'align="center"',$sortfield,$sortorder);
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -483,7 +591,9 @@ 
 			print "<td>";
 			print $shipment->getNomUrl(1);
 			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 
 		// Ref customer
@@ -492,7 +602,9 @@ 
 			print "<td>";
 			print $obj->ref_customer;
 			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 
 		// Third party
@@ -501,7 +613,9 @@ 
 			print '<td>';
 			print $companystatic->getNomUrl(1);
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 		// Town
 		if (! empty($arrayfields['s.town']['checked']))
@@ -509,7 +623,9 @@ 
 			print '<td class="nocellnopadd">';
 			print $obj->town;
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 		// Zip
 		if (! empty($arrayfields['s.zip']['checked']))
@@ -517,13 +633,17 @@ 
 			print '<td class="nocellnopadd">';
 			print $obj->zip;
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 		// State
 		if (! empty($arrayfields['state.nom']['checked']))
 		{
 			print "<td>".$obj->state_name."</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 		// Country
 		if (! empty($arrayfields['country.code_iso']['checked']))
@@ -532,16 +652,22 @@ 
 			$tmparray=getCountry($obj->fk_pays,'all');
 			print $tmparray['label'];
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 		// Type ent
 		if (! empty($arrayfields['typent.code']['checked']))
 		{
 			print '<td align="center">';
-			if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+			if (count($typenArray)==0) {
+			    $typenArray = $formcompany->typent_array(1);
+			}
 			print $typenArray[$obj->typent_code];
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 
 		// Date delivery planed
@@ -560,7 +686,9 @@ 
 		{
 			$shipment->fetchObjectLinked($shipment->id,$shipment->element);
 			$receiving='';
-			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) $receiving=reset($shipment->linkedObjects['delivery']);
+			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) {
+			    $receiving=reset($shipment->linkedObjects['delivery']);
+			}
 
 			if (! empty($arrayfields['l.ref']['checked']))
 			{
@@ -591,7 +719,9 @@ 
 			print '<td align="center" class="nowrap">';
 			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 		// Date modification
 		if (! empty($arrayfields['e.tms']['checked']))
@@ -599,24 +729,32 @@ 
 			print '<td align="center" class="nowrap">';
 			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 		// Status
 		if (! empty($arrayfields['e.fk_statut']['checked']))
 		{
 			print '<td align="right" class="nowrap">'.$shipment->LibStatut($obj->fk_statut,5).'</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 		// Billed
 		if (! empty($arrayfields['e.billed']['checked']))
 		{
 			print '<td align="center">'.yn($obj->billed).'</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 		}
 
 		// Action column
 		print '<td></td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 
 		print "</tr>\n";
 
@@ -627,8 +765,7 @@ 
 	print "</div>";
 	print '</form>';
 	$db->free($resql);
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/htdocs/expedition/stats/index.php

Braces +35 added lines, -16 removed lines

@@ -74,15 +74,22 @@ 
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
+    if ($mode == 'customer') {
+        $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
+    }
+    if ($mode == 'supplier') {
+        $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
+    }
+    } else
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
-    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsnbinyear-'.$year.'.png';
-    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsnbinyear-'.$year.'.png';
-}
+    if ($mode == 'customer') {
+        $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstats&file=shipmentsnbinyear-'.$year.'.png';
+    }
+    if ($mode == 'supplier') {
+        $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=shipmentstatssupplier&file=shipmentsnbinyear-'.$year.'.png';
+    }
+    }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
@@ -209,7 +216,9 @@ 
 		$arrayyears[$val['year']]=$val['year'];
 	}
 }
-if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear;
+if (! count($arrayyears)) {
+    $arrayyears[$nowyear]=$nowyear;
+}
 
 $h=0;
 $head = array();
@@ -238,8 +247,12 @@ 
 	print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 	// Company
 	print '<tr><td align="left">'.$langs->trans("ThirdParty").'</td><td align="left">';
-	if ($mode == 'customer') $filter='s.client in (1,2,3)';
-	if ($mode == 'supplier') $filter='s.fournisseur = 1';
+	if ($mode == 'customer') {
+	    $filter='s.client in (1,2,3)';
+	}
+	if ($mode == 'supplier') {
+	    $filter='s.fournisseur = 1';
+	}
 	print $form->select_company($socid,'socid',$filter,1,0,0,array(),0,'','style="width: 95%"');
 	print '</td></tr>';
 	// User
@@ -248,8 +261,12 @@ 
 	print '</td></tr>';
 	// Year
 	print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
-	if (! in_array($year,$arrayyears)) $arrayyears[$year]=$year;
-	if (! in_array($nowyear,$arrayyears)) $arrayyears[$nowyear]=$nowyear;
+	if (! in_array($year,$arrayyears)) {
+	    $arrayyears[$year]=$year;
+	}
+	if (! in_array($nowyear,$arrayyears)) {
+	    $arrayyears[$nowyear]=$nowyear;
+	}
 	arsort($arrayyears);
 	print $form->selectarray('year',$arrayyears,$year,0);
 	print '</td></tr>';
@@ -289,8 +306,11 @@ 
 
 	print '<tr class="oddeven" height="24">';
 	print '<td align="center">';
-	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
-	else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
+	if ($year) {
+	    print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.'">'.$year.'</a>';
+	} else {
+	    print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
+	}
 	print '</td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	/*print '<td align="right">'.price(price2num($val['total'],'MT'),1).'</td>';
@@ -308,8 +328,7 @@ 
 
 // Show graphs
 print '<table class="border" width="100%"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     /*print $px2->show();

dolibarr/htdocs/societe/class/companypaymentmode.class.php

Braces +87 added lines, -44 removed lines

@@ -212,8 +212,12 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		    $this->fields['rowid']['visible']=0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		    $this->fields['entity']['enabled']=0;
+		}
 	}
 
 	/**
@@ -291,11 +295,17 @@ 
 	public function fetch($id, $ref = null, $socid = 0, $type = '')
 	{
 		$morewhere = '';
-		if ($socid) $morewhere.= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
-		if ($type)  $morewhere.= " AND type = '".$this->db->escape($type)."'";
+		if ($socid) {
+		    $morewhere.= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
+		}
+		if ($type) {
+		    $morewhere.= " AND type = '".$this->db->escape($type)."'";
+		}
 
 		$result = $this->fetchCommon($id, $ref, $morewhere);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && ! empty($this->table_element_line)) {
+		    $this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -353,7 +363,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 = '';
         $companylink = '';
@@ -368,8 +381,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='';
@@ -382,16 +399,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)) : '');
 
@@ -417,25 +439,30 @@ 
 			if ($this->db->num_rows($result1) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				$obj = $this->db->fetch_object($result1);
 
 				$type = '';
-				if (empty($alltypes)) $type = $obj->type;
+				if (empty($alltypes)) {
+				    $type = $obj->type;
+				}
 
 				$this->db->begin();
 
 				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
 				$sql2.= " WHERE default_rib <> 0 AND fk_soc = ".$obj->fk_soc;
-				if ($type) $sql2.= " AND type = '".$this->db->escape($type)."'";
+				if ($type) {
+				    $sql2.= " AND type = '".$this->db->escape($type)."'";
+				}
 				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;
-				if ($type) $sql3.= " AND type = '".$this->db->escape($type)."'";
+				if ($type) {
+				    $sql3.= " AND type = '".$this->db->escape($type)."'";
+				}
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result3 = $this->db->query($sql3);
 
@@ -444,15 +471,13 @@ 
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
-				}
-				else
+				} else
 				{
 					$this->db->commit();
 					return 1;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -485,33 +510,52 @@ 
 
 		if ($mode == 0 || $mode == 1)
 		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
+		} elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($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').' '.$langs->trans('Enabled');
+			}
+			if ($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');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 4)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($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');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			}
+			if ($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');
-			if ($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');
+			}
+			if ($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');
-			if ($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');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			}
 		}
 	}
 
@@ -561,8 +605,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}

dolibarr/htdocs/societe/class/address.class.php

Braces +17 added lines, -24 removed lines

@@ -118,15 +118,13 @@ 
 					dol_syslog(get_class($this)."::create success id=".$this->id);
 					$this->db->commit();
 					return 0;
-				}
-				else
+				} else
 				{
 					dol_syslog(get_class($this)."::create echec update");
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
+			} else
 
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
@@ -138,8 +136,7 @@ 
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::create echec verify sql=$sql");
@@ -213,7 +210,9 @@ 
 			$sql.= ", note = ".($this->note?"'".$this->db->escape($this->note)."'":"null");
 			$sql.= ", phone = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null");
 			$sql.= ", fax = ".($this->fax?"'".$this->db->escape($this->fax)."'":"null");
-			if ($user) $sql .= ",fk_user_modif = '".$user->id."'";
+			if ($user) {
+			    $sql .= ",fk_user_modif = '".$user->id."'";
+			}
 			$sql .= " WHERE fk_soc = '" . $socid ."' AND rowid = '" . $this->db->escape($id) ."'";
 
 			dol_syslog(get_class($this)."::Update", LOG_DEBUG);
@@ -223,16 +222,14 @@ 
 				dol_syslog(get_class($this)."::Update success");
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 
 					$this->error=$langs->trans("ErrorDuplicateField",$this->name);
 					$result=-1;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$result=-2;
@@ -319,20 +316,17 @@ 
 					}
 					$this->db->free($resql);
 					return $num;
-				}
-				else
+				} else
 				{
 					dol_syslog(get_class($this).'::Fetch Erreur: aucune adresse', LOG_ERR);
 					return 0;
 				}
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::Fetch Erreur: societe inconnue', LOG_ERR);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 		}
@@ -386,8 +380,7 @@ 
 				$this->note				= $obj->note;
 
 				$result = 1;
-			}
-			else
+			} else
 			{
 				dol_syslog('Erreur Societe::Fetch aucune adresse avec id='.$this->id.' - '.$sql);
 				$this->error='Erreur Societe::Fetch aucune adresse avec id='.$this->id.' - '.$sql;
@@ -395,8 +388,7 @@ 
 			}
 
 			$this->db->free($resql);
-		}
-		else
+		} else
 		{
 			dol_syslog('Erreur Societe::Fetch echec', LOG_DEBUG);
 			dol_syslog('Erreur Societe::Fetch '.$this->db->error());
@@ -450,7 +442,9 @@ 
         $link = '<a href="'.DOL_URL_ROOT.'/comm/address.php?id='.$this->id.'&socid='.$this->socid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
-        if ($withpicto) $result.=($link.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$linkend.' ');
+        if ($withpicto) {
+            $result.=($link.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$linkend.' ');
+        }
 		$result.=$link.$this->label.$linkend;
 		return $result;
 	}
@@ -495,8 +489,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}

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

Braces +52 added lines, -38 removed lines

@@ -77,8 +77,12 @@ 
 		if ($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;
+			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)";
@@ -94,25 +98,24 @@ 
 				{
 				   	// Call trigger
 					$result=$this->call_trigger('COMPANY_RIB_CREATE',$user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+					    $error++;
+					}
 					// End call triggers
 
 					if (! $error)
 					{
 						return 1;
-					}
-					else
+					} else
 					{
 						return 0;
 					}
-				}
-				else
+				} else
 				{
 					return 1;
 				}
 			}
-		}
-		else
+		} else
 		{
 			print $this->db->error();
 			return 0;
@@ -131,10 +134,16 @@ 
 		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);
+		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)."'";
@@ -154,10 +163,11 @@ 
 			$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)."'";
-		else
-			$sql.= ",label = NULL";
+		if (trim($this->label) != '') {
+					$sql.= ",label = '".$this->db->escape($this->label)."'";
+		} else {
+					$sql.= ",label = NULL";
+		}
 		$sql.= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
@@ -169,23 +179,22 @@ 
 		{
 			// Call trigger
 			$result=$this->call_trigger('COMPANY_RIB_MODIFY',$user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+			    $error++;
+			}
 			// End call triggers
 			if(! $error )
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 1;
 		}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -203,17 +212,25 @@ 
 	 */
 	function fetch($id, $socid=0, $default=1, $type='ban')
 	{
-		if (empty($id) && empty($socid)) return -1;
+		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;
+		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)."'";
+			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);
@@ -248,8 +265,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -277,7 +293,9 @@ 
 		{
 			// Call trigger
 			$result=$this->call_trigger('COMPANY_RIB_DELETE',$user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+			    $error++;
+			}
 			// End call triggers
 		}
 
@@ -297,8 +315,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1*$error;
@@ -345,8 +362,7 @@ 
 			if ($this->db->num_rows($result1) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				$obj = $this->db->fetch_object($result1);
 
@@ -367,15 +383,13 @@ 
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
-				}
-				else
+				} else
 				{
 					$this->db->commit();
 					return 1;
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;

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

Braces +29 added lines, -18 removed lines

@@ -118,8 +118,9 @@ 
 
 		// 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";
 		$sql.= " FROM " . MAIN_DB_PREFIX . "socpeople as t";
@@ -130,12 +131,17 @@ 
 		}
 		$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 ($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";
-		if ($search_sale > 0)
-			$sql.= " AND s.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 ($search_sale > 0) {
+					$sql.= " AND s.rowid = sc.fk_soc";
+		}
+		// Join for the needed table to filter by sale
 		// Insert sale filter
 		if ($search_sale > 0)
 		{
@@ -179,8 +185,7 @@ 
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve contacts : ' . $sql);
 		}
 		if (!count($obj_ret))
@@ -242,12 +247,15 @@ 
 
 		foreach ($request_data as $field => $value)
 		{
-            if ($field == 'id') continue;
+            if ($field == 'id') {
+                continue;
+            }
 		    $this->contact->$field = $value;
 		}
 
-		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
-			return $this->get($id);
+		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update')) {
+					return $this->get($id);
+		}
 
 		return false;
 	}
@@ -293,10 +301,12 @@ 
 	    //throw new RestException(401);
 	    //}
 
-	    if (!isset($request_data["login"]))
-	    				throw new RestException(400, "login field missing");
-	    if (!isset($request_data["password"]))
-	    				throw new RestException(400, "password field missing");
+	    if (!isset($request_data["login"])) {
+	    	    				throw new RestException(400, "login field missing");
+	    }
+	    if (!isset($request_data["password"])) {
+	    	    				throw new RestException(400, "password field missing");
+	    }
 
 	    if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
 	        throw new RestException(401, 'No permission to read contacts');
@@ -400,8 +410,9 @@ 
 		$contact = array();
 		foreach (Contacts::$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");
+			}
 			$contact[$field] = $data[$field];
 		}
 

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

Braces +66 added lines, -36 removed lines

@@ -186,7 +186,9 @@ 
 
 		$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 +262,9 @@ 
 	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;
 	}
 
@@ -352,7 +356,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 = '';
         $companylink = '';
@@ -370,8 +377,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='';
@@ -384,16 +395,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;
 
 		return $result;
@@ -437,38 +453,53 @@ 
 		if ($mode == 0)
 		{
 			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			} elseif ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
+		} elseif ($mode == 1)
 		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			} elseif ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
+		} 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');
-		}
-		elseif ($mode == 3)
+			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');
-		}
-		elseif ($mode == 4)
+			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');
-		}
-		elseif ($mode == 5)
+			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');
-		}
-		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');
+			}
+		} 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');
+			}
 		}
 	}
 
@@ -518,8 +549,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}

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

Braces +10 added lines, -5 removed lines

@@ -78,13 +78,16 @@ 
         {
             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;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             $this->error=$this->db->lasterror();
@@ -103,7 +106,9 @@ 
     	global $langs;
 
    		$sql="SELECT id, code, libelle as label FROM ".MAIN_DB_PREFIX."c_stcomm";
-   		if ($active >= 0) $sql.=" WHERE active = ".$active;
+   		if ($active >= 0) {
+   		    $sql.=" WHERE active = ".$active;
+   		}
 		$resql=$this->db->query($sql);
 		$num=$this->db->num_rows($resql);
 		$i=0;