alxarafe / alixar

dolibarr/htdocs/dav/dav.class.php

Braces +63 added lines, -52 removed lines

@@ -82,14 +82,15 @@ 
 						LEFT OUTER JOIN '.MAIN_DB_PREFIX.'user AS u ON (u.rowid=fk_element)
 						WHERE ar.element_type=\'user\' AND fk_actioncomm=a.id) AS other_users
 				FROM '.MAIN_DB_PREFIX.'actioncomm AS a';
-		if (! $this->user->rights->societe->client->voir )//FIXME si 'voir' on voit plus de chose ?
+		if (! $this->user->rights->societe->client->voir ) {
+		    //FIXME si 'voir' on voit plus de chose ?
 		{
 			$sql.=' LEFT OUTER JOIN '.MAIN_DB_PREFIX.'societe_commerciaux AS sc ON (a.fk_soc = sc.fk_soc AND sc.fk_user='.$this->user->id.')
 					LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = sc.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.fk_soc = sc.fk_soc AND sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
 		}
-		else
+		} else
 		{
 			$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.rowid = a.fk_contact)
@@ -105,8 +106,7 @@ 
 			if($ouri===false)
 			{
 				$sql.=' AND a.id = '.intval($oid);
-			}
-			else
+			} else
 			{
 				$sql.=' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
 			}
@@ -159,10 +159,11 @@ 
 		$address[]='';
 		$address[]='';
 
-		if($obj->percent==-1 && trim($obj->datep)!='')
-			$type='VEVENT';
-		else
-			$type='VTODO';
+		if($obj->percent==-1 && trim($obj->datep)!='') {
+					$type='VEVENT';
+		} else {
+					$type='VTODO';
+		}
 
 		$timezone = date_default_timezone_get();
 
@@ -174,10 +175,11 @@ 
 		$caldata.="CREATED:".gmdate('Ymd\THis', strtotime($obj->datec))."Z\n";
 		$caldata.="LAST-MODIFIED:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
 		$caldata.="DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
-		if($obj->sourceuid=='')
-			$caldata.="UID:".$obj->id.'-ev-'.$calid.'-cal-'.CDAV_URI_KEY."\n";
-		else
-			$caldata.="UID:".$obj->sourceuid."\n";
+		if($obj->sourceuid=='') {
+					$caldata.="UID:".$obj->id.'-ev-'.$calid.'-cal-'.CDAV_URI_KEY."\n";
+		} else {
+					$caldata.="UID:".$obj->sourceuid."\n";
+		}
 		$caldata.="SUMMARY:".$obj->label."\n";
 		$caldata.="LOCATION:".$location."\n";
 		$caldata.="PRIORITY:".$obj->priority."\n";
@@ -186,40 +188,42 @@ 
 			$caldata.="DTSTART;VALUE=DATE:".date('Ymd', strtotime($obj->datep))."\n";
 			if($type=='VEVENT')
 			{
-				if(trim($obj->datep2)!='')
-					$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
-				else
-					$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep)+(25*3600))."\n";
+				if(trim($obj->datep2)!='') {
+									$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
+				} else {
+									$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep)+(25*3600))."\n";
+				}
+			} elseif(trim($obj->datep2)!='') {
+							$caldata.="DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
 			}
-			elseif(trim($obj->datep2)!='')
-				$caldata.="DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
-		}
-		else
+		} else
 		{
 			$caldata.="DTSTART;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
 			if($type=='VEVENT')
 			{
-				if(trim($obj->datep2)!='')
-					$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
-				else
-					$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+				if(trim($obj->datep2)!='') {
+									$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+				} else {
+									$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+				}
+			} elseif(trim($obj->datep2)!='') {
+							$caldata.="DUE;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
 			}
-			elseif(trim($obj->datep2)!='')
-				$caldata.="DUE;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
 		}
 		$caldata.="CLASS:PUBLIC\n";
-		if($obj->transparency==1)
-			$caldata.="TRANSP:TRANSPARENT\n";
-		else
-			$caldata.="TRANSP:OPAQUE\n";
+		if($obj->transparency==1) {
+					$caldata.="TRANSP:TRANSPARENT\n";
+		} else {
+					$caldata.="TRANSP:OPAQUE\n";
+		}
 
-		if($type=='VEVENT')
-			$caldata.="STATUS:CONFIRMED\n";
-		elseif($obj->percent==0)
-			$caldata.="STATUS:NEEDS-ACTION\n";
-		elseif($obj->percent==100)
-			$caldata.="STATUS:COMPLETED\n";
-		else
+		if($type=='VEVENT') {
+					$caldata.="STATUS:CONFIRMED\n";
+		} elseif($obj->percent==0) {
+					$caldata.="STATUS:NEEDS-ACTION\n";
+		} elseif($obj->percent==100) {
+					$caldata.="STATUS:COMPLETED\n";
+		} else
 		{
 			$caldata.="STATUS:IN-PROCESS\n";
 			$caldata.="PERCENT-COMPLETE:".$obj->percent."\n";
@@ -227,16 +231,22 @@ 
 
 		$caldata.="DESCRIPTION:";
 		$caldata.=strtr($obj->note, array("\n"=>"\\n", "\r"=>""));
-		if(!empty($obj->soc_nom))
-			$caldata.="\\n*DOLIBARR-SOC: ".$obj->soc_nom;
-		if(!empty($obj->soc_phone))
-			$caldata.="\\n*DOLIBARR-SOC-TEL: ".$obj->soc_phone;
-		if(!empty($obj->firstname) || !empty($obj->lastname))
-			$caldata.="\\n*DOLIBARR-CTC: ".trim($obj->firstname.' '.$obj->lastname);
-		if(!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile))
-			$caldata.="\\n*DOLIBARR-CTC-TEL: ".trim($obj->phone.' '.$obj->phone_perso.' '.$obj->phone_mobile);
-		if(strpos($obj->other_users,',')) // several
+		if(!empty($obj->soc_nom)) {
+					$caldata.="\\n*DOLIBARR-SOC: ".$obj->soc_nom;
+		}
+		if(!empty($obj->soc_phone)) {
+					$caldata.="\\n*DOLIBARR-SOC-TEL: ".$obj->soc_phone;
+		}
+		if(!empty($obj->firstname) || !empty($obj->lastname)) {
+					$caldata.="\\n*DOLIBARR-CTC: ".trim($obj->firstname.' '.$obj->lastname);
+		}
+		if(!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile)) {
+					$caldata.="\\n*DOLIBARR-CTC-TEL: ".trim($obj->phone.' '.$obj->phone_perso.' '.$obj->phone_mobile);
+		}
+		if(strpos($obj->other_users,',')) {
+		    // several
 			$caldata.="\\n*DOLIBARR-USR: ".$obj->other_users;
+		}
 		$caldata.="\n";
 
 		$caldata.="END:".$type."\n";
