alxarafe / alixar

dolibarr/htdocs/core/class/link.class.php

Braces +30 added lines, -20 removed lines

@@ -112,7 +112,9 @@ 
             if ($this->id > 0) {
                 // Call trigger
                 $result=$this->call_trigger('LINK_CREATE',$user);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
                 // End call triggers
             } else {
                 $error++;
@@ -123,23 +125,20 @@ 
                 dol_syslog(get_class($this)."::Create success id=" . $this->id);
                 $this->db->commit();
                 return $this->id;
-            }
-            else
+            } else
             {
                 dol_syslog(get_class($this)."::Create echec update " . $this->error, LOG_ERR);
                 $this->db->rollback();
                 return -3;
             }
-        }
-        else
+        } else
         {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
 
                 $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);
                 $result=-1;
-            }
-            else
+            } else
             {
                 $this->error=$this->db->lasterror();
                 $result=-2;
@@ -175,7 +174,9 @@ 
 
         // Clean parameters
         $this->url       = clean_url($this->url,1);
-        if (empty($this->label)) $this->label = basename($this->url);
+        if (empty($this->label)) {
+            $this->label = basename($this->url);
+        }
         $this->label     = trim($this->label);
 
 
@@ -198,7 +199,9 @@ 
             {
                 // Call trigger
                 $result=$this->call_trigger('LINK_MODIFY',$user);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
                 // End call triggers
             }
 
@@ -212,16 +215,14 @@ 
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
+        } else
         {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 // Doublon
                 $this->error = $langs->trans("ErrorDuplicateField");
                 $result =  -1;
-            }
-            else
+            } else
             {
                 $this->error = $langs->trans("Error sql = " . $sql);
                 $result =  -2;
@@ -247,7 +248,9 @@ 
 
         $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM " . MAIN_DB_PREFIX . "links";
         $sql .= " WHERE objecttype = '" . $objecttype . "' AND objectid = " . $objectid;
-        if ($conf->entity != 0) $sql .= " AND entity = " . $conf->entity;
+        if ($conf->entity != 0) {
+            $sql .= " AND entity = " . $conf->entity;
+        }
         if ($sortfield) {
             if (empty($sortorder)) {
                 $sortorder = "ASC";
@@ -298,13 +301,17 @@ 
 
         $sql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "links";
         $sql .= " WHERE objecttype = '" . $objecttype . "' AND objectid = " . $objectid;
-        if ($conf->entity != 0) $sql .= " AND entity = " . $conf->entity;
+        if ($conf->entity != 0) {
+            $sql .= " AND entity = " . $conf->entity;
+        }
 
         $resql = $db->query($sql);
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
-            if ($obj) return $obj->nb;
+            if ($obj) {
+                return $obj->nb;
+            }
         }
         return -1;
     }
@@ -325,7 +332,9 @@ 
 
         $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM " . MAIN_DB_PREFIX . "links";
         $sql .= " WHERE rowid = " . $rowid;
-        if($conf->entity != 0) $sql .= " AND entity = " . $conf->entity;
+        if($conf->entity != 0) {
+            $sql .= " AND entity = " . $conf->entity;
+        }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -341,8 +350,7 @@ 
                 $this->objecttype = $obj->objecttype;
                 $this->objectid = $obj->objectid;
                 return 1;
-            }
-            else
+            } else
 			{
                 return 0;
             }
@@ -366,7 +374,9 @@ 
 
         // Call trigger
         $result=$this->call_trigger('LINK_DELETE',$user);
-        if ($result < 0) return -1;
+        if ($result < 0) {
+            return -1;
+        }
         // End call triggers
 
         $this->db->begin();

dolibarr/htdocs/core/class/utils.class.php

Braces +270 added lines, -116 removed lines

@@ -63,7 +63,9 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$filesarray=array();
-		if (empty($choice)) $choice='tempfilesold';
+		if (empty($choice)) {
+		    $choice='tempfilesold';
+		}
 
 		if ($choice=='tempfiles' || $choice=='tempfilesold')
 		{
@@ -76,7 +78,10 @@ 
 					$now = dol_now();
 					foreach($filesarray as $key => $val)
 					{
-						if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]);	// Discard files not older than 24h
+						if ($val['date'] > ($now - (24 * 3600))) {
+						    unset($filesarray[$key]);
+						}
+						// Discard files not older than 24h
 					}
 				}
 			}
@@ -110,7 +115,9 @@ 
 				{
 					if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded=true; }
 				}
-				if (! $alreadyincluded) $filesarray[]=array('fullname'=>$filelog,'type'=>'file');
+				if (! $alreadyincluded) {
+				    $filesarray[]=array('fullname'=>$filelog,'type'=>'file');
+				}
 			}
 		}
 
@@ -129,8 +136,7 @@ 
 					$result=dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
 					$count+=$result;
 					$countdeleted+=$tmpcountdeleted;
-				}
-				elseif ($filesarray[$key]['type'] == 'file')
+				} elseif ($filesarray[$key]['type'] == 'file')
 				{
 					// If (file that is not logfile) or (if mode is logfile)
 					if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
@@ -140,8 +146,7 @@ 
 						{
 							$count++;
 							$countdeleted++;
-						}
-						else
+						} else
 						{
 							$counterror++;
 						}
@@ -161,9 +166,12 @@ 
 		if ($count > 0)
 		{
 			$this->output=$langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
-			if ($count > $countdeleted) $this->output.='<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
+			if ($count > $countdeleted) {
+			    $this->output.='<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
+			}
+		} else {
+		    $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':'');
 		}
