alxarafe / alixar

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

Braces +1 added lines, -2 removed lines

@@ -176,8 +176,7 @@
             }
             $out .= "</select>";
             $out .= ajax_combobox("select_".$htmlname);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
         return $out;

dolibarr/htdocs/core/class/CSMSFile.class.php

Braces +38 added lines, -24 removed lines

@@ -65,8 +65,12 @@ 
 
 		// On definit fin de ligne
 		$this->eol="\n";
-		if (preg_match('/^win/i',PHP_OS)) $this->eol="\r\n";
-		if (preg_match('/^mac/i',PHP_OS)) $this->eol="\r";
+		if (preg_match('/^win/i',PHP_OS)) {
+		    $this->eol="\r\n";
+		}
+		if (preg_match('/^mac/i',PHP_OS)) {
+		    $this->eol="\r";
+		}
 
 		// If ending method not defined
 		if (empty($conf->global->MAIN_SMS_SENDMODE))
@@ -108,15 +112,19 @@ 
 
         $this->message=stripslashes($this->message);
 
-        if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms();
+        if (! empty($conf->global->MAIN_SMS_DEBUG)) {
+            $this->dump_sms();
+        }
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_SMS))
 		{
 
 		    // Action according to choosed sending method
-		    if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')    // Backward compatibility    @deprecated
+		    if ($conf->global->MAIN_SMS_SENDMODE == 'ovh') {
+		        // Backward compatibility    @deprecated
 			{
 				dol_include_once('/ovh/class/ovhsms.class.php');
+		    }
 				$sms=new OvhSms($this->db);
 				$sms->expe=$this->addr_from;
 				$sms->dest=$this->addr_to;
@@ -131,17 +139,19 @@ 
 				{
 					$this->error=$sms->error;
 					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-				}
-				else
+				} else
 				{
 					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
 					//var_dump($res);        // 1973128
-					if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+					if (! empty($conf->global->MAIN_SMS_DEBUG)) {
+					    $this->dump_sms_result($res);
+					}
 				}
-			}
-		    else if (! empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+			} else if (! empty($conf->global->MAIN_SMS_SENDMODE)) {
+		        // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
 		    {
 		        $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
+		    }
 		        $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
 		        dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
 		        try
@@ -162,28 +172,26 @@ 
     				if ($res <= 0)
     				{
     					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-    				}
-    				else
+    				} else
     				{
     					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
     					//var_dump($res);        // 1973128
-    					if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+    					if (! empty($conf->global->MAIN_SMS_DEBUG)) {
+    					    $this->dump_sms_result($res);
+    					}
     				}
-		        }
-		        catch(Exception $e)
+		        } catch(Exception $e)
 		        {
 		            dol_print_error('','Error to get list of senders: '.$e->getMessage());
 		        }
-		    }
-			else
+		    } else
 			{
 				// Send sms method not correctly defined
 				// --------------------------------------
 
 				return 'Bad value for MAIN_SMS_SENDMODE constant';
 			}
-		}
-		else
+		} else
 		{
 			$this->error='No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS';
 			dol_syslog("CSMSFile::sendfile: ".$this->error, LOG_WARNING);
@@ -207,9 +215,11 @@ 
         // phpcs:enable
 		global $conf,$dolibarr_main_data_root;
 
-		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
+		if (@is_writeable($dolibarr_main_data_root)) {
+		    // Avoid fatal error on fopen with open_basedir
 		{
 			$outputfile=$dolibarr_main_data_root."/dolibarr_sms.log";
+		}
 			$fp = fopen($outputfile,"w");
 
 			fputs($fp, "From: ".$this->addr_from."\n");
@@ -221,8 +231,9 @@ 
 			fputs($fp, "Message:\n".$this->message);
 
 			fclose($fp);
-			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));
+			}
 		}
 	}
 
@@ -239,16 +250,19 @@ 
         // phpcs:enable
         global $conf,$dolibarr_main_data_root;
 
-        if (@is_writeable($dolibarr_main_data_root))    // Avoid fatal error on fopen with open_basedir
+        if (@is_writeable($dolibarr_main_data_root)) {
+            // Avoid fatal error on fopen with open_basedir
         {
         	$outputfile=$dolibarr_main_data_root."/dolibarr_sms.log";
+        }
             $fp = fopen($outputfile,"a+");
 
             fputs($fp, "\nResult id=".$result);
 
             fclose($fp);
-            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));
+            }
         }
     }
 }

dolibarr/htdocs/core/class/fileupload.class.php

Braces +17 added lines, -29 removed lines

@@ -62,46 +62,36 @@ 
 		if ($element == 'propal') {
 			$pathname = 'comm/propal';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'facture') {
+		} elseif ($element == 'facture') {
 			$pathname = 'compta/facture';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'project') {
+		} elseif ($element == 'project') {
 			$element = $pathname = 'projet';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'project_task') {
+		} elseif ($element == 'project_task') {
 			$pathname = 'projet'; $filename='task';
 			$dir_output=$conf->projet->dir_output;
 			$parentForeignKey = 'fk_project';
 			$parentClass = 'Project';
 			$parentElement = 'projet';
 			$parentObject = 'project';
-		}
-		elseif ($element == 'fichinter') {
+		} elseif ($element == 'fichinter') {
 			$element='ficheinter';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'order_supplier') {
+		} elseif ($element == 'order_supplier') {
 			$pathname = 'fourn'; $filename='fournisseur.commande';
 			$dir_output=$conf->fournisseur->commande->dir_output;
-		}
-		elseif ($element == 'invoice_supplier') {
+		} elseif ($element == 'invoice_supplier') {
 			$pathname = 'fourn'; $filename='fournisseur.facture';
 			$dir_output=$conf->fournisseur->facture->dir_output;
-		}
-		elseif ($element == 'product') {
+		} elseif ($element == 'product') {
 			$dir_output = $conf->product->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'productbatch') {
+		} elseif ($element == 'productbatch') {
 			$dir_output = $conf->productbatch->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'action') {
+		} elseif ($element == 'action') {
 			$pathname = 'comm/action'; $filename='actioncomm';
 			$dir_output=$conf->agenda->dir_output;
-		}
-		elseif ($element == 'chargesociales') {
+		} elseif ($element == 'chargesociales') {
 			$pathname = 'compta/sociales'; $filename='chargesociales';
 			$dir_output=$conf->tax->dir_output;
 		} else {
@@ -282,10 +272,11 @@ 
 
 			$res=vignette($file_path,$maxwidthmini,$maxheightmini,'_mini');  // We don't use ->addThumbs here because there is no object and we don't need all thumbs, only the "mini".
 
-			if (preg_match('/error/i',$res)) return false;
+			if (preg_match('/error/i',$res)) {
+			    return false;
+			}
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -437,8 +428,7 @@ 
 				} else {
 					dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');
 				}
-			}
-			else
+			} else
 			{
 				// Non-multipart uploads (PUT method support)
 				file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);
@@ -455,8 +445,7 @@ 
 						$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
 					}
 				}
-			}
-			else if ($this->options['discard_aborted_uploads'])
+			} else if ($this->options['discard_aborted_uploads'])
 			{
 				unlink($file_path);
 				$file->error = 'abort';
@@ -479,8 +468,7 @@ 
 		if ($file_name)
 		{
 			$info = $this->getFileObject($file_name);
-		}
-		else
+		} else
 		{
 			$info = $this->getFileObjects();
 		}

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

Braces +123 added lines, -69 removed lines

@@ -97,8 +97,7 @@ 
 			));
 
 			$out.='<input type="text" class="minwidth200'.($morecss?' '.$morecss:'').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
-		}
-		else
+		} else
 		{
 			$out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
 		}
@@ -106,7 +105,9 @@ 
 		{
 			if (class_exists('Form'))
 			{
-				if (empty($form)) $form=new Form($this->db);
+				if (empty($form)) {
+				    $form=new Form($this->db);
+				}
 				$out.=$form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
 			}
 		}
@@ -115,8 +116,9 @@ 
 		{
 		    print $out;
 		    return '';
+		} else {
+		    return $out;
 		}
-		else return $out;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -147,13 +149,17 @@ 
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($htmlid)) $htmlid = $htmlname;
+		if (empty($htmlid)) {
+		    $htmlid = $htmlname;
+		}
 
 		$out='';
 		$outarray=array();
 
 		$hideunselectables = false;
-		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) {
+		    $hideunselectables = true;
+		}
 
 		$projectsListId = false;
 		if (empty($user->rights->projet->all->lire))
@@ -166,17 +172,26 @@ 
 		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
 		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p LEFT JOIN '.MAIN_DB_PREFIX .'societe as s ON s.rowid = p.fk_soc';
 		$sql.= " WHERE p.entity IN (".getEntity('project').")";
-		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		if ($projectsListId !== false) {
+		    $sql.= " AND p.rowid IN (".$projectsListId.")";
+		}
+		if ($socid == 0) {
+		    $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		}
 		if ($socid > 0)
 		{
-		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		    else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
+		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
+		        $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		    } else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all') {
+		        // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 		    {
 		        $sql.= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
 		    }