@@ -257,11 +267,13 @@ 
 		$calid = ($calendarId*1);
 		$calevents = array();
 
-		if(! $this->user->rights->agenda->myactions->read)
-			return $calevents;
+		if(! $this->user->rights->agenda->myactions->read) {
+					return $calevents;
+		}
 
-		if($calid!=$this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read))
-			return $calevents;
+		if($calid!=$this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read)) {
+					return $calevents;
+		}
 
 		$sql = $this->getSqlCalEvents($calid);
 
@@ -284,8 +296,7 @@ 
 						'size' => strlen($calendardata),
 						'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
 					);
-				}
-				else
+				} else
 				{
 					$calevents[] = array(
 						// 'calendardata' => $calendardata,  not necessary because etag+size are present

dolibarr/htdocs/dav/fileserver.php

Braces +45 added lines, -19 removed lines

@@ -21,12 +21,28 @@ 
  *      \brief      Server DAV
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOLOGIN'))  		 define("NOLOGIN",1);		// This means this output page does not require to be logged.
-if (! defined('NOCSRFCHECK'))  	 define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOLOGIN')) {
+    define("NOLOGIN",1);
+}
+// This means this output page does not require to be logged.
+if (! defined('NOCSRFCHECK')) {
+    define("NOCSRFCHECK",1);
+}
+// We accept to go on this page from external web site.
 
 require "../main.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -47,8 +63,9 @@ 
 $langs->loadLangs(array("main","other"));
 
 
-if(empty($conf->dav->enabled))
+if(empty($conf->dav->enabled)) {
 	accessforbidden();
+}
 
 
 // settings
@@ -63,21 +80,26 @@ 
 	global $conf;
 	global $dolibarr_main_authentication;
 
-	if (empty($user->login))
-		return false;
-	if ($user->socid > 0)
-		return false;
-	if ($user->login != $username)
-		return false;
+	if (empty($user->login)) {
+			return false;
+	}
+	if ($user->socid > 0) {
+			return false;
+	}
+	if ($user->login != $username) {
+			return false;
+	}
 
 	// Authentication mode
-	if (empty($dolibarr_main_authentication))
-		$dolibarr_main_authentication='http,dolibarr';
+	if (empty($dolibarr_main_authentication)) {
+			$dolibarr_main_authentication='http,dolibarr';
+	}
 	$authmode = explode(',',$dolibarr_main_authentication);
 	$entity = (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
 
-	if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username)
-		return false;
+	if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username) {
+			return false;
+	}
 
 	return true;
 });
@@ -131,7 +153,9 @@ 
 // If you want to run the SabreDAV server in a custom location (using mod_rewrite for instance)
 // You can override the baseUri here.
 $baseUri = DOL_URL_ROOT.'/dav/fileserver.php/';
-if (isset($baseUri)) $server->setBaseUri($baseUri);
+if (isset($baseUri)) {
+    $server->setBaseUri($baseUri);
+}
 
 // Add authentication function
 if ((empty($conf->global->DAV_ALLOW_PUBLIC_DIR)
@@ -166,4 +190,6 @@ 
 // And off we go!
 $server->exec();
 
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+    $db->close();
+}

dolibarr/htdocs/exports/class/export.class.php

Braces +127 added lines, -80 removed lines

@@ -108,8 +108,12 @@ 
 						// Defined if module is enabled
 						$enabled=true;
 						$part=strtolower(preg_replace('/^mod/i','',$modulename));
-						if ($part == 'propale') $part='propal';
-						if (empty($conf->$part->enabled)) $enabled=false;
+						if ($part == 'propale') {
+						    $part='propal';
+						}
+						if (empty($conf->$part->enabled)) {
+						    $enabled=false;
+						}
 
 						if ($enabled)
 						{
@@ -124,10 +128,14 @@ 
 							    foreach($module->export_code as $r => $value)
 								{
                                     //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
-								    if ($filter && ($filter != $module->export_code[$r])) continue;
+								    if ($filter && ($filter != $module->export_code[$r])) {
+								        continue;
+								    }
 
                                     // Test if condition to show are ok
-                                    if (! empty($module->export_enabled[$r]) && ! verifCond($module->export_enabled[$r])) continue;
+                                    if (! empty($module->export_enabled[$r]) && ! verifCond($module->export_enabled[$r])) {
+                                        continue;
+                                    }
 
                                     // Test if permissions are ok
 									$bool=true;
@@ -140,13 +148,16 @@ 
 	    									if (! empty($perm[2]))
 	    									{
 	    										$bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
-	    									}
-	    									else
+	    									} else
 	    									{
 	    										$bool=$user->rights->{$perm[0]}->{$perm[1]};
 	    									}
-	    									if ($perm[0]=='user' && $user->admin) $bool=true;
-	    									if (! $bool) break;
+	    									if ($perm[0]=='user' && $user->admin) {
+	    									    $bool=true;
+	    									}
+	    									if (! $bool) {
+	    									    break;
+	    									}
 										}
 									}
 									//print $bool." $perm[0]"."<br>";
@@ -229,10 +240,19 @@ 
 		//print_r($array_selected);
 		foreach ($this->array_export_fields[$indice] as $key => $value)
 		{
-			if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
-            if (preg_match('/^none\./', $key)) continue;                    // A field that must not appears into SQL
-			if ($i > 0) $sql.=', ';
-			else $i++;
+			if (! array_key_exists($key, $array_selected)) {
+			    continue;
+			}
+			// Field not selected
+            if (preg_match('/^none\./', $key)) {
+                continue;
+            }
+            // A field that must not appears into SQL
+			if ($i > 0) {
+			    $sql.=', ';
+			} else {
+			    $i++;
+			}
 
 			if (strpos($key, ' as ')===false) {
 				$newfield=$key.' as '.str_replace(array('.', '-','(',')'),'_',$key);
@@ -251,8 +271,12 @@ 
 			// Loop on each condition to add
 			foreach ($array_filterValue as $key => $value)
 			{
-			    if (preg_match('/GROUP_CONCAT/i', $key)) continue;
-				if ($value != '') $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+			    if (preg_match('/GROUP_CONCAT/i', $key)) {
+			        continue;
+			    }
+				if ($value != '') {
+				    $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+				}
 			}
 			$sql.=$sqlWhere;
 		}
@@ -266,7 +290,9 @@ 
 		    // Loop on each condition to add
 		    foreach ($array_filterValue as $key => $value)
 		    {
-		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql.=" HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') {
+		            $sql.=" HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+		        }
 		    }
 		}
 