-		else $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':'');
 
 		//return $count;
 		return 0;     // This function can be called by cron so must return 0 if OK
@@ -201,7 +209,9 @@ 
 		}
 
 		// Check type parameter
-		if ($type == 'auto') $type = $db->type;
+		if ($type == 'auto') {
+		    $type = $db->type;
+		}
 		if (! in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
 		{
 			$langs->load("errors");
@@ -233,44 +243,75 @@ 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
 			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			if ($compression == 'gz') {
+			    $outputfile.='.gz';
+			}
+			if ($compression == 'bz') {
+			    $outputfile.='.bz2';
+			}
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
 			// Parameteres execution
 			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+			if (preg_match("/\s/",$command)) {
+			    $command=escapeshellarg($command);
+			}
+			// Use quotes on command
 
 			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
 			$param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
 			$param.=" -u ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
-			if (! GETPOST("use_transaction"))    $param.=" -l --single-transaction";
-			if (GETPOST("disable_fk") || $usedefault) $param.=" -K";
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat","alpha"));
-			if (GETPOST("drop_database"))        $param.=" --add-drop-database";
+			if (! empty($dolibarr_main_db_port)) {
+			    $param.=" -P ".$dolibarr_main_db_port;
+			}
+			if (! GETPOST("use_transaction")) {
+			    $param.=" -l --single-transaction";
+			}
+			if (GETPOST("disable_fk") || $usedefault) {
+			    $param.=" -K";
+			}
+			if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') {
+			    $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat","alpha"));
+			}
+			if (GETPOST("drop_database")) {
+			    $param.=" --add-drop-database";
+			}
 			if (GETPOST("sql_structure") || $usedefault)
 			{
-				if (GETPOST("drop") || $usedefault)	$param.=" --add-drop-table=TRUE";
-				else 							    $param.=" --add-drop-table=FALSE";
-			}
-			else
+				if (GETPOST("drop") || $usedefault) {
+				    $param.=" --add-drop-table=TRUE";
+				} else {
+				    $param.=" --add-drop-table=FALSE";
+				}
+			} else
 			{
 				$param.=" -t";
 			}
-			if (GETPOST("disable-add-locks")) $param.=" --add-locks=FALSE";
+			if (GETPOST("disable-add-locks")) {
+			    $param.=" --add-locks=FALSE";
+			}
 			if (GETPOST("sql_data") || $usedefault)
 			{
 				$param.=" --tables";
-				if (GETPOST("showcolumns") || $usedefault)	 $param.=" -c";
-				if (GETPOST("extended_ins") || $usedefault) $param.=" -e";
-				else $param.=" --skip-extended-insert";
-				if (GETPOST("delayed"))	 	 $param.=" --delayed-insert";
-				if (GETPOST("sql_ignore"))	 $param.=" --insert-ignore";
-				if (GETPOST("hexforbinary") || $usedefault) $param.=" --hex-blob";
-			}
-			else
+				if (GETPOST("showcolumns") || $usedefault) {
+				    $param.=" -c";
+				}
+				if (GETPOST("extended_ins") || $usedefault) {
+				    $param.=" -e";
+				} else {
+				    $param.=" --skip-extended-insert";
+				}
+				if (GETPOST("delayed")) {
+				    $param.=" --delayed-insert";
+				}
+				if (GETPOST("sql_ignore")) {
+				    $param.=" --insert-ignore";
+				}
+				if (GETPOST("hexforbinary") || $usedefault) {
+				    $param.=" --hex-blob";
+				}
+			} else
 			{
 				$param.=" -d";    // No row information (no data)
 			}
@@ -289,14 +330,24 @@ 
 			// Start call method to execute dump
 			$fullcommandcrypted=$command." ".$paramcrypted." 2>&1";
 			$fullcommandclear=$command." ".$paramclear." 2>&1";
-			if ($compression == 'none') $handle = fopen($outputfile, 'w');
-			if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');
-			if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');
+			if ($compression == 'none') {
+			    $handle = fopen($outputfile, 'w');
+			}
+			if ($compression == 'gz') {
+			    $handle = gzopen($outputfile, 'w');
+			}
+			if ($compression == 'bz') {
+			    $handle = bzopen($outputfile, 'w');
+			}
 
 			if ($handle)
 			{
-				if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-				if (empty($execmethod)) $execmethod=1;
+				if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) {
+				    $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
+				}
+				if (empty($execmethod)) {
+				    $execmethod=1;
+				}
 
 				$ok=0;
 				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG);
@@ -313,47 +364,66 @@ 
 						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
 						$error = 'Error '.$retval;
 						$ok=0;
-					}
-					else
+					} else
 					{
 						$i=0;
-						if (!empty($readt))
-						foreach($readt as $key=>$read)
+						if (!empty($readt)) {
+												foreach($readt as $key=>$read)
 						{
-							$i++;   // output line number
-							if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+							$i++;
+						}
+						// output line number
+							if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) {
+							    continue;
+							}
 							fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
-							if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-							elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+							if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) {
+							    $ok=1;
+							} elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) {
+							    $ok=1;
+							}
 						}
 					}
 				}
-				if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
+				if ($execmethod == 2) {
+				    // With this method, there is no way to get the return code, only output
 				{
 					$handlein = popen($fullcommandclear, 'r');
+				}
 					$i=0;
 					while (!feof($handlein))
 					{
 						$i++;   // output line number
 						$read = fgets($handlein);
 						// Exclude warning line we don't want
-						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) {
+						    continue;
+						}
 						fwrite($handle,$read);
-						if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+						if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) {
+						    $ok=1;
+						} elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) {
+						    $ok=1;
+						}
 					}
 					pclose($handlein);
 				}
 
 