+		    }
+		}
+		if (!empty($filterkey)) {
+		    $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
 		}
-		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
 		$sql.= " ORDER BY p.ref ASC";
 
 		$resql=$this->db->query($sql);
@@ -208,12 +223,13 @@ 
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
+					} else
 					{
-						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) // We discard closed except if selected
+						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) {
+						    // We discard closed except if selected
 						{
 							$i++;
+						}
 							continue;
 						}
 
@@ -224,7 +240,9 @@ 
 						if ($obj->name)
 						{
 						    $labeltoshow.=' - '.$obj->name;
-						    if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
+						    if ($obj->name_alias) {
+						        $labeltoshow.=' ('.$obj->name_alias.')';
+						    }
 						}
 
 						$disabled=0;
@@ -232,13 +250,13 @@ 
 						{
 							$disabled=1;
 							$labeltoshow.=' - '.$langs->trans("Draft");
-						}
-						else if ($obj->fk_statut == 2)
+						} else if ($obj->fk_statut == 2)
 						{
-							if ($discard_closed == 2) $disabled=1;
+							if ($discard_closed == 2) {
+							    $disabled=1;
+							}
 							$labeltoshow.=' - '.$langs->trans("Closed");
-						}
-						else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						} else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
 						{
 							$disabled=1;
 							$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
@@ -249,17 +267,17 @@ 
 							$out.= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out.= '>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$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.='>';
@@ -284,18 +302,20 @@ 
 			$this->db->free($resql);
 
 			if (!$mode) {
-				if (empty($option_only)) $out.= '</select>';
+				if (empty($option_only)) {
+				    $out.= '</select>';
+				}
 				if (empty($nooutput))
 				{
 				    print $out;
 				    return '';
+				} else {
+				    return $out;
 				}
-				else return $out;
 			} else {
 				return $outarray;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -334,7 +354,9 @@ 
 		$out='';
 
 		$hideunselectables = false;
-		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+		    $hideunselectables = true;
+		}
 
 		if (empty($projectsListId))
 		{
@@ -353,9 +375,15 @@ 
 		$sql.= ' '.MAIN_DB_PREFIX.'projet_task as t';
 		$sql.= " WHERE p.entity IN (".getEntity('project').")";
 		$sql.= " AND t.fk_projet = p.rowid";
-		if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
-		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		if ($projectsListId) {
+		    $sql.= " AND p.rowid IN (".$projectsListId.")";
+		}
+		if ($socid == 0) {
+		    $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		}
+		if ($socid > 0) {
+		    $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		}
 		$sql.= " ORDER BY p.ref, t.ref ASC";
 
 		$resql=$this->db->query($sql);
@@ -375,8 +403,11 @@ 
 			}
 			if (! empty($show_empty)) {
 				$out.= '<option value="0" class="optiongrey">';
-				if (! is_numeric($show_empty)) $out.=$show_empty;
-				else $out.='&nbsp;';
+				if (! is_numeric($show_empty)) {
+				    $out.=$show_empty;
+				} else {
+				    $out.='&nbsp;';
+				}
 				$out.= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
@@ -390,8 +421,7 @@ 
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
 					{
 						// Do nothing
-					}
-					else
+					} else
 					{
 						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
 						{
@@ -408,20 +438,22 @@ 
 							//else $labeltoshow.=' ('.$langs->trans("Private").')';
 							$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
 
-							if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
+							if ($obj->name) {
+							    $labeltoshow.=' ('.$obj->name.')';
+							}
 
 							$disabled=0;
 							if ($obj->fk_statut == Project::STATUS_DRAFT)
 							{
 								$disabled=1;
 								$labeltoshow.=' - '.$langs->trans("Draft");
-							}
-							else if ($obj->fk_statut == Project::STATUS_CLOSED)
+							} else if ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
-								if ($discard_closed == 2) $disabled=1;
+								if ($discard_closed == 2) {
+								    $disabled=1;
+								}
 								$labeltoshow.=' - '.$langs->trans("Closed");
-							}
-							else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							} else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
 								$disabled=1;
 								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
@@ -437,17 +469,17 @@ 
 							$out.= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out.= '>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$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.='>';
@@ -468,8 +500,7 @@ 
 
 			$this->db->free($resql);
 			return $num;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -493,10 +524,15 @@ 
         // phpcs:enable
 		global $conf, $langs;
 
-		if ($table_element == 'projet_task') return '';		// Special cas of element we never link to a project (already always done)
+		if ($table_element == 'projet_task') {
+		    return '';
+		}
+		// Special cas of element we never link to a project (already always done)
 
 		$linkedtothirdparty=false;
-		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement','payment_salary','payment_various','chargesociales'))) $linkedtothirdparty=true;
+		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement','payment_salary','payment_various','chargesociales'))) {
+		    $linkedtothirdparty=true;
+		}
 
 		$sqlfilter='';
 
@@ -550,18 +586,31 @@ 
 				$sql = "SELECT t.rowid, t.ref";
 				break;
 		}
-		if ($linkedtothirdparty) $sql.=", s.nom as name";
+		if ($linkedtothirdparty) {
+		    $sql.=", s.nom as name";
+		}
 		$sql.= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
-		if ($linkedtothirdparty) $sql.=", ".MAIN_DB_PREFIX."societe as s";
+		if ($linkedtothirdparty) {
+		    $sql.=", ".MAIN_DB_PREFIX."societe as s";
+		}
 		$sql.= " WHERE ".$projectkey." is null";
 		if (! empty($socid) && $linkedtothirdparty)
 		{
-		    if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
-		    else $sql.= " AND t.fk_soc IN (".$socid.")";
+		    if (is_numeric($socid)) {
+		        $sql.= " AND t.fk_soc=".$socid;
+		    } else {
+		        $sql.= " AND t.fk_soc IN (".$socid.")";
+		    }
+		}
+		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) {
+		    $sql.= ' AND t.entity IN ('.getEntity('project').')';
+		}
+		if ($linkedtothirdparty) {
+		    $sql.=" AND s.rowid = t.fk_soc";
+		}
+		if ($sqlfilter) {
+		    $sql.= " AND ".$sqlfilter;
 		}
-		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project').')';
-		if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";
-		if ($sqlfilter) $sql.= " AND ".$sqlfilter;
 		$sql.= " ORDER BY ref DESC";
 
 		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
@@ -578,8 +627,12 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 					$ref=$obj->ref?$obj->ref:$obj->rowid;
-					if (! empty($obj->ref_supplier)) $ref.=' ('.$obj->ref_supplier.')';
-					if (! empty($obj->name)) $ref.=' - '.$obj->name;
+					if (! empty($obj->ref_supplier)) {
+					    $ref.=' ('.$obj->ref_supplier.')';
+					}
+					if (! empty($obj->name)) {
+					    $ref.=' - '.$obj->name;
+					}
 					$sellist .='<option value="'.$obj->rowid.'">'.$ref.'</option>';
 					$i++;
 				}
@@ -594,8 +647,7 @@ 
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->lasterror();
@@ -650,16 +702,19 @@ 
 					$obj = $this->db->fetch_object($resql);
 
 					$sellist .='<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';
-					if ($obj->rowid == $preselected) $sellist .= ' selected="selected"';
+					if ($obj->rowid == $preselected) {
+					    $sellist .= ' selected="selected"';
+					}
 					$sellist .= '>';
 					if ($useshortlabel)
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-					}
-					else
+					} else
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-						if ($showpercent) $finallabel.= ' ('.$obj->percent.'%)';
+						if ($showpercent) {
+						    $finallabel.= ' ('.$obj->percent.'%)';
+						}
 					}
 					$sellist .= $finallabel;
 					$sellist .='</option>';
@@ -676,8 +731,7 @@ 
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->errors[]=$this->db->lasterror();

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

Braces +145 added lines, -83 removed lines

@@ -73,7 +73,9 @@ 
         $sql = "SELECT rowid, label";
         $sql.= " FROM ".MAIN_DB_PREFIX."export_model";
         $sql.= " WHERE type = '".$type."'";
-		if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;
+		if (!empty($fk_user)) {
+		    $sql.=" AND fk_user=".$fk_user;
+		}
         $sql.= " ORDER BY rowid";
         $result = $this->db->query($sql);
         if ($result)
@@ -92,8 +94,7 @@ 
                 if ($selected == $obj->rowid)
                 {
                     print '<option value="'.$obj->rowid.'" selected>';
-                }
-                else
+                } else
                 {
                     print '<option value="'.$obj->rowid.'">';
                 }
@@ -102,8 +103,7 @@ 
                 $i++;
             }
             print "</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -143,8 +143,7 @@ 
                 if ($selected == $obj->rowid)
                 {
                     print '<option value="'.$obj->rowid.'" selected>';
-                }
-                else
+                } else
                 {
                     print '<option value="'.$obj->rowid.'">';
                 }
@@ -153,8 +152,7 @@ 
                 $i++;
             }
             print "</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -195,8 +193,7 @@ 
                     if ($selected && $selected == $obj->rowid)
                     {
                         print '<option value="'.$obj->rowid.'" selected>';
-                    }
-                    else
+                    } else
                     {
                         print '<option value="'.$obj->rowid.'">';
                         //print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
@@ -209,8 +206,7 @@ 
             }
             print '</select>';
             return 0;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             return 1;