@@ -290,10 +316,11 @@ 
 		// build the input field on depend of the type of file
 		switch ($InfoFieldList[0]) {
 			case 'Text':
-				if (! (strpos($ValueField, '%') === false))
-					$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
-				else
-					$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
+				if (! (strpos($ValueField, '%') === false)) {
+									$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
+				} else {
+									$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
+				}
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
@@ -302,13 +329,13 @@ 
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery ="(".$this->conditionDate($NameField,trim($ValueArray[0]),">=");
 					$szFilterQuery.=" AND ".$this->conditionDate($NameField,trim($ValueArray[1]),"<=").")";
-				}
-				else
+				} else
 				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=$this->conditionDate($NameField,trim($ValueField),"=");
-					else
-						$szFilterQuery=$this->conditionDate($NameField,trim(substr($ValueField,1)),substr($ValueField,0,1));
+					if (is_numeric(substr($ValueField,0,1))) {
+											$szFilterQuery=$this->conditionDate($NameField,trim($ValueField),"=");
+					} else {
+											$szFilterQuery=$this->conditionDate($NameField,trim(substr($ValueField,1)),substr($ValueField,0,1));
+					}
 				}
 				break;
 			case 'Duree':
@@ -321,13 +348,13 @@ 
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery ="(".$NameField.">=".$ValueArray[0];
 					$szFilterQuery.=" AND ".$NameField."<=".$ValueArray[1].")";
-				}
-				else
+				} else
 				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=" ".$NameField."=".$ValueField;
-					else
-						$szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
+					if (is_numeric(substr($ValueField,0,1))) {
+											$szFilterQuery=" ".$NameField."=".$ValueField;
+					} else {
+											$szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
+					}
 				}
 				break;
 			case 'Boolean':
@@ -335,13 +362,14 @@ 
 				break;
 			case 'Status':
 			case 'List':
-				if (is_numeric($ValueField))
-					$szFilterQuery=" ".$NameField."=".$ValueField;
-				else {
-                    if (! (strpos($ValueField, '%') === false))
-                        $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
-                    else
-                        $szFilterQuery=" ".$NameField." = '".$ValueField."'";
+				if (is_numeric($ValueField)) {
+									$szFilterQuery=" ".$NameField."=".$ValueField;
+				} else {
+                    if (! (strpos($ValueField, '%') === false)) {
+                                            $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
+                    } else {
+                                            $szFilterQuery=" ".$NameField." = '".$ValueField."'";
+                    }
 				}
 				break;
 			default:
@@ -362,9 +390,13 @@ 
 	function conditionDate($Field, $Value, $Sens)
 	{
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
-		if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
-		elseif (strlen($Value)==6) $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
-		else  $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+		if (strlen($Value)==4) {
+		    $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
+		} elseif (strlen($Value)==6) {
+		    $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
+		} else {
+		    $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+		}
 		return $Condition;
 	}
 
@@ -399,21 +431,30 @@ 
 			    $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Status':
-				if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) $szFilterField='<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
-				else $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) {
+				    $szFilterField='<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				} else {
+				    $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				}
 				break;
 			case 'Boolean':
 				$szFilterField='<select name="'.$NameField.'" class="flat">';
 				$szFilterField.='<option ';
-				if ($ValueField=='') $szFilterField.=' selected ';
+				if ($ValueField=='') {
+				    $szFilterField.=' selected ';
+				}
 				$szFilterField.=' value="">&nbsp;</option>';
 
 				$szFilterField.='<option ';
-				if ($ValueField=='yes' || $ValueField == '1') $szFilterField.=' selected ';
+				if ($ValueField=='yes' || $ValueField == '1') {
+				    $szFilterField.=' selected ';
+				}
 				$szFilterField.=' value="1">'.yn(1).'</option>';
 
 				$szFilterField.='<option ';
-				if ($ValueField=='no' || $ValueField=='0') $szFilterField.=' selected ';
+				if ($ValueField=='no' || $ValueField=='0') {
+				    $szFilterField.=' selected ';
+				}
 				$szFilterField.=' value="0">'.yn(0).'</option>';
 				$szFilterField.="</select>";
 				break;
@@ -422,13 +463,18 @@ 
 				// 1 : Nom de la table
 				// 2 : Nom du champ contenant le libelle
 				// 3 : Name of field with key (if it is not "rowid"). Used this field as key for combo list.
-				if (count($InfoFieldList)==4)
-					$keyList=$InfoFieldList[3];
-				else
-					$keyList='rowid';
+				if (count($InfoFieldList)==4) {
+									$keyList=$InfoFieldList[3];
+				} else {
+									$keyList='rowid';
+				}
 				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
-				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
-				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
+				if ($InfoFieldList[1] == 'c_stcomm') {
+				    $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
+				}
+				if ($InfoFieldList[1] == 'c_country') {
+				    $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
+				}
 				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[1];
 
 				$resql = $this->db->query($sql);
@@ -466,8 +512,7 @@ 
 							if (!empty($ValueField) && $ValueField == $obj->rowid)
 							{
 								$szFilterField.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-							}
-							else
+							} else
 							{
 								$szFilterField.='<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
 							}
@@ -477,8 +522,9 @@ 
 					$szFilterField.="</select>";
 
 					$this->db->free($resql);
+				} else {
+				    dol_print_error($this->db);
 				}
-				else dol_print_error($this->db);
 				break;
 		}
 
@@ -556,8 +602,9 @@ 
 		require_once $dir.$file;
 		$objmodel = new $classname($this->db);
 