-				if ($compression == 'none') fclose($handle);
-				if ($compression == 'gz')   gzclose($handle);
-				if ($compression == 'bz')   bzclose($handle);
+				if ($compression == 'none') {
+				    fclose($handle);
+				}
+				if ($compression == 'gz') {
+				    gzclose($handle);
+				}
+				if ($compression == 'bz') {
+				    bzclose($handle);
+				}
 
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-			}
-			else
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+				}
+			} else
 			{
 				$langs->load("errors");
 				dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
@@ -361,18 +431,33 @@ 
 			}
 
 			// Get errorstring
-			if ($compression == 'none') $handle = fopen($outputfile, 'r');
-			if ($compression == 'gz')   $handle = gzopen($outputfile, 'r');
-			if ($compression == 'bz')   $handle = bzopen($outputfile, 'r');
+			if ($compression == 'none') {
+			    $handle = fopen($outputfile, 'r');
+			}
+			if ($compression == 'gz') {
+			    $handle = gzopen($outputfile, 'r');
+			}
+			if ($compression == 'bz') {
+			    $handle = bzopen($outputfile, 'r');
+			}
 			if ($handle)
 			{
 				// Get 2048 first chars of error message.
 				$errormsg = fgets($handle,2048);
 				// Close file
-				if ($compression == 'none') fclose($handle);
-				if ($compression == 'gz')   gzclose($handle);
-				if ($compression == 'bz')   bzclose($handle);
-				if ($ok && preg_match('/^-- MySql/i',$errormsg)) $errormsg='';	// Pas erreur
+				if ($compression == 'none') {
+				    fclose($handle);
+				}
+				if ($compression == 'gz') {
+				    gzclose($handle);
+				}
+				if ($compression == 'bz') {
+				    bzclose($handle);
+				}
+				if ($ok && preg_match('/^-- MySql/i',$errormsg)) {
+				    $errormsg='';
+				}
+				// Pas erreur
 				else
 				{
 					// Renommer fichier sortie en fichier erreur
@@ -402,8 +487,12 @@ 
 			$outputfiletemp = $outputfile.'-TMP.sql';
 			// for compression format, we add extension
 			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			if ($compression == 'gz') {
+			    $outputfile.='.gz';
+			}
+			if ($compression == 'bz') {
+			    $outputfile.='.bz2';
+			}
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
@@ -412,8 +501,7 @@ 
 				$this->backupTables($outputfiletemp);
 				dol_compress_file($outputfiletemp, $outputfile, $compression);
 				unlink($outputfiletemp);
-			}
-			else
+			} else
 			{
 				$this->backupTables($outputfile);
 			}
@@ -430,36 +518,59 @@ 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
 			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			if ($compression == 'gz') {
+			    $outputfile.='.gz';
+			}
+			if ($compression == 'bz') {
+			    $outputfile.='.bz2';
+			}
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
 			// Parameteres execution
 			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+			if (preg_match("/\s/",$command)) {
+			    $command=escapeshellarg($command);
+			}
+			// Use quotes on command
 
 			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
 			//$param="-F c";
 			$param="-F p";
 			$param.=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
 			$param.=" -U ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param.="  --disable-dollar-quoting";
-			if (GETPOST("drop_database"))        $param.=" -c -C";
+			if (! empty($dolibarr_main_db_port)) {
+			    $param.=" -p ".$dolibarr_main_db_port;
+			}
+			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') {
+			    $param.="  --disable-dollar-quoting";
+			}
+			if (GETPOST("drop_database")) {
+			    $param.=" -c -C";
+			}
 			if (GETPOST("sql_structure"))
 			{
-				if (GETPOST("drop"))			 $param.=" --add-drop-table";
-				if (! GETPOST("sql_data"))       $param.=" -s";
+				if (GETPOST("drop")) {
+				    $param.=" --add-drop-table";
+				}
+				if (! GETPOST("sql_data")) {
+				    $param.=" -s";
+				}
 			}
 			if (GETPOST("sql_data"))
 			{
-				if (! GETPOST("sql_structure"))	 $param.=" -a";
-				if (GETPOST("showcolumns"))	     $param.=" -c";
+				if (! GETPOST("sql_structure")) {
+				    $param.=" -a";
+				}
+				if (GETPOST("showcolumns")) {
+				    $param.=" -c";
+				}
 			}
 			$param.=' -f "'.$outputfile.'"';
 			//if ($compression == 'none')
-			if ($compression == 'gz')   $param.=' -Z 9';
+			if ($compression == 'gz') {
+			    $param.=' -Z 9';
+			}
 			//if ($compression == 'bz')
 			$paramcrypted=$param;
 			$paramclear=$param;
@@ -483,7 +594,9 @@ 
 			foreach($tmpfiles as $key => $val)
 			{
 				$i++;
-				if ($i <= $keeplastnfiles) continue;
+				if ($i <= $keeplastnfiles) {
+				    continue;
+				}
 				dol_delete_file($val['fullname'], 0, 0, 0, null, false, 0);
 			}
 		}
@@ -512,8 +625,12 @@ 
 		$command=escapeshellcmd($command);
 		$command.=" 2>&1";
 