@@ -255,8 +251,7 @@ 
     				if (($selected && $selected == $obj->taux) || $num == 1)
     				{
     					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
-    				}
-    				else
+    				} else
     				{
     					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
     					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
@@ -268,8 +263,7 @@ 
     		}
     		$out.='</select>';
     		return $out;
-    	}
-    	else
+    	} else
     	{
     		dol_print_error($this->db);
     		return '';
@@ -294,15 +288,16 @@ 
     {
         // phpcs:enable
         $return = '<select class="flat" name="'.$htmlname.'" '.($disabled?'disabled':'').'>';
-        if ($showempty) $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';
+        if ($showempty) {
+            $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';
+        }
 
         for ($i = $start ; $i <= $end ; $i += $increment)
         {
             if ($selected != '' && (int) $selected == $i)
             {
                 $return.= '<option value="'.$i.'" selected>';
-            }
-            else
+            } else
             {
                 $return.= '<option value="'.$i.'">';
             }
@@ -355,14 +350,19 @@ 
 
         // Print a select with each of them
         $moreforfilter.='<select class="flat minwidth100'.($morecss?' '.$morecss:'').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $moreforfilter.='<option value="0">&nbsp;</option>';	// Should use -1 to say nothing
+        if ($showempty) {
+            $moreforfilter.='<option value="0">&nbsp;</option>';
+        }
+        // Should use -1 to say nothing
 
         if (is_array($tab_categs))
         {
             foreach ($tab_categs as $categ)
             {
                 $moreforfilter.='<option value="'.$categ['id'].'"';
-                if ($categ['id'] == $selected) $moreforfilter.=' selected';
+                if ($categ['id'] == $selected) {
+                    $moreforfilter.=' selected';
+                }
                 $moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>';
             }
         }
@@ -409,14 +409,20 @@ 
         }
         // Select each sales and print them in a select input
         $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $out.='<option value="0">&nbsp;</option>';
+        if ($showempty) {
+            $out.='<option value="0">&nbsp;</option>';
+        }
 
         // Get list of users allowed to be viewed
         $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
         $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u";
         $sql_usr.= " WHERE u.entity IN (0,".$conf->entity.")";
-        if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.rowid = ".$user->id;
-        if (! empty($user->societe_id)) $sql_usr.=" AND u.fk_soc = ".$user->societe_id;
+        if (empty($user->rights->user->user->lire)) {
+            $sql_usr.=" AND u.rowid = ".$user->id;
+        }
+        if (! empty($user->societe_id)) {
+            $sql_usr.=" AND u.fk_soc = ".$user->societe_id;
+        }
         // Add existing sales representatives of thirdparty of external user
         if (empty($user->rights->user->user->lire) && $user->societe_id)
         {
@@ -437,7 +443,9 @@ 
 
                 $out.='<option value="'.$obj_usr->rowid.'"';
 
-                if ($obj_usr->rowid == $selected) $out.=' selected';
+                if ($obj_usr->rowid == $selected) {
+                    $out.=' selected';
+                }
 
                 $out.='>';
                 $out.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);
@@ -465,8 +473,7 @@ 
                 $out.='</option>';
             }
             $this->db->free($resql_usr);
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -502,15 +509,16 @@ 
         if ($tasksarray)
         {
         	print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty) print '<option value="0">&nbsp;</option>';
+            if ($useempty) {
+                print '<option value="0">&nbsp;</option>';
+            }
             $j=0;
             $level=0;
             $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);
             print '</select>';
 
             print ajax_combobox($htmlname);
-        }
-        else
+        } else
         {
             print '<div class="warning">'.$langs->trans("NoProject").'</div>';
         }
@@ -544,20 +552,23 @@ 
 				//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines
 
                 // Break on a new project
-                if ($parent == 0)	// We are on a task at first level
+                if ($parent == 0) {
+                    // We are on a task at first level
                 {
                     if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project
                     {
                         if ($i > 0) print '<option value="0" disabled>----------</option>';
+                }
                         print '<option value="'.$lines[$i]->fk_project.'_0"';
-                        if ($selectedproject == $lines[$i]->fk_project) print ' selected';
+                        if ($selectedproject == $lines[$i]->fk_project) {
+                            print ' selected';
+                        }
                         print '>';	// Project -> Task
                         print $langs->trans("Project").' '.$lines[$i]->projectref;
                         if (empty($lines[$i]->public))
                         {
                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                        }
-                        else
+                        } else
                         {
                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
                         }
@@ -572,31 +583,41 @@ 
                 $newdisablechildoftaskid=$disablechildoftaskid;
 
                 // Print task
-                if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
+                if (isset($lines[$i]->id)) {
+                    // We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
                 {
                 	// Check if we must disable entry
                 	$disabled=0;
+                }
                 	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
                 	{
                			$disabled++;
-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too
+               			if ($lines[$i]->fk_parent == $disablechildoftaskid) {
+               			    $newdisablechildoftaskid=$lines[$i]->id;
+               			}
+               			// If task is child of a disabled parent, we will propagate id to disable next child too
                 	}
 
                     print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
-                    if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
-                    if ($disabled) print ' disabled';
+                    if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) {
+                        print ' selected';
+                    }
+                    if ($disabled) {
+                        print ' disabled';
+                    }
                     print '>';
                     print $langs->trans("Project").' '.$lines[$i]->projectref;
                     print ' '.$lines[$i]->projectlabel;
                     if (empty($lines[$i]->public))
                     {
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                    }
-                    else
+                    } else
                     {
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
                     }
-                    if ($lines[$i]->id) print ' > ';
+                    if ($lines[$i]->id) {
+                        print ' > ';
+                    }
                     for ($k = 0 ; $k < $level ; $k++)
                     {
                         print "&nbsp;&nbsp;&nbsp;";
@@ -606,7 +627,9 @@ 
                 }
 
                 $level++;
-                if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
+                if ($lines[$i]->id) {
+                    $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
+                }
                 $level--;
             }
         }
@@ -625,12 +648,17 @@ 
     {
     	$textcolor='FFF';
     	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-    	if(colorIsLight($color)) $textcolor='000';
+    	if(colorIsLight($color)) {
+    	    $textcolor='000';
+    	}
 
     	$color = colorArrayToHex(colorStringToArray($color,array()),'');
 
-		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
-		else print $textifnotdefined;
+		if ($color) {
+		    print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
+		} else {
+		    print $textifnotdefined;
+		}
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -721,8 +749,7 @@ 
 	             </script>';
             }
             $out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />';
-        }
-        else  // In most cases, this is not used. We used instead function with no specific list of colors
+        } else  // In most cases, this is not used. We used instead function with no specific list of colors
         {
             if (empty($conf->dol_use_jmobile))
             {
@@ -743,7 +770,9 @@ 
             foreach ($arrayofcolors as $val)
             {
                 $out.= '<option value="'.$val.'"';
-                if ($set_color == $val) $out.= ' selected';
+                if ($set_color == $val) {
+                    $out.= ' selected';
+                }
                 $out.= '>'.$val.'</option>';
             }
             $out.= '</select>';
@@ -827,8 +856,7 @@ 
             if ($selected == $key)
             {
                 $select_week .= '<option value="'.$key.'" selected>';
-            }
-            else
+            } else
             {
                 $select_week .= '<option value="'.$key.'">';
             }
@@ -857,8 +885,13 @@ 
 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        if ($longlabel) $montharray = monthArray($langs, 0);	// Get array
-        else $montharray = monthArray($langs, 1);
+        if ($longlabel) {
+            $montharray = monthArray($langs, 0);
+        }
+        // Get array
+        else {
+            $montharray = monthArray($langs, 1);
+        }
 
         $select_month = '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
         if ($useempty)
@@ -870,8 +903,7 @@ 
             if ($selected == $key)
             {
                 $select_month .= '<option value="'.$key.'" selected>';
-            }
-            else
+            } else
             {
                 $select_month .= '<option value="'.$key.'">';
             }
@@ -924,13 +956,17 @@ 
         $currentyear = date("Y")+$offset;
         $max_year = $currentyear+$max_year;
         $min_year = $currentyear-$min_year;
-        if(empty($selected) && empty($useempty)) $selected = $currentyear;
+        if(empty($selected) && empty($useempty)) {
+            $selected = $currentyear;
+        }
 
         $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';
         if($useempty)
         {
         	$selected_html='';
-            if ($selected == '') $selected_html = ' selected';
+            if ($selected == '') {
+                $selected_html = ' selected';
+            }
             $out.= '<option value=""' . $selected_html . '>&nbsp;</option>';
         }
         if (! $invert)
@@ -938,16 +974,19 @@ 
             for ($y = $max_year; $y >= $min_year; $y--)
             {
                 $selected_html='';
-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+                if ($selected > 0 && $y == $selected) {
+                    $selected_html = ' selected';
+                }
                 $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
             }