-		if (! empty($sqlquery)) $sql = $sqlquery;
-        else
+		if (! empty($sqlquery)) {
+		    $sql = $sqlquery;
+		} else
 		{
 			// Define value for indice from $datatoexport
 			$foundindice=0;
@@ -586,10 +633,11 @@ 
 		if ($resql)
 		{
 			//$this->array_export_label[$indice]
-			if ($conf->global->EXPORT_PREFIX_SPEC)
-				$filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
-			else
-				$filename="export_".$datatoexport;
+			if ($conf->global->EXPORT_PREFIX_SPEC) {
+							$filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
+			} else {
+							$filename="export_".$datatoexport;
+			}
 			$filename.='.'.$objmodel->getDriverExtension();
 			$dirname=$conf->export->dir_temp.'/'.$user->id;
 
@@ -614,20 +662,27 @@ 
 					{
 						foreach ($this->array_export_special[$indice] as $key => $value)
 						{
-							if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
+							if (! array_key_exists($key, $array_selected)) {
+							    continue;
+							}
+							// Field not selected
 							// Operation NULLIFNEG
 							if ($this->array_export_special[$indice][$key]=='NULLIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($obj->$alias < 0) $obj->$alias='';
+								if ($obj->$alias < 0) {
+								    $obj->$alias='';
+								}
 							}
 							// Operation ZEROIFNEG
 							elseif ($this->array_export_special[$indice][$key]=='ZEROIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($obj->$alias < 0) $obj->$alias='0';
+								if ($obj->$alias < 0) {
+								    $obj->$alias='0';
+								}
 							}
 							// Operation INVOICEREMAINTOPAY
 							elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
@@ -648,8 +703,7 @@ 
 								    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
 								}
 								$obj->$alias=$remaintopay;
-							}
-							else
+							} else
 							{
 							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
 							    $computestring=$this->array_export_special[$indice][$key];
@@ -672,15 +726,13 @@ 
 				$objmodel->close_file();
 
         		return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error()." - sql=".$sql;
 			return -1;
@@ -723,8 +775,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->errno=$this->db->lasterrno();
@@ -760,14 +811,12 @@ 
 				$this->hexafiltervalue	= $obj->filter;
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error="ModelNotFound";
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -3;
@@ -822,8 +871,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -881,8 +929,7 @@ 
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}

dolibarr/htdocs/exports/export.php

Braces +111 added lines, -69 removed lines

@@ -153,9 +153,11 @@ 
  * Actions
  */
 
-if ($action=='selectfield')     // Selection of field at step 2
+if ($action=='selectfield') {
+    // Selection of field at step 2
 {
 	$fieldsarray=$objexport->array_export_fields[0];
+}
 	$fieldsentitiesarray=$objexport->array_export_entities[0];
     $fieldsdependenciesarray=$objexport->array_export_dependencies[0];
 
@@ -163,13 +165,15 @@ 
     {
 		foreach($fieldsarray as $key=>$val)
 		{
-			if (! empty($array_selected[$key])) continue;		// If already selected, check next
+			if (! empty($array_selected[$key])) {
+			    continue;
+			}
+			// If already selected, check next
 			$array_selected[$key]=count($array_selected)+1;
 		    //print_r($array_selected);
 		    $_SESSION["export_selected_fields"]=$array_selected;
 		}
-    }
-    else
+    } else
     {
         $warnings=array();
 
@@ -183,15 +187,20 @@ 
         {
             // We found a dependency on the type of field
             $tmp=$fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
-            if (is_array($tmp)) $listofdependencies=$tmp;
-            else $listofdependencies=array($tmp);
-        }
-        else if (! empty($field) && ! empty($fieldsdependenciesarray[$field]))
+            if (is_array($tmp)) {
+                $listofdependencies=$tmp;
+            } else {
+                $listofdependencies=array($tmp);
+            }
+        } else if (! empty($field) && ! empty($fieldsdependenciesarray[$field]))
         {
             // We found a dependency on a dedicated field
             $tmp=$fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
-            if (is_array($tmp)) $listofdependencies=$tmp;
-            else $listofdependencies=array($tmp);
+            if (is_array($tmp)) {
+                $listofdependencies=$tmp;
+            } else {
+                $listofdependencies=array($tmp);
+            }
         }
 
         if (count($listofdependencies))
@@ -217,8 +226,7 @@ 
     {
 		$array_selected=array();
 		$_SESSION["export_selected_fields"]=$array_selected;
-    }
-    else
+    } else
     {
 	    unset($array_selected[$_GET["field"]]);
 	    // Renumber fields of array_selected (from 1 to nb_elements)
@@ -238,8 +246,12 @@ 
 if ($action=='downfield' || $action=='upfield')
 {
     $pos=$array_selected[$_GET["field"]];
-    if ($action=='downfield') $newpos=$pos+1;
-    if ($action=='upfield') $newpos=$pos-1;
+    if ($action=='downfield') {
+        $newpos=$pos+1;
+    }
+    if ($action=='upfield') {
+        $newpos=$pos-1;
+    }
     // Recherche code avec qui switcher
     $newcode="";
     foreach($array_selected as $code=>$value)
@@ -251,9 +263,11 @@ 
         }
     }
     //print("Switch pos=$pos (code=".$_GET["field"].") and newpos=$newpos (code=$newcode)");
-    if ($newcode)   // Si newcode trouve (protection contre resoumission de page)
+    if ($newcode) {
+        // Si newcode trouve (protection contre resoumission de page)
     {
         $array_selected[$_GET["field"]]=$newpos;
+    }
         $array_selected[$newcode]=$pos;
         $_SESSION["export_selected_fields"]=$array_selected;
     }
@@ -282,8 +296,7 @@ 
 	{
 		setEventMessages($objexport->error, $objexport->errors, 'errors');
 		$sqlusedforexport=$objexport->sqlusedforexport;
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
 	    $sqlusedforexport=$objexport->sqlusedforexport;
@@ -296,8 +309,11 @@ 
 	$file = $upload_dir . "/" . GETPOST('file');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 
 	$ret=dol_delete_file($file);
-	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+	if ($ret) {
+	    setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+	} else {
+	    setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+	}
 	header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport);
 	exit;
 }
@@ -322,7 +338,9 @@ 
 		$hexa='';
 		foreach($array_selected as $key=>$val)
 		{
-			if ($hexa) $hexa.=',';
+			if ($hexa) {
+			    $hexa.=',';
+			}
 			$hexa.=$key;
 		}
 
@@ -331,7 +349,9 @@ 
 		{
 			foreach($array_filtervalue as $key=>$val)
 			{
-				if ($hexafiltervalue) $hexafiltervalue.=',';
+				if ($hexafiltervalue) {
+				    $hexafiltervalue.=',';
+				}
 				$hexafiltervalue.=$key.'='.$val;
 			}
 		}
@@ -345,17 +365,16 @@ 
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("ExportModelSaved",$objexport->model_name), null, 'mesgs');
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
-			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors');
-			else
-				setEventMessages($objexport->error, $objexport->errors, 'errors');
+			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+							setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors');
+			} else {
+							setEventMessages($objexport->error, $objexport->errors, 'errors');
+			}
 		}
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportModelName")), null, 'errors');
 	}