-		if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-		if (empty($execmethod)) $execmethod=1;
+		if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) {
+		    $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
+		}
+		if (empty($execmethod)) {
+		    $execmethod=1;
+		}
 		//$execmethod=1;
 
 		dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
@@ -530,9 +647,11 @@ 
 				$error = 'Error '.$retval;
 			}
 		}
-		if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
+		if ($execmethod == 2) {
+		    // With this method, there is no way to get the return code, only output
 		{
 			$ok=0;
+		}
 			$handle = fopen($outputfile, 'w+b');
 			if ($handle)
 			{
@@ -547,7 +666,9 @@ 
 				pclose($handlein);
 				fclose($handle);
 			}
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+			    @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 		}
 
 		// Update with result
@@ -592,14 +713,12 @@ 
 		{
 			try {
 				$moduleobj = new $class($this->db);
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$error++;
 				dol_print_error($e->getMessage());
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$langs->load("errors");
@@ -618,8 +737,12 @@ 
 			$outputfiledoc = $dirofmodule.'/'.$FILENAMEDOC;
 			if ($dirofmodule)
 			{
-				if (! dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
-				if (! dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);
+				if (! dol_is_dir($dirofmodule)) {
+				    dol_mkdir($dirofmodule);
+				}
+				if (! dol_is_dir($dirofmoduletmp)) {
+				    dol_mkdir($dirofmoduletmp);
+				}
 				if (! is_writable($dirofmoduletmp))
 				{
 					$this->error = 'Dir '.$dirofmoduletmp.' does not exists or is not writable';
@@ -636,19 +759,26 @@ 
 					$i = 0;
 					foreach ($specs as $spec)
 					{
-						if (preg_match('/notindoc/', $spec['relativename'])) continue;	// Discard file
-						if (preg_match('/disabled/', $spec['relativename'])) continue;	// Discard file
+						if (preg_match('/notindoc/', $spec['relativename'])) {
+						    continue;
+						}
+						// Discard file
+						if (preg_match('/disabled/', $spec['relativename'])) {
+						    continue;
+						}
+						// Discard file
 
 						$pathtofile = strtolower($module).'/doc/'.$spec['relativename'];
 						$format='asciidoc';
-						if (preg_match('/\.md$/i', $spec['name'])) $format='markdown';
+						if (preg_match('/\.md$/i', $spec['name'])) {
+						    $format='markdown';
+						}
 
 						$filecursor = @file_get_contents($spec['fullname']);
 						if ($filecursor)
 						{
 							fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");
-						}
-						else
+						} else
 						{
 							$this->error = 'Failed to concat content of file '.$spec['fullname'];
 							return -1;
@@ -683,8 +813,7 @@ 
 					$this->error = $resarray['error'].' '.$resarray['output'];
 				}
 				$result = ($resarray['result'] == 0) ? 1 : 0;
-			}
-			else
+			} else
 			{
 				$result = 0;
 			}
@@ -692,15 +821,13 @@ 
 			if ($result > 0)
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				$error++;
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$langs->load("errors");
@@ -751,11 +878,13 @@ 
 			$logname = $file['name'];
 			$logpath = $file['path'];
 
-			if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0)	// If log file exists and is not empty
+			if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0) {
+			    // If log file exists and is not empty
 			{
 				// Handle already compressed files to rename them and add +1
 
 				$filter = '^'.preg_quote($logname, '/').'\.([0-9]+)\.gz$';
+			}
 
 				$gzfilestmp = dol_dir_list($logpath, 'files', 0, $filter);
 				$gzfiles = array();
@@ -859,8 +988,7 @@ 
 			{
 				$tables[] = $row[0];
 			}
-		}
-		else
+		} else
 		{
 			$tables = is_array($tables) ? $tables : explode(',',$tables);
 		}
@@ -896,16 +1024,24 @@ 
 
 ";
 
-		if (GETPOST("nobin_disable_fk")) $sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";
+		if (GETPOST("nobin_disable_fk")) {
+		    $sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";
+		}
 		//$sqlhead .= "SET SQL_MODE=\"NO_AUTO_VALUE_ON_ZERO\";\n";
-		if (GETPOST("nobin_use_transaction")) $sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";
+		if (GETPOST("nobin_use_transaction")) {
+		    $sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";
+		}
 
 		fwrite($handle, $sqlhead);
 
 		$ignore = '';
-		if (GETPOST("nobin_sql_ignore")) $ignore = 'IGNORE ';
+		if (GETPOST("nobin_sql_ignore")) {
+		    $ignore = 'IGNORE ';
+		}
 		$delayed = '';
-		if (GETPOST("nobin_delayed")) $delayed = 'DELAYED ';
+		if (GETPOST("nobin_delayed")) {
+		    $delayed = 'DELAYED ';
+		}
 
 		// Process each table and print their definition + their datas
 		foreach($tables as $table)
@@ -913,7 +1049,10 @@ 
 			// Saving the table structure
 			fwrite($handle, "\n--\n-- Table structure for table `".$table."`\n--\n");
 