-        }
-        else
+        } else
         {
             for ($y = $min_year; $y <= $max_year; $y++)
             {
                 $selected_html='';
-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+                if ($selected > 0 && $y == $selected) {
+                    $selected_html = ' selected';
+                }
                 $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
             }
         }
@@ -984,8 +1023,7 @@ 
             $langs->load("companies");
             print ' &nbsp; <a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$socid.'&action=create&origin='.$origin.'&originid='.$originid.'>'.$langs->trans("AddAddress").'</a>';
             print '</form>';
-        }
-        else
+        } else
         {
             if ($selected)
             {
@@ -993,8 +1031,7 @@ 
                 $address=new Address($this->db);
                 $result=$address->fetch_address($selected);
                 print '<a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$address->socid.'&id='.$address->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$address->label.'</a>';
-            }
-            else
+            } else
             {
                 print "&nbsp;";
             }
@@ -1028,7 +1065,10 @@ 
         $boxidactivatedforuser=array();
         foreach($boxactivated as $box)
         {
-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user
+        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) {
+        	    $boxidactivatedforuser[$box->id]=$box->id;
+        	}
+        	// We keep only boxes to show for user
         }
 
         // Define selectboxlist
@@ -1039,7 +1079,10 @@ 
         	$langs->load("boxes");	// Load label of boxes
         	foreach($boxactivated as $box)
         	{
-        		if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user
+        		if (! empty($boxidactivatedforuser[$box->id])) {
+        		    continue;
+        		}
+        		// Already visible for user
         		$label=$langs->transnoentitiesnoconv($box->boxlabel);
         		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
         		if (preg_match('/graph/',$box->class) && $conf->browser->layout != 'phone')
@@ -1050,7 +1093,9 @@ 
         	}
             foreach($boxidactivatedforuser as $boxid)
         	{
-       			if (empty($boxorder)) $boxorder.='A:';
+       			if (empty($boxorder)) {
+       			    $boxorder.='A:';
+       			}
   				$boxorder.=$boxid.',';
         	}
 
@@ -1064,7 +1109,9 @@ 
 			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';
 			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';
 			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
-            if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+            if (empty($conf->use_javascript_ajax)) {
+                $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+            }
             $selectboxlist.='</form>';
             if (! empty($conf->use_javascript_ajax))
             {
@@ -1115,7 +1162,9 @@ 
 	        			window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=addbox&boxid=\'+boxid;
 	                }
 	        	});';
-	        	if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';
+	        	if (! count($arrayboxtoactivatelabel)) {
+	        	    $selectboxlist.='jQuery("#boxcombo").hide();';
+	        	}
 	        	$selectboxlist.='
 
 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({
@@ -1158,16 +1207,25 @@ 
 
             // Define $box_max_lines
             $box_max_lines=5;
-            if (! empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;
+            if (! empty($conf->global->MAIN_BOXES_MAXLINES)) {
+                $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;
+            }
 
             $ii=0;
             foreach ($boxactivated as $key => $box)
             {
-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^A/i',$box->box_order)) // column A
+            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) {
+            	    continue;
+            	}
+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) {
+				    $box->box_order='A'.sprintf("%02d",($ii+1));
+				}
+				// When box_order was not yet set to Axx or Bxx and is still 0
+            	if (preg_match('/^A/i',$box->box_order)) {
+            	    // column A
                 {
                     $ii++;
+            	}
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
                     // Show box
@@ -1190,11 +1248,18 @@ 
             $ii=0;
             foreach ($boxactivated as $key => $box)
             {
-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^B/i',$box->box_order)) // colonne B
+            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) {
+            	    continue;
+            	}
+            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) {
+            	    $box->box_order='B'.sprintf("%02d",($ii+1));
+            	}
+            	// When box_order was not yet set to Axx or Bxx and is still 0
+            	if (preg_match('/^B/i',$box->box_order)) {
+            	    // colonne B
                 {
                     $ii++;
+            	}
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
                     // Show box
@@ -1262,8 +1327,7 @@ 
                     if ($selected == $obj->rowid || $selected == $obj->$keyfield)
                     {
                         print '<option value="'.$obj->$keyfield.'" selected>';
-                    }
-                    else
+                    } else
                     {
                         print '<option value="'.$obj->$keyfield.'">';
                     }
@@ -1272,13 +1336,11 @@ 
                     $i++;
                 }
                 print "</select>";
-            }
-            else
+            } else
 			{
                 print $langs->trans("DictionaryEmpty");
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }

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

Braces +235 added lines, -126 removed lines

@@ -166,7 +166,9 @@ 
 		// Set tmp user directory
 		$vardir=$conf->user->dir_output."/".$user->id;
 		$upload_dir = $vardir.'/temp/';                     // TODO Add $keytoavoidconflict in upload_dir path
-		if (is_dir($upload_dir)) dol_delete_dir_recursive($upload_dir);
+		if (is_dir($upload_dir)) {
+		    dol_delete_dir_recursive($upload_dir);
+		}
 
 		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
 		unset($_SESSION["listofpaths".$keytoavoidconflict]);
@@ -190,13 +192,23 @@ 
 		$listofnames=array();
 		$listofmimes=array();
 
-		if (empty($file)) $file=basename($path);
-		if (empty($type)) $type=dol_mimetype($file);
+		if (empty($file)) {
+		    $file=basename($path);
+		}
+		if (empty($type)) {
+		    $type=dol_mimetype($file);
+		}
 
 		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		}
 		if (! in_array($file,$listofnames))
 		{
 			$listofpaths[]=$path;
@@ -223,9 +235,15 @@ 
 		$listofmimes=array();
 
 		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		}
 		if ($keytodelete >= 0)
 		{
 			unset ($listofpaths[$keytodelete]);
@@ -252,9 +270,15 @@ 
 		$listofmimes=array();
 
 		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		}
 		return array('paths'=>$listofpaths, 'names'=>$listofnames, 'mimes'=>$listofmimes);
 	}
 
@@ -290,7 +314,9 @@ 
         // phpcs:enable
 		global $conf, $langs, $user, $hookmanager, $form;
 
-		if (! is_object($form)) $form=new Form($this->db);
+		if (! is_object($form)) {
+		    $form=new Form($this->db);
+		}
 
 		// Load translation files required by the page
         $langs->loadLangs(array('other', 'mails'));
@@ -314,8 +340,7 @@ 
 		if (!empty($reshook))
 		{
 			return $hookmanager->resPrint;
-		}
-		else
+		} else
 		{
 			$out='';
 
@@ -324,7 +349,9 @@ 
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $this->param['langsmodels'];
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+			    $newlang = $this->param['langsmodels'];
+			}
 			if (! empty($newlang))
 			{
 				$outputlangs = new Translate("", $conf);
@@ -362,9 +389,15 @@ 
 				}
 			}
 
-	   		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	   		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	   		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	   		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+	   		    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+	   		}
+	   		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+	   		    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+	   		}
+	   		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+	   		    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	   		}
 
 
 			$out.= "\n".'<!-- Begin form mail type='.$this->param["models"].' --><div id="mailformdiv"></div>'."\n";
@@ -404,13 +437,16 @@ 
 					if (preg_match('/\((.*)\)/', $line->label, $reg))
 					{
 						$modelmail_array[$line->id]=$langs->trans($reg[1]);		// langs->trans when label is __(xxx)__
-					}
-					else
+					} else
 					{
 						$modelmail_array[$line->id]=$line->label;
 					}
-					if ($line->lang) $modelmail_array[$line->id].=' ('.$line->lang.')';
-					if ($line->private) $modelmail_array[$line->id].=' - '.$langs->trans("Private");
+					if ($line->lang) {
+					    $modelmail_array[$line->id].=' ('.$line->lang.')';
+					}
+					if ($line->private) {
+					    $modelmail_array[$line->id].=' - '.$langs->trans("Private");
+					}
 					//if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';
 				}
 			}
@@ -421,13 +457,14 @@ 
 				// If list of template is filled
 				$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
 				$out.= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-				if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
+				if ($user->admin) {
+				    $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
+				}
 				$out.= ' &nbsp; ';
 				$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
 				$out.= ' &nbsp; ';
 				$out.= '</div>';
-			}
-			elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
+			} elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
 					'propal_send','order_send','facture_send',
 					'shipping_send','fichinter_send','supplier_proposal_send','order_supplier_send',
 					'invoice_supplier_send','thirdparty','contract','user','all'
@@ -436,7 +473,9 @@ 
 				// If list of template is empty
 				$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
 				$out.= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>';    // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
-				if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
+				if ($user->admin) {
+				    $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
+				}
 				$out.= ' &nbsp; ';
 				$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
 				$out.= ' &nbsp; ';
@@ -449,17 +488,27 @@ 
 
 			// Substitution array/string
 			$helpforsubstitution='';
-			if (is_array($this->substit) && count($this->substit)) $helpforsubstitution.=$langs->trans('AvailableVariables').' :<br>'."\n";
+			if (is_array($this->substit) && count($this->substit)) {
+			    $helpforsubstitution.=$langs->trans('AvailableVariables').' :<br>'."\n";
+			}
 			foreach($this->substit as $key => $val)
 			{
 				$helpforsubstitution.=$key.' -> '.$langs->trans(dol_string_nohtmltag($val)).'<br>';
 			}