@@ -401,13 +420,18 @@ 
 	if (is_array($objexport->array_export_TypeFields[0]))
 	{
 		$_SESSION["export_filtered_fields"]=array();
-		foreach($objexport->array_export_TypeFields[0] as $code => $type)	// $code: s.fieldname $value: Text|Boolean|List:ccc
+		foreach($objexport->array_export_TypeFields[0] as $code => $type) {
+		    // $code: s.fieldname $value: Text|Boolean|List:ccc
 		{
 			$newcode=(string) preg_replace('/\./','_',$code);
+		}
 			//print 'xxx'.$code."=".$newcode."=".$type."=".$_POST[$newcode]."\n<br>";
 			$filterqualified=1;
-			if (! isset($_POST[$newcode]) || $_POST[$newcode] == '') $filterqualified=0;
-			elseif (preg_match('/^List/',$type) && (is_numeric($_POST[$newcode]) && $_POST[$newcode] <= 0)) $filterqualified=0;
+			if (! isset($_POST[$newcode]) || $_POST[$newcode] == '') {
+			    $filterqualified=0;
+			} elseif (preg_match('/^List/',$type) && (is_numeric($_POST[$newcode]) && $_POST[$newcode] <= 0)) {
+			    $filterqualified=0;
+			}
 			if ($filterqualified)
 			{
 				//print 'Filter on '.$newcode.' type='.$type.' value='.$_POST[$newcode]."\n";
@@ -477,15 +501,13 @@ 
             if ($objexport->array_export_perms[$key])
             {
             	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"),'filenew').'</a>';
-            }
-            else
+            } else
             {
             	print $langs->trans("NotEnoughPermissions");
             }
            	print '</td></tr>';
         }
-    }
-    else
+    } else
     {
         print '<tr><td '.$bc[false].' colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
     }
@@ -553,8 +575,11 @@ 
     print '<input type="hidden" name="datatoexport" value="'.$datatoexport.'">';
     print '<table><tr><td colspan="2">';
     print $langs->trans("SelectExportFields").' ';
-    if(empty($conf->global->EXPORTS_SHARE_MODELS))$htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1,$user->id);
-	else $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1);
+    if(empty($conf->global->EXPORTS_SHARE_MODELS)) {
+        $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1,$user->id);
+    } else {
+	    $htmlother->select_export_model($exportmodelid,'exportmodelid',$datatoexport,1);
+	}
     print ' ';
     print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
     print '</td></tr></table>';
@@ -618,8 +643,7 @@ 
         if (! empty($objexport->array_export_special[0][$code]))
         {
             $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        }
-        else
+        } else
         {
             $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
         }
@@ -642,8 +666,7 @@ 
             print $form->textwithpicto($text,$htmltext);
 			//print ' ('.$code.')';
             print '</td>';
-        }
-        else
+        } else
         {
         	// Fields not selected
             print '<td>';
@@ -672,13 +695,11 @@ 
 		if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
 		{
 			print '<a class="butAction" href="export.php?step=3&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
-		}
-		else
+		} else
 		{
 			print '<a class="butAction" href="export.php?step=4&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
 		}
-	}
-	else
+	} else
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SelectAtLeastOneField")).'">'.$langs->trans("NextStep").'</a>';
 	}
@@ -688,10 +709,12 @@ 
 
 if ($step == 3 && $datatoexport)
 {
-    if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
+    if (count($array_selected) < 1) {
+        // This occurs when going back to page after sessecion expired
     {
         // Switch to step 2
         header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+    }
         exit;
     }
 
@@ -809,8 +832,7 @@ 
 			if (! empty($objexport->array_export_special[0][$code]))
 		{
 		    $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-		}
-		else
+		} else
 		{
 		    $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
 		}
@@ -829,15 +851,18 @@ 
 
 		// Filter value
 		print '<td>';
-		if (! empty($Typefieldsarray[$code]))	// Example: Text, List:c_country:label:rowid, Number, Boolean
+		if (! empty($Typefieldsarray[$code])) {
+		    // Example: Text, List:c_country:label:rowid, Number, Boolean
 		{
 			$szInfoFiltre=$objexport->genDocFilter($Typefieldsarray[$code]);
-			if ($szInfoFiltre)	// Is there an info help for this filter ?
+		}
+			if ($szInfoFiltre) {
+			    // Is there an info help for this filter ?
 			{
 				$tmp=$objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
-				print $form->textwithpicto($tmp, $szInfoFiltre);
 			}
-			else
+				print $form->textwithpicto($tmp, $szInfoFiltre);
+			} else
 			{
 				print $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 			}
@@ -862,10 +887,12 @@ 
 
 if ($step == 4 && $datatoexport)
 {
-    if (count($array_selected) < 1)     // This occurs when going back to page after sessecion expired
+    if (count($array_selected) < 1) {
+        // This occurs when going back to page after sessecion expired
     {
         // Switch to step 2
         header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+    }
         exit;
     }
 
@@ -945,8 +972,11 @@ 
     			if (isset($objexport->array_export_fields[0][$code]))
     			{
     				$list.=($list?', ':'');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-    				else $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) {
+    				    $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
+    				} else {
+    				    $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    				}
     			}
     		}
     	}
@@ -1001,8 +1031,7 @@ 
         if (! empty($objexport->array_export_special[0][$code]))
         {
             $htmltext.='<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        }
-        else
+        } else
         {
             $htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
         }
@@ -1023,8 +1052,12 @@ 
         print '<td align="right" width="100">';
         print $value.' ';
         print '</td><td align="center" width="20">';
-        if ($value < count($array_selected)) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=downfield&field='.$code.'">'.img_down().'</a>';
-        if ($value > 1) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=upfield&field='.$code.'">'.img_up().'</a>';
+        if ($value < count($array_selected)) {
+            print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=downfield&field='.$code.'">'.img_down().'</a>';
+        }
+        if ($value > 1) {
+            print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=upfield&field='.$code.'">'.img_up().'</a>';
+        }
         print '</td>';
 
         //print '<td>&nbsp;</td>';
@@ -1079,7 +1112,9 @@ 
     	$sql = "SELECT rowid, label";
 		$sql.= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql.= " WHERE type = '".$datatoexport."'";
-		if(empty($conf->global->EXPORTS_SHARE_MODELS))$sql.=" AND fk_user=".$user->id;
+		if(empty($conf->global->EXPORTS_SHARE_MODELS)) {
+		    $sql.=" AND fk_user=".$user->id;
+		}
 		$sql.= " ORDER BY rowid";
 		$resql = $db->query($sql);
 		if ($resql)
@@ -1098,8 +1133,7 @@ 
 				print '</tr>';
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1110,10 +1144,12 @@ 
 
 if ($step == 5 && $datatoexport)
 {
-    if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
+    if (count($array_selected) < 1) {
+        // This occurs when going back to page after sessecion expired
     {
         // Switch to step 2
         header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
+    }
         exit;
     }
 
@@ -1205,8 +1241,11 @@ 
     			if (isset($objexport->array_export_fields[0][$code]))
     			{
     				$list.=($list?', ':'');
-    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
-    				else $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    				if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/',$array_filtervalue[$code])) {
+    				    $list.=$langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'');
+    				} else {
+    				    $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
+    				}
     			}
     		}
     	}