-			if (GETPOST("nobin_drop")) fwrite($handle,"DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
+			if (GETPOST("nobin_drop")) {
+			    fwrite($handle,"DROP TABLE IF EXISTS `".$table."`;\n");
+			}
+			// Dropping table if exists prior to re create it
 			fwrite($handle,"/*!40101 SET @saved_cs_client     = @@character_set_client */;\n");
 			fwrite($handle,"/*!40101 SET character_set_client = utf8 */;\n");
 			$resqldrop=$db->query('SHOW CREATE TABLE '.$table);
@@ -921,17 +1060,22 @@ 
 			if (empty($row2[1]))
 			{
 				fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
-			}
-			else
+			} else
 			{
 				fwrite($handle,$row2[1].";\n");
 				//fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
 
 				// Dumping the data (locking the table and disabling the keys check while doing the process)
 				fwrite($handle, "\n--\n-- Dumping data for table `".$table."`\n--\n");
-				if (!GETPOST("nobin_nolocks")) fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n"); // Lock the table before inserting data (when the data will be imported back)
-				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
-				else fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
+				if (!GETPOST("nobin_nolocks")) {
+				    fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n");
+				}
+				// Lock the table before inserting data (when the data will be imported back)
+				if (GETPOST("nobin_disable_fk")) {
+				    fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
+				} else {
+				    fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
+				}
 
 				$sql='SELECT * FROM '.$table;
 				$result = $db->query($sql);
@@ -959,8 +1103,14 @@ 
 					}
 					fwrite($handle,implode(',', $row).");\n");
 				}
-				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking
-				if (!GETPOST("nobin_nolocks")) fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table
+				if (GETPOST("nobin_disable_fk")) {
+				    fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n");
+				}
+				// Enabling back the keys/index checking
+				if (!GETPOST("nobin_nolocks")) {
+				    fwrite($handle, "UNLOCK TABLES;\n");
+				}
+				// Unlocking the table
 				fwrite($handle,"\n\n\n");
 			}
 		}
@@ -986,8 +1136,12 @@ 
 
 		// Write the footer (restore the previous database settings)
 		$sqlfooter="\n\n";
-		if (GETPOST("nobin_use_transaction")) $sqlfooter .= "COMMIT;\n";
-		if (GETPOST("nobin_disable_fk")) $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
+		if (GETPOST("nobin_use_transaction")) {
+		    $sqlfooter .= "COMMIT;\n";
+		}
+		if (GETPOST("nobin_disable_fk")) {
+		    $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
+		}
 		$sqlfooter.="\n\n-- Dump completed on ".date('Y-m-d G-i-s');
 		fwrite($handle, $sqlfooter);
 

dolibarr/htdocs/core/class/html.formcontract.class.php

Braces +19 added lines, -15 removed lines

@@ -66,7 +66,9 @@ 
 		global $db,$user,$conf,$langs;
 
 		$hideunselectables = false;
-		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) {
+		    $hideunselectables = true;
+		}
 
 		// Search all contacts
 		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut';
@@ -76,15 +78,17 @@ 
 		if ($socid > 0)
 		{
 			// CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-		    	if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))
-			    $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
-		    	else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')
+		    	if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
+		    				    $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
+		    	} else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')
 			{
 		        	$sql.= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
 				$sql.= " OR c.fk_soc IS NULL)";
 		    	}
 		}
-		if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
+		if ($socid == 0) {
+		    $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
+		}
 		$sql.= " ORDER BY c.ref ";
 
 		dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
@@ -92,7 +96,9 @@ 
 		if ($resql)
 		{
 			print '<select class="flat" name="'.$htmlname.'">';
-			if ($showempty) print '<option value="0">&nbsp;</option>';
+			if ($showempty) {
+			    print '<option value="0">&nbsp;</option>';
+			}
 			$num = $db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -104,8 +110,7 @@ 
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
+					} else
 					{
 						$labeltoshow=dol_trunc($obj->ref,18);
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
@@ -113,8 +118,7 @@ 
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							$disabled=0;
 							if ( $obj->statut ==  0)
@@ -131,11 +135,12 @@ 
 							if ($hideunselectables && $disabled)
 							{
 								$resultat='';
-							}
-							else
+							} else
 							{
 								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								if ($disabled) {
+								    $resultat.=' disabled';
+								}
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
 								$resultat.='>'.$labeltoshow;
@@ -158,8 +163,7 @@ 
 			}
 
 			return $num;
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 			return -1;

dolibarr/htdocs/core/class/html.formmargin.class.php

Braces +66 added lines, -46 removed lines

@@ -88,8 +88,9 @@ 
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 				$product = new ProductFournisseur($db);
-				if ($product->fetch_product_fournisseur_price($line->fk_fournprice))
-					$line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
+				if ($product->fetch_product_fournisseur_price($line->fk_fournprice)) {
+									$line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
+				}
 			}
 			// si prix d'achat non renseigné et devrait l'être, alors prix achat = prix vente
 			if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
@@ -114,8 +115,7 @@ 
 					//}
 					//else
 						$marginInfos['margin_on_products'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] +=  $pa;
@@ -125,13 +125,11 @@ 
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
 					//else
 						$marginInfos['margin_on_services'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
 					$marginInfos['pa_total'] += $pa;
 					$marginInfos['pv_total'] += $pv;
 				}
-			}
-			else {
+			} else {
 				$type=$line->product_type?$line->product_type:$line->fk_product_type;
 				if ($type == 0) {  // product
 					$marginInfos['pa_products'] += $pa;
@@ -147,8 +145,7 @@ 
 					//{
 					    $marginInfos['margin_on_products'] += $pv - $pa;
 					//}
-				}
-				elseif ($type == 1) {  // service
+				} elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] +=  $pa;
@@ -161,25 +158,31 @@ 
 				}
 			}
 		}