-			if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+			if (! empty($this->withsubstit)) {
+			    // Unset or set ->withsubstit=0 to disable this.
 			{
 				$out.= '<tr><td colspan="2" align="right">';
+			}
 				//$out.='<div class="floatright">';
-				if (is_numeric($this->withsubstit)) $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');	// Old usage
-				else $out.= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');															// New usage
+				if (is_numeric($this->withsubstit)) {
+				    $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');
+				}
+				// Old usage
+				else {
+				    $out.= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');
+				}
+				// New usage
 				$out.= "</td></tr>\n";
 				//$out.='</div>';
 			}
@@ -490,8 +539,7 @@ 
 						if ($this->frommail)
 						{
 							$out.= ' &lt;'.$this->frommail.'&gt;';
-						}
-						else
+						} else
 						{
 							if ($this->fromtype)
 							{
@@ -507,8 +555,7 @@ 
 						{
 							$langs->load('errors');
 							$liste['user'] = $user->getFullName($langs) . ' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
-						}
-						else
+						} else
 						{
 							$liste['user'] = $user->getFullName($langs) .' &lt;'.$user->email.'&gt;';
 						}
@@ -548,8 +595,9 @@ 
 								}
 								$i++;
 							}
+						} else {
+						    dol_print_error($this->db);
 						}
-						else dol_print_error($this->db);
 
 						foreach($listaliases as $typealias => $listalias)
 						{
@@ -563,7 +611,9 @@ 
 								{
 									$listaliasval=preg_replace('/</', '&lt;', $listaliasval);
 									$listaliasval=preg_replace('/>/', '&gt;', $listaliasval);
-									if (! preg_match('/&lt;/', $listaliasval)) $listaliasval='&lt;'.$listaliasval.'&gt;';
+									if (! preg_match('/&lt;/', $listaliasval)) {
+									    $listaliasval='&lt;'.$listaliasval.'&gt;';
+									}
 									$liste[$typealias.'_'.$posalias]=$listaliasval;
 								}
 							}
@@ -576,7 +626,9 @@ 
 						{
 							$defaultfrom = $this->fromtype;
 						}
-						if (! empty($hookmanager->resArray['defaultfrom'])) $defaultfrom=$hookmanager->resArray['defaultfrom'];
+						if (! empty($hookmanager->resArray['defaultfrom'])) {
+						    $defaultfrom=$hookmanager->resArray['defaultfrom'];
+						}
 
 						// Using combo here make the '<email>' no more visible on list.
 						//$out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
@@ -584,8 +636,7 @@ 
 					}
 
 					$out.= "</td></tr>\n";
-				}
-				else
+				} else
 				{
 					$out.= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
 					$out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
@@ -599,8 +650,11 @@ 
 			if (! empty($this->withto) || is_array($this->withto))
 			{
 				$out.= '<tr><td class="fieldrequired">';
-				if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-				else $out.= $langs->trans("MailTo");
+				if ($this->withtofree) {
+				    $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+				} else {
+				    $out.= $langs->trans("MailTo");
+				}
 				$out.= '</td><td>';
 				if ($this->withtoreadonly)
 				{
@@ -613,14 +667,12 @@ 
 							$soc=new Societe($this->db);
 							$soc->fetch($this->toid);
 							$out.= $soc->getNomUrl(1);
-						}
-						else if ($this->totype == 'contact')
+						} else if ($this->totype == 'contact')
 						{
 							$contact=new Contact($this->db);
 							$contact->fetch($this->toid);
 							$out.= $contact->getNomUrl(1);
-						}
-						else
+						} else
 						{
 							$out.= $this->toname;
 						}
@@ -629,14 +681,12 @@ 
 						{
 							$out.= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
 						}
-					}
-					else
+					} else
 					{
 						// Note withto may be a text like 'AllRecipientSelected'
 						$out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
 					}
-				}
-				else
+				} else
 				{
 					if (! empty($this->withtofree))
 					{
@@ -644,7 +694,9 @@ 
 					}
 					if (! empty($this->withto) && is_array($this->withto))
 					{
-						if (! empty($this->withtofree)) $out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						if (! empty($this->withtofree)) {
+						    $out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						}
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
 						foreach($tmparray as $key => $val)
@@ -708,8 +760,7 @@ 
 				if ($this->withtoccreadonly)
 				{
 					$out.= (! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"";
-				}
-				else
+				} else
 				{
 					$out.= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
 					if (! empty($this->withtocc) && is_array($this->withtocc))
@@ -790,11 +841,13 @@ 
 
 				$out.= '<td>';
 
-				if ($this->withmaindocfile)	// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
+				if ($this->withmaindocfile) {
+				    // withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
 				{
 					if (GETPOSTISSET('sendmail'))
 					{
 						$this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1);
+				}
 					}
 					// If a template was selected, we use setup of template to define if join file checkbox is selected or not.
 					elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
@@ -840,20 +893,23 @@ 
 							}
 							$out.= '<br></div>';
 						}
-					}
-					else if (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
+					} else if (empty($this->withmaindocfile)) {
+					    // Do not show message if we asked to show the checkbox
 					{
 						$out.= $langs->trans("NoAttachedFiles").'<br>';
 					}
-					if ($this->withfile == 2)	// Can add other files
+					}
+					if ($this->withfile == 2) {
+					    // Can add other files
 					{
 						if (!empty($conf->global->FROM_MAIL_USE_INPUT_FILE_MULTIPLE)) $out.= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
-						else $out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+					} else {
+						    $out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+						}
 						$out.= ' ';
 						$out.= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 					}
-				}
-				else
+				} else
 				{
 					$out.=$this->withfile;
 				}
@@ -879,16 +935,24 @@ 
 				if (empty($this->substit['__REF__']))
 				{
 					$paymenturl='';
-				}
-				else
+				} else
 				{
 					// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 					$langs->loadLangs(array('paypal','other'));
 					$typeforonlinepayment='free';
-					if ($this->param["models"]=='order'   || $this->param["models"]=='order_send')   $typeforonlinepayment='order';		// TODO use detection on something else than template
-					if ($this->param["models"]=='invoice' || $this->param["models"]=='facture_send') $typeforonlinepayment='invoice';	// TODO use detection on something else than template
-					if ($this->param["models"]=='member') $typeforonlinepayment='member';												// TODO use detection on something else than template
+					if ($this->param["models"]=='order'   || $this->param["models"]=='order_send') {
+					    $typeforonlinepayment='order';
+					}
+					// TODO use detection on something else than template
+					if ($this->param["models"]=='invoice' || $this->param["models"]=='facture_send') {
+					    $typeforonlinepayment='invoice';
+					}
+					// TODO use detection on something else than template
+					if ($this->param["models"]=='member') {
+					    $typeforonlinepayment='member';
+					}
+					// TODO use detection on something else than template
 					$url=getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
 					$paymenturl=$url;
 
@@ -900,8 +964,7 @@ 
 					$langs->load('other');
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']=str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
 					$this->substit['__ONLINE_PAYMENT_URL__']=$paymenturl;
-				}
-				else
+				} else
 				{
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']='';
 					$this->substit['__ONLINE_PAYMENT_URL__']='';
@@ -928,8 +991,9 @@ 
 					$defaultmessage = dol_nl2br($defaultmessage);
 				}
 
-				if (isset($_POST["message"]) && ! $_POST['modelselected']) $defaultmessage=$_POST["message"];
-				else
+				if (isset($_POST["message"]) && ! $_POST['modelselected']) {
+				    $defaultmessage=$_POST["message"];
+				} else
 				{
 					$defaultmessage=make_substitutions($defaultmessage,$this->substit);
 					// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
@@ -946,17 +1010,21 @@ 
 				{
 					$out.= nl2br($defaultmessage);
 					$out.= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
-				}
-				else
+				} else
 				{
-					if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
+					if (! isset($this->ckeditortoolbar)) {
+					    $this->ckeditortoolbar = 'dolibarr_notes';
+					}
 
 					// Editor wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 					if ($this->withfckeditor == -1)
 					{
-						if (! empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $this->withfckeditor=1;
-						else $this->withfckeditor=0;
+						if (! empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
+						    $this->withfckeditor=1;
+						} else {
+						    $this->withfckeditor=0;
+						}
 					}
 
 					$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,'95%');
@@ -985,7 +1053,9 @@ 
 				$out.= '</div>'."\n";
 			}
 
-			if ($this->withform == 1) $out.= '</form>'."\n";
+			if ($this->withform == 1) {
+			    $out.= '</form>'."\n";
+			}
 
 			// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
 			if (! empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY))
@@ -1037,11 +1107,21 @@ 
 		}
 
 		$showinfobcc='';
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
-		if ($showinfobcc) $out.=' + '.$showinfobcc;
+		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') {
+		    $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
+		}
+		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {
+		    $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
+		}
+		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') {
+		    $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
+		}
+		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') {
+		    $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
+		}
+		if ($showinfobcc) {
+		    $out.=' + '.$showinfobcc;
+		}
 		$out.= "</td></tr>\n";
 		return $out;
 	}