@@ -1266,7 +1305,9 @@ 
 
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    if (! is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
+    if (! is_dir($conf->export->dir_temp)) {
+        dol_mkdir($conf->export->dir_temp);
+    }
 
     // Affiche liste des documents
     // NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste
@@ -1303,6 +1344,7 @@ 
 	if (preg_match($regexstring,$newsql,$reg))
 	{
 		return $reg[1];   // The tablename
+	} else {
+	    return '';
+	}
 	}
-	else return '';
-}

dolibarr/htdocs/exports/index.php

Braces +1 added lines, -2 removed lines

@@ -94,8 +94,7 @@
 	if ($user->rights->export->creer)
 	{
 		print '<a class="butActionNew" href="'.DOL_URL_ROOT.'/exports/export.php?leftmenu=export">'.$langs->trans("NewExport").'<span class="fa fa-plus-circle valignmiddle"></span></a>';
-	}
-	else
+	} else
 	{
 		print '<a class="butActionNewRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("NewExport").'<span class="fa fa-plus-circle valignmiddle"></span></a>';
 	}

dolibarr/htdocs/margin/productMargins.php

Braces +67 added lines, -46 removed lines

@@ -40,7 +40,9 @@ 
 // Security check
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 $result=restrictedArea($user,'margins');
 