-		if ($marginInfos['pa_products'] > 0)
-			$marginInfos['margin_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pa_products'];
-		if ($marginInfos['pv_products'] > 0)
-			$marginInfos['mark_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pv_products'];
+		if ($marginInfos['pa_products'] > 0) {
+					$marginInfos['margin_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pa_products'];
+		}
+		if ($marginInfos['pv_products'] > 0) {
+					$marginInfos['mark_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pv_products'];
+		}
 
-		if ($marginInfos['pa_services'] > 0)
-			$marginInfos['margin_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pa_services'];
-		if ($marginInfos['pv_services'] > 0)
-			$marginInfos['mark_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pv_services'];
+		if ($marginInfos['pa_services'] > 0) {
+					$marginInfos['margin_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pa_services'];
+		}
+		if ($marginInfos['pv_services'] > 0) {
+					$marginInfos['mark_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pv_services'];
+		}
 
 		// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 		//if ($marginInfos['pv_total'] < 0)
 		//	$marginInfos['total_margin'] = -1 * (abs($marginInfos['pv_total']) - $marginInfos['pa_total']);
 		//else
 			$marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];
-		if ($marginInfos['pa_total'] > 0)
-			$marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
-		if ($marginInfos['pv_total'] > 0)
-			$marginInfos['total_mark_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pv_total'];
+		if ($marginInfos['pa_total'] > 0) {
+					$marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
+		}
+		if ($marginInfos['pv_total'] > 0) {
+					$marginInfos['total_mark_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pv_total'];
+		}
 
 		return $marginInfos;
 	}
@@ -195,17 +198,23 @@ 
 	{
 		global $langs, $conf, $user;
 
-    	if (! empty($user->societe_id)) return;
+    	if (! empty($user->societe_id)) {
+    	    return;
+    	}
 
-    	if (! $user->rights->margins->liretous) return;
+    	if (! $user->rights->margins->liretous) {
+    	    return;
+    	}
 
         $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
 		$marginInfo = $this->getMarginInfosArray($object, $force_price);
 
-		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
+		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON)) {
+		    // TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
 		{
 			print $langs->trans('ShowMarginInfos').' : ';
+		}
 	        $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];
 	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'':'hideobject').'">'.img_picto($langs->trans("Disabled"),'switch_off').'</span>';
 	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'hideobject':'').'">'.img_picto($langs->trans("Enabled"),'switch_on').'</span>';
@@ -214,7 +223,9 @@ 
         	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
         	    $("span#hideMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
       	        });</script>';
-    	    if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+    	    if (!empty($hidemargininfos)) {
+    	        print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+    	    }
 		}
 
 		print '<div class="div-table-responsive-no-min">';
@@ -224,15 +235,18 @@ 
 		print '<tr class="liste_titre">';
 		print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
 		print '<td class="liste_titre" align="right">'.$langs->trans('SellingPrice').'</td>';
-		if ($conf->global->MARGIN_TYPE == "1")
-			print '<td class="liste_titre" align="right">'.$langs->trans('BuyingPrice').'</td>';
-		else
-			print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
+		if ($conf->global->MARGIN_TYPE == "1") {
+					print '<td class="liste_titre" align="right">'.$langs->trans('BuyingPrice').'</td>';
+		} else {
+					print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
+		}
 		print '<td class="liste_titre" align="right">'.$langs->trans('Margin').'</td>';
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-			print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
-		if (! empty($conf->global->DISPLAY_MARK_RATES))
-			print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
+		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+					print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
+		}
+		if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+					print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
+		}
 		print '</tr>';
 
 		if (! empty($conf->product->enabled))
@@ -243,10 +257,12 @@ 
 			print '<td align="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			}
 			print '</tr>';
 		}
 
@@ -257,10 +273,12 @@ 
 			print '<td align="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			}
 			print '</tr>';
 		}
 
@@ -271,10 +289,12 @@ 
 			print '<td align="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+			}
 			print '</tr>';
 		}
 		print '</table>';

dolibarr/htdocs/core/class/html.formpropal.class.php

Braces +10 added lines, -10 removed lines

@@ -78,8 +78,7 @@ 
                 3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),
                 4=>array('id'=>4, 'code'=>'PR_CLOSED')
             );
-        }
-        else
+        } else
         {
             $prefix="PropalStatus";
 
@@ -100,15 +99,16 @@ 
                         $i++;
                     }
                 }
-            }
-            else
+            } else
             {
                 dol_print_error($this->db);
             }
         }
 
         print '<select class="flat" name="'.$htmlname.'">';
-        if ($showempty) print '<option value="-1">&nbsp;</option>';
+        if ($showempty) {
+            print '<option value="-1">&nbsp;</option>';
+        }
 
         foreach($listofstatus as $key => $obj)
         {
@@ -123,8 +123,7 @@ 
             if ($selected != '' && $selected == $obj['id'])
             {
                 print '<option value="'.$obj['id'].'" selected>';
-            }
-            else
+            } else
             {
                 print '<option value="'.$obj['id'].'">';
             }
@@ -132,11 +131,12 @@ 
             if ($langs->trans($prefix.$key.($short?'Short':'')) != $prefix.$key.($short?'Short':''))
             {
                 print $langs->trans($prefix.$key.($short?'Short':''));
-            }
-            else
+            } else
 			{
                 $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
-                if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
+                if (! empty($conv_to_new_code[$obj['code']])) {
+                    $key=$conv_to_new_code[$obj['code']];
+                }
 
                 print ($langs->trans($prefix.$key.($short?'Short':''))!=$prefix.$key.($short?'Short':''))?$langs->trans($prefix.$key.($short?'Short':'')):($obj['label']?$obj['label']:$obj['code']);
             }