@@ -1083,10 +1163,18 @@ 
 			$out.= yn($this->withdeliveryreceipt);
 		} else {
 			$defaultvaluefordeliveryreceipt=0;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt=1;
+			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') {
+			    $defaultvaluefordeliveryreceipt=1;
+			}
+			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {
+			    $defaultvaluefordeliveryreceipt=1;
+			}
+			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') {
+			    $defaultvaluefordeliveryreceipt=1;
+			}
+			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') {
+			    $defaultvaluefordeliveryreceipt=1;
+			}
 			$out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:$defaultvaluefordeliveryreceipt), 1);
 		}
 		$out.= "</td></tr>\n";
@@ -1155,13 +1243,29 @@ 
 		$sql.= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')";
 		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";				// Get all public or private owned
-		if ($active >= 0) $sql.=" AND active = ".$active;
-		if ($label) $sql.=" AND label ='".$db->escape($label)."'";
-		if (! ($id > 0) && is_object($outputlangs)) $sql.= " AND (lang = '".$db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
-		if ($id > 0)   $sql.= " AND rowid=".$id;
-		if ($id == -1) $sql.= " AND position=0";
-		if (is_object($outputlangs)) $sql.= $db->order("position,lang,label","ASC,DESC,ASC");		// We want line with lang set first, then with lang null or ''
-		else $sql.= $db->order("position,lang,label","ASC,ASC,ASC");		// If no language provided, we give priority to lang not defined
+		if ($active >= 0) {
+		    $sql.=" AND active = ".$active;
+		}
+		if ($label) {
+		    $sql.=" AND label ='".$db->escape($label)."'";
+		}
+		if (! ($id > 0) && is_object($outputlangs)) {
+		    $sql.= " AND (lang = '".$db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
+		}
+		if ($id > 0) {
+		    $sql.= " AND rowid=".$id;
+		}
+		if ($id == -1) {
+		    $sql.= " AND position=0";
+		}
+		if (is_object($outputlangs)) {
+		    $sql.= $db->order("position,lang,label","ASC,DESC,ASC");
+		}
+		// We want line with lang set first, then with lang null or ''
+		else {
+		    $sql.= $db->order("position,lang,label","ASC,ASC,ASC");
+		}
+		// If no language provided, we give priority to lang not defined
 		$sql.= $db->plimit(1);
 		//print $sql;
 
@@ -1179,26 +1283,13 @@ 
 				$ret->content = $obj->content;
 				$ret->content_lines = $obj->content_lines;
 				$ret->joinfiles = $obj->joinfiles;