@@ -61,8 +63,7 @@ 
 	{
 		$sortfield="f.datef";
 		$sortorder="DESC";
-	}
-	else
+	} else
 	{
 	    $sortfield="p.ref";
 	    $sortorder="ASC";
@@ -71,10 +72,12 @@ 
 
 $startdate=$enddate='';
 
-if (!empty($_POST['startdatemonth']))
+if (!empty($_POST['startdatemonth'])) {
   $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
-if (!empty($_POST['enddatemonth']))
+}
+if (!empty($_POST['enddatemonth'])) {
   $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
+}
 
 
 /*
@@ -109,10 +112,13 @@ 
   print $form->select_produits($id,'id','',20,0,1,2,'',1, array(), 0, 'All');
   print '</td></tr>';
 
-  if (! $sortorder) $sortorder="DESC";
-  if (! $sortfield) $sortfield="f.datef";
-}
-else {
+  if (! $sortorder) {
+      $sortorder="DESC";
+  }
+  if (! $sortfield) {
+      $sortfield="f.datef";
+  }
+  } else {
 	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
 	print $form->select_produits('','id','',20,0,1,2,'',1, array(), 0, 'All');
@@ -175,8 +181,12 @@ 
 print '</form>';
 
 $sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref, p.entity as pentity,";
-if ($id > 0) $sql.= " d.fk_product,";
-if ($id > 0) $sql.= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
+if ($id > 0) {
+    $sql.= " d.fk_product,";
+}
+if ($id > 0) {
+    $sql.= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
+}
 $sql.= " SUM(d.total_ht) as selling_price,";
 // Note: qty and buy_price_ht is always positive (if not your database may be corrupted, you can update this)
 $sql.= " SUM(".$db->ifsql('d.total_ht < 0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,";
@@ -192,20 +202,27 @@ 
 $sql.= ' AND f.entity IN ('.getEntity('invoice').')';
 $sql.= " AND f.fk_statut > 0";
 $sql.= " AND d.fk_facture = f.rowid";
-if ($id > 0)
+if ($id > 0) {
 	$sql.= " AND d.fk_product =".$id;
+}
 if (! empty($TSelectedCats)) {
 	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
 }
-if (!empty($startdate))
+if (!empty($startdate)) {
   $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
-if (!empty($enddate))
+}
+if (!empty($enddate)) {
   $sql.= " AND f.datef <= '".$db->idate($enddate)."'";
+}
 $sql .= " AND d.buy_price_ht IS NOT NULL";
-if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)
+if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) {
 	$sql .= " AND d.buy_price_ht <> 0";
-if ($id > 0) $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
-else $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
+}
+if ($id > 0) {
+    $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity, d.fk_product, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut";
+} else {
+    $sql.= " GROUP BY p.label, p.rowid, p.fk_product_type, p.ref, p.entity";
+}
 $sql.=$db->order($sortfield,$sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -220,10 +237,12 @@ 
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "&amp;id=".$id, $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
 	//var_dump($conf->global->MARGIN_TYPE);
-	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice='BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	if ($conf->global->MARGIN_TYPE == "1") {
+		    $labelcostprice='BuyingPrice';
+	} else {
+	    // value is 'costprice' or 'pmp'
 	    $labelcostprice='CostPrice';
+	}
 
 	$moreforfilter='';
 
@@ -235,18 +254,19 @@ 
 	if ($id > 0) {
   		print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
   		print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$id,'align="center"',$sortfield,$sortorder);
-  	}
-  	else
+  	} else
   	{
   		print_liste_field_titre("ProductService",$_SERVER["PHP_SELF"],"p.ref","","&amp;id=".$id,'',$sortfield,$sortorder);
   	}
 	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+	}
+	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$id,'align="right"',$sortfield,$sortorder);
+	}
 	print "</tr>\n";
 
 	$cumul_achat = 0;
@@ -266,8 +286,7 @@ 
 			{
 				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
 				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
-			}
-			else
+			} else
 			{
 				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
@@ -282,8 +301,7 @@ 
 				print "</td>\n";
 				print "<td align=\"center\">";
 				print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-			}
-			else {
+			} else {
 				print '<td>';
 				if ($objp->rowid > 0)
 				{
@@ -294,8 +312,7 @@ 
     				$product_static->entity=$objp->pentity;
     				$text=$product_static->getNomUrl(1);
     				print $text.= ' - '.$objp->label;
-				}
-				else
+				} else
 				{
 				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
 				}
@@ -305,10 +322,12 @@ 
 			print "<td align=\"right\">".price($pv, null, null, null, null, $rounding)."</td>\n";
 			print "<td align=\"right\">".price($pa, null, null, null, null, $rounding)."</td>\n";
 			print "<td align=\"right\">".price($marge, null, null, null, null, $rounding)."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+			}
 			print "</tr>\n";
 
 			$i++;
@@ -325,24 +344,26 @@ 
 	$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
 
 	print '<tr class="liste_total">';
-	if ($id > 0)
-		print '<td colspan=2>';
-	else
-		print '<td>';
+	if ($id > 0) {
+			print '<td colspan=2>';
+	} else {
+			print '<td>';
+	}
 	print $langs->trans('TotalMargin')."</td>";
 	print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
 	print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
 	print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+	}
+	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+	}
 	print "</tr>\n";
 
 	print "</table>";
 	print '</div>';
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/htdocs/margin/agentMargins.php

Braces +62 added lines, -42 removed lines

@@ -43,21 +43,26 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
 if (! $sortfield)
 {
-	if ($agentid > 0)
-		$sortfield="s.nom";
-	else
-	    $sortfield="u.lastname";
-}
+	if ($agentid > 0) {
+			$sortfield="s.nom";
+	} else {
+		    $sortfield="u.lastname";
+	}
+	}
 
 $startdate=$enddate='';
 
-if (!empty($_POST['startdatemonth']))
+if (!empty($_POST['startdatemonth'])) {
   $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
-if (!empty($_POST['enddatemonth']))
+}
+if (!empty($_POST['enddatemonth'])) {
   $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
+}
 
 // Security check
 if ($user->rights->margins->read->all) {
@@ -126,7 +131,9 @@ 
 print '</form>';
 
 $sql = "SELECT";
-if ($agentid > 0) $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
+if ($agentid > 0) {
+    $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
+}
 $sql.= " u.rowid as agent, u.login, u.lastname, u.firstname,";
 $sql.= " sum(d.total_ht) as selling_price,";
 // Note: qty and buy_price_ht is always positive (if not your database may be corrupted, you can update this)
@@ -142,27 +149,36 @@ 
 $sql.= ' AND f.entity IN ('.getEntity('invoice').')';
 $sql.= " AND sc.fk_soc = f.fk_soc";
 $sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
-if (! empty($conf->global->AGENT_CONTACT_TYPE))
+if (! empty($conf->global->AGENT_CONTACT_TYPE)) {
 	$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
-else
+} else {
 	$sql .= " AND sc.fk_user = u.rowid";
+}
 $sql.= " AND f.fk_statut > 0";
 $sql.= ' AND s.entity IN ('.getEntity('societe').')';
 $sql.= " AND d.fk_facture = f.rowid";
 if ($agentid > 0) {
-	if (! empty($conf->global->AGENT_CONTACT_TYPE))
-  		$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
-	else
-	    $sql .= " AND sc.fk_user = ".$agentid;
-}
-if (!empty($startdate))
+	if (! empty($conf->global->AGENT_CONTACT_TYPE)) {
+	  		$sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
+	} else {
+		    $sql .= " AND sc.fk_user = ".$agentid;
+	}
+	}
+if (!empty($startdate)) {
   $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
-if (!empty($enddate))
+}
+if (!empty($enddate)) {
   $sql.= " AND f.datef <= '".$db->idate($enddate)."'";
+}
 $sql .= " AND d.buy_price_ht IS NOT NULL";
-if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
-if ($agentid > 0) $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
-else $sql.= " GROUP BY u.rowid, u.login, u.lastname, u.firstname";
+if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) {
+    $sql .= " AND d.buy_price_ht <> 0";
+}
+if ($agentid > 0) {
+    $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
+} else {
+    $sql.= " GROUP BY u.rowid, u.login, u.lastname, u.firstname";
+}
 $sql.=$db->order($sortfield,$sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -181,27 +197,32 @@ 
 	print '<br>';
 	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
 
-	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice='BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	if ($conf->global->MARGIN_TYPE == "1") {
+		    $labelcostprice='BuyingPrice';
+	} else {
+	    // value is 'costprice' or 'pmp'
 	    $labelcostprice='CostPrice';
+	}
 
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 
 	print '<tr class="liste_titre">';
-	if ($agentid > 0)
-		print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
-	else
-		print_liste_field_titre("SalesRepresentative",$_SERVER["PHP_SELF"],"u.lastname","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
+	if ($agentid > 0) {
+			print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
+	} else {
+			print_liste_field_titre("SalesRepresentative",$_SERVER["PHP_SELF"],"u.lastname","","&amp;agentid=".$agentid,'',$sortfield,$sortorder);
+	}
 
 	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+	}
+	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+			print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;agentid=".$agentid,'align="right"',$sortfield,$sortorder);
+	}
 	print "</tr>\n";
 
 	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
@@ -221,8 +242,7 @@ 
 			{
 				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
 				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
-			}
-			else
+			} else
 			{
 				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
 				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
@@ -234,8 +254,7 @@ 
 				$companystatic->name=$objp->name;
 				$companystatic->client=$objp->client;
 				print "<td>".$companystatic->getNomUrl(1,'customer')."</td>\n";
-			}
-			else {
+			} else {
 				$userstatic->fetch($objp->agent);
 				print "<td>".$userstatic->getFullName($langs,0,0,0)."</td>\n";
 			}
@@ -243,18 +262,19 @@ 
 			print "<td align=\"right\">".price($pv, null, null, null, null, $rounding)."</td>\n";
 			print "<td align=\"right\">".price($pa, null, null, null, null, $rounding)."</td>\n";
 			print "<td align=\"right\">".price($marge, null, null, null, null, $rounding)."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+			}
 			print "</tr>\n";
 
 			$i++;
 		}
 	}
 	print "</table>";
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/htdocs/margin/tabs/productMargins.php

Braces +46 added lines, -23 removed lines

@@ -36,7 +36,9 @@ 
 // Security check
 $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
 $object = new Product($db);
@@ -50,8 +52,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="f.datef";
+if (! $sortorder) {
+    $sortorder="DESC";
+}
+if (! $sortfield) {
+    $sortfield="f.datef";
+}
 
 
 /*
@@ -133,7 +139,9 @@ 
             $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
             $sql.= " f.rowid as facid, f.ref, f.total as total_ht,";
             $sql.= " f.datef, f.paye, f.fk_statut as statut, f.type,";
-            if (!$user->rights->societe->client->voir && !$socid) $sql.= " sc.fk_soc, sc.fk_user,";
+            if (!$user->rights->societe->client->voir && !$socid) {
+                $sql.= " sc.fk_soc, sc.fk_user,";
+            }
             $sql.= " sum(d.total_ht) as selling_price,";							// may be negative or positive
             $sql.= " IF(f.type = 2, -1, 1) * sum(d.qty) as qty,";						// not always positive in case of Credit note
             $sql.= " IF(f.type = 2, -1, 1) * sum(d.qty * d.buy_price_ht) as buying_price,";			// not always positive in case of Credit note
@@ -141,18 +149,28 @@ 
             $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
             $sql.= ", ".MAIN_DB_PREFIX."facture as f";
             $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-            if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            if (!$user->rights->societe->client->voir && !$socid) {
+                $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            }
             $sql.= " WHERE f.fk_soc = s.rowid";
             $sql.= " AND f.fk_statut > 0";
             $sql.= " AND s.entity = ".$conf->entity;
             $sql.= " AND d.fk_facture = f.rowid";
             $sql.= " AND d.fk_product =".$object->id;
-            if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-            if (! empty($socid)) $sql.= " AND f.fk_soc = $socid";
+            if (!$user->rights->societe->client->voir && !$socid) {
+                $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            }
+            if (! empty($socid)) {
+                $sql.= " AND f.fk_soc = $socid";
+            }
             $sql .= " AND d.buy_price_ht IS NOT NULL";
-            if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
+            if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) {
+                $sql .= " AND d.buy_price_ht <> 0";
+            }
             $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
-            if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user";
+            if (!$user->rights->societe->client->voir && !$socid) {
+                $sql.= ", sc.fk_soc, sc.fk_user";
+            }
             $sql.= $db->order($sortfield,$sortorder);
             // TODO: calculate total to display then restore pagination
             //$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -177,10 +195,12 @@ 
                 print_liste_field_titre("BuyingPrice",$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
                 print_liste_field_titre("Qty",$_SERVER["PHP_SELF"],"d.qty","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
                 print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-                if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-                    print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-                if (! empty($conf->global->DISPLAY_MARK_RATES))
-                    print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+                                    print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                }
+                if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+                                    print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                }
                 print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
                 print "</tr>\n";
 
@@ -210,10 +230,12 @@ 
 						print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
 						print "<td align=\"right\">".price($objp->qty, null, null, null, null, $rounding)."</td>\n";
 						print "<td align=\"right\">".price($objp->marge, null, null, null, null, $rounding)."</td>\n";
-						if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-							print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-						if (! empty($conf->global->DISPLAY_MARK_RATES))
-							print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+						if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+													print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+						}
+						if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+													print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+						}
 						print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
                         print "</tr>\n";
                         $i++;
@@ -230,8 +252,7 @@ 
                 {
                     $marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
                     $markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
-                }
-                else
+                } else
                 {
                     $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
                     $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
@@ -242,10 +263,12 @@ 
                 print '<td align="right">'.price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
                 print '<td align="right">'.price($cumul_qty, null, null, null, null, $rounding)."</td>\n";
                 print '<td align="right">'.price($totalMargin, null, null, null, null, $rounding)."</td>\n";
-                if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-                    print '<td align="right">'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-                if (! empty($conf->global->DISPLAY_MARK_RATES))
-                    print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+                if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+                                    print '<td align="right">'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+                }
+                if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+                                    print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+                }
                 print '<td align="right">&nbsp;</td>';
                 print "</tr>\n";
                 print "</table>";

dolibarr/htdocs/margin/tabs/thirdpartyMargins.php

Braces +48 added lines, -27 removed lines

@@ -30,7 +30,9 @@ 
 
 // Security check
 $socid = GETPOST('socid','int');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe','','');
 
 
@@ -43,11 +45,17 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="f.datef";
+if (! $sortorder) {
+    $sortorder="DESC";
+}
+if (! $sortfield) {
+    $sortfield="f.datef";
+}
 
 $object = new Societe($db);
-if ($socid > 0) $object->fetch($socid);
+if ($socid > 0) {
+    $object->fetch($socid);
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartymargins','globalcard'));
@@ -59,7 +67,9 @@ 
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 
 
@@ -71,7 +81,9 @@ 
 $form = new Form($db);
 
 $title=$langs->trans("ThirdParty").' - '.$langs->trans("Margins");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Files");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+    $title=$object->name.' - '.$langs->trans("Files");
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -102,7 +114,9 @@ 
         print '<tr><td class="titlefield">';
         print $langs->trans('CustomerCode').'</td><td colspan="3">';
         print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        if ($object->check_codeclient() <> 0) {
+            print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -111,7 +125,9 @@ 
         print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
         print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        if ($object->check_codefournisseur() <> 0) {
+            print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -158,7 +174,9 @@ 
     $sql.= " AND d.fk_facture = f.rowid";
     $sql.= " AND f.fk_soc = $socid";
     $sql.= " AND d.buy_price_ht IS NOT NULL";
-    if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
+    if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) {
+        $sql .= " AND d.buy_price_ht <> 0";
+    }
     $sql.= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total, f.datef, f.paye, f.fk_statut, f.type";
     $sql.= $db->order($sortfield,$sortorder);
     // TODO: calculate total to display then restore pagination
@@ -182,10 +200,12 @@ 
     	print_liste_field_titre("SoldAmount",$_SERVER["PHP_SELF"],"selling_price","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
     	print_liste_field_titre("PurchasedAmount",$_SERVER["PHP_SELF"],"buying_price","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
     	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
-    	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-    		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
-    	if (! empty($conf->global->DISPLAY_MARK_RATES))
-    		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+    	    		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    	}
+    	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+    	    		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
+    	}
     	print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;socid=".$_REQUEST["socid"],'align="right"',$sortfield,$sortorder);
     	print "</tr>\n";
 
@@ -219,10 +239,12 @@ 
     			print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
     			print "<td align=\"right\">".price(($objp->type == 2 ? -1 : 1) * $objp->buying_price, null, null, null, null, $rounding)."</td>\n";
     			print "<td align=\"right\">".$sign.price($objp->marge, null, null, null, null, $rounding)."</td>\n";
-    			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-    			    print "<td align=\"right\">".(($marginRate === '')?'n/a':$sign.price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-    			if (! empty($conf->global->DISPLAY_MARK_RATES))
-    			    print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+    			    			    print "<td align=\"right\">".(($marginRate === '')?'n/a':$sign.price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+    			}
+    			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+    			    			    print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    			}
     			print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
     			print "</tr>\n";
     			$i++;
@@ -238,8 +260,7 @@ 
     	{
     		$marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
     		$markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
-    	}
-    	else
+    	} else
     	{
     		$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
     		$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
@@ -251,14 +272,15 @@ 
     	print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
     	print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
     	print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
-    	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-    		print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-    	if (! empty($conf->global->DISPLAY_MARK_RATES))
-    		print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+    	    		print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+    	}
+    	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+    	    		print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    	}
     	print '<td align="right">&nbsp;</td>';
     	print "</tr>\n";
-    }
-    else
+    } else
     {
     	dol_print_error($db);
     }
@@ -267,8 +289,7 @@ 
 
     print '<br>';
     $db->free($result);
-}
-else
+} else
 {
 	dol_print_error('', 'Parameter socid not defined');
 }