dolibarr/htdocs/core/class/discount.class.php

Braces +88 added lines, -59 removed lines

@@ -131,9 +131,15 @@ 
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
         $sql.= " WHERE sr.entity = " . $conf->entity;
-        if ($rowid) $sql.= " AND sr.rowid=".$rowid;
-        if ($fk_facture_source) $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
-        if ($fk_invoice_supplier_source) $sql.= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
+        if ($rowid) {
+            $sql.= " AND sr.rowid=".$rowid;
+        }
+        if ($fk_facture_source) {
+            $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
+        }
+        if ($fk_invoice_supplier_source) {
+            $sql.= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
+        }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -170,14 +176,12 @@ 
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else
+            } else
             {
                 $this->db->free($resql);
                 return 0;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -206,9 +210,15 @@ 
         $this->multicurrency_amount_tva=price2num($this->multicurrency_amount_tva);
         $this->multicurrency_amount_ttc=price2num($this->multicurrency_amount_ttc);
 
-        if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht=0;
-        if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva=0;
-        if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc=0;
+        if (empty($this->multicurrency_amount_ht)) {
+            $this->multicurrency_amount_ht=0;
+        }
+        if (empty($this->multicurrency_amount_tva)) {
+            $this->multicurrency_amount_tva=0;
+        }
+        if (empty($this->multicurrency_amount_ttc)) {
+            $this->multicurrency_amount_ttc=0;
+        }
 
         // Check parameters
         if (empty($this->description))
@@ -238,8 +248,7 @@ 
         {
             $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
             return $this->id;
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror().' - sql='.$sql;
             return -1;
@@ -277,8 +286,7 @@ 
                     $this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
                     return -2;
                 }
-            }
-            else
+            } else
             {
                 dol_print_error($this->db);
                 return -1;
@@ -305,8 +313,7 @@ 
         			$this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
         			return -2;
         		}
-        	}
-        	else
+        	} else
         	{
         		dol_print_error($this->db);
         		return -1;
@@ -317,9 +324,18 @@ 
 
         // Delete but only if not used
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
-        if ($this->fk_facture_source) $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;	// Delete all lines of same serie
-        elseif ($this->fk_invoice_supplier_source) $sql.= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;	// Delete all lines of same serie
-        else $sql.= " WHERE rowid = ".$this->id;	// Delete only line
+        if ($this->fk_facture_source) {
+            $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;
+        }
+        // Delete all lines of same serie
+        elseif ($this->fk_invoice_supplier_source) {
+            $sql.= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
+        }
+        // Delete all lines of same serie
+        else {
+            $sql.= " WHERE rowid = ".$this->id;
+        }
+        // Delete only line
         $sql.= " AND (fk_facture_line IS NULL";	// Not used as absolute simple discount
         $sql.= " AND fk_facture IS NULL)";		// Not used as credit note and not used as deposit
         $sql.= " AND (fk_invoice_supplier_line IS NULL";	// Not used as absolute simple discount
@@ -342,15 +358,13 @@ 
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->error=$this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            elseif($this->fk_invoice_supplier_source) {
+            } elseif($this->fk_invoice_supplier_source) {
 
             	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
             	$sql.=" set paye=0, fk_statut=1";
@@ -362,21 +376,18 @@ 
             	{
             		$this->db->commit();
             		return 1;
-            	}
-            	else
+            	} else
             	{
             		$this->error=$this->db->lasterror();
             		$this->db->rollback();
             		return -1;
             	}
-            }
-            else
+            } else
             {
                 $this->db->commit();
                 return 1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             $this->db->rollback();
@@ -413,11 +424,19 @@ 
 
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
         if(! empty($this->discount_type)) {
-        	if ($rowidline)    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
+        	if ($rowidline) {
+        	    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
+        	}
+        	if ($rowidinvoice) {
+        	    $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
+        	}
         } else {
-        	if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
+        	if ($rowidline) {
+        	    $sql.=" SET fk_facture_line = ".$rowidline;
+        	}
+        	if ($rowidinvoice) {
+        	    $sql.=" SET fk_facture = ".$rowidinvoice;
+        	}
         }
         $sql.=" WHERE rowid = ".$this->id;
 
@@ -433,8 +452,7 @@ 
         		$this->fk_facture=$rowidinvoice;
         	}
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -3;
@@ -465,8 +483,7 @@ 
         if ($resql)
         {
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -3;
@@ -498,10 +515,18 @@ 
         } else {
         	$sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
         }