-			}
-			elseif($id == -2) {
+			} elseif($id == -2) {
 				// Not found with the provided label
 				return -1;
-			}
-			else {	// If there is no template at all
+			} else {	// If there is no template at all
 				$defaultmessage='';
 				if ($type_template=='body')							{ $defaultmessage=$this->withbody; }		// Special case to use this->withbody as content
-				elseif ($type_template=='facture_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
-				elseif ($type_template=='facture_relance')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-				elseif ($type_template=='propal_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendProposal"); }
-				elseif ($type_template=='supplier_proposal_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); }
-				elseif ($type_template=='order_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendOrder"); }
-				elseif ($type_template=='order_supplier_send')		{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-				elseif ($type_template=='invoice_supplier_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-				elseif ($type_template=='shipping_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
-				elseif ($type_template=='fichinter_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
-				elseif ($type_template=='thirdparty')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
-				elseif ($type_template=='user')				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentUser"); }
-				elseif (!empty($type_template))				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
+				elseif ($type_template=='facture_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoice"); } elseif ($type_template=='facture_relance')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); } elseif ($type_template=='propal_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendProposal"); } elseif ($type_template=='supplier_proposal_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); } elseif ($type_template=='order_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendOrder"); } elseif ($type_template=='order_supplier_send')		{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); } elseif ($type_template=='invoice_supplier_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); } elseif ($type_template=='shipping_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendShipping"); } elseif ($type_template=='fichinter_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); } elseif ($type_template=='thirdparty')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); } elseif ($type_template=='user')				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentUser"); } elseif (!empty($type_template))				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
 
 				$ret->label = 'default';
 				$ret->lang = $outputlangs->defaultlang;
@@ -1210,8 +1301,7 @@ 
 
 			$db->free($resql);
 			return $ret;
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 			return -1;
@@ -1236,7 +1326,9 @@ 
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
 		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
-		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
+		if (is_object($outputlangs)) {
+		    $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
+		}
 		$sql.= $this->db->order("lang,label","ASC");
 		//print $sql;
 
@@ -1246,8 +1338,7 @@ 
 			$num= $this->db->num_rows($resql);
 			$this->db->free($resql);
 			return $num;
-		}
-		else
+		} else
 		{
 			$this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
@@ -1273,7 +1364,9 @@ 
 		$sql.= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')";
 		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";		// See all public templates or templates I own.
-		if ($active >= 0) $sql.=" AND active = ".$active;
+		if ($active >= 0) {
+		    $sql.=" AND active = ".$active;
+		}
 		//if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";	// Return all languages
 		$sql.= $this->db->order("position,lang,label","ASC");
 		//print $sql;
@@ -1300,8 +1393,7 @@ 
 			}
 			$this->db->free($resql);
 			return $num;
-		}
-		else
+		} else
 		{
 			$this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
@@ -1350,7 +1442,9 @@ 
 				// Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__
 				if (!empty($line->fk_product))
 				{
-					if (! is_object($extrafields)) $extrafields = new ExtraFields($this->db);
+					if (! is_object($extrafields)) {
+					    $extrafields = new ExtraFields($this->db);
+					}
 					$extrafields->fetch_name_optionals_label('product', true);
 					$product = new Product($this->db);
 					$product->fetch($line->fk_product, '', '', 1);
@@ -1419,21 +1513,34 @@ 
 				//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
 
 			$onlinepaymentenabled = 0;
-			if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
-			if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
-			if (! empty($conf->stripe->enabled)) $onlinepaymentenabled++;
+			if (! empty($conf->paypal->enabled)) {
+			    $onlinepaymentenabled++;
+			}
+			if (! empty($conf->paybox->enabled)) {
+			    $onlinepaymentenabled++;
+			}
+			if (! empty($conf->stripe->enabled)) {
+			    $onlinepaymentenabled++;
+			}
 			if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 			{
 				$tmparray['__SECUREKEYPAYMENT__']=$conf->global->PAYMENT_SECURITY_TOKEN;
 				if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 				{
-					if ($conf->adherent->enabled) $tmparray['__SECUREKEYPAYMENT_MEMBER__']='SecureKeyPAYMENTUniquePerMember';
-					if ($conf->facture->enabled)  $tmparray['__SECUREKEYPAYMENT_INVOICE__']='SecureKeyPAYMENTUniquePerInvoice';
-					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__']='SecureKeyPAYMENTUniquePerOrder';
-					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__']='SecureKeyPAYMENTUniquePerContractLine';
+					if ($conf->adherent->enabled) {
+					    $tmparray['__SECUREKEYPAYMENT_MEMBER__']='SecureKeyPAYMENTUniquePerMember';
+					}
+					if ($conf->facture->enabled) {
+					    $tmparray['__SECUREKEYPAYMENT_INVOICE__']='SecureKeyPAYMENTUniquePerInvoice';
+					}
+					if ($conf->commande->enabled) {
+					    $tmparray['__SECUREKEYPAYMENT_ORDER__']='SecureKeyPAYMENTUniquePerOrder';
+					}
+					if ($conf->contrat->enabled) {
+					    $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__']='SecureKeyPAYMENTUniquePerContractLine';
+					}
 				}
-			}
-			else
+			} else
 			{
 				/* No need to show into tooltip help, option is not enabled
 				$vars['__SECUREKEYPAYMENT__']='';
@@ -1447,7 +1554,9 @@ 
 
 		foreach($tmparray as $key => $val)
 		{
-			if (empty($val)) $tmparray[$key]=$key;
+			if (empty($val)) {
+			    $tmparray[$key]=$key;
+			}
 		}
 
 		return $tmparray;

dolibarr/htdocs/core/class/notify.class.php

Braces +146 added lines, -66 removed lines

@@ -113,24 +113,42 @@ 
 		$listofnotiftodo=$this->getNotificationsArray($action,$socid,$object,0);
 
 		$nb=-1;
-		if (is_array($listofnotiftodo)) $nb=count($listofnotiftodo);
-		if ($nb < 0)  $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
-		if ($nb == 0) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("NoNotificationsWillBeSent");
-   		if ($nb == 1) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ANotificationsWillBeSent");
-   		if ($nb >= 2) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("SomeNotificationsWillBeSent",$nb);
+		if (is_array($listofnotiftodo)) {
+		    $nb=count($listofnotiftodo);
+		}
+		if ($nb < 0) {
+		    $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
+		}
+		if ($nb == 0) {
+		    $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("NoNotificationsWillBeSent");
+		}
+   		if ($nb == 1) {
+   		    $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ANotificationsWillBeSent");
+   		}
+   		if ($nb >= 2) {
+   		    $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("SomeNotificationsWillBeSent",$nb);
+   		}
 
    		if (is_array($listofnotiftodo))
    		{
 			$i=0;
 			foreach ($listofnotiftodo as $key => $val)
 			{
-				if ($i) $texte.=', ';
-				else $texte.=' (';
-				if ($val['isemailvalid']) $texte.=$val['email'];
-				else $texte.=$val['emaildesc'];
+				if ($i) {
+				    $texte.=', ';
+				} else {
+				    $texte.=' (';
+				}
+				if ($val['isemailvalid']) {
+				    $texte.=$val['email'];
+				} else {
+				    $texte.=$val['emaildesc'];
+				}
 				$i++;
 			}
-			if ($i) $texte.=')';
+			if ($i) {
+			    $texte.=')';
+			}
    		}
 
 		return $texte;
@@ -154,7 +172,9 @@ 
 		$resarray=array();
 
 		$valueforthreshold = 0;
-		if (is_object($object)) $valueforthreshold = $object->total_ht;
+		if (is_object($object)) {
+		    $valueforthreshold = $object->total_ht;
+		}
 
 		if (! $error)
 		{
@@ -170,11 +190,19 @@ 
 				$sql.= " AND n.fk_soc = s.rowid";
 				if ($notifcode)
 				{
-					if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-					else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+					if (is_numeric($notifcode)) {
+					    $sql.= " AND n.fk_action = ".$notifcode;
+					}
+					// Old usage
+					else {
+					    $sql.= " AND a.code = '".$notifcode."'";
+					}
+					// New usage
 				}
 				$sql.= " AND s.entity IN (".getEntity('societe').")";
-				if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
+				if ($socid > 0) {
+				    $sql.= " AND s.rowid = ".$socid;
+				}
 
 				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
 
@@ -190,12 +218,13 @@ 
 						{
 							$newval2=trim($obj->email);
 							$isvalid=isValidEmail($newval2);
-							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							if (empty($resarray[$newval2])) {
+							    $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							}
 						}
 						$i++;
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$this->error=$this->db->lasterror();
@@ -215,11 +244,19 @@ 
 				$sql.= " AND a.rowid = n.fk_action";
 				if ($notifcode)
 				{
-					if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-					else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+					if (is_numeric($notifcode)) {
+					    $sql.= " AND n.fk_action = ".$notifcode;
+					}
+					// Old usage
+					else {
+					    $sql.= " AND a.code = '".$notifcode."'";
+					}
+					// New usage
 				}
 				$sql.= " AND c.entity IN (".getEntity('user').")";
-				if ($userid > 0) $sql.= " AND c.rowid = ".$userid;
+				if ($userid > 0) {
+				    $sql.= " AND c.rowid = ".$userid;
+				}
 
 				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
 
@@ -235,12 +272,13 @@ 
 						{
 							$newval2=trim($obj->email);
 							$isvalid=isValidEmail($newval2);
-							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							if (empty($resarray[$newval2])) {
+							    $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							}
 						}
 						$i++;
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$this->error=$this->db->lasterror();
@@ -257,15 +295,20 @@ 
 				{
 					if ($notifcode)
 					{
-						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-					}
-					else
+						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+						    continue;
+						}
+					} else
 					{
-						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+						    continue;
+						}
 					}
 
 					$threshold = (float) $reg[1];
-					if ($valueforthreshold < $threshold) continue;
+					if ($valueforthreshold < $threshold) {
+					    continue;
+					}
 
 					$tmpemail=explode(',',$val);
 					foreach($tmpemail as $key2 => $val2)
@@ -277,22 +320,30 @@ 
 							{
 								$tmpuser=new User($this->db);
 								$tmpuser->fetch($user->fk_user);
-								if ($tmpuser->email) $newval2=trim($tmpuser->email);
-								else $newval2='';
+								if ($tmpuser->email) {
+								    $newval2=trim($tmpuser->email);
+								} else {
+								    $newval2='';
+								}
+							} else {
+							    $newval2='';
 							}
-							else $newval2='';
 						}
 						if ($newval2)
 						{
 							$isvalid=isValidEmail($newval2, 0);
-							if (empty($resarray[$newval2])) $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+							if (empty($resarray[$newval2])) {
+							    $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+							}
 						}
 					}
 				}
 			}
 		}
 
-		if ($error) return -1;
+		if ($error) {
+		    return -1;
+		}
 
 		//var_dump($resarray);
 		return $resarray;
@@ -315,7 +366,9 @@ 
 		global $hookmanager;
 		global $dolibarr_main_url_root;
 
-		if (! in_array($notifcode, $this->arrayofnotifsupported)) return 0;
+		if (! in_array($notifcode, $this->arrayofnotifsupported)) {
+		    return 0;
+		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		if (! is_object($hookmanager))
@@ -336,7 +389,9 @@ 
 
 		// Define some vars
 		$application = 'Dolibarr';
-		if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
+		if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
+		    $application = $conf->global->MAIN_APPLICATION_TITLE;
+		}
 		$replyto = $conf->notification->email_from;
 		$object_type = '';
 		$link = '';
@@ -358,8 +413,14 @@ 
 			$sql.= " ".MAIN_DB_PREFIX."societe as s";
 			$sql.= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
 			$sql.= " AND n.fk_soc = s.rowid";
-			if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-			else $sql.= " AND a.code = '".$notifcode."'";	// New usage
+			if (is_numeric($notifcode)) {
+			    $sql.= " AND n.fk_action = ".$notifcode;
+			}
+			// Old usage
+			else {
+			    $sql.= " AND a.code = '".$notifcode."'";
+			}
+			// New usage
 			$sql .= " AND s.rowid = ".$object->socid;
 
 			$sql.= "\nUNION\n";
@@ -372,8 +433,14 @@ 
 		$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
 		$sql.= " ".MAIN_DB_PREFIX."notify_def as n";
 		$sql.= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
-		if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-		else $sql.= " AND a.code = '".$this->db->escape($notifcode)."'";	// New usage
+		if (is_numeric($notifcode)) {
+		    $sql.= " AND n.fk_action = ".$notifcode;
+		}
+		// Old usage
+		else {
+		    $sql.= " AND a.code = '".$this->db->escape($notifcode)."'";
+		}
+		// New usage
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -391,9 +458,11 @@ 
 			if ($num > 0)
 			{
 				$i = 0;
-				while ($i < $num && ! $error)	// For each notification couple defined (third party/actioncode)
+				while ($i < $num && ! $error) {
+				    // For each notification couple defined (third party/actioncode)
 				{
 					$obj = $this->db->fetch_object($result);
+				}
 
 					$sendto = dolGetFirstLastname($obj->firstname,$obj->lastname) . " <".$obj->email.">";
 					$notifcodedefid = $obj->adid;
@@ -510,8 +579,7 @@ 
 						{
 							// We can't add PDF as it is not generated yet.
 							$filepdf = '';
-						}
-						else
+						} else
 						{
 							$filepdf = $pdf_path;
 						}
@@ -520,14 +588,20 @@ 
 						$message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
 						$message.= "\n";
 						$message.= $mesg;
-						if ($link) $message.= "\n" . $urlwithroot . $link;
+						if ($link) {
+						    $message.= "\n" . $urlwithroot . $link;
+						}
 
 						$parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
 						$reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 						if (empty($reshook))
 						{
-							if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-							if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+							if (! empty($hookmanager->resArray['subject'])) {
+							    $subject.=$hookmanager->resArray['subject'];
+							}
+							if (! empty($hookmanager->resArray['message'])) {
+							    $message.=$hookmanager->resArray['message'];
+							}
 						}
 
 						$mailfile = new CMailFile(
@@ -549,8 +623,7 @@ 
 							if ($obj->type_target == 'touserid') {
 	 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
 								$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
-							}
-							else {
+							} else {
 								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
 								$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
 							}
@@ -558,26 +631,22 @@ 
 							{
 								dol_print_error($this->db);
 							}
-						}
-						else
+						} else
 						{
 							$error++;
 							$this->errors[]=$mailfile->error;
 						}
-					}
-					else
+					} else
 				  {
 						dol_syslog("No notification sent for ".$sendto." because email is empty");
 					}
 					$i++;
 				}
-			}
-			else
+			} else
 			{
 				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
 			}
-		}
-		else
+		} else
 		{
 	   		$error++;
 			$this->errors[]=$this->db->lasterror();
@@ -590,7 +659,9 @@ 
 		{
 			foreach($conf->global as $key => $val)
 			{
-				if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+				if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+				    continue;
+				}
 
 				$threshold = (float) $reg[1];
 				if (!empty($object->total_ht) && $object->total_ht <= $threshold)
@@ -603,7 +674,9 @@ 
 
 				$sendto = $conf->global->$param;
 				$notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid');
-				if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code');
+				if ($notifcodedefid <= 0) {
+				    dol_print_error($this->db, 'Failed to get id from code');
+				}
 
 				$object_type = '';
 				$link = '';
@@ -718,8 +791,7 @@ 
 				{
 					// We can't add PDF as it is not generated yet.
 					$filepdf = '';
-				}
-				else
+				} else
 				{
 					$filepdf = $pdf_path;
 				}
@@ -740,7 +812,9 @@ 
 					{
 						$supervisoruser=new User($this->db);
 						$supervisoruser->fetch($user->fk_user);
-						if ($supervisoruser->email) $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+						if ($supervisoruser->email) {
+						    $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+						}
 					}
 					dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);
 					$sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);
@@ -755,8 +829,12 @@ 
 					$reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 					if (empty($reshook))
 					{
-						if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-						if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+						if (! empty($hookmanager->resArray['subject'])) {
+						    $subject.=$hookmanager->resArray['subject'];
+						}
+						if (! empty($hookmanager->resArray['message'])) {
+						    $message.=$hookmanager->resArray['message'];
+						}
 					}
 					$mailfile = new CMailFile(
 						$subject,
@@ -780,8 +858,7 @@ 
 						{
 							dol_print_error($this->db);
 						}
-					}
-					else
+					} else
 					{
 						$error++;
 						$this->errors[]=$mailfile->error;
@@ -790,7 +867,10 @@ 
 			}
 		}
 
-		if (! $error) return $num;
-		else return -1 * $error;
+		if (! $error) {
+		    return $num;
+		} else {
+		    return -1 * $error;
+		}
 	}
 }

dolibarr/htdocs/core/class/dolgeoip.class.php

Braces +19 added lines, -13 removed lines

@@ -46,14 +46,16 @@ 
 		if ($type == 'country')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc';
-		}
-		else if ($type == 'city')
+		    if (! function_exists('geoip_country_code_by_name')) {
+		        $res=include_once GEOIP_PATH.'geoip.inc';
+		    }
+		} else if ($type == 'city')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoipcity.inc';
-		}
-		else { print 'ErrorBadParameterInConstructor'; return 0; }
+		    if (! function_exists('geoip_country_code_by_name')) {
+		        $res=include_once GEOIP_PATH.'geoipcity.inc';
+		    }
+		} else { print 'ErrorBadParameterInConstructor'; return 0; }
 
 		// Here, function exists (embedded into PHP or exists because we made include)
 		if (empty($type) || empty($datfile))
@@ -73,8 +75,7 @@ 
 		if (function_exists('geoip_open'))
 		{
 			$this->gi = geoip_open($datfile,GEOIP_STANDARD);
-		}
-		else
+		} else
 		{
 		    $this->gi = 'NOGI';    // We are using embedded php geoip functions
 		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
@@ -98,10 +99,11 @@ 
 		{
 		    // geoip_country_code_by_addr does not exists
     		return strtolower(geoip_country_code_by_name($ip));
-		}
-		else
+		} else
 		{
-		    if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+		    if (! function_exists('geoip_country_code_by_addr')) {
+		        return strtolower(geoip_country_code_by_name($this->gi, $ip));
+		    }
 		    return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 		}
 	}
@@ -128,7 +130,9 @@ 
 	 */
 	function getVersion()
 	{
-	    if ($this->gi == 'NOGI') return geoip_database_info();
+	    if ($this->gi == 'NOGI') {
+	        return geoip_database_info();
+	    }
 		return 'Not available (not using PHP internal geo functions)';
 	}
 
@@ -139,9 +143,11 @@ 
 	 */
 	function close()
 	{
-	    if (function_exists('geoip_close'))    // With some geoip with PEAR, geoip_close function may not exists
+	    if (function_exists('geoip_close')) {
+	        // With some geoip with PEAR, geoip_close function may not exists
 	    {
 	        geoip_close($this->gi);
 	    }
+	    }
 	}
 }

dolibarr/htdocs/core/class/stats.class.php

Braces +99 added lines, -53 removed lines

@@ -46,7 +46,9 @@ 
 	{
 		global $conf,$user,$langs;
 
-	    if ($startyear > $endyear) return -1;
+	    if ($startyear > $endyear) {
+	        return -1;
+	    }
 
 		$datay=array();
 
@@ -71,19 +73,19 @@ 
 				$foundintocache=1;
 
 				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
 		// Load file into $data
-		if ($foundintocache)    // Cache file found and is not too old
+		if ($foundintocache) {
+		    // Cache file found and is not too old
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		}
-		else
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
+		} else
 		{
 			$year=$startyear;
 			while ($year <= $endyear)
@@ -110,11 +112,15 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (! dol_is_dir($conf->user->dir_temp)) {
+			    dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			fwrite($fp, json_encode($data));
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+			if (! empty($conf->global->MAIN_UMASK)) {
+			    $newmask=$conf->global->MAIN_UMASK;
+			}
 			@chmod($newpathofdestfile, octdec($newmask));
 
 			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
@@ -140,7 +146,9 @@ 
 	{
 		global $conf,$user,$langs;
 
-        if ($startyear > $endyear) return -1;
+        if ($startyear > $endyear) {
+            return -1;
+        }
 
         $datay=array();
 
@@ -165,20 +173,20 @@ 
         		$foundintocache=1;
 
         		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
+        	} else
         	{
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
 
         // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+            // Cache file found and is not too old
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
         }
-        else
+        	$data = json_decode(file_get_contents($newpathofdestfile), true);
+        } else
 		{
 			$year=$startyear;
 			while($year <= $endyear)
@@ -205,16 +213,21 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (! dol_is_dir($conf->user->dir_temp)) {
+			    dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (! empty($conf->global->MAIN_UMASK)) {
+				    $newmask=$conf->global->MAIN_UMASK;
+				}
 				@chmod($newpathofdestfile, octdec($newmask));
+			} else {
+			    dol_syslog("Failed to write cache file", LOG_ERR);
 			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
 			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
 		}
 
@@ -230,7 +243,9 @@ 
 	 */
 	function getAverageByMonthWithPrevYear($endyear,$startyear)
 	{
-        if ($startyear > $endyear) return -1;
+        if ($startyear > $endyear) {
+            return -1;
+        }
 
         $datay=array();
 
@@ -291,20 +306,20 @@ 
         		$foundintocache=1;
 
         		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
+        	} else
         	{
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
 
         // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+            // Cache file found and is not too old
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
         }
-        else
+        	$data = json_decode(file_get_contents($newpathofdestfile), true);
+        } else
 		{
 			$data=$this->getAllByProduct($year);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
@@ -314,13 +329,17 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (! dol_is_dir($conf->user->dir_temp)) {
+			    dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (! empty($conf->global->MAIN_UMASK)) {
+				    $newmask=$conf->global->MAIN_UMASK;
+				}
 				@chmod($newpathofdestfile, octdec($newmask));
 			}
 			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
@@ -356,8 +375,7 @@ 
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -384,22 +402,29 @@ 
 				$row = $this->db->fetch_object($resql);
 				$result[$i]['year'] = $row->year;
 				$result[$i]['nb'] = $row->nb;
-				if($i>0 && $row->nb) $result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
+				if($i>0 && $row->nb) {
+				    $result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
+				}
 				$result[$i]['total'] = $row->total;
-				if($i>0 && $row->total) $result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
+				if($i>0 && $row->total) {
+				    $result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
+				}
 				$result[$i]['avg'] = $row->avg;
-				if($i>0 && $row->avg) $result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
+				if($i>0 && $row->avg) {
+				    $result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
+				}
 				// For some $sql only
 				if (isset($row->weighted))
 				{
 				    $result[$i]['weighted'] = $row->weighted;
-				    if($i>0 && $row->weighted) $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+				    if($i>0 && $row->weighted) {
+				        $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+				    }
 				}
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -434,8 +459,7 @@ 
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -450,9 +474,13 @@ 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
 			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			if ($format == 0) {
+			    $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			} elseif ($format == 1) {
+			    $month=$i;
+			} elseif ($format == 2) {
+			    $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			}
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
 			$data[$i-1] = array($month, $res[$i]);
@@ -492,8 +520,9 @@ 
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else {
+            dol_print_error($this->db);
+        }
 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
@@ -505,9 +534,13 @@ 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
 			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			if ($format == 0) {
+			    $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			} elseif ($format == 1) {
+			    $month=$i;
+			} elseif ($format == 2) {
+			    $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			}
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
 			$data[$i-1] = array($month, $res[$i]);
@@ -545,8 +578,9 @@ 
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else {
+            dol_print_error($this->db);
+        }
 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
@@ -558,9 +592,13 @@ 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
 			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			if ($format == 0) {
+			    $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			} elseif ($format == 1) {
+			    $month=$i;
+			} elseif ($format == 2) {
+			    $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			}
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
 			$data[$i-1] = array($month, $res[$i]);
@@ -593,14 +631,22 @@ 
 			while ($i < $num)
 			{
 		  		$row = $this->db->fetch_row($resql);
-		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0],$row[1]);	// Ref of product, nb
-		  		else $other += $row[1];
+		  		if ($i < $limit || $num == $limit) {
+		  		    $result[$i] = array($row[0],$row[1]);
+		  		}
+		  		// Ref of product, nb
+		  		else {
+		  		    $other += $row[1];
+		  		}
 		  		$i++;
 		  	}
-		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
+		  	if ($num > $limit) {
+		  	    $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
+		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else {
+            dol_print_error($this->db);
+        }
 
 		return $result;
 	}