-        if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
-        if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
-        if ($filter)   $sql.=' AND ('.$filter.')';
-        if ($maxvalue) $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+        if (is_object($company)) {
+            $sql.= " AND rc.fk_soc = ".$company->id;
+        }
+        if (is_object($user)) {
+            $sql.= " AND rc.fk_user = ".$user->id;
+        }
+        if ($filter) {
+            $sql.=' AND ('.$filter.')';
+        }
+        if ($maxvalue) {
+            $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+        }
 
         dol_syslog(get_class($this)."::getAvailableDiscounts", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -537,15 +562,13 @@ 
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql.= ' AND f.type = 3';
-        }
-        else if ($invoice->element == 'invoice_supplier')
+        } else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql.= ' AND f.type = 3';
-        }
-        else
+        } else
         {
             $this->error=get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
@@ -556,10 +579,12 @@ 
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        }
-        else
+            if ($multicurrency) {
+                return $obj->multicurrency_amount;
+            } else {
+			    return $obj->amount;
+			}
+        } else
         {
             $this->error = $this->db->lasterror();
             return -1;
@@ -583,15 +608,13 @@ 
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql.= ' AND (f.type = 2 OR f.type = 0)';	// Find discount coming from credit note or excess received
-        }
-        else if ($invoice->element == 'invoice_supplier')
+        } else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql.= ' AND (f.type = 2 OR f.type = 0)';	// Find discount coming from credit note or excess paid
-        }
-        else
+        } else
         {
             $this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
@@ -602,10 +625,12 @@ 
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        }
-        else
+            if ($multicurrency) {
+                return $obj->multicurrency_amount;
+            } else {
+			    return $obj->amount;
+			}
+        } else
         {
             $this->error = $this->db->lasterror();
             return -1;
@@ -643,8 +668,12 @@ 
         }
 
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
+        if ($withpicto) {
+            $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        }
+        if ($withpicto && $withpicto != 2) {
+            $result.=' ';
+        }
         $result.=$link.$ref.$linkend;
         return $result;
     }

dolibarr/htdocs/core/class/openid.class.php

Braces +21 added lines, -16 removed lines

@@ -218,8 +218,7 @@ 
         if (count($this->error) > 0)
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -255,8 +254,9 @@ 
     function OpenID_Standarize($openid_identity = null)
     {
         // phpcs:enable
-        if ($openid_identity === null)
-        $openid_identity = $this->openid_url_identity;
+        if ($openid_identity === null) {
+                $openid_identity = $this->openid_url_identity;
+        }
 
         $u = parse_url(strtolower(trim($openid_identity)));
 
@@ -268,7 +268,7 @@ 
         }
         if (isset($u['query'])){ // If there is a query string, then use identity as is
             return $u['host'] . $u['path'] . '?' . $u['query'];
-        }else{
+        } else{
             return $u['host'] . $u['path'];
         }
     }
@@ -339,7 +339,9 @@ 
     {
         // phpcs:enable
         // Remember, SSL MUST BE SUPPORTED
-        if (is_array($params)) $params = $this->array2url($params);
+        if (is_array($params)) {
+            $params = $this->array2url($params);
+        }
 
         $curl = curl_init($url . ($method == "GET" && $params != "" ? "?" . $params : ""));
         @curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
@@ -347,13 +349,15 @@ 
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
         curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
-        if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+        if ($method == "POST") {
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+        }
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         $response = curl_exec($curl);
 
         if (curl_errno($curl) == 0){
             $response;
-        }else{
+        } else{
             $this->ErrorStore('OPENID_CURL', curl_error($curl));
         }
         return $response;
@@ -400,7 +404,9 @@ 
         global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) {
+		    $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		}
 
         $response = getURLContent($url);
 
@@ -458,8 +464,7 @@ 
             echo '<script language="JavaScript" type="text/javascript">window.location=\'';
             echo $redirect_to;
             echo '\';</script>';
-        }
-        else
+        } else
         {	// Default Header Redirect
             header('Location: ' . $redirect_to);
         }
@@ -502,8 +507,7 @@ 
         if ($data['is_valid'] == "true")
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -523,7 +527,9 @@ 
     	global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) {
+		    $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		}
 
 		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
@@ -554,8 +560,7 @@ 
         {
             $this->ErrorStore('OPENID_NOSERVERSFOUND');
             return false;
-        }
-        else
+        } else
        {
        		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
         	$this->SetOpenIDServer($server);

dolibarr/htdocs/core/class/emailsenderprofile.class.php

Braces +54 added lines, -28 removed lines

@@ -152,8 +152,12 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+		    $this->fields['rowid']['visible']=0;
+		}
+		if (empty($conf->multicompany->enabled)) {
+		    $this->fields['entity']['enabled']=0;
+		}
 	}
 
 	/**
@@ -227,7 +231,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;
 	}
 
@@ -295,7 +301,9 @@ 
 		if ($withpicto)
 		{
 			$result.=($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
-			if ($withpicto != 2) $result.=' ';
+			if ($withpicto != 2) {
+			    $result.=' ';
+			}
 		}
 		$result.= $linkstart . $this->label . $linkend;
 		return $result;
@@ -337,33 +345,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');
+			}
 		}
 	}
 
@@ -413,8 +440,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}

dolibarr/htdocs/core/class/html.formwebsite.class.php

Braces +9 added lines, -13 removed lines

@@ -79,8 +79,7 @@ 
                 if ($selected == $obj->rowid)
                 {
                     $out.='<option value="'.$obj->rowid.'" selected>';
-                }
-                else
+                } else
                 {
                     $out.='<option value="'.$obj->rowid.'">';
                 }
@@ -89,8 +88,7 @@ 
                 $i++;
             }
             $out.="</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -138,8 +136,7 @@ 
     				if ($selected == $obj->rowid || $selected == $obj->code)
     				{
     					print '<option value="'.$obj->code.'" selected>';
-    				}
-    				else
+    				} else
     				{
     					print '<option value="'.$obj->code.'">';
     				}
@@ -148,14 +145,14 @@ 
     				$i++;
     			}
     			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-    		}
-    		else
+    			if ($user->admin) {
+    			    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    			}
+    		} else
     		{
     			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     	}
     }
@@ -191,8 +188,7 @@ 
     		if ($selected == $key)
     		{
     			$out .= '<option value="'.$key.'" selected>';
-    		}
-    		else
+    		} else
     		{
     			$out .= '<option value="'.$key.'">';
     		}