Inspection of "The first object-oriented draft is almost working" - alxarafe/alixar - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 1007d6...492b54 )

by Alxarafe

created 2019-01-23 20:07 UTC

Status

Braces +149 added lines, -89 removed lines patch added patch discarded remove patch

@@ -74,7 +74,9 @@  discard block
 block discarded – undo
         $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)
@@ -93,8 +95,7 @@  discard block
 block discarded – undo
                 if ($selected == $obj->rowid)
                 {
                     print '<option value="'.$obj->rowid.'" selected>';
-                }
-                else
+                } else
                 {
                     print '<option value="'.$obj->rowid.'">';
                 }
@@ -103,8 +104,7 @@  discard block
 block discarded – undo
                 $i++;
             }
             print "</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -144,8 +144,7 @@  discard block
 block discarded – undo
                 if ($selected == $obj->rowid)
                 {
                     print '<option value="'.$obj->rowid.'" selected>';
-                }
-                else
+                } else
                 {
                     print '<option value="'.$obj->rowid.'">';
                 }
@@ -154,8 +153,7 @@  discard block
 block discarded – undo
                 $i++;
             }
             print "</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -196,8 +194,7 @@  discard block
 block discarded – undo
                     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.'">';
@@ -210,8 +207,7 @@  discard block
 block discarded – undo
             }
             print '</select>';
             return 0;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             return 1;
@@ -256,8 +252,7 @@  discard block
 block discarded – undo
     				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.'">';
@@ -269,8 +264,7 @@  discard block
 block discarded – undo
     		}
     		$out.='</select>';
     		return $out;
-    	}
-    	else
+    	} else
     	{
     		dol_print_error($this->db);
     		return '';
@@ -295,15 +289,16 @@  discard block
 block discarded – undo
     {
         // 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 @@  discard block
 block discarded – undo
 
         // 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>';
             }
         }
@@ -408,14 +408,20 @@  discard block
 block discarded – undo
         }
         // 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," . Globals::$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)
         {
@@ -436,7 +442,9 @@  discard block
 block discarded – undo
 
                 $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);
@@ -463,8 +471,7 @@  discard block
 block discarded – undo
                 $out.='</option>';
             }
             $this->db->free($resql_usr);
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -500,15 +507,16 @@  discard block
 block discarded – undo
         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>';
         }
@@ -542,20 +550,23 @@  discard block
 block discarded – undo
 				//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>';
+                        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").')';
                         }
@@ -570,31 +581,41 @@  discard block
 block discarded – undo
                 $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;
+                	$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;";
@@ -604,7 +625,9 @@  discard block
 block discarded – undo
                 }
 
                 $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--;
             }
         }
@@ -623,12 +646,17 @@  discard block
 block discarded – undo
     {
     	$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
@@ -718,8 +746,7 @@  discard block
 block discarded – undo
 	             </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(Globals::$conf->dol_use_jmobile)) {
 	        	$out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
@@ -739,7 +766,9 @@  discard block
 block discarded – undo
             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>';
@@ -822,8 +851,7 @@  discard block
 block discarded – undo
             if ($selected == $key)
             {
                 $select_week .= '<option value="'.$key.'" selected>';
-            }
-            else
+            } else
             {
                 $select_week .= '<option value="'.$key.'">';
             }
@@ -852,8 +880,13 @@  discard block
 block discarded – undo
 
         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)
@@ -865,8 +898,7 @@  discard block
 block discarded – undo
             if ($selected == $key)
             {
                 $select_month .= '<option value="'.$key.'" selected>';
-            }
-            else
+            } else
             {
                 $select_month .= '<option value="'.$key.'">';
             }
@@ -919,13 +951,17 @@  discard block
 block discarded – undo
         $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)
@@ -933,16 +969,19 @@  discard block
 block discarded – undo
             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>';
             }
         }
@@ -979,8 +1018,7 @@  discard block
 block discarded – undo
             $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)
             {
@@ -988,8 +1026,7 @@  discard block
 block discarded – undo
                 $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;";
             }
@@ -1023,7 +1060,10 @@  discard block
 block discarded – undo
         $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
@@ -1034,7 +1074,10 @@  discard block
 block discarded – undo
         	$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) && Globals::$conf->browser->layout != 'phone') {
@@ -1044,7 +1087,9 @@  discard block
 block discarded – undo
         	}
             foreach($boxidactivatedforuser as $boxid)
         	{
-       			if (empty($boxorder)) $boxorder.='A:';
+       			if (empty($boxorder)) {
+       			    $boxorder.='A:';
+       			}
   				$boxorder.=$boxid.',';
         	}
 
@@ -1058,8 +1103,9 @@  discard block
 block discarded – undo
 			$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(Globals::$conf->use_javascript_ajax))
-                $selectboxlist .= ' <input type="submit" class="button" value="' . $langs->trans("AddBox") . '">';
+            if (empty(Globals::$conf->use_javascript_ajax)) {
+                            $selectboxlist .= ' <input type="submit" class="button" value="' . $langs->trans("AddBox") . '">';
+            }
             $selectboxlist.='</form>';
             if (!empty(Globals::$conf->use_javascript_ajax)) {
             	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
@@ -1108,7 +1154,9 @@  discard block
 block discarded – undo
 	        			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({
@@ -1151,17 +1199,25 @@  discard block
 block discarded – undo
 
             // Define $box_max_lines
             $box_max_lines=5;
-            if (!empty(Globals::$conf->global->MAIN_BOXES_MAXLINES))
-                $box_max_lines = Globals::$conf->global->MAIN_BOXES_MAXLINES;
+            if (!empty(Globals::$conf->global->MAIN_BOXES_MAXLINES)) {
+                            $box_max_lines = Globals::$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++;
+                    $ii++;
+            	}
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
                     // Show box
@@ -1183,11 +1239,18 @@  discard block
 block discarded – undo
             $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++;
+                    $ii++;
+            	}
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
                     // Show box
@@ -1254,8 +1317,7 @@  discard block
 block discarded – undo
                     if ($selected == $obj->rowid || $selected == $obj->$keyfield)
                     {
                         print '<option value="'.$obj->$keyfield.'" selected>';
-                    }
-                    else
+                    } else
                     {
                         print '<option value="'.$obj->$keyfield.'">';
                     }
@@ -1264,13 +1326,11 @@  discard block
 block discarded – undo
                     $i++;
                 }
                 print "</select>";
-            }
-            else
+            } else
 			{
                 print $langs->trans("DictionaryEmpty");
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }

Please login to merge, or discard this patch.

Helpers/DolUtils2.php 1 patch

Braces +726 added lines, -385 removed lines patch added patch discarded remove patch

@@ -59,8 +59,7 @@  discard block
 block discarded – undo
                 $entity = "&#". $unicode . ';';
                 $decodedStr .= utf8_encode($entity);
                 $pos += 4;
-            }
-            else {
+            } else {
                 // we have an escaped ascii character
                 $hexVal = substr($source, $pos, 2);
                 $decodedStr .= chr(hexdec($hexVal));
@@ -100,7 +99,10 @@  discard block
 block discarded – undo
         {
             while (($file = readdir($handle))!==false)
             {
-                if (preg_match('/disabled/',$file)) continue;   // We discard module if it contains disabled into name.
+                if (preg_match('/disabled/',$file)) {
+                    continue;
+                }
+                // We discard module if it contains disabled into name.
 
                 if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
                 {
@@ -132,8 +134,14 @@  discard block
 block discarded – undo
     	$outputlangs=$langs;
     }
 
-    if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada
-    if ($outputlangs->defaultlang == 'en_US') $selected='USLetter';    // US
+    if ($outputlangs->defaultlang == 'ca_CA') {
+        $selected='CAP4';
+    }
+    // Canada
+    if ($outputlangs->defaultlang == 'en_US') {
+        $selected='USLetter';
+    }
+    // US
     return $selected;
 }
 
@@ -158,33 +166,42 @@  discard block
 block discarded – undo
         {
             $content=file_get_contents($formfile);
             $isutf8=utf8_check($content);
-            if (!$isutf8 && Globals::$conf->file->character_set_client == 'UTF-8')
-                    print utf8_encode($content);
-                elseif ($isutf8 && Globals::$conf->file->character_set_client == 'ISO-8859-1')
-                    print utf8_decode($content);
-                else print $content;
+            if (!$isutf8 && Globals::$conf->file->character_set_client == 'UTF-8') {
+                                print utf8_encode($content);
+            } elseif ($isutf8 && Globals::$conf->file->character_set_client == 'ISO-8859-1') {
+                                    print utf8_decode($content);
+                } else {
+                    print $content;
+                }
             return true;
-        }
-        else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+        } else {
+            dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+        }
 
         if ($searchalt) {
             // Test si fichier dans repertoire de la langue alternative
-            if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;
-            else $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+            if ($langs->defaultlang != "en_US") {
+                $formfilealt = $searchdir."/langs/en_US/".$filename;
+            } else {
+                $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+            }
             dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);
             //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
             if (is_readable($formfilealt))
             {
                 $content=file_get_contents($formfilealt);
                 $isutf8=utf8_check($content);
-                if (!$isutf8 && Globals::$conf->file->character_set_client == 'UTF-8')
-                        print utf8_encode($content);
-                    elseif ($isutf8 && Globals::$conf->file->character_set_client == 'ISO-8859-1')
-                        print utf8_decode($content);
-                    else print $content;
+                if (!$isutf8 && Globals::$conf->file->character_set_client == 'UTF-8') {
+                                        print utf8_encode($content);
+                } elseif ($isutf8 && Globals::$conf->file->character_set_client == 'ISO-8859-1') {
+                                            print utf8_decode($content);
+                    } else {
+                        print $content;
+                    }
                 return true;
-            }
-            else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+            } else {
+                dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+            }
         }
     }
 
@@ -214,279 +231,460 @@  discard block
 block discarded – undo
     $deltadateforuser=round($deltadateforclient-$deltadateforserver);
     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
 
-    if ($usetable) print '<table class="border centpercent">';
+    if ($usetable) {
+        print '<table class="border centpercent">';
+    }
 
     // Import key
     if (! empty($object->import_key))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ImportedWithSet");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print $object->import_key;
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User creation (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_creation) || ! empty($object->user_creation_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("CreatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_creation))
         {
-        	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+        	if ($object->user_creation->id) {
+        	    print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
+        	} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) {
+                print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date creation
     if (! empty($object->date_creation))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateCreation");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_creation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User change (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_modification) || ! empty($object->user_modification_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ModifiedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_modification))
         {
-        	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+        	if ($object->user_modification->id) {
+        	    print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
+        	} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) {
+                print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date change
     if (! empty($object->date_modification))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateLastModification");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_modification, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User validation (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_validation) || ! empty($object->user_validation_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ValidatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_validation))
         {
-            if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+            if ($object->user_validation->id) {
+                print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date validation
     if (! empty($object->date_validation))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateValidation");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_validation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User approve (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_approve) || ! empty($object->user_approve_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ApprovedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_approve))
         {
-            if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+            if ($object->user_approve->id) {
+                print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date approve
     if (! empty($object->date_approve))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateApprove");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_approve, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User approve
     if (! empty($object->user_approve_id2))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ApprovedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         $userstatic=new User($db);
         $userstatic->fetch($object->user_approve_id2);
-        if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        else print $langs->trans("Unknown");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($userstatic->id) {
+            print $userstatic->getNomUrl(1, '', 0, 0, 0);
+        } else {
+            print $langs->trans("Unknown");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date approve
     if (! empty($object->date_approve2))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateApprove2");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_approve2, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User close
     if (! empty($object->user_cloture))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ClosedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_cloture))
         {
-			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+			if ($object->user_cloture->id) {
+			    print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_cloture);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date close
     if (! empty($object->date_cloture))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateClosing");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_cloture, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User conciliate
     if (! empty($object->user_rappro))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ConciliatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_rappro))
         {
-			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+			if ($object->user_rappro->id) {
+			    print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_rappro);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date conciliate
     if (! empty($object->date_rappro))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateConciliating");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_rappro, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date send
     if (! empty($object->date_envoi))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateLastSend");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_envoi, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
-    if ($usetable) print '</table>';
-}
+    if ($usetable) {
+        print '</table>';
+    }
+    }
 
 
 /**
@@ -515,8 +713,7 @@  discard block
 block discarded – undo
     if (checkdnsrr($domain, "MX"))
     {
         return true;
-    }
-    else
+    } else
     {
         return false;
     }
@@ -541,10 +738,14 @@  discard block
 block discarded – undo
     $urlregex = '';
 
     // SCHEME
-    if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";
+    if ($http) {
+        $urlregex .= "^(http:\/\/|https:\/\/)";
+    }
 
     // USER AND PASS
-    if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+    if ($pass) {
+        $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+    }
 
     // HOSTNAME OR IP
     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)
@@ -553,13 +754,21 @@  discard block
 block discarded – undo
     //use only one of the above
 
     // PORT
-    if ($port) $urlregex .= "(\:[0-9]{2,5})";
+    if ($port) {
+        $urlregex .= "(\:[0-9]{2,5})";
+    }
     // PATH
-    if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+    if ($path) {
+        $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+    }
     // GET Query
-    if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+    if ($query) {
+        $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+    }
     // ANCHOR
-    if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+    if ($anchor) {
+        $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+    }
 
     // check
     if (preg_match('/'.$urlregex.'/i', $url))
@@ -607,9 +816,10 @@  discard block
 block discarded – undo
         $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain,'/').'/i', $newproto.strtolower($domain), $url);
 
         return $CleanUrl;
+    } else {
+        return $url;
+    }
     }
-    else return $url;
-}
 
 
 
@@ -626,7 +836,9 @@  discard block
 block discarded – undo
  */
 function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)
 {
-	if(!isValidEmail($mail))return '';
+	if(!isValidEmail($mail)) {
+	    return '';
+	}
 	$tab = explode('@', $mail);
 	$tab2 = explode('.',$tab[1]);
 	$string_replace = '';
@@ -688,7 +900,9 @@  discard block
 block discarded – undo
 function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdoptions='')
 {
     $text='' ;
-    if($tableMarkup) $text = '<table '.$tableoptions.'>' ;
+    if($tableMarkup) {
+        $text = '<table '.$tableoptions.'>' ;
+    }
     foreach($data as $key => $item){
         if(is_array($item)){
             $text.=array2tr($item,$troptions,$tdoptions);
@@ -699,7 +913,9 @@  discard block
 block discarded – undo
             $text.= '</tr>' ;
         }
     }
-    if($tableMarkup) $text.= '</table>' ;
+    if($tableMarkup) {
+        $text.= '</table>' ;
+    }
     return $text ;
 }
 
@@ -723,15 +939,25 @@  discard block
 block discarded – undo
 {
     global $conf,$user;
 
-    if (! is_object($objsoc)) $valueforccc=$objsoc;
-    else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=$objsoc->code_fournisseur;
-    else $valueforccc=$objsoc->code_client;
+    if (! is_object($objsoc)) {
+        $valueforccc=$objsoc;
+    } else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) {
+        $valueforccc=$objsoc->code_fournisseur;
+    } else {
+        $valueforccc=$objsoc->code_client;
+    }
 
     $sharetable = $table;
-    if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
+    if ($table == 'facture' || $table == 'invoice') {
+        $sharetable = 'invoicenumber';
+    }
+    // for getEntity function
 
     // Clean parameters
-    if ($date == '') $date=dol_now();	// We use local year and month of PHP server to search numbers
+    if ($date == '') {
+        $date=dol_now();
+    }
+    // We use local year and month of PHP server to search numbers
     // but we should use local year and month of user
 
     // For debugging
@@ -748,8 +974,7 @@  discard block
 block discarded – undo
         $masktri=$reg[1].(! empty($reg[2])?$reg[2]:'').(! empty($reg[3])?$reg[3]:'');
         $maskcounter=$reg[1];
         $hasglobalcounter=true;
-    }
-    else
+    } else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri='00000';
@@ -759,8 +984,9 @@  discard block
 block discarded – undo
     $maskraz=-1;
     $maskoffset=0;
     $resetEveryMonth=false;
-    if (dol_strlen($maskcounter) < 3 && empty(Globals::$conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS))
-            return 'ErrorCounterMustHaveMoreThan3Digits';
+    if (dol_strlen($maskcounter) < 3 && empty(Globals::$conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) {
+                return 'ErrorCounterMustHaveMoreThan3Digits';
+    }
 
         // Extract value for third party mask counter
     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -772,9 +998,12 @@  discard block
 block discarded – undo
         $maskrefclient_clientcode=substr($valueforccc,0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code where n is length in mask
         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
-    }
-    else $maskrefclient='';
+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+            return 'ErrorCounterMustHaveMoreThan3Digits';
+        }
+    } else {
+        $maskrefclient='';
+    }
 
     // fail if there is neither a global nor a third party counter
     if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -788,8 +1017,7 @@  discard block
 block discarded – undo
         $masktype=$regType[1];
         $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));// get n first characters of thirdpaty typent_code (where n is length in mask)
         $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
-    }
-    else
+    } else
     {
     	$masktype='';
     	$masktype_value='';
@@ -799,13 +1027,14 @@  discard block
 block discarded – undo
     if (preg_match('/\{(u+)\}/i',$mask,$regType))
     {
     	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-    	if (is_object($objuser)) $lastname = $objuser->lastname;
+    	if (is_object($objuser)) {
+    	    $lastname = $objuser->lastname;
+    	}
 
     	$maskuser=$regType[1];
     	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
     	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
-    }
-    else
+    } else
     {
     	$maskuser='';
     	$maskuser_value='';
@@ -852,8 +1081,12 @@  discard block
 block discarded – undo
     //var_dump($reg);
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    }
 
     // Define $sqlwhere
     $sqlwhere='';
@@ -861,14 +1094,21 @@  discard block
 block discarded – undo
     $yearoffsettype=false;		// false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))	$yearoffsettype = preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))	$yearoffsettype = preg_replace('/^@/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) {
+        $yearoffsettype = preg_replace('/^@/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) {
+        $yearoffsettype = preg_replace('/^@/','',$reg[3]);
+    }
 
     //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
-    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
-        $maskraz=$yearoffsettype; // For backward compatibility
-    else if ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && Globals::$conf->global->SOCIETE_FISCAL_MONTH_START > 1))
-            $maskraz = Globals::$conf->global->SOCIETE_FISCAL_MONTH_START;
+    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1) {
+            $maskraz=$yearoffsettype;
+    }
+    // For backward compatibility
+    else if ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && Globals::$conf->global->SOCIETE_FISCAL_MONTH_START > 1)) {
+                $maskraz = Globals::$conf->global->SOCIETE_FISCAL_MONTH_START;
+    }
         //print "maskraz=".$maskraz;	// -1=no reset
 
     if ($maskraz > 0) {   // A reset is required
@@ -876,23 +1116,28 @@  discard block
 block discarded – undo
             $maskraz = date('m', $date);
             $resetEveryMonth = true;
         }
-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+        if ($maskraz > 12) {
+            return 'ErrorBadMaskBadRazMonth';
+        }
 
         // Define posy, posm and reg
-        if ($maskraz > 1)	// if reset is not first month, we need month and year into mask
+        if ($maskraz > 1) {
+            // if reset is not first month, we need month and year into mask
         {
-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-            else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-
-            if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';
-        }
-        else // if reset is for a specific month in year, we need year
+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2;
+        }
+        $posm=3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; } else {
+                return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+            }
+
+            if (dol_strlen($reg[$posy]) < 2) {
+                return 'ErrorCantUseRazWithYearOnOneDigit';
+            }
+        } else // if reset is for a specific month in year, we need year
         {
-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }
-            else return 'ErrorCantUseRazIfNoYearInMask';
+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; } else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; } else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; } else {
+                return 'ErrorCantUseRazIfNoYearInMask';
+            }
         }
         // Define length
         $yearlen = $posy?dol_strlen($reg[$posy]):0;
@@ -910,9 +1155,11 @@  discard block
 block discarded – undo
         $monthcomp=$maskraz;
         $yearcomp=0;
 
-        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
+        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=') {
+            // $yearoffsettype is - or +
         {
-        	$currentyear=date("Y", $date);
+        	$currentyear=date("Y", $date);
+        }
         	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
         	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
         	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
@@ -922,21 +1169,32 @@  discard block
 block discarded – undo
         	if ($date >= $fiscaldate)
         	{
         		// If before of next new year date
-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
+        		if ($date < $nextnewyeardate && $yearoffsettype == '+') {
+        		    $yearoffset=1;
+        		}
         	}
         	// If after or equal of current new year date
-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
+        	else if ($date >= $newyeardate && $yearoffsettype == '-') {
+        	    $yearoffset=-1;
+        	}
         }
         // For backward compatibility
         else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year
 
-        if ($yearlen == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
-        elseif ($yearlen == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
-        elseif ($yearlen == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
-        if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
+        if ($yearlen == 4) {
+            $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
+        } elseif ($yearlen == 2) {
+            $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
+        } elseif ($yearlen == 1) {
+            $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
+        }
+        if ($monthcomp > 1 && empty($resetEveryMonth)) {
+            // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
         {
-            if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);
-            elseif ($yearlen == 2) $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);
+            if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);
+        } elseif ($yearlen == 2) {
+                $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);
+            }
 
             $sqlwhere.="(";
             $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
@@ -945,13 +1203,11 @@  discard block
 block discarded – undo
             $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
             $sqlwhere.=')';
-        }
-		else if ($resetEveryMonth)
+        } else if ($resetEveryMonth)
 		{
 			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-		}
-        else   // reset is done on january
+		} else   // reset is done on january
         {
             $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
         }
@@ -963,12 +1219,13 @@  discard block
 block discarded – undo
     if (function_exists('mb_strrpos'))
     	{
     	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
-	}
-	else
+	} else
 	{
     	$posnumstart=strrpos($maskwithnocode,$maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
-    if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
+    if ($posnumstart < 0) {
+        return 'ErrorBadMaskFailedToLocatePosOfSequence';
+    }
     $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';
 
     // Define $maskLike
@@ -981,9 +1238,15 @@  discard block
 block discarded – undo
     $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
     $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
     $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike);
-    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+    if ($maskrefclient) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
+    }
+    if ($masktype) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
+    }
+    if ($maskuser) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+    }
     foreach($maskperso as $key => $val)
     {
     	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
@@ -995,12 +1258,18 @@  discard block
 block discarded – undo
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;
     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
 	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";
-    if ($bentityon) // only if entity enable
-    	$sql.= " AND entity IN (".getEntity($sharetable).")";
-    else if (! empty($forceentity))
-    	$sql.= " AND entity IN (".$forceentity.")";
-    if ($where) $sql.=$where;
-    if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+    if ($bentityon) {
+        // only if entity enable
+    	$sql.= " AND entity IN (".getEntity($sharetable).")";
+    } else if (! empty($forceentity)) {
+        	$sql.= " AND entity IN (".$forceentity.")";
+    }
+    if ($where) {
+        $sql.=$where;
+    }
+    if ($sqlwhere) {
+        $sql.=' AND '.$sqlwhere;
+    }
 
     //print $sql.'<br>';
     dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
@@ -1009,22 +1278,26 @@  discard block
 block discarded – undo
     {
         $obj = $db->fetch_object($resql);
         $counter = $obj->val;
-    }
-    else dol_print_error($db);
+    } else {
+        dol_print_error($db);
+    }
 
     // Check if we must force counter to maskoffset
-    if (empty($counter)) $counter=$maskoffset;
-    else if (preg_match('/[^0-9]/i',$counter))
+    if (empty($counter)) {
+        $counter=$maskoffset;
+    } else if (preg_match('/[^0-9]/i',$counter))
     {
     	$counter=0;
     	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
-    }
-    else if ($counter < $maskoffset && empty(Globals::$conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST))
-            $counter = $maskoffset;
+    } else if ($counter < $maskoffset && empty(Globals::$conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) {
+                $counter = $maskoffset;
+    }
 
-        if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
+        if ($mode == 'last') {
+            // We found value for counter = last counter value. Now need to get corresponding ref of invoice.
     {
-        $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);
+        $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);
+        }
 
         // Define $maskLike
         $maskLike = dol_string_nospecial($mask);
@@ -1036,34 +1309,48 @@  discard block
 block discarded – undo
         $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
         $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
         $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike);
-        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+        if ($maskrefclient) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
+        }
+        if ($masktype) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
+        }
+        if ($maskuser) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+        }
 
         $ref='';
         $sql = "SELECT ".$field." as ref";
         $sql.= " FROM ".MAIN_DB_PREFIX.$table;
         $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
     	$sql.= " AND ".$field." NOT LIKE '%PROV%'";
-    	if ($bentityon) // only if entity enable
-        	$sql.= " AND entity IN (".getEntity($sharetable).")";
-        else if (! empty($forceentity))
-        	$sql.= " AND entity IN (".$forceentity.")";
-        if ($where) $sql.=$where;
-        if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+    	if ($bentityon) {
+    	    // only if entity enable
+        	$sql.= " AND entity IN (".getEntity($sharetable).")";
+    	} else if (! empty($forceentity)) {
+                	$sql.= " AND entity IN (".$forceentity.")";
+        }
+        if ($where) {
+            $sql.=$where;
+        }
+        if ($sqlwhere) {
+            $sql.=' AND '.$sqlwhere;
+        }
 
         dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
-            if ($obj) $ref = $obj->ref;
-        }
-        else dol_print_error($db);
+            if ($obj) {
+                $ref = $obj->ref;
+            }
+        } else {
+            dol_print_error($db);
+        }
 
         $numFinal=$ref;
-    }
-    else if ($mode == 'next')
+    } else if ($mode == 'next')
     {
         $counter++;
 
@@ -1079,7 +1366,9 @@  discard block
 block discarded – undo
 
             // Define $sqlstring
             $maskrefclient_posnumstart=strpos($maskwithnocode,$maskrefclient_maskcounter,strpos($maskwithnocode,$maskrefclient));	// Pos of counter in final string (from 0 to ...)
-            if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';
+            if ($maskrefclient_posnumstart <= 0) {
+                return 'ErrorBadMask';
+            }
             $maskrefclient_sqlstring='SUBSTRING('.$field.', '.($maskrefclient_posnumstart+1).', '.dol_strlen($maskrefclient_maskcounter).')';
             //print "x".$sqlstring;
 
@@ -1101,12 +1390,20 @@  discard block
 block discarded – undo
             $maskrefclient_sql.= " FROM ".MAIN_DB_PREFIX.$table;
             //$sql.= " WHERE ".$field." not like '(%'";
             $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
-            if ($bentityon) // only if entity enable
-            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
-            else if (! empty($forceentity))
-            	$sql.= " AND entity IN (".$forceentity.")";
-            if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask
-            if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask
+            if ($bentityon) {
+                // only if entity enable
+            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
+            } else if (! empty($forceentity)) {
+                        	$sql.= " AND entity IN (".$forceentity.")";
+            }
+            if ($where) {
+                $maskrefclient_sql.=$where;
+            }
+            //use the same optional where as general mask
+            if ($sqlwhere) {
+                $maskrefclient_sql.=' AND '.$sqlwhere;
+            }
+            //use the same sqlwhere as general mask
             $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
 
             dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);
@@ -1115,10 +1412,13 @@  discard block
 block discarded – undo
             {
                 $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);
                 $maskrefclient_counter = $maskrefclient_obj->val;
-            }
-            else dol_print_error($db);
+            } else {
+                dol_print_error($db);
+            }
 
-            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;
+            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) {
+                $maskrefclient_counter=$maskrefclient_maskoffset;
+            }
 			$maskrefclient_counter++;
         }
 
@@ -1126,13 +1426,14 @@  discard block
 block discarded – undo
         $numFinal = $mask;
 
         // We replace special codes except refclient
-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
+		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=') {
+		    // yearoffsettype is - or +, so we don't want current year
 		{
-	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
+	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
+		}
         	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
         	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
-		}
-		else	// we want yyyy to be current year
+		} else	// we want yyyy to be current year
 		{
         	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
         	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
@@ -1189,7 +1490,9 @@  discard block
 block discarded – undo
 {
     $string = " ".$string;
      $ini = strpos($string,$start);
-     if ($ini == 0) return "";
+     if ($ini == 0) {
+         return "";
+     }
      $ini += strlen($start);
      $len = strpos($string,$end,$ini) - $ini;
      return substr($string,$ini,$len);
@@ -1213,8 +1516,7 @@  discard block
 block discarded – undo
         $masktri=$reg[1].(isset($reg[2])?$reg[2]:'').(isset($reg[3])?$reg[3]:'');
         $maskcounter=$reg[1];
         $hasglobalcounter=true;
-    }
-    else
+    } else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri='00000';
@@ -1223,7 +1525,9 @@  discard block
 block discarded – undo
 
     $maskraz=-1;
     $maskoffset=0;
-    if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+    if (dol_strlen($maskcounter) < 3) {
+        return 'ErrorCounterMustHaveMoreThan3Digits';
+    }
 
     // Extract value for third party mask counter
     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -1235,9 +1539,12 @@  discard block
 block discarded – undo
         $maskrefclient_clientcode=substr('',0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode
         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
-    }
-    else $maskrefclient='';
+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+            return 'ErrorCounterMustHaveMoreThan3Digits';
+        }
+    } else {
+        $maskrefclient='';
+    }
 
     // fail if there is neither a global nor a third party counter
     if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -1259,21 +1566,35 @@  discard block
 block discarded – undo
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    }
 
     // Define $sqlwhere
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))  $maskraz=preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))  $maskraz=preg_replace('/^@/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) {
+        $maskraz=preg_replace('/^@/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) {
+        $maskraz=preg_replace('/^@/','',$reg[3]);
+    }
     if ($maskraz >= 0)
     {
-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+        if ($maskraz > 12) {
+            return 'ErrorBadMaskBadRazMonth';
+        }
 
         // Define reg
-        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';
+        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) {
+            return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+        }
+        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) {
+            return 'ErrorCantUseRazIfNoYearInMask';
+        }
         //print "x".$maskwithonlyymcode." ".$maskraz;
     }
     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
@@ -1283,7 +1604,9 @@  discard block
 block discarded – undo
 
     // Check length
     $len=dol_strlen($maskwithnocode);
-    if (dol_strlen($value) != $len) $result=-1;
+    if (dol_strlen($value) != $len) {
+        $result=-1;
+    }
 
     // Define $maskLike
     /* seems not used
@@ -1364,29 +1687,37 @@  discard block
 block discarded – undo
      */
 
     // Definition du Jeudi de la semaine
-    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) // Dimanche
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) // du Lundi au Mercredi
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) // du Vendredi au Samedi
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;
-    else // Jeudi
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);
+    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) {
+        // Dimanche
+    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;
+    } else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) {
+        // du Lundi au Mercredi
+    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;
+    } else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) {
+        // du Vendredi au Samedi
+    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;
+    } else {
+        // Jeudi
+    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);
+    }
 
     // Definition du premier Jeudi de l'annee
-    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) // Dimanche
+    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) {
+        // Dimanche
     {
-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;
-    }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) // du Lundi au Mercredi
+        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;
+    }
+    } else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) {
+        // du Lundi au Mercredi
     {
-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;
-    }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) // du Vendredi au Samedi
+        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;
+    }
+    } else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) {
+        // du Vendredi au Samedi
     {
-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;
-    }
-    else // Jeudi
+        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;
+    }
+    } else // Jeudi
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));
     }
@@ -1407,8 +1738,7 @@  discard block
 block discarded – undo
         if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))
         {
             $numeroSemaine = 53;
-        }
-        else
+        } else
         {
             $numeroSemaine = 1;
         }
@@ -1467,7 +1797,9 @@  discard block
 block discarded – undo
 function dol_set_user_param($db, $conf, &$user, $tab)
 {
     // Verification parametres
-    if (count($tab) < 1) return -1;
+    if (count($tab) < 1) {
+        return -1;
+    }
 
     $db->begin();
 
@@ -1479,7 +1811,9 @@  discard block
 block discarded – undo
     $i=0;
     foreach ($tab as $key => $value)
     {
-        if ($i > 0) $sql.=',';
+        if ($i > 0) {
+            $sql.=',';
+        }
         $sql.="'".$db->escape($key)."'";
         $i++;
     }
@@ -1513,8 +1847,7 @@  discard block
 block discarded – undo
             }
             $user->conf->$key = $value;
             //print "key=".$key." user->conf->key=".$user->conf->$key;
-        }
-        else
+        } else
         {
             unset($user->conf->$key);
         }
@@ -1537,8 +1870,7 @@  discard block
 block discarded – undo
     if ($reduction == 100)
     {
         $string = $langs->transnoentities("Offered");
-    }
-    else
+    } else
     {
     	$string = vatrate($reduction,true);
     }
@@ -1625,9 +1957,11 @@  discard block
 block discarded – undo
 
             // If this generation module needs to scan a directory, then description field is filled
             // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
-            if (! empty($obj->description))	// A list of directories to scan is defined
+            if (! empty($obj->description)) {
+                // A list of directories to scan is defined
             {
-                include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            }
 
                 $const=$obj->description;
                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim(Globals::$conf->global->$const));
@@ -1646,7 +1980,9 @@  discard block
 block discarded – undo
                     {
 			// all type of template is allowed
 			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
-                        if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+                        if (count($tmpfiles)) {
+                            $listoffiles=array_merge($listoffiles,$tmpfiles);
+                        }
                     }
                 }
 
@@ -1657,40 +1993,41 @@  discard block
 block discarded – undo
                         $max=($maxfilenamelength?$maxfilenamelength:28);
                         $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],$max,'middle');
                     }
-                }
-                else
+                } else
                 {
                     $liste[0]=$obj->label.': '.$langs->trans("None");
                 }
-            }
-            else
+            } else
             {
-                if ($type == 'member' && $obj->lib == 'standard')   // Special case, if member template, we add variant per format
+                if ($type == 'member' && $obj->lib == 'standard') {
+                    // Special case, if member template, we add variant per format
                 {
-                    global $_Avery_Labels;
+                    global $_Avery_Labels;
+                }
                     include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
                     foreach($_Avery_Labels as $key => $val)
                     {
                         $liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->lib).' '.$val['name'];
                     }
-                }
-                else    // Common usage
+                } else    // Common usage
                 {
                     $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;
                 }
             }
             $i++;
         }
-    }
-    else
+    } else
     {
         dol_print_error($db);
         return -1;
     }
 
-    if ($found) return $liste;
-    else return 0;
-}
+    if ($found) {
+        return $liste;
+    } else {
+        return 0;
+    }
+    }
 
 /**
  * This function evaluates a string that should be a valid IPv4
@@ -1705,10 +2042,14 @@  discard block
 block discarded – undo
 	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 
 		// Then we test if it is a private range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) {
+		    return 2;
+		}
 
 		// Then we test if it is a reserved range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) {
+		    return 0;
+		}
 
 		return 1;
 	}
@@ -1761,8 +2102,7 @@  discard block
 block discarded – undo
                       'proxy_password' => $proxypass,
                       'trace'		   => 1
         );
-    }
-    else
+    } else
     {
         $params=array('connection_timeout'=>$timeout,
                       'response_timeout'=>$response_timeout,
@@ -1869,14 +2209,12 @@  discard block
 block discarded – undo
 		$classname='FactureFournisseur';
 		$classpath = 'fourn/class';
 		$module='fournisseur';
-	}
-	elseif ($objecttype == 'order_supplier')   {
+	} elseif ($objecttype == 'order_supplier')   {
 		$classfile = 'fournisseur.commande';
 		$classname='CommandeFournisseur';
 		$classpath = 'fourn/class';
 		$module='fournisseur';
-	}
-	elseif ($objecttype == 'stock')   {
+	} elseif ($objecttype == 'stock')   {
 		$classpath = 'product/stock/class';
 		$classfile='entrepot';
 		$classname='Entrepot';
@@ -1895,8 +2233,9 @@  discard block
 block discarded – undo
 					$ret=$langs->trans('Deleted');
 				}
 				unset($object);
-			}
-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
+			} else {
+			    dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
+			}
 		}
 	}
 	return $ret;
@@ -1928,11 +2267,12 @@  discard block
 block discarded – undo
 		{
 			$obj = $db->fetch_object($resql);
 			$listofid[]=$obj->rowid;
-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
+			if ($obj->parent_id > 0) {
+			    $listofparentid[$obj->rowid]=$obj->parent_id;
+			}
 			$i++;
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -1967,9 +2307,11 @@  discard block
 block discarded – undo
 			while ($cursor > 0)
 			{
 				$arrayidparsed[$cursor]=1;
-				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
+				if ($arrayidparsed[$listofparentid[$cursor]]) {
+				    // We detect a loop. A record with a parent that was already into child
 				{
-					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
+					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
+				}
 					unset($arrayidparsed);
 					$listofidtoclean[$cursor]=$id;
 					break;
@@ -1977,7 +2319,9 @@  discard block
 block discarded – undo
 				$cursor=$listofparentid[$cursor];
 			}
 
-			if (count($listofidtoclean)) break;
+			if (count($listofidtoclean)) {
+			    break;
+			}
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
@@ -2124,9 +2468,15 @@  discard block
 block discarded – undo
         $classfile='fournisseur.facture';
     }
 
-    if (!isset($classfile)) $classfile = strtolower($subelement);
-    if (!isset($classname)) $classname = ucfirst($subelement);
-    if (!isset($classpath)) $classpath = $module.'/class';
+    if (!isset($classfile)) {
+        $classfile = strtolower($subelement);
+    }
+    if (!isset($classname)) {
+        $classname = ucfirst($subelement);
+    }
+    if (!isset($classpath)) {
+        $classpath = $module.'/class';
+    }
 
     $element_properties = array(
         'module' => $module,
@@ -2179,8 +2529,12 @@  discard block
 block discarded – undo
  */
 function colorArrayToHex($arraycolor,$colorifnotfound='888888')
 {
-	if (! is_array($arraycolor)) return $colorifnotfound;
-	if (empty($arraycolor)) return $colorifnotfound;
+	if (! is_array($arraycolor)) {
+	    return $colorifnotfound;
+	}
+	if (empty($arraycolor)) {
+	    return $colorifnotfound;
+	}
 	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
 }
 
@@ -2196,12 +2550,17 @@  discard block
 block discarded – undo
  */
 static function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88))
     {
-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+	if (is_array($stringcolor)) {
+	    return $stringcolor;
+	}
+	// If already into correct output format, we return as is
 	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
 	if (! $tmp)
 	{
 		$tmp=explode(',',$stringcolor);
-		if (count($tmp) < 3) return $colorifnotfound;
+		if (count($tmp) < 3) {
+		    return $colorifnotfound;
+		}
 		return $tmp;
 	}
 	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
@@ -2247,69 +2606,51 @@  discard block
 block discarded – undo
 function getModuleDirForApiClass($module)
 {
     $moduledirforclass=$module;
-    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
+    if ($moduledirforclass != 'api') {
+        $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
+    }
 
     if ($module == 'contracts') {
     	$moduledirforclass = 'contrat';
-    }
-    elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
+    } elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
         $moduledirforclass = 'api';
-    }
-    elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
+    } elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
         $moduledirforclass = 'societe';
-    }
-    elseif ($module == 'propale' || $module == 'proposals') {
+    } elseif ($module == 'propale' || $module == 'proposals') {
         $moduledirforclass = 'comm/propal';
-    }
-    elseif ($module == 'agenda' || $module == 'agendaevents') {
+    } elseif ($module == 'agenda' || $module == 'agendaevents') {
         $moduledirforclass = 'comm/action';
-    }
-    elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
+    } elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
         $moduledirforclass = 'adherents';
-    }
-    elseif ($module == 'banque' || $module == 'bankaccounts') {
+    } elseif ($module == 'banque' || $module == 'bankaccounts') {
         $moduledirforclass = 'compta/bank';
-    }
-    elseif ($module == 'category' || $module == 'categorie') {
+    } elseif ($module == 'category' || $module == 'categorie') {
         $moduledirforclass = 'categories';
-    }
-    elseif ($module == 'order' || $module == 'orders') {
+    } elseif ($module == 'order' || $module == 'orders') {
         $moduledirforclass = 'commande';
-    }
-    elseif ($module == 'shipments') {
+    } elseif ($module == 'shipments') {
     	$moduledirforclass = 'expedition';
-    }
-    elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
+    } elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
         $moduledirforclass = 'compta/facture';
-    }
-    elseif ($module == 'products') {
+    } elseif ($module == 'products') {
         $moduledirforclass = 'product';
-    }
-    elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
+    } elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'task') {
+    } elseif ($module == 'task') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
+    } elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
         $moduledirforclass = 'product/stock';
-    }
-    elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
+    } elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
     	$moduledirforclass = 'supplier_proposal';
-    }
-    elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
+    } elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
         $moduledirforclass = 'fourn';
-    }
-    elseif ($module == 'expensereports') {
+    } elseif ($module == 'expensereports') {
         $moduledirforclass = 'expensereport';
-    }
-    elseif ($module == 'users') {
+    } elseif ($module == 'users') {
         $moduledirforclass = 'user';
-    }
-    elseif ($module == 'ficheinter' || $module == 'interventions') {
+    } elseif ($module == 'ficheinter' || $module == 'interventions') {
     	$moduledirforclass = 'fichinter';
-    }
-    elseif ($module == 'tickets') {
+    } elseif ($module == 'tickets') {
     	$moduledirforclass = 'ticket';
     }
 

Please login to merge, or discard this patch.

Helpers/Security.php 1 patch

Braces +129 added lines, -104 removed lines patch added patch discarded remove patch

@@ -196,24 +196,29 @@  discard block
 block discarded – undo
         // Get more permissions checks from hooks
         $parameters = array('features' => $features, 'objectid' => $objectid, 'idtype' => $dbt_select);
         $reshook = $hookmanager->executeHooks('restrictedArea', $parameters);
-        if (!empty($hookmanager->resArray['result']))
-            return true;
-        if ($reshook > 0)
-            return false;
+        if (!empty($hookmanager->resArray['result'])) {
+                    return true;
+        }
+        if ($reshook > 0) {
+                    return false;
+        }
 
-        if ($dbt_select != 'rowid' && $dbt_select != 'id')
-            $objectid = "'" . $objectid . "'";
+        if ($dbt_select != 'rowid' && $dbt_select != 'id') {
+                    $objectid = "'" . $objectid . "'";
+        }
 
         // Features/modules to check
         $featuresarray = array($features);
-        if (preg_match('/&/', $features))
-            $featuresarray = explode("&", $features);
-        else if (preg_match('/\|/', $features))
-            $featuresarray = explode("|", $features);
+        if (preg_match('/&/', $features)) {
+                    $featuresarray = explode("&", $features);
+        } else if (preg_match('/\|/', $features)) {
+                    $featuresarray = explode("|", $features);
+        }
 
         // More subfeatures to check
-        if (!empty($feature2))
-            $feature2 = explode("|", $feature2);
+        if (!empty($feature2)) {
+                    $feature2 = explode("|", $feature2);
+        }
 
         // More parameters
         $params = explode('&', $tableandshare);
@@ -227,8 +232,9 @@  discard block
 block discarded – undo
         $nbko = 0;
         foreach ($featuresarray as $feature) { // first we check nb of test ko
             $featureforlistofmodule = $feature;
-            if ($featureforlistofmodule == 'produit')
-                $featureforlistofmodule = 'product';
+            if ($featureforlistofmodule == 'produit') {
+                            $featureforlistofmodule = 'product';
+            }
             if (!empty($user->societe_id) && !empty(Globals::$conf->global->MAIN_MODULES_FOR_EXTERNAL) && !in_array($featureforlistofmodule, $listofmodules)) { // If limits on modules for external users, module must be into list of modules for external users
                 $readok = 0;
                 $nbko++;
@@ -290,11 +296,13 @@  discard block
 block discarded – undo
         }
 
         // If a or and at least one ok
-        if (preg_match('/\|/', $features) && $nbko < count($featuresarray))
-            $readok = 1;
+        if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+                    $readok = 1;
+        }
 
-        if (!$readok)
-            accessforbidden();
+        if (!$readok) {
+                    accessforbidden();
+        }
         //print "Read access is ok";
         // Check write permission from module (we need to know write permission to create but also to delete drafts record)
         $createok = 1;
@@ -351,22 +359,26 @@  discard block
 block discarded – undo
             }
 
             // If a or and at least one ok
-            if (preg_match('/\|/', $features) && $nbko < count($featuresarray))
-                $createok = 1;
+            if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+                            $createok = 1;
+            }
 
-            if (GETPOST('action', 'aZ09') == 'create' && !$createok)
-                accessforbidden();
+            if (GETPOST('action', 'aZ09') == 'create' && !$createok) {
+                            accessforbidden();
+            }
             //print "Write access is ok";
         }
 
         // Check create user permission
         $createuserok = 1;
         if (GETPOST('action', 'aZ09') == 'confirm_create_user' && GETPOST("confirm", 'aZ09') == 'yes') {
-            if (!$user->rights->user->user->creer)
-                $createuserok = 0;
+            if (!$user->rights->user->user->creer) {
+                            $createuserok = 0;
+            }
 
-            if (!$createuserok)
-                accessforbidden();
+            if (!$createuserok) {
+                            accessforbidden();
+            }
             //print "Create user access is ok";
         }
 
@@ -376,62 +388,66 @@  discard block
 block discarded – undo
         if ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete') {
             foreach ($featuresarray as $feature) {
                 if ($feature == 'contact') {
-                    if (!$user->rights->societe->contact->supprimer)
-                        $deleteok = 0;
-                }
-                else if ($feature == 'produit|service') {
-                    if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer)
-                        $deleteok = 0;
-                }
-                else if ($feature == 'commande_fournisseur') {
-                    if (!$user->rights->fournisseur->commande->supprimer)
-                        $deleteok = 0;
-                }
-                else if ($feature == 'banque') {
-                    if (!$user->rights->banque->modifier)
-                        $deleteok = 0;
-                }
-                else if ($feature == 'cheque') {
-                    if (!$user->rights->banque->cheque)
-                        $deleteok = 0;
-                }
-                else if ($feature == 'ecm') {
-                    if (!$user->rights->ecm->upload)
-                        $deleteok = 0;
-                }
-                else if ($feature == 'ftp') {
-                    if (!$user->rights->ftp->write)
-                        $deleteok = 0;
-                }else if ($feature == 'salaries') {
-                    if (!$user->rights->salaries->delete)
-                        $deleteok = 0;
-                }
-                else if ($feature == 'salaries') {
-                    if (!$user->rights->salaries->delete)
-                        $deleteok = 0;
-                }
-                else if (!empty($feature2)) { // This should be used for permissions on 2 levels
+                    if (!$user->rights->societe->contact->supprimer) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'produit|service') {
+                    if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'commande_fournisseur') {
+                    if (!$user->rights->fournisseur->commande->supprimer) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'banque') {
+                    if (!$user->rights->banque->modifier) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'cheque') {
+                    if (!$user->rights->banque->cheque) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'ecm') {
+                    if (!$user->rights->ecm->upload) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'ftp') {
+                    if (!$user->rights->ftp->write) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'salaries') {
+                    if (!$user->rights->salaries->delete) {
+                                            $deleteok = 0;
+                    }
+                } else if ($feature == 'salaries') {
+                    if (!$user->rights->salaries->delete) {
+                                            $deleteok = 0;
+                    }
+                } else if (!empty($feature2)) { // This should be used for permissions on 2 levels
                     foreach ($feature2 as $subfeature) {
-                        if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete))
-                            $deleteok = 0;
-                        else {
+                        if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) {
+                                                    $deleteok = 0;
+                        } else {
                             $deleteok = 1;
                             break;
                         } // For bypass the second test if the first is ok
                     }
                 } else if (!empty($feature)) {  // This is used for permissions on 1 level
                     //print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
-                    if (empty($user->rights->$feature->supprimer) && empty($user->rights->$feature->delete) && empty($user->rights->$feature->run))
-                        $deleteok = 0;
+                    if (empty($user->rights->$feature->supprimer) && empty($user->rights->$feature->delete) && empty($user->rights->$feature->run)) {
+                                            $deleteok = 0;
+                    }
                 }
             }
 
             // If a or and at least one ok
-            if (preg_match('/\|/', $features) && $nbko < count($featuresarray))
-                $deleteok = 1;
+            if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+                            $deleteok = 1;
+            }
 
-            if (!$deleteok && !($isdraft && $createok))
-                accessforbidden();
+            if (!$deleteok && !($isdraft && $createok)) {
+                            accessforbidden();
+            }
             //print "Delete access is ok";
         }
 
@@ -472,12 +488,15 @@  discard block
 block discarded – undo
             $sql = '';
 
             // For backward compatibility
-            if ($feature == 'member')
-                $feature = 'adherent';
-            if ($feature == 'project')
-                $feature = 'projet';
-            if ($feature == 'task')
-                $feature = 'projet_task';
+            if ($feature == 'member') {
+                            $feature = 'adherent';
+            }
+            if ($feature == 'project') {
+                            $feature = 'projet';
+            }
+            if ($feature == 'task') {
+                            $feature = 'projet_task';
+            }
 
             $check = array('adherent', 'banque', 'don', 'user', 'usergroup', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource'); // Test on entity only (Objects with no link to company)
             $checksoc = array('societe');  // Test for societe object
@@ -519,8 +538,9 @@  discard block
 block discarded – undo
             } else if (in_array($feature, $checksoc)) { // We check feature = checksoc
                 // If external user: Check permission for external users
                 if ($user->socid > 0) {
-                    if ($user->socid <> $objectid)
-                        return false;
+                    if ($user->socid <> $objectid) {
+                                            return false;
+                    }
                 }
                 // If internal user: Check permission for internal users that are restricted on their objects
                 else if (!empty(Globals::$conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {
@@ -569,10 +589,10 @@  discard block
 block discarded – undo
                     $projectstatic = new Project($db);
                     $tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
                     $tmparray = explode(',', $tmps);
-                    if (!in_array($objectid, $tmparray))
-                        return false;
-                }
-                else {
+                    if (!in_array($objectid, $tmparray)) {
+                                            return false;
+                    }
+                } else {
                     $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";
                     $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
                     $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";
@@ -587,10 +607,10 @@  discard block
 block discarded – undo
                     $projectstatic = new Project($db);
                     $tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
                     $tmparray = explode(',', $tmps);
-                    if (!in_array($task->fk_project, $tmparray))
-                        return false;
-                }
-                else {
+                    if (!in_array($task->fk_project, $tmparray)) {
+                                            return false;
+                    }
+                } else {
                     $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";
                     $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
                     $sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";
@@ -599,8 +619,9 @@  discard block
 block discarded – undo
             } else if (!in_array($feature, $nocheck)) {  // By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
                 // If external user: Check permission for external users
                 if ($user->socid > 0) {
-                    if (empty($dbt_keyfield))
-                        dol_print_error('', 'Param dbt_keyfield is required but not defined');
+                    if (empty($dbt_keyfield)) {
+                                            dol_print_error('', 'Param dbt_keyfield is required but not defined');
+                    }
                     $sql = "SELECT COUNT(dbt." . $dbt_keyfield . ") as nb";
                     $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
                     $sql .= " WHERE dbt.rowid IN (" . $objectid . ")";
@@ -608,8 +629,9 @@  discard block
 block discarded – undo
                 }
                 // If internal user: Check permission for internal users that are restricted on their objects
                 else if (!empty(Globals::$conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {
-                    if (empty($dbt_keyfield))
-                        dol_print_error('', 'Param dbt_keyfield is required but not defined');
+                    if (empty($dbt_keyfield)) {
+                                            dol_print_error('', 'Param dbt_keyfield is required but not defined');
+                    }
                     $sql = "SELECT COUNT(sc.fk_soc) as nb";
                     $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
                     $sql .= ", " . MAIN_DB_PREFIX . "societe as s";
@@ -633,10 +655,10 @@  discard block
 block discarded – undo
                 $resql = $db->query($sql);
                 if ($resql) {
                     $obj = $db->fetch_object($resql);
-                    if (!$obj || $obj->nb < count(explode(',', $objectid)))
-                        return false;
-                }
-                else {
+                    if (!$obj || $obj->nb < count(explode(',', $objectid))) {
+                                            return false;
+                    }
+                } else {
                     return false;
                 }
             }
@@ -666,16 +688,18 @@  discard block
 block discarded – undo
         $langs->load("errors");
 
         if ($printheader) {
-            if (function_exists("llxHeader"))
-                llxHeader('');
-            else if (function_exists("llxHeaderVierge"))
-                llxHeaderVierge('');
+            if (function_exists("llxHeader")) {
+                            llxHeader('');
+            } else if (function_exists("llxHeaderVierge")) {
+                            llxHeaderVierge('');
+            }
         }
         print '<div class="error">';
-        if (!$message)
-            print $langs->trans("ErrorForbidden");
-        else
-            print $message;
+        if (!$message) {
+                    print $langs->trans("ErrorForbidden");
+        } else {
+                    print $message;
+        }
         print '</div>';
         print '<br>';
         if (empty($showonlymessage)) {
@@ -686,8 +710,9 @@  discard block
 block discarded – undo
                 print $langs->trans("ErrorForbidden3");
             }
         }
-        if ($printfooter && function_exists("llxFooter"))
-            llxFooter();
+        if ($printfooter && function_exists("llxFooter")) {
+                    llxFooter();
+        }
         exit(0);
     }
 }

Please login to merge, or discard this patch.

Helpers/DolUtils.php 1 patch

Braces +1399 added lines, -1009 removed lines patch added patch discarded remove patch

@@ -75,8 +75,9 @@  discard block
 block discarded – undo
           if ($found) return $result;
           } */
 
-        if (isset($class::$member))
-            return $class::$member;
+        if (isset($class::$member)) {
+                    return $class::$member;
+        }
         dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');
         return null;
     }
@@ -127,8 +128,9 @@  discard block
 block discarded – undo
         } else {
             $out = '';
             $addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
-            if (in_array($element, $addzero))
-                $out .= '0,';
+            if (in_array($element, $addzero)) {
+                            $out .= '0,';
+            }
             $out .= Globals::$conf->entity;
             return $out;
         }
@@ -307,32 +309,35 @@  discard block
 block discarded – undo
     {
         // global $mysoc, $user, Globals::$conf;
 
-        if (empty($paramname))
-            return 'BadFirstParameterForDolUtils::GETPOST';
+        if (empty($paramname)) {
+                    return 'BadFirstParameterForDolUtils::GETPOST';
+        }
         if (empty($check)) {
             DolUtils::dol_syslog("Deprecated use of DolUtils::GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);
             // Enable this line to know who call the DolUtils::GETPOST with '' $check parameter.
             //var_dump(debug_backtrace()[0]);
         }
 
-        if (empty($method))
-            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
-        elseif ($method == 1)
-            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
-        elseif ($method == 2)
-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
-        elseif ($method == 3)
-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
-        elseif ($method == 4)
-            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));
-        else
-            return 'BadThirdParameterForDolUtils::GETPOST';
+        if (empty($method)) {
+                    $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+        } elseif ($method == 1) {
+                    $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+        } elseif ($method == 2) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+        } elseif ($method == 3) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+        } elseif ($method == 4) {
+                    $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));
+        } else {
+                    return 'BadThirdParameterForDolUtils::GETPOST';
+        }
 
         if (empty($method) || $method == 3 || $method == 4) {
             $relativepathstring = $_SERVER["PHP_SELF"];
             // Clean $relativepathstring
-            if (constant('DOL_BASE_URI'))
-                $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+            if (constant('DOL_BASE_URI')) {
+                            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+            }
             $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
             $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
             //var_dump($relativepathstring);
@@ -381,14 +386,17 @@  discard block
 block discarded – undo
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
                                         $foundintru = 0;
                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {
-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))
-                                                $foundintru = 1;
+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
                                         }
-                                        if (!$foundintru)
-                                            $qualified = 1;
+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
+                                        }
                                         //var_dump($defkey.'-'.$qualified);
-                                    } else
-                                        $qualified = 1;
+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 
                                     if ($qualified) {
                                         //var_dump($user->default_values[$relativepathstring][$defkey]['createform']);
@@ -415,20 +423,24 @@  discard block
 block discarded – undo
                                             $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
                                             $foundintru = 0;
                                             foreach ($tmpqueryarraytohave as $tmpquerytohave) {
-                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave))
-                                                    $foundintru = 1;
+                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                                    $foundintru = 1;
+                                                }
                                             }
-                                            if (!$foundintru)
-                                                $qualified = 1;
+                                            if (!$foundintru) {
+                                                                                            $qualified = 1;
+                                            }
                                             //var_dump($defkey.'-'.$qualified);
-                                        } else
-                                            $qualified = 1;
+                                        } else {
+                                                                                    $qualified = 1;
+                                        }
 
                                         if ($qualified) {
                                             $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,
                                             foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {
-                                                if ($out)
-                                                    $out .= ', ';
+                                                if ($out) {
+                                                                                                    $out .= ', ';
+                                                }
                                                 if ($paramname == 'sortfield') {
                                                     $out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace);
                                                 }
@@ -448,14 +460,17 @@  discard block
 block discarded – undo
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
                                         $foundintru = 0;
                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {
-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))
-                                                $foundintru = 1;
+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
                                         }
-                                        if (!$foundintru)
-                                            $qualified = 1;
+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
+                                        }
                                         //var_dump($defkey.'-'.$qualified);
-                                    } else
-                                        $qualified = 1;
+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 
                                     if ($qualified) {
                                         if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {
@@ -527,8 +542,10 @@  discard block
 block discarded – undo
                     $newout = $user->fk_user;
                 } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {
                     $newout = Globals::$conf->entity;
-                } else
-                    $newout = '';     // Key not found, we replace with empty string
+                } else {
+                                    $newout = '';
+                }
+                // Key not found, we replace with empty string
 
 
 
@@ -579,18 +596,20 @@  discard block
 block discarded – undo
                 }
                 break;
             case 'intcomma':
-                if (preg_match('/[^0-9,-]+/i', $out))
-                    $out = '';
+                if (preg_match('/[^0-9,-]+/i', $out)) {
+                                    $out = '';
+                }
                 break;
             case 'alpha':
                 if (!is_array($out)) {
                     $out = trim($out);
                     // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
                     // '../' is dangerous because it allows dir transversals
-                    if (preg_match('/"/', $out))
-                        $out = '';
-                    else if (preg_match('/\.\.\//', $out))
-                        $out = '';
+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                 }
                 break;
             case 'san_alpha':
@@ -599,27 +618,31 @@  discard block
 block discarded – undo
             case 'aZ':
                 if (!is_array($out)) {
                     $out = trim($out);
-                    if (preg_match('/[^a-z]+/i', $out))
-                        $out = '';
+                    if (preg_match('/[^a-z]+/i', $out)) {
+                                            $out = '';
+                    }
                 }
                 break;
             case 'aZ09':
                 if (!is_array($out)) {
                     $out = trim($out);
-                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out))
-                        $out = '';
+                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) {
+                                            $out = '';
+                    }
                 }
                 break;
             case 'aZ09comma':  // great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh
                 if (!is_array($out)) {
                     $out = trim($out);
-                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out))
-                        $out = '';
+                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) {
+                                            $out = '';
+                    }
                 }
                 break;
             case 'array':
-                if (!is_array($out) || empty($out))
-                    $out = array();
+                if (!is_array($out) || empty($out)) {
+                                    $out = array();
+                }
                 break;
             case 'nohtml':  // Recommended for most scalar parameters
                 $out = dol_string_nohtmltag($out, 0);
@@ -629,16 +652,18 @@  discard block
 block discarded – undo
                     $out = trim($out);
                     // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
                     // '../' is dangerous because it allows dir transversals
-                    if (preg_match('/"/', $out))
-                        $out = '';
-                    else if (preg_match('/\.\.\//', $out))
-                        $out = '';
+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                     $out = dol_string_nohtmltag($out);
                 }
                 break;
             case 'custom':
-                if (empty($filter))
-                    return 'BadFourthParameterForDolUtils::GETPOST';
+                if (empty($filter)) {
+                                    return 'BadFourthParameterForDolUtils::GETPOST';
+                }
                 $out = filter_var($out, $filter, $options);
                 break;
         }
@@ -756,11 +781,11 @@  discard block
 block discarded – undo
                 }
             }
             if ($returnemptyifnotfound) {        // Not found into alternate dir
-                if ($returnemptyifnotfound == 1 || !file_exists($res))
-                    return '';
+                if ($returnemptyifnotfound == 1 || !file_exists($res)) {
+                                    return '';
+                }
             }
-        }
-        else {    // For an url path
+        } else {    // For an url path
 // We try to get local path of file on filesystem from url
 // Note that trying to know if a file on disk exist by forging path on disk from url
 // works only for some web server and some setup. This is bugged when
@@ -854,12 +879,14 @@  discard block
 block discarded – undo
     static function dol_size($size, $type = '')
     {
         //global Globals::$conf;
-        if (empty(Globals::$conf->dol_optimize_smallscreen))
-            return $size;
-        if ($type == 'width' && $size > 250)
-            return 250;
-        else
-            return 10;
+        if (empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    return $size;
+        }
+        if ($type == 'width' && $size > 250) {
+                    return 250;
+        } else {
+                    return 10;
+        }
     }
 
     /**
@@ -959,9 +986,10 @@  discard block
 block discarded – undo
     {
         $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName
         $forbidden_chars_to_remove = array();
-        if (is_array($badcharstoreplace))
-            $forbidden_chars_to_replace = $badcharstoreplace;
-//$forbidden_chars_to_remove=array("(",")");
+        if (is_array($badcharstoreplace)) {
+                    $forbidden_chars_to_replace = $badcharstoreplace;
+        }
+        //$forbidden_chars_to_remove=array("(",")");
 
         return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));
     }
@@ -997,9 +1025,9 @@  discard block
 block discarded – undo
         if (empty($mode)) {
             $substitjs["'"] = "\\'";
             $substitjs['"'] = "\\'";
-        } else if ($mode == 1)
-            $substitjs["'"] = "\\'";
-        else if ($mode == 2) {
+        } else if ($mode == 1) {
+                    $substitjs["'"] = "\\'";
+        } else if ($mode == 2) {
             $substitjs['"'] = '\\"';
         } else if ($mode == 3) {
             $substitjs["'"] = "\\'";
@@ -1021,10 +1049,12 @@  discard block
 block discarded – undo
     {
 // escape quotes and backslashes, newlines, etc.
         $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags
-        if (!$keepb)
-            $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));
-        if (!$keepn)
-            $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));
+        if (!$keepb) {
+                    $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));
+        }
+        if (!$keepn) {
+                    $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));
+        }
         return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags
     }
 
@@ -1074,8 +1104,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, $user;
 // If syslog module enabled
-        if (empty(Globals::$conf->syslog->enabled))
-            return;
+        if (empty(Globals::$conf->syslog->enabled)) {
+                    return;
+        }
 
         if ($ident < 0) {
             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {
@@ -1089,8 +1120,9 @@  discard block
 block discarded – undo
             if (!in_array($level, $logLevels, true)) {
                 throw new Exception('Incorrect log level');
             }
-            if ($level > Globals::$conf->global->SYSLOG_LEVEL)
-                return;
+            if ($level > Globals::$conf->global->SYSLOG_LEVEL) {
+                            return;
+            }
 
             $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log
 // If adding log inside HTML page is required
@@ -1115,24 +1147,30 @@  discard block
 block discarded – undo
             );
 
 // This is when server run behind a reverse proxy
-            if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
-                $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);
-// This is when server run normally on a server
-            else if (!empty($_SERVER["REMOTE_ADDR"]))
-                $data['ip'] = $_SERVER['REMOTE_ADDR'];
-// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
-            else if (!empty($_SERVER['SERVER_ADDR']))
-                $data['ip'] = $_SERVER['SERVER_ADDR'];
-// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).
-            else if (!empty($_SERVER['COMPUTERNAME']))
-                $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);
-// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).
-            else if (!empty($_SERVER['LOGNAME']))
-                $data['ip'] = '???@' . $_SERVER['LOGNAME'];
-// Loop on each log handler and send output
+            if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                            $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);
+            }
+            // This is when server run normally on a server
+            else if (!empty($_SERVER["REMOTE_ADDR"])) {
+                            $data['ip'] = $_SERVER['REMOTE_ADDR'];
+            }
+            // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
+            else if (!empty($_SERVER['SERVER_ADDR'])) {
+                            $data['ip'] = $_SERVER['SERVER_ADDR'];
+            }
+            // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).
+            else if (!empty($_SERVER['COMPUTERNAME'])) {
+                            $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);
+            }
+            // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).
+            else if (!empty($_SERVER['LOGNAME'])) {
+                            $data['ip'] = '???@' . $_SERVER['LOGNAME'];
+            }
+            // Loop on each log handler and send output
             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {
-                if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)
-                    continue;
+                if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+                                    continue;
+                }
                 $loghandlerinstance->export($data, $suffixinfilename);
             }
             unset($data);
@@ -1188,13 +1226,15 @@  discard block
 block discarded – undo
 
 // Show title
         $showtitle = 1;
-        if (!empty(Globals::$conf->dol_optimize_smallscreen))
-            $showtitle = 0;
+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    $showtitle = 0;
+        }
         if (!empty($title) && $showtitle) {
             $limittitle = 30;
             $out .= '<a class="tabTitle">';
-            if ($picto)
-                $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';
+            if ($picto) {
+                            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';
+            }
             $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';
             $out .= '</a>';
         }
@@ -1203,12 +1243,14 @@  discard block
 block discarded – undo
         $maxkey = -1;
         if (is_array($links) && !empty($links)) {
             $keys = array_keys($links);
-            if (count($keys))
-                $maxkey = max($keys);
+            if (count($keys)) {
+                            $maxkey = max($keys);
+            }
         }
 
-        if (!empty(Globals::$conf->dol_optimize_smallscreen))
-            Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2;
+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2;
+        }
 
 // Show tabs
         $bactive = false;
@@ -1221,8 +1263,9 @@  discard block
 block discarded – undo
         for ($i = 0; $i <= $maxkey; $i++) {
             if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {
 // If active tab is already present
-                if ($i >= $limittoshow)
-                    $limittoshow--;
+                if ($i >= $limittoshow) {
+                                    $limittoshow--;
+                }
             }
         }
 
@@ -1263,12 +1306,12 @@  discard block
 block discarded – undo
                 }
                 $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';
                 if (isset($links[$i][2]) && $links[$i][2] == 'image') {
-                    if (!empty($links[$i][0]))
-                        $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";
-                    else
-                        $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";
-                }
-                else if (!empty($links[$i][1])) {
+                    if (!empty($links[$i][0])) {
+                                            $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";
+                    } else {
+                                            $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";
+                    }
+                } else if (!empty($links[$i][1])) {
                     $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';
                     $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.
                     $outmore .= '</a>' . "\n";
@@ -1279,8 +1322,9 @@  discard block
 block discarded – undo
             }
             $displaytab = $i;
         }
-        if ($popuptab)
-            $outmore .= '</div>';
+        if ($popuptab) {
+                    $outmore .= '</div>';
+        }
 
         if ($displaytab > $limittoshow) {
             $left = (Globals::$langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
@@ -1303,8 +1347,9 @@  discard block
 block discarded – undo
 
         $out .= "</div>\n";
 
-        if (!$notab || $notab == -1)
-            $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";
+        if (!$notab || $notab == -1) {
+                    $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";
+        }
 
         $parameters = array('tabname' => $active, 'out' => $out);
         $reshook = Globals::$hookManager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"
@@ -1334,10 +1379,11 @@  discard block
 block discarded – undo
      */
     static function dol_get_fiche_end($notab = 0)
     {
-        if (!$notab || $notab == -1)
-            return "\n</div>\n";
-        else
-            return '';
+        if (!$notab || $notab == -1) {
+                    return "\n</div>\n";
+        } else {
+                    return '';
+        }
     }
 
     /**
@@ -1369,8 +1415,9 @@  discard block
 block discarded – undo
         $showimage = 1;
         $entity = (empty($object->entity) ? Globals::$conf->entity : $object->entity);
         $showbarcode = empty(Globals::$conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);
-        if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))
-            $showbarcode = 0;
+        if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+                    $showbarcode = 0;
+        }
         $modulepart = 'unknown';
 
         if ($object->element == 'societe') {
@@ -1475,8 +1522,10 @@  discard block
 block discarded – undo
                         } else {
                             $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);
                         }
-                        if (empty($subdir))
-                            $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path
+                        if (empty($subdir)) {
+                                                    $subdir = 'errorgettingsubdirofobject';
+                        }
+                        // Protection to avoid to return empty path
 
                         $filepath = $dir_output . $subdir . "/";
 
@@ -1497,14 +1546,16 @@  discard block
 block discarded – undo
                                 if (empty(Globals::$conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.
                                     include_once DOL_BASE_PATH . '/core/lib/files.lib.php';
                                     $ret = dol_convert_file($file, 'png', $fileimage);
-                                    if ($ret < 0)
-                                        $error++;
+                                    if ($ret < 0) {
+                                                                            $error++;
+                                    }
                                 }
                             }
 
                             $heightforphotref = 70;
-                            if (!empty(Globals::$conf->dol_optimize_smallscreen))
-                                $heightforphotref = 60;
+                            if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                                                            $heightforphotref = 60;
+                            }
                             // Si fichier png PDF d'1 page trouve
                             if (file_exists($fileimage)) {
                                 $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
@@ -1540,8 +1591,10 @@  discard block
 block discarded – undo
                         $width = 14;
                         $cssclass = 'photorefcenter';
                         $picto = $object->picto;
-                        if ($object->element == 'project' && !$object->public)
-                            $picto = 'project'; // instead of projectpub
+                        if ($object->element == 'project' && !$object->public) {
+                                                    $picto = 'project';
+                        }
+                        // instead of projectpub
                         $nophoto = img_picto('', 'object_' . $picto, '', false, 1);
                     }
                     $morehtmlleft .= '<!-- No photo to show -->';
@@ -1552,8 +1605,9 @@  discard block
 block discarded – undo
             }
         }
 
-        if ($showbarcode)
-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';
+        if ($showbarcode) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';
+        }
 
         if ($object->element == 'societe') {
             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->societe->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
@@ -1577,35 +1631,37 @@  discard block
 block discarded – undo
             }
         } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {
             $tmptxt = $object->getLibStatut(6, $object->totalpaye);
-            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone')
-                $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') {
+                            $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+            }
             $morehtmlstatus .= $tmptxt;
-        }
-        elseif ($object->element == 'contrat' || $object->element == 'contract') {
-            if ($object->statut == 0)
-                $morehtmlstatus .= $object->getLibStatut(5);
-            else
-                $morehtmlstatus .= $object->getLibStatut(4);
-        }
-        elseif ($object->element == 'facturerec') {
-            if ($object->frequency == 0)
-                $morehtmlstatus .= $object->getLibStatut(2);
-            else
-                $morehtmlstatus .= $object->getLibStatut(5);
-        }
-        elseif ($object->element == 'project_task') {
+        } elseif ($object->element == 'contrat' || $object->element == 'contract') {
+            if ($object->statut == 0) {
+                            $morehtmlstatus .= $object->getLibStatut(5);
+            } else {
+                            $morehtmlstatus .= $object->getLibStatut(4);
+            }
+        } elseif ($object->element == 'facturerec') {
+            if ($object->frequency == 0) {
+                            $morehtmlstatus .= $object->getLibStatut(2);
+            } else {
+                            $morehtmlstatus .= $object->getLibStatut(5);
+            }
+        } elseif ($object->element == 'project_task') {
             $object->fk_statut = 1;
-            if ($object->progress > 0)
-                $object->fk_statut = 2;
-            if ($object->progress >= 100)
-                $object->fk_statut = 3;
+            if ($object->progress > 0) {
+                            $object->fk_statut = 2;
+            }
+            if ($object->progress >= 100) {
+                            $object->fk_statut = 3;
+            }
             $tmptxt = $object->getLibStatut(5);
             $morehtmlstatus .= $tmptxt;  // No status on task
-        }
-        else { // Generic case
+        } else { // Generic case
             $tmptxt = $object->getLibStatut(6);
-            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone')
-                $tmptxt = $object->getLibStatut(5);
+            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') {
+                            $tmptxt = $object->getLibStatut(5);
+            }
             $morehtmlstatus .= $tmptxt;
         }
 
@@ -1619,13 +1675,15 @@  discard block
 block discarded – undo
         }
 
 // Add alias for thirdparty
-        if (!empty($object->name_alias))
-            $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';
+        if (!empty($object->name_alias)) {
+                    $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';
+        }
 
 // Add label
         if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {
-            if (!empty($object->label))
-                $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';
+            if (!empty($object->label)) {
+                            $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';
+            }
         }
 
         if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {
@@ -1658,15 +1716,19 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
         $ret = '';
-        if ($fieldrequired)
-            $ret .= '<span class="fieldrequired">';
-        if ((Globals::$conf->dol_use_jmobile != 4))
-            $ret .= '<label for="' . $fieldkey . '">';
+        if ($fieldrequired) {
+                    $ret .= '<span class="fieldrequired">';
+        }
+        if ((Globals::$conf->dol_use_jmobile != 4)) {
+                    $ret .= '<label for="' . $fieldkey . '">';
+        }
         $ret .= Globals::$langs->trans($langkey);
-        if ((Globals::$conf->dol_use_jmobile != 4))
-            $ret .= '</label>';
-        if ($fieldrequired)
-            $ret .= '</span>';
+        if ((Globals::$conf->dol_use_jmobile != 4)) {
+                    $ret .= '</label>';
+        }
+        if ($fieldrequired) {
+                    $ret .= '</span>';
+        }
         return $ret;
     }
 
@@ -1681,8 +1743,9 @@  discard block
 block discarded – undo
     {
         // global $bc;
         $ret = ' ' . $bc[$var];
-        if ($moreclass)
-            $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);
+        if ($moreclass) {
+                    $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);
+        }
         return $ret;
     }
 
@@ -1713,18 +1776,18 @@  discard block
 block discarded – undo
             if ($object->state) {
                 $ret .= ($ret ? ", " : '') . $object->state;
             }
-            if ($object->zip)
-                $ret .= ($ret ? ", " : '') . $object->zip;
-        }
-        else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country
+            if ($object->zip) {
+                            $ret .= ($ret ? ", " : '') . $object->zip;
+            }
+        } else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country
             $ret .= ($ret ? $sep : '' ) . $object->town;
             if ($object->state) {
                 $ret .= ($ret ? ", " : '') . $object->state;
             }
-            if ($object->zip)
-                $ret .= ($ret ? $sep : '' ) . $object->zip;
-        }
-        else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country
+            if ($object->zip) {
+                            $ret .= ($ret ? $sep : '' ) . $object->zip;
+            }
+        } else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country
             $ret .= ($ret ? $sep : '' ) . $object->zip;
             $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');
             if ($object->state) {
@@ -1741,8 +1804,9 @@  discard block
 block discarded – undo
                 $ret .= ($ret ? ", " : '') . $object->state;
             }
         }
-        if (!is_object($outputlangs))
-            $outputlangs = Globals::$langs;
+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
         if ($withcountry) {
             Globals::$langs->load("dict");
             $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');
@@ -1763,8 +1827,9 @@  discard block
 block discarded – undo
     {
         if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
             return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);
-        } else
-            return 'Error date into a not supported range';
+        } else {
+                    return 'Error date into a not supported range';
+        }
     }
 
     /**
@@ -1810,10 +1875,12 @@  discard block
 block discarded – undo
                 }
             }
         }
-        if (!is_object($outputlangs))
-            $outputlangs = Globals::$langs;
-        if (!$format)
-            $format = 'daytextshort';
+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
+        if (!$format) {
+                    $format = 'daytextshort';
+        }
         $reduceformat = (!empty(Globals::$conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;
         $formatwithoutreduce = preg_replace('/reduceformat/', '', $format);
         if ($formatwithoutreduce != $format) {
@@ -1822,40 +1889,46 @@  discard block
 block discarded – undo
         }  // so format 'dayreduceformat' is processed like day
 // Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
 // TODO Add format daysmallyear and dayhoursmallyear
-        if ($format == 'day')
-            $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short);
-        else if ($format == 'hour')
-            $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short);
-        else if ($format == 'hourduration')
-            $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration);
-        else if ($format == 'daytext')
-            $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text);
-        else if ($format == 'daytextshort')
-// Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781
-            $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short);
-        else if ($format == 'dayhour')
-            $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short ?? "%d/%m/%Y %H:%M");
-        else if ($format == 'dayhoursec')
-            $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short);
-        else if ($format == 'dayhourtext')
-            $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text);
-        else if ($format == 'dayhourtextshort')
-            $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short);
-// Format not sensitive to language
-        else if ($format == 'dayhourlog')
-            $format = '%Y%m%d%H%M%S';
-        else if ($format == 'dayhourldap')
-            $format = '%Y%m%d%H%M%SZ';
-        else if ($format == 'dayhourxcard')
-            $format = '%Y%m%dT%H%M%SZ';
-        else if ($format == 'dayxcard')
-            $format = '%Y%m%d';
-        else if ($format == 'dayrfc')
-            $format = '%Y-%m-%d';             // DATE_RFC3339
-        else if ($format == 'dayhourrfc')
-            $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339
-        else if ($format == 'standard')
-            $format = '%Y-%m-%d %H:%M:%S';
+        if ($format == 'day') {
+                    $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short);
+        } else if ($format == 'hour') {
+                    $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short);
+        } else if ($format == 'hourduration') {
+                    $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration);
+        } else if ($format == 'daytext') {
+                    $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text);
+        } else if ($format == 'daytextshort') {
+            // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781
+            $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short);
+        } else if ($format == 'dayhour') {
+                    $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short ?? "%d/%m/%Y %H:%M");
+        } else if ($format == 'dayhoursec') {
+                    $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short);
+        } else if ($format == 'dayhourtext') {
+                    $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text);
+        } else if ($format == 'dayhourtextshort') {
+                    $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short);
+        }
+        // Format not sensitive to language
+        else if ($format == 'dayhourlog') {
+                    $format = '%Y%m%d%H%M%S';
+        } else if ($format == 'dayhourldap') {
+                    $format = '%Y%m%d%H%M%SZ';
+        } else if ($format == 'dayhourxcard') {
+                    $format = '%Y%m%dT%H%M%SZ';
+        } else if ($format == 'dayxcard') {
+                    $format = '%Y%m%d';
+        } else if ($format == 'dayrfc') {
+                    $format = '%Y-%m-%d';
+        }
+        // DATE_RFC3339
+        else if ($format == 'dayhourrfc') {
+                    $format = '%Y-%m-%dT%H:%M:%SZ';
+        }
+        // DATETIME RFC3339
+        else if ($format == 'standard') {
+                    $format = '%Y-%m-%d %H:%M:%S';
+        }
 
         if ($reduceformat) {
             $format = str_replace('%Y', '%y', $format);
@@ -1863,8 +1936,10 @@  discard block
 block discarded – undo
         }
 
 // If date undefined or "", we return ""
-        if (DolUtils::dol_strlen($time) == 0)
-            return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)
+        if (DolUtils::dol_strlen($time) == 0) {
+                    return '';
+        }
+        // $time=0 allowed (it means 01/01/1970 00:00:00)
 
 
 
@@ -1934,8 +2009,9 @@  discard block
 block discarded – undo
                 $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
                 $ret = adodb_strftime($format, $timetouse, $to_gmt);
-            } else
-                $ret = 'Bad value ' . $time . ' for date';
+            } else {
+                            $ret = 'Bad value ' . $time . ' for date';
+            }
         }
 
         if (preg_match('/__b__/i', $format)) {
@@ -2006,10 +2082,14 @@  discard block
 block discarded – undo
         // global Globals::$conf;
 
         $usealternatemethod = false;
-        if ($timestamp <= 0)
-            $usealternatemethod = true;    // <= 1970
-        if ($timestamp >= 2145913200)
-            $usealternatemethod = true;  // >= 2038
+        if ($timestamp <= 0) {
+                    $usealternatemethod = true;
+        }
+        // <= 1970
+        if ($timestamp >= 2145913200) {
+                    $usealternatemethod = true;
+        }
+        // >= 2038
 
         if ($usealternatemethod) {
             $arrayinfo = adodb_getdate($timestamp, $fast);
@@ -2044,27 +2124,36 @@  discard block
 block discarded – undo
         // global Globals::$conf;
 //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";
 // Clean parameters
-        if ($hour == -1 || empty($hour))
-            $hour = 0;
-        if ($minute == -1 || empty($minute))
-            $minute = 0;
-        if ($second == -1 || empty($second))
-            $second = 0;
+        if ($hour == -1 || empty($hour)) {
+                    $hour = 0;
+        }
+        if ($minute == -1 || empty($minute)) {
+                    $minute = 0;
+        }
+        if ($second == -1 || empty($second)) {
+                    $second = 0;
+        }
 
 // Check parameters
         if ($check) {
-            if (!$month || !$day)
-                return '';
-            if ($day > 31)
-                return '';
-            if ($month > 12)
-                return '';
-            if ($hour < 0 || $hour > 24)
-                return '';
-            if ($minute < 0 || $minute > 60)
-                return '';
-            if ($second < 0 || $second > 60)
-                return '';
+            if (!$month || !$day) {
+                            return '';
+            }
+            if ($day > 31) {
+                            return '';
+            }
+            if ($month > 12) {
+                            return '';
+            }
+            if ($hour < 0 || $hour > 24) {
+                            return '';
+            }
+            if ($minute < 0 || $minute > 60) {
+                            return '';
+            }
+            if ($second < 0 || $second > 60) {
+                            return '';
+            }
         }
 
         if (method_exists('DateTime', 'getTimestamp')) {
@@ -2121,8 +2210,10 @@  discard block
 block discarded – undo
 
 // Note that gmmktime and mktime return same value (GMT) when used without parameters
 //if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() static function instead
-        if ($mode == 'gmt')
-            $ret = time(); // Time for now at greenwich.
+        if ($mode == 'gmt') {
+                    $ret = time();
+        }
+        // Time for now at greenwich.
         else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added
             require_once DOL_BASE_PATH . '/core/lib/date.lib.php';
             $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time
@@ -2156,8 +2247,9 @@  discard block
 block discarded – undo
         // global Globals::$conf, Globals::$langs;
         $level = 1024;
 
-        if (!empty(Globals::$conf->dol_optimize_smallscreen))
-            $shortunit = 1;
+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    $shortunit = 1;
+        }
 
 // Set value text
         if (empty($shortvalue) || $size < ($level * 10)) {
@@ -2192,19 +2284,23 @@  discard block
 block discarded – undo
     {
         // global Globals::$langs;
 
-        if (empty($url))
-            return '';
+        if (empty($url)) {
+                    return '';
+        }
 
         $link = '<a href="';
-        if (!preg_match('/^http/i', $url))
-            $link .= 'http://';
+        if (!preg_match('/^http/i', $url)) {
+                    $link .= 'http://';
+        }
         $link .= $url;
         $link .= '"';
-        if ($target)
-            $link .= ' target="' . $target . '"';
+        if ($target) {
+                    $link .= ' target="' . $target . '"';
+        }
         $link .= '>';
-        if (!preg_match('/^http/i', $url))
-            $link .= 'http://';
+        if (!preg_match('/^http/i', $url)) {
+                    $link .= 'http://';
+        }
         $link .= dol_trunc($url, $max);
         $link .= '</a>';
         return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto(Globals::$langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';
@@ -2228,13 +2324,15 @@  discard block
 block discarded – undo
 
         $newemail = $email;
 
-        if (empty($email))
-            return '&nbsp;';
+        if (empty($email)) {
+                    return '&nbsp;';
+        }
 
         if (!empty($addlink)) {
             $newemail = '<a style="text-overflow: ellipsis;" href="';
-            if (!preg_match('/^mailto:/i', $email))
-                $newemail .= 'mailto:';
+            if (!preg_match('/^mailto:/i', $email)) {
+                            $newemail .= 'mailto:';
+            }
             $newemail .= $email;
             $newemail .= '">';
             $newemail .= dol_trunc($email, $max);
@@ -2247,13 +2345,14 @@  discard block
 block discarded – undo
             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
                 $type = 'AC_EMAIL';
                 $link = '';
-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL))
-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
-                if ($link)
-                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';
+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
+                if ($link) {
+                                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';
+                }
             }
-        }
-        else {
+        } else {
             if ($showinvalid && !isValidEmail($email)) {
                 Globals::$langs->load("errors");
                 $newemail .= img_warning(Globals::$langs->trans("ErrorBadEMail", $email));
@@ -2285,8 +2384,9 @@  discard block
 block discarded – undo
 
         $newskype = $value;
 
-        if (empty($value))
-            return '&nbsp;';
+        if (empty($value)) {
+                    return '&nbsp;';
+        }
 
         if (!empty($type)) {
             $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';
@@ -2307,13 +2407,13 @@  discard block
 block discarded – undo
             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {
                 $addlink = 'AC_SKYPE';
                 $link = '';
-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE))
-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
                 $newskype .= ($link ? ' ' . $link : '');
             }
             $newskype .= '</div>';
-        }
-        else {
+        } else {
             Globals::$langs->load("errors");
             $newskype .= img_warning(Globals::$langs->trans("ErrorBadSocialNetworkValue", $value));
         }
@@ -2342,12 +2442,14 @@  discard block
 block discarded – undo
         if (empty($phone)) {
             return '';
         }
-        if (empty($countrycode))
-            $countrycode = $mysoc->country_code;
+        if (empty($countrycode)) {
+                    $countrycode = $mysoc->country_code;
+        }
 
 // Short format for small screens
-        if (Globals::$conf->dol_optimize_smallscreen)
-            $separ = '';
+        if (Globals::$conf->dol_optimize_smallscreen) {
+                    $separ = '';
+        }
 
         $newphone = $phone;
         if (strtoupper($countrycode) == "FR") {
@@ -2513,15 +2615,18 @@  discard block
 block discarded – undo
                 $newphone = '<a href="tel:' . $phone . '"';
                 $newphone .= '>' . $phone . '</a>';
             } else if (!empty(Globals::$conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url
-                if (empty($user->clicktodial_loaded))
-                    $user->fetch_clicktodial();
+                if (empty($user->clicktodial_loaded)) {
+                                    $user->fetch_clicktodial();
+                }
 
 // Define urlmask
                 $urlmask = 'ErrorClickToDialModuleNotConfigured';
-                if (!empty(Globals::$conf->global->CLICKTODIAL_URL))
-                    $urlmask = Globals::$conf->global->CLICKTODIAL_URL;
-                if (!empty($user->clicktodial_url))
-                    $urlmask = $user->clicktodial_url;
+                if (!empty(Globals::$conf->global->CLICKTODIAL_URL)) {
+                                    $urlmask = Globals::$conf->global->CLICKTODIAL_URL;
+                }
+                if (!empty($user->clicktodial_url)) {
+                                    $urlmask = $user->clicktodial_url;
+                }
 
                 $clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : '');
                 $clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : '');
@@ -2536,8 +2641,9 @@  discard block
 block discarded – undo
                 $url = make_substitutions($url, $substitarray);
                 $newphonesav = $newphone;
                 $newphone = '<a href="' . $url . '"';
-                if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET))
-                    $newphone .= ' target="_blank"';
+                if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+                                    $newphone .= ' target="_blank"';
+                }
                 $newphone .= '>' . $newphonesav . '</a>';
             }
 
@@ -2545,12 +2651,15 @@  discard block
 block discarded – undo
             if (!empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
                 $type = 'AC_TEL';
                 $link = '';
-                if ($addlink == 'AC_FAX')
-                    $type = 'AC_FAX';
-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE))
-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
-                if ($link)
-                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';
+                if ($addlink == 'AC_FAX') {
+                                    $type = 'AC_FAX';
+                }
+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
+                if ($link) {
+                                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';
+                }
             }
         }
 
@@ -2577,15 +2686,17 @@  discard block
 block discarded – undo
                     $picto = '';
                 }
             }
-            if ($adddivfloat)
-                $rep .= '<div class="nospan float" style="margin-right: 10px">';
-            else
-                $rep .= '<span style="margin-right: 10px;">';
+            if ($adddivfloat) {
+                            $rep .= '<div class="nospan float" style="margin-right: 10px">';
+            } else {
+                            $rep .= '<span style="margin-right: 10px;">';
+            }
             $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;
-            if ($adddivfloat)
-                $rep .= '</div>';
-            else
-                $rep .= '</span>';
+            if ($adddivfloat) {
+                            $rep .= '</div>';
+            } else {
+                            $rep .= '</span>';
+            }
         }
 
         return $rep;
@@ -2615,8 +2726,9 @@  discard block
 block discarded – undo
             if ($countrycode) { // If success, countrycode is us, fr, ...
                 if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) {
                     $ret .= ' ' . img_picto($countrycode . ' ' . Globals::$langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);
-                } else
-                    $ret .= ' (' . $countrycode . ')';
+                } else {
+                                    $ret .= ' (' . $countrycode . ')';
+                }
             }
         }
 
@@ -2713,26 +2825,33 @@  discard block
 block discarded – undo
                 $out .= Globals::$hookManager->resPrint;
             }
             if (empty($reshook)) {
-                if (empty($charfornl))
-                    $out .= nl2br($address);
-                else
-                    $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+                if (empty($charfornl)) {
+                                    $out .= nl2br($address);
+                } else {
+                                    $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+                }
 
                 $showgmap = $showomap = 0;
 
 // TODO Add a hook here
-                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS))
-                    $showgmap = 1;
-                if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS))
-                    $showgmap = 1;
-                if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS))
-                    $showgmap = 1;
-                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS))
-                    $showomap = 1;
-                if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS))
-                    $showomap = 1;
-                if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS))
-                    $showomap = 1;
+                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS)) {
+                                    $showgmap = 1;
+                }
+                if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+                                    $showgmap = 1;
+                }
+                if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+                                    $showgmap = 1;
+                }
+                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+                                    $showomap = 1;
+                }
+                if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+                                    $showomap = 1;
+                }
+                if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+                                    $showomap = 1;
+                }
 
                 if ($showgmap) {
                     $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);
@@ -2744,10 +2863,11 @@  discard block
 block discarded – undo
                 }
             }
         }
-        if ($noprint)
-            return $out;
-        else
-            print $out;
+        if ($noprint) {
+                    return $out;
+        } else {
+                    print $out;
+        }
     }
 
     /**
@@ -2759,10 +2879,12 @@  discard block
 block discarded – undo
      */
     static function isValidEmail($address, $acceptsupervisorkey = 0)
     {
-        if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__')
-            return true;
-        if (filter_var($address, FILTER_VALIDATE_EMAIL))
-            return true;
+        if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+                    return true;
+        }
+        if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+                    return true;
+        }
 
         return false;
     }
@@ -2784,10 +2906,12 @@  discard block
 block discarded – undo
                 $mxhosts = array();
                 $weight = array();
                 getmxrr(idn_to_ascii($domain), $mxhosts, $weight);
-                if (count($mxhosts) > 1)
-                    return 1;
-                if (count($mxhosts) == 1 && !empty($mxhosts[0]))
-                    return 1;
+                if (count($mxhosts) > 1) {
+                                    return 1;
+                }
+                if (count($mxhosts) == 1 && !empty($mxhosts[0])) {
+                                    return 1;
+                }
 
                 return 0;
             }
@@ -2816,10 +2940,11 @@  discard block
 block discarded – undo
      */
     static function dol_strlen($string, $stringencoding = 'UTF-8')
     {
-        if (function_exists('mb_strlen'))
-            return mb_strlen($string, $stringencoding);
-        else
-            return strlen($string);
+        if (function_exists('mb_strlen')) {
+                    return mb_strlen($string, $stringencoding);
+        } else {
+                    return strlen($string);
+        }
     }
 
     /**
@@ -2836,8 +2961,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$langs;
 
-        if (empty($stringencoding))
-            $stringencoding = Globals::$langs->charset_output;
+        if (empty($stringencoding)) {
+                    $stringencoding = Globals::$langs->charset_output;
+        }
 
         $ret = '';
         if (empty($trunconbytes)) {
@@ -2873,48 +2999,55 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf;
 
-        if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC))
-            return $string;
+        if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC)) {
+                    return $string;
+        }
 
-        if (empty($stringencoding))
-            $stringencoding = 'UTF-8';
-// reduce for small screen
-        if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1)
-            $size = round($size / 3);
+        if (empty($stringencoding)) {
+                    $stringencoding = 'UTF-8';
+        }
+        // reduce for small screen
+        if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1) {
+                    $size = round($size / 3);
+        }
 
 // We go always here
         if ($trunc == 'right') {
             $newstring = DolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;
-            if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
-                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');
-            else
-            //return 'u'.$size.'-'.$newstring.'-'.DolUtils::dol_strlen($newstring,$stringencoding).'-'.$string;
-                return $string;
-        }
-        elseif ($trunc == 'middle') {
+            if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+                // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');
+            } else {
+                        //return 'u'.$size.'-'.$newstring.'-'.DolUtils::dol_strlen($newstring,$stringencoding).'-'.$string;
+                return $string;
+            }
+        } elseif ($trunc == 'middle') {
             $newstring = DolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;
             if (DolUtils::dol_strlen($newstring, $stringencoding) > 2 && DolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1)) {
                 $size1 = round($size / 2);
                 $size2 = round($size / 2);
                 return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, DolUtils::dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);
-            } else
-                return $string;
-        }
-        elseif ($trunc == 'left') {
+            } else {
+                            return $string;
+            }
+        } elseif ($trunc == 'left') {
             $newstring = DolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;
-            if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
-                return '...' . dol_substr($newstring, DolUtils::dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
-            else
-                return $string;
-        }
-        elseif ($trunc == 'wrap') {
+            if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+                // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
+                return '...' . dol_substr($newstring, DolUtils::dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
+            } else {
+                            return $string;
+            }
+        } elseif ($trunc == 'wrap') {
             $newstring = DolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;
-            if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1))
-                return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, DolUtils::dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
-            else
-                return $string;
-        } else
-            return 'BadParam3CallingDolTrunc';
+            if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1)) {
+                            return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, DolUtils::dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
+            } else {
+                            return $string;
+            }
+        } else {
+                    return 'BadParam3CallingDolTrunc';
+        }
     }
 
     /**
@@ -3124,8 +3257,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf;
 
-        if (!preg_match('/(\.png|\.gif)$/i', $picto))
-            $picto .= '.png';
+        if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+                    $picto .= '.png';
+        }
 
 //$path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;
         $path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;
@@ -3147,20 +3281,22 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf;
 
-        if (!preg_match('/(\.png|\.gif)$/i', $picto))
-            $picto .= '.png';
+        if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+                    $picto .= '.png';
+        }
 
-        if ($pictoisfullpath)
-            $path = $picto;
-        else {
+        if ($pictoisfullpath) {
+                    $path = $picto;
+        } else {
 //$path = DOL_BASE_URI . '/theme/common/' . $picto;
             $path = DOL_BASE_URI . '/theme/common/' . $picto;
 
             if (!empty(Globals::$conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {
                 $themepath = DOL_BASE_PATH . 'theme/' . Globals::$conf->theme . '/img/' . $picto;
 
-                if (file_exists($themepath))
-                    $path = $themepath;
+                if (file_exists($themepath)) {
+                                    $path = $themepath;
+                }
             }
         }
 
@@ -3199,8 +3335,9 @@  discard block
 block discarded – undo
                 $numaction = 0;
             }
         }
-        if (!is_numeric($numaction))
-            $numaction = 0;
+        if (!is_numeric($numaction)) {
+                    $numaction = 0;
+        }
 
         return img_picto($titlealt, 'stcomm' . $numaction . '.png');
     }
@@ -3216,8 +3353,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Show');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Show');
+        }
 
         return img_picto($titlealt, 'pdf' . $size . '.png');
     }
@@ -3233,8 +3371,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Add');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Add');
+        }
 
         return img_picto($titlealt, 'edit_add.png', $other);
     }
@@ -3250,8 +3389,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Remove');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Remove');
+        }
 
         return img_picto($titlealt, 'edit_remove.png', $other);
     }
@@ -3268,8 +3408,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Modify');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Modify');
+        }
 
         return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . (Globals::$langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));
     }
@@ -3286,8 +3427,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('View');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('View');
+        }
 
         $moreatt = ($float ? 'style="float: right" ' : '') . $other;
 
@@ -3305,8 +3447,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Delete');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Delete');
+        }
 
         return img_picto($titlealt, 'delete.png', $other);
 //return '<span class="fa fa-trash fa-2x fa-fw" style="font-size: 1.7em;" title="'.$titlealt.'"></span>';
@@ -3322,8 +3465,9 @@  discard block
 block discarded – undo
     static function img_printer($titlealt = "default", $other = '')
     {
         // global Globals::$conf, Globals::$langs;
-        if ($titlealt == "default")
-            $titlealt = Globals::$langs->trans("Print");
+        if ($titlealt == "default") {
+                    $titlealt = Globals::$langs->trans("Print");
+        }
         return img_picto($titlealt, 'printer.png', $other);
     }
 
@@ -3338,8 +3482,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Split');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Split');
+        }
 
         return img_picto($titlealt, 'split.png', $other);
     }
@@ -3356,10 +3501,11 @@  discard block
 block discarded – undo
         // global Globals::$conf, Globals::$langs;
 
         if ($usealttitle) {
-            if (is_string($usealttitle))
-                $usealttitle = DolUtils::dol_escape_htmltag($usealttitle);
-            else
-                $usealttitle = Globals::$langs->trans('Info');
+            if (is_string($usealttitle)) {
+                            $usealttitle = DolUtils::dol_escape_htmltag($usealttitle);
+            } else {
+                            $usealttitle = Globals::$langs->trans('Info');
+            }
         }
 
         return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');
@@ -3375,8 +3521,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Informations');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Informations');
+        }
 
         return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');
     }
@@ -3392,8 +3539,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Warning');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Warning');
+        }
 
 //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';
         return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));
@@ -3409,8 +3557,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Error');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Error');
+        }
 
         return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');
     }
@@ -3426,8 +3575,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Next');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Next');
+        }
 
 //return img_picto($titlealt, 'next.png', $moreatt);
         return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . DolUtils::dol_escape_htmltag($titlealt) . '"></span>';
@@ -3444,8 +3594,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Previous');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Previous');
+        }
 
 //return img_picto($titlealt, 'previous.png', $moreatt);
         return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . DolUtils::dol_escape_htmltag($titlealt) . '"></span>';
@@ -3463,8 +3614,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Down');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Down');
+        }
 
         return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');
     }
@@ -3481,8 +3633,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Up');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Up');
+        }
 
         return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');
     }
@@ -3499,8 +3652,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Left');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Left');
+        }
 
         return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);
     }
@@ -3517,8 +3671,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Right');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Right');
+        }
 
         return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);
     }
@@ -3534,11 +3689,13 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Active');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Active');
+        }
 
-        if ($allow == 1)
-            return img_picto($titlealt, 'tick.png');
+        if ($allow == 1) {
+                    return img_picto($titlealt, 'tick.png');
+        }
 
         return '-';
     }
@@ -3586,8 +3743,9 @@  discard block
 block discarded – undo
         $mimeimg = dol_mimetype($file, '', 2);
         $mimefa = dol_mimetype($file, '', 4);
 
-        if (empty($titlealt))
-            $titlealt = 'Mime type: ' . $mimetype;
+        if (empty($titlealt)) {
+                    $titlealt = 'Mime type: ' . $mimetype;
+        }
 
 //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');
         return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';
@@ -3609,13 +3767,15 @@  discard block
 block discarded – undo
 
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Call');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Call');
+        }
 
-        if ($option == 1)
-            $img = 'call';
-        else
-            $img = 'call_out';
+        if ($option == 1) {
+                    $img = 'call';
+        } else {
+                    $img = 'call_out';
+        }
 
         return img_picto($titlealt, $img);
     }
@@ -3631,8 +3791,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Search');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Search');
+        }
 
         $img = img_picto($titlealt, 'search.png', $other, false, 1);
 
@@ -3653,8 +3814,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if ($titlealt == 'default')
-            $titlealt = Globals::$langs->trans('Search');
+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Search');
+        }
 
         $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);
 
@@ -3716,14 +3878,16 @@  discard block
 block discarded – undo
 
         if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web
             $out .= Globals::$langs->trans("DolibarrHasDetectedError") . ".<br>\n";
-            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))
-                $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {
+                            $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+            }
             $out .= Globals::$langs->trans("InformationToHelpDiagnose") . ":<br>\n";
 
             $out .= "<b>" . Globals::$langs->trans("Date") . ":</b> " . DolUtils::dol_print_date(time(), 'dayhourlog') . "<br>\n";
             $out .= "<b>" . Globals::$langs->trans("Dolibarr") . ":</b> " . DOL_VERSION . "<br>\n";
-            if (isset(Globals::$conf->global->MAIN_FEATURES_LEVEL))
-                $out .= "<b>" . Globals::$langs->trans("LevelOfFeature") . ":</b> " . Globals::$conf->global->MAIN_FEATURES_LEVEL . "<br>\n";
+            if (isset(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {
+                            $out .= "<b>" . Globals::$langs->trans("LevelOfFeature") . ":</b> " . Globals::$conf->global->MAIN_FEATURES_LEVEL . "<br>\n";
+            }
             if (function_exists("phpversion")) {
                 $out .= "<b>" . Globals::$langs->trans("PHP") . ":</b> " . phpversion() . "<br>\n";
             }
@@ -3766,18 +3930,20 @@  discard block
 block discarded – undo
             Globals::$langs->load("errors");
 
 // Merge all into $errors array
-            if (is_array($error) && is_array($errors))
-                $errors = array_merge($error, $errors);
-            elseif (is_array($error))
-                $errors = $error;
-            elseif (is_array($errors))
-                $errors = array_merge(array($error), $errors);
-            else
-                $errors = array_merge(array($error));
+            if (is_array($error) && is_array($errors)) {
+                            $errors = array_merge($error, $errors);
+            } elseif (is_array($error)) {
+                            $errors = $error;
+            } elseif (is_array($errors)) {
+                            $errors = array_merge(array($error), $errors);
+            } else {
+                            $errors = array_merge(array($error));
+            }
 
             foreach ($errors as $msg) {
-                if (empty($msg))
-                    continue;
+                if (empty($msg)) {
+                                    continue;
+                }
                 if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web
                     $out .= "<b>" . Globals::$langs->trans("Message") . ":</b> " . DolUtils::dol_escape_htmltag($msg) . "<br>\n";
                 } else {                        // Mode CLI
@@ -3795,9 +3961,9 @@  discard block
 block discarded – undo
             $out .= "<br>\n";
         }
 
-        if (empty($dolibarr_main_prod))
-            print $out;
-        else {
+        if (empty($dolibarr_main_prod)) {
+                    print $out;
+        } else {
             print Globals::$langs->trans("DolibarrHasDetectedError") . '. ';
             print Globals::$langs->trans("YouCanSetOptionDolibarrMainProdToZero");
             define("MAIN_CORE_ERROR", 1);
@@ -3820,16 +3986,18 @@  discard block
 block discarded – undo
     {
         // global Globals::$langs, Globals::$conf;
 
-        if (empty($email))
-            $email = Globals::$conf->global->MAIN_INFO_SOCIETE_MAIL;
+        if (empty($email)) {
+                    $email = Globals::$conf->global->MAIN_INFO_SOCIETE_MAIL;
+        }
 
         Globals::$langs->load("errors");
         $now = dol_now();
 
         print '<br><div class="center login_main_message"><div class="' . $morecss . '">';
         print Globals::$langs->trans("ErrorContactEMail", $email, $prefixcode . DolUtils::dol_print_date($now, '%Y%m%d'));
-        if ($errormessage)
-            print '<br><br>' . $errormessage;
+        if ($errormessage) {
+                    print '<br><br>' . $errormessage;
+        }
         if (is_array($errormessages) && count($errormessages)) {
             foreach ($errormessages as $mesgtoshow) {
                 print '<br><br>' . $mesgtoshow;
@@ -4072,12 +4240,15 @@  discard block
 block discarded – undo
         $savtotalnboflines = $totalnboflines;
         $totalnboflines = abs($totalnboflines);
 
-        if ($picto == 'setup')
-            $picto = 'title_setup.png';
-        if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png')
-            $picto = 'title.gif';
-        if ($limit < 0)
-            $limit = Globals::$conf->liste_limit;
+        if ($picto == 'setup') {
+                    $picto = 'title_setup.png';
+        }
+        if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png') {
+                    $picto = 'title.gif';
+        }
+        if ($limit < 0) {
+                    $limit = Globals::$conf->liste_limit;
+        }
         if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) {
             $nextpage = 1;
         } else {
@@ -4091,11 +4262,13 @@  discard block
 block discarded – undo
 // Left
 //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';
         print '<td class="nobordernopadding valignmiddle">';
-        if ($picto && $titre)
-            print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);
+        if ($picto && $titre) {
+                    print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);
+        }
         print '<div class="titre inline-block">' . $titre;
-        if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')
-            print ' (' . $totalnboflines . ')';
+        if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+                    print ' (' . $totalnboflines . ')';
+        }
         print '</div></td>';
 
 // Center
@@ -4105,21 +4278,24 @@  discard block
 block discarded – undo
 
 // Right
         print '<td class="nobordernopadding valignmiddle" align="right">';
-        if ($sortfield)
-            $options .= "&sortfield=" . urlencode($sortfield);
-        if ($sortorder)
-            $options .= "&sortorder=" . urlencode($sortorder);
-// Show navigation bar
+        if ($sortfield) {
+                    $options .= "&sortfield=" . urlencode($sortfield);
+        }
+        if ($sortorder) {
+                    $options .= "&sortorder=" . urlencode($sortorder);
+        }
+        // Show navigation bar
         $pagelist = '';
         if ($savlimit != 0 && ($page > 0 || $num > $limit)) {
             if ($totalnboflines) { // If we know total nb of lines
 // Define nb of extra page links before and after selected page + ... + first or last
                 $maxnbofpage = (empty(Globals::$conf->dol_optimize_smallscreen) ? 4 : 1);
 
-                if ($limit > 0)
-                    $nbpages = ceil($totalnboflines / $limit);
-                else
-                    $nbpages = 1;
+                if ($limit > 0) {
+                                    $nbpages = ceil($totalnboflines / $limit);
+                } else {
+                                    $nbpages = 1;
+                }
                 $cpt = ($page - $maxnbofpage);
                 if ($cpt < 0) {
                     $cpt = 0;
@@ -4127,10 +4303,11 @@  discard block
 block discarded – undo
 
                 if ($cpt >= 1) {
                     $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';
-                    if ($cpt > 2)
-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
-                    else if ($cpt == 2)
-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';
+                    if ($cpt > 2) {
+                                            $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                    } else if ($cpt == 2) {
+                                            $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';
+                    }
                 }
 
                 do {
@@ -4143,14 +4320,14 @@  discard block
 block discarded – undo
                 } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);
 
                 if ($cpt < $nbpages) {
-                    if ($cpt < $nbpages - 2)
-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
-                    else if ($cpt == $nbpages - 2)
-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';
+                    if ($cpt < $nbpages - 2) {
+                                            $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                    } else if ($cpt == $nbpages - 2) {
+                                            $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';
+                    }
                     $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';
                 }
-            }
-            else {
+            } else {
                 $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";
             }
         }
@@ -4186,18 +4363,21 @@  discard block
 block discarded – undo
             $pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
 //$pagesizechoices.=',0:'.Globals::$langs->trans("All");     // Not yet supported
 //$pagesizechoices.=',2:2';
-            if (!empty(Globals::$conf->global->MAIN_PAGESIZE_CHOICES))
-                $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;
+            if (!empty(Globals::$conf->global->MAIN_PAGESIZE_CHOICES)) {
+                            $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;
+            }
 
             print '<li class="pagination">';
             print '<select class="flat selectlimit" name="limit" title="' . DolUtils::dol_escape_htmltag(Globals::$langs->trans("MaxNbOfRecordPerPage")) . '">';
             $tmpchoice = explode(',', $pagesizechoices);
             $tmpkey = $limit . ':' . $limit;
-            if (!in_array($tmpkey, $tmpchoice))
-                $tmpchoice[] = $tmpkey;
+            if (!in_array($tmpkey, $tmpchoice)) {
+                            $tmpchoice[] = $tmpkey;
+            }
             $tmpkey = Globals::$conf->liste_limit . ':' . Globals::$conf->liste_limit;
-            if (!in_array($tmpkey, $tmpchoice))
-                $tmpchoice[] = $tmpkey;
+            if (!in_array($tmpkey, $tmpchoice)) {
+                            $tmpchoice[] = $tmpkey;
+            }
             asort($tmpchoice, SORT_NUMERIC);
             $found = false;
             foreach ($tmpchoice as $val) {
@@ -4273,14 +4453,15 @@  discard block
 block discarded – undo
         }
 
 // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()
-        if (!preg_match('/\//', $rate))
-            $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');
-        else {
+        if (!preg_match('/\//', $rate)) {
+                    $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');
+        } else {
 // TODO Split on / and output with a price2num to have clean numbers without ton of 000.
             $ret = $rate . ($addpercent ? '%' : '');
         }
-        if (($info_bits & 1) && $usestarfornpr >= 0)
-            $ret .= ' *';
+        if (($info_bits & 1) && $usestarfornpr >= 0) {
+                    $ret .= ' *';
+        }
         $ret .= $morelabel;
         return $ret;
     }
@@ -4304,11 +4485,14 @@  discard block
 block discarded – undo
     {
         // global Globals::$langs, Globals::$conf;
 // Clean parameters
-        if (empty($amount))
-            $amount = 0; // To have a numeric value if amount not defined or = ''
+        if (empty($amount)) {
+                    $amount = 0;
+        }
+        // To have a numeric value if amount not defined or = ''
         $amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
-        if ($rounding < 0)
-            $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT);
+        if ($rounding < 0) {
+                    $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT);
+        }
         $nbdecimal = $rounding;
 
 // Output separators by default (french)
@@ -4316,18 +4500,22 @@  discard block
 block discarded – undo
         $thousand = ' ';
 
 // If $outlangs not forced, we use use language
-        if (!is_object($outlangs))
-            $outlangs = Globals::$langs;
-
-        if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")
-            $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
-        if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")
-            $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
-        if ($thousand == 'None')
-            $thousand = '';
-        else if ($thousand == 'Space')
-            $thousand = ' ';
-//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
+        if (!is_object($outlangs)) {
+                    $outlangs = Globals::$langs;
+        }
+
+        if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+                    $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+        }
+        if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+                    $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+        }
+        if ($thousand == 'None') {
+                    $thousand = '';
+        } else if ($thousand == 'Space') {
+                    $thousand = ' ';
+        }
+        //print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 //print "amount=".$amount."-";
         $amount = str_replace(',', '.', $amount); // should be useless
 //print $amount."-";
@@ -4338,9 +4526,10 @@  discard block
 block discarded – undo
         $end = '';
 
 // We increase nbdecimal if there is more decimal than asked (to not loose information)
-        if (DolUtils::dol_strlen($decpart) > $nbdecimal)
-            $nbdecimal = DolUtils::dol_strlen($decpart);
-// Si on depasse max
+        if (DolUtils::dol_strlen($decpart) > $nbdecimal) {
+                    $nbdecimal = DolUtils::dol_strlen($decpart);
+        }
+        // Si on depasse max
         if ($trunc && $nbdecimal > Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN) {
             $nbdecimal = Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN;
             if (preg_match('/\.\.\./i', Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN)) {
@@ -4350,8 +4539,9 @@  discard block
 block discarded – undo
         }
 
 // If force rounding
-        if ($forcerounding >= 0)
-            $nbdecimal = $forcerounding;
+        if ($forcerounding >= 0) {
+                    $nbdecimal = $forcerounding;
+        }
 
 // Format number
         $output = number_format($amount, $nbdecimal, $dec, $thousand);
@@ -4362,13 +4552,14 @@  discard block
 block discarded – undo
 // Add symbol of currency if requested
         $cursymbolbefore = $cursymbolafter = '';
         if ($currency_code) {
-            if ($currency_code == 'auto')
-                $currency_code = Globals::$conf->currency;
+            if ($currency_code == 'auto') {
+                            $currency_code = Globals::$conf->currency;
+            }
 
             $listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'MXN', 'PEN', 'CNY');
-            if (in_array($currency_code, $listofcurrenciesbefore))
-                $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
-            else {
+            if (in_array($currency_code, $listofcurrenciesbefore)) {
+                            $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
+            } else {
                 $tmpcur = $outlangs->getCurrencySymbol($currency_code);
                 $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);
             }
@@ -4401,15 +4592,18 @@  discard block
 block discarded – undo
 // Decimal delimiter for PHP and database SQL requests must be '.'
         $dec = ',';
         $thousand = ' ';
-        if (Globals::$langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")
-            $dec = Globals::$langs->transnoentitiesnoconv("SeparatorDecimal");
-        if (Globals::$langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")
-            $thousand = Globals::$langs->transnoentitiesnoconv("SeparatorThousand");
-        if ($thousand == 'None')
-            $thousand = '';
-        elseif ($thousand == 'Space')
-            $thousand = ' ';
-//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
+        if (Globals::$langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+                    $dec = Globals::$langs->transnoentitiesnoconv("SeparatorDecimal");
+        }
+        if (Globals::$langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+                    $thousand = Globals::$langs->transnoentitiesnoconv("SeparatorThousand");
+        }
+        if ($thousand == 'None') {
+                    $thousand = '';
+        } elseif ($thousand == 'Space') {
+                    $thousand = ' ';
+        }
+        //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 // Convert value to universal number format (no thousand separator, '.' as decimal separator)
         if ($alreadysqlnb != 1) { // If not a PHP number or unknown, we change format
 //print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';
@@ -4424,8 +4618,10 @@  discard block
 block discarded – undo
             }
 //print "QQ".$amount.'<br>';
 // Now make replace (the main goal of function)
-            if ($thousand != ',' && $thousand != '.')
-                $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+            if ($thousand != ',' && $thousand != '.') {
+                            $amount = str_replace(',', '.', $amount);
+            }
+            // To accept 2 notations for french users
             $amount = str_replace(' ', '', $amount);  // To avoid spaces
             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
             $amount = str_replace($dec, '.', $amount);
@@ -4434,20 +4630,24 @@  discard block
 block discarded – undo
 // Now, make a rounding if required
         if ($rounding) {
             $nbofdectoround = '';
-            if ($rounding == 'MU')
-                $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT;
-            elseif ($rounding == 'MT')
-                $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT;
-            elseif ($rounding == 'MS')
-                $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK;
-            elseif (is_numeric($rounding))
-                $nbofdectoround = $rounding;
-//print "RR".$amount.' - '.$nbofdectoround.'<br>';
-            if (DolUtils::dol_strlen($nbofdectoround))
-                $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.
-            else
-                return 'ErrorBadParameterProvidedToFunction';
-//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';
+            if ($rounding == 'MU') {
+                            $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT;
+            } elseif ($rounding == 'MT') {
+                            $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT;
+            } elseif ($rounding == 'MS') {
+                            $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK;
+            } elseif (is_numeric($rounding)) {
+                            $nbofdectoround = $rounding;
+            }
+            //print "RR".$amount.' - '.$nbofdectoround.'<br>';
+            if (DolUtils::dol_strlen($nbofdectoround)) {
+                            $amount = round($amount, $nbofdectoround);
+            }
+            // $nbofdectoround can be 0.
+            else {
+                            return 'ErrorBadParameterProvidedToFunction';
+            }
+            //print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';
 // Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number
 // to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup.
             if (is_numeric($amount)) {
@@ -4460,8 +4660,10 @@  discard block
 block discarded – undo
 //print "TT".$amount.'<br>';
 // Always make replace because each math static function (like round) replace
 // with local values and we want a number that has a SQL string format x.y
-            if ($thousand != ',' && $thousand != '.')
-                $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+            if ($thousand != ',' && $thousand != '.') {
+                            $amount = str_replace(',', '.', $amount);
+            }
+            // To accept 2 notations for french users
             $amount = str_replace(' ', '', $amount);  // To avoid spaces
             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
             $amount = str_replace($dec, '.', $amount);
@@ -4520,8 +4722,9 @@  discard block
 block discarded – undo
     {
         // global $db, Globals::$conf, $mysoc;
 
-        if (empty($thirdparty_seller) || !is_object($thirdparty_seller))
-            $thirdparty_seller = $mysoc;
+        if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) {
+                    $thirdparty_seller = $mysoc;
+        }
 
         DolUtils::dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);
 
@@ -4539,37 +4742,43 @@  discard block
 block discarded – undo
 // Some test to guess with no need to make database access
         if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
             if ($local == 1) {
-                if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0")
-                    return 0;
+                if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") {
+                                    return 0;
+                }
                 if ($thirdparty_seller->id == $mysoc->id) {
-                    if (!$thirdparty_buyer->localtax1_assuj)
-                        return 0;
-                }
-                else {
-                    if (!$thirdparty_seller->localtax1_assuj)
-                        return 0;
+                    if (!$thirdparty_buyer->localtax1_assuj) {
+                                            return 0;
+                    }
+                } else {
+                    if (!$thirdparty_seller->localtax1_assuj) {
+                                            return 0;
+                    }
                 }
             }
 
             if ($local == 2) {
 //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
-                if (!$mysoc->localtax2_assuj)
-                    return 0;  // If main vat is 0, IRPF may be different than 0.
+                if (!$mysoc->localtax2_assuj) {
+                                    return 0;
+                }
+                // If main vat is 0, IRPF may be different than 0.
                 if ($thirdparty_seller->id == $mysoc->id) {
-                    if (!$thirdparty_buyer->localtax2_assuj)
-                        return 0;
-                }
-                else {
-                    if (!$thirdparty_seller->localtax2_assuj)
-                        return 0;
+                    if (!$thirdparty_buyer->localtax2_assuj) {
+                                            return 0;
+                    }
+                } else {
+                    if (!$thirdparty_seller->localtax2_assuj) {
+                                            return 0;
+                    }
                 }
             }
-        }
-        else {
-            if ($local == 1 && !$thirdparty_seller->localtax1_assuj)
-                return 0;
-            if ($local == 2 && !$thirdparty_seller->localtax2_assuj)
-                return 0;
+        } else {
+            if ($local == 1 && !$thirdparty_seller->localtax1_assuj) {
+                            return 0;
+            }
+            if ($local == 2 && !$thirdparty_seller->localtax2_assuj) {
+                            return 0;
+            }
         }
 
 // For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.
@@ -4611,19 +4820,23 @@  discard block
 block discarded – undo
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";
         $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";
         $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";
-        if ($vatratecode)
-            $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority
-        else
-            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";
+        if ($vatratecode) {
+                    $sql .= " AND t.code ='" . $vatratecode . "'";
+        }
+        // If we have the code, we use it in priority
+        else {
+                    $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";
+        }
         DolUtils::dol_syslog("get_localtax", LOG_DEBUG);
         $resql = $db->query($sql);
 
         if ($resql) {
             $obj = $db->fetch_object($resql);
-            if ($local == 1)
-                return $obj->localtax1;
-            elseif ($local == 2)
-                return $obj->localtax2;
+            if ($local == 1) {
+                            return $obj->localtax1;
+            } elseif ($local == 2) {
+                            return $obj->localtax2;
+            }
         }
 
         return 0;
@@ -4669,10 +4882,11 @@  discard block
 block discarded – undo
         $resql = $db->query($sql);
         if ($resql) {
             $obj = $db->fetch_object($resql);
-            if ($local == 1)
-                return $obj->localtax1;
-            elseif ($local == 2)
-                return $obj->localtax2;
+            if ($local == 1) {
+                            return $obj->localtax1;
+            } elseif ($local == 2) {
+                            return $obj->localtax2;
+            }
         }
 
         return 0;
@@ -4698,9 +4912,9 @@  discard block
 block discarded – undo
 // Search local taxes
         $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";
-        if ($firstparamisid)
-            $sql .= " WHERE t.rowid = " . (int) $vatrate;
-        else {
+        if ($firstparamisid) {
+                    $sql .= " WHERE t.rowid = " . (int) $vatrate;
+        } else {
             $vatratecleaned = $vatrate;
             $vatratecode = '';
             if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"
@@ -4713,19 +4927,22 @@  discard block
 block discarded – undo
               else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */
             $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
             $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";
-            if ($vatratecode)
-                $sql .= " AND t.code = '" . $vatratecode . "'";
+            if ($vatratecode) {
+                            $sql .= " AND t.code = '" . $vatratecode . "'";
+            }
         }
 
         $resql = $db->query($sql);
         if ($resql) {
             $obj = $db->fetch_object($resql);
-            if ($obj)
-                return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);
-            else
-                return array();
-        } else
-            dol_print_error($db);
+            if ($obj) {
+                            return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);
+            } else {
+                            return array();
+            }
+        } else {
+                    dol_print_error($db);
+        }
 
         return array();
     }
@@ -4755,9 +4972,9 @@  discard block
 block discarded – undo
 // Search local taxes
         $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";
-        if ($firstparamisid)
-            $sql .= " WHERE t.rowid = " . (int) $vatrate;
-        else {
+        if ($firstparamisid) {
+                    $sql .= " WHERE t.rowid = " . (int) $vatrate;
+        } else {
             $vatratecleaned = $vatrate;
             $vatratecode = '';
             if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "x.x (yy)"
@@ -4766,13 +4983,17 @@  discard block
 block discarded – undo
             }
 
             $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";
-            if ($mysoc->country_code == 'ES')
-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??
-            else
-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
+            if ($mysoc->country_code == 'ES') {
+                            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";
+            }
+            // local tax in spain use the buyer country ??
+            else {
+                            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
+            }
             $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";
-            if ($vatratecode)
-                $sql .= " AND t.code = '" . $vatratecode . "'";
+            if ($vatratecode) {
+                            $sql .= " AND t.code = '" . $vatratecode . "'";
+            }
         }
 
         $resql = $db->query($sql);
@@ -4818,17 +5039,17 @@  discard block
 block discarded – undo
                 if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object
                     $product->get_buyprice($idprodfournprice, 0, 0, 0);
                     $ret = $product->vatrate_supplier;
-                    if ($product->default_vat_code)
-                        $ret .= ' (' . $product->default_vat_code . ')';
-                }
-                else {
+                    if ($product->default_vat_code) {
+                                            $ret .= ' (' . $product->default_vat_code . ')';
+                    }
+                } else {
                     $ret = $product->tva_tx;    // Default vat of product we defined
-                    if ($product->default_vat_code)
-                        $ret .= ' (' . $product->default_vat_code . ')';
+                    if ($product->default_vat_code) {
+                                            $ret .= ' (' . $product->default_vat_code . ')';
+                    }
                 }
                 $found = 1;
-            }
-            else {
+            } else {
 // TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
 // May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
             }
@@ -4848,14 +5069,18 @@  discard block
 block discarded – undo
                     $obj = $db->fetch_object($resql);
                     if ($obj) {
                         $ret = $obj->vat_rate;
-                        if ($obj->default_vat_code)
-                            $ret .= ' (' . $obj->default_vat_code . ')';
+                        if ($obj->default_vat_code) {
+                                                    $ret .= ' (' . $obj->default_vat_code . ')';
+                        }
                     }
                     $db->free($sql);
-                } else
-                    dol_print_error($db);
-            } else
-                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails
+                } else {
+                                    dol_print_error($db);
+                }
+            } else {
+                            $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+            }
+            // Forced value if autodetect fails
         }
 
         DolUtils::dol_syslog("get_product_vat_for_country: ret=" . $ret);
@@ -4910,13 +5135,15 @@  discard block
 block discarded – undo
             if ($resql) {
                 $obj = $db->fetch_object($resql);
                 if ($obj) {
-                    if ($local == 1)
-                        $ret = $obj->localtax1;
-                    elseif ($local == 2)
-                        $ret = $obj->localtax2;
+                    if ($local == 1) {
+                                            $ret = $obj->localtax1;
+                    } elseif ($local == 2) {
+                                            $ret = $obj->localtax2;
+                    }
                 }
-            } else
-                dol_print_error($db);
+            } else {
+                            dol_print_error($db);
+            }
         }
 
         DolUtils::dol_syslog("get_product_localtax_for_country: ret=" . $ret);
@@ -5019,15 +5246,16 @@  discard block
 block discarded – undo
         // global $db;
 
         if ($idprodfournprice > 0) {
-            if (!class_exists('ProductFournisseur'))
-                require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';
+            if (!class_exists('ProductFournisseur')) {
+                            require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';
+            }
             $prodprice = new ProductFournisseur($db);
             $prodprice->fetch_product_fournisseur_price($idprodfournprice);
             return $prodprice->fourn_tva_npr;
-        }
-        elseif ($idprod > 0) {
-            if (!class_exists('Product'))
-                require_once DOL_BASE_PATH . 'product/class/product.class.php';
+        } elseif ($idprod > 0) {
+            if (!class_exists('Product')) {
+                            require_once DOL_BASE_PATH . 'product/class/product.class.php';
+            }
             $prod = new Product($db);
             $prod->fetch($idprod);
             return $prod->tva_npr;
@@ -5053,30 +5281,35 @@  discard block
 block discarded – undo
     {
         // global $mysoc;
 
-        if (!is_object($thirdparty_seller))
-            return -1;
-        if (!is_object($thirdparty_buyer))
-            return -1;
+        if (!is_object($thirdparty_seller)) {
+                    return -1;
+        }
+        if (!is_object($thirdparty_buyer)) {
+                    return -1;
+        }
 
         if ($local == 1) { // Localtax 1
             if ($mysoc->country_code == 'ES') {
-                if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj)
-                    return 0;
-            }
-            else {
+                if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) {
+                                    return 0;
+                }
+            } else {
 // Si vendeur non assujeti a Localtax1, localtax1 par default=0
-                if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj)
-                    return 0;
-                if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off')
-                    return 0;
-            }
-        }
-        elseif ($local == 2) { //I Localtax 2
+                if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) {
+                                    return 0;
+                }
+                if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') {
+                                    return 0;
+                }
+            }
+        } elseif ($local == 2) { //I Localtax 2
 // Si vendeur non assujeti a Localtax2, localtax2 par default=0
-            if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj)
-                return 0;
-            if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off')
-                return 0;
+            if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) {
+                            return 0;
+            }
+            if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') {
+                            return 0;
+            }
         }
 
         if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code) {
@@ -5101,31 +5334,38 @@  discard block
 block discarded – undo
         $classname = '';
         if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0
             $result = Globals::$langs->trans('yes');
-            if ($case == 1 || $case == 3)
-                $result = Globals::$langs->trans("Yes");
-            if ($case == 2)
-                $result = '<input type="checkbox" value="1" checked disabled>';
-            if ($case == 3)
-                $result = '<input type="checkbox" value="1" checked disabled> ' . $result;
+            if ($case == 1 || $case == 3) {
+                            $result = Globals::$langs->trans("Yes");
+            }
+            if ($case == 2) {
+                            $result = '<input type="checkbox" value="1" checked disabled>';
+            }
+            if ($case == 3) {
+                            $result = '<input type="checkbox" value="1" checked disabled> ' . $result;
+            }
 
             $classname = 'ok';
-        }
-        elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {
+        } elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {
             $result = Globals::$langs->trans("no");
-            if ($case == 1 || $case == 3)
-                $result = Globals::$langs->trans("No");
-            if ($case == 2)
-                $result = '<input type="checkbox" value="0" disabled>';
-            if ($case == 3)
-                $result = '<input type="checkbox" value="0" disabled> ' . $result;
-
-            if ($color == 2)
-                $classname = 'ok';
-            else
-                $classname = 'error';
-        }
-        if ($color)
-            return '<font class="' . $classname . '">' . $result . '</font>';
+            if ($case == 1 || $case == 3) {
+                            $result = Globals::$langs->trans("No");
+            }
+            if ($case == 2) {
+                            $result = '<input type="checkbox" value="0" disabled>';
+            }
+            if ($case == 3) {
+                            $result = '<input type="checkbox" value="0" disabled> ' . $result;
+            }
+
+            if ($color == 2) {
+                            $classname = 'ok';
+            } else {
+                            $classname = 'error';
+            }
+        }
+        if ($color) {
+                    return '<font class="' . $classname . '">' . $result . '</font>';
+        }
         return $result;
     }
 
@@ -5151,23 +5391,27 @@  discard block
 block discarded – undo
         $path = '';
 
         $arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');
-        if (!empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-            $arrayforoldpath[] = 'product';
+        if (!empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+                    $arrayforoldpath[] = 'product';
+        }
         if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {
 // This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.
-            if (empty($alpha))
-                $num = preg_replace('/([^0-9])/i', '', $num);
-            else
-                $num = preg_replace('/^.*\-/i', '', $num);
+            if (empty($alpha)) {
+                            $num = preg_replace('/([^0-9])/i', '', $num);
+            } else {
+                            $num = preg_replace('/^.*\-/i', '', $num);
+            }
             $num = substr("000" . $num, -$level);
-            if ($level == 1)
-                $path = substr($num, 0, 1);
-            if ($level == 2)
-                $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);
-            if ($level == 3)
-                $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);
-        }
-        else {
+            if ($level == 1) {
+                            $path = substr($num, 0, 1);
+            }
+            if ($level == 2) {
+                            $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);
+            }
+            if ($level == 3) {
+                            $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);
+            }
+        } else {
 // TODO
 // We will enhance here a common way of forging path for document storage
 // Here, object->id, object->ref and modulepart are required.
@@ -5178,8 +5422,9 @@  discard block
 block discarded – undo
             }
         }
 
-        if (empty($withoutslash) && !empty($path))
-            $path .= '/';
+        if (empty($withoutslash) && !empty($path)) {
+                    $path .= '/';
+        }
 
         return $path;
     }
@@ -5199,8 +5444,9 @@  discard block
 block discarded – undo
         DolUtils::dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);
 
         $dir_osencoded = dol_osencode($dir);
-        if (@is_dir($dir_osencoded))
-            return 0;
+        if (@is_dir($dir_osencoded)) {
+                    return 0;
+        }
 
         $nberr = 0;
         $nbcreated = 0;
@@ -5215,12 +5461,15 @@  discard block
 block discarded – undo
         $cdir = explode("/", $dir);
         $num = count($cdir);
         for ($i = 0; $i < $num; $i++) {
-            if ($i > 0)
-                $ccdir .= '/' . $cdir[$i];
-            else
-                $ccdir .= $cdir[$i];
-            if (preg_match("/^.:$/", $ccdir, $regs))
-                continue; // Si chemin Windows incomplet, on poursuit par rep suivant
+            if ($i > 0) {
+                            $ccdir .= '/' . $cdir[$i];
+            } else {
+                            $ccdir .= $cdir[$i];
+            }
+            if (preg_match("/^.:$/", $ccdir, $regs)) {
+                            continue;
+            }
+            // Si chemin Windows incomplet, on poursuit par rep suivant
 
 
 
@@ -5314,8 +5563,9 @@  discard block
 block discarded – undo
      */
     static function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)
     {
-        if ($removelinefeed == 2)
-            $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);
+        if ($removelinefeed == 2) {
+                    $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);
+        }
         $temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);
 
         if ($strip_tags) {
@@ -5332,8 +5582,9 @@  discard block
 block discarded – undo
         $temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);
 
 // Supprime aussi les retours
-        if ($removelinefeed == 1)
-            $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+        if ($removelinefeed == 1) {
+                    $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+        }
 
 // et les espaces doubles
         while (strpos($temp, "  ")) {
@@ -5419,18 +5670,21 @@  discard block
 block discarded – undo
             if ($charset == 'UTF-8') {
                 $pattern = '/(<br[^>]*>)/Uu';
             } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-            else
-                $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.
+            else {
+                            $pattern = '/(<br[^>]*>)/U';
+            }
+            // /U is to have UNGREEDY regex to limit to one html tag.
             $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
             $firstline = '';
             $i = 0;
             $nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator
             while (($i < $nba) && ($i < ($nboflines * 2))) {
-                if ($i % 2 == 0)
-                    $firstline .= $a[$i];
-                elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1)))
-                    $firstline .= ($ishtml ? "<br>\n" : "\n");
+                if ($i % 2 == 0) {
+                                    $firstline .= $a[$i];
+                } elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+                                    $firstline .= ($ishtml ? "<br>\n" : "\n");
+                }
                 $i++;
             }
             unset($a);
@@ -5479,15 +5733,18 @@  discard block
 block discarded – undo
         $newstring = $stringtoencode;
         if (DolUtils::dol_textishtml($stringtoencode)) { // Check if text is already HTML or not
             $newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
-            if ($removelasteolbr)
-                $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)
+            if ($removelasteolbr) {
+                            $newstring = preg_replace('/<br>$/i', '', $newstring);
+            }
+            // Remove last <br> (remove only last one)
             $newstring = strtr($newstring, array('&' => '__and__', '<' => '__lt__', '>' => '__gt__', '"' => '__dquot__'));
             $newstring = DolUtils::dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding
             $newstring = strtr($newstring, array('__and__' => '&', '__lt__' => '<', '__gt__' => '>', '__dquot__' => '"'));
-        }
-        else {
-            if ($removelasteolbr)
-                $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)
+        } else {
+            if ($removelasteolbr) {
+                            $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring);
+            }
+            // Remove last \n (may remove several)
             $newstring = dol_nl2br(DolUtils::dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);
         }
 // Other substitutions that htmlentities does not do
@@ -5589,8 +5846,9 @@  discard block
 block discarded – undo
      */
     static function dol_nboflines($s, $maxchar = 0)
     {
-        if ($s == '')
-            return 0;
+        if ($s == '') {
+                    return 0;
+        }
         $arraystring = explode("\n", $s);
         $nb = count($arraystring);
 
@@ -5609,15 +5867,18 @@  discard block
 block discarded – undo
     static function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')
     {
         $repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
-        if (DolUtils::dol_textishtml($text))
-            $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+        if (DolUtils::dol_textishtml($text)) {
+                    $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+        }
 
         $text = strtr($text, $repTable);
         if ($charset == 'UTF-8') {
             $pattern = '/(<br[^>]*>)/Uu';
         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-        else
-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.
+        else {
+                    $pattern = '/(<br[^>]*>)/U';
+        }
+        // /U is to have UNGREEDY regex to limit to one html tag.
         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
         $nblines = (int) floor((count($a) + 1) / 2);
@@ -5664,39 +5925,47 @@  discard block
 block discarded – undo
     static function dol_textishtml($msg, $option = 0)
     {
         if ($option == 1) {
-            if (preg_match('/<html/i', $msg))
-                return true;
-            elseif (preg_match('/<body/i', $msg))
-                return true;
-            elseif (preg_match('/<br/i', $msg))
-                return true;
+            if (preg_match('/<html/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<body/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<br/i', $msg)) {
+                            return true;
+            }
             return false;
-        }
-        else {
-            if (preg_match('/<html/i', $msg))
-                return true;
-            elseif (preg_match('/<body/i', $msg))
-                return true;
-            elseif (preg_match('/<(b|em|i|u)>/i', $msg))
-                return true;
-            elseif (preg_match('/<br\/>/i', $msg))
-                return true;
-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg))
-                return true;
-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg))
-                return true;
-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg))
-                return true;
-            elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg))
-                return true; // must accept <img src="http://example.com/aaa.png" />
-            elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg))
-                return true; // must accept <a href="http://example.com/aaa.png" />
-            elseif (preg_match('/<h[0-9]>/i', $msg))
-                return true;
-            elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))
-                return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
-            elseif (preg_match('/&#[0-9]{2,3};/i', $msg))
-                return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
+        } else {
+            if (preg_match('/<html/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<body/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(b|em|i|u)>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<br\/>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {
+                            return true;
+            }
+            // must accept <img src="http://example.com/aaa.png" />
+            elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) {
+                            return true;
+            }
+            // must accept <a href="http://example.com/aaa.png" />
+            elseif (preg_match('/<h[0-9]>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {
+                            return true;
+            }
+            // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
+            elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {
+                            return true;
+            }
+            // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
 
             return false;
         }
@@ -5848,12 +6117,14 @@  discard block
 block discarded – undo
                 $birthday = DolUtils::dol_print_date($object->birth, 'day');
 
                 $substitutionarray['__MEMBER_ID__'] = $object->id;
-                if (method_exists($object, 'getCivilityLabel'))
-                    $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+                if (method_exists($object, 'getCivilityLabel')) {
+                                    $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+                }
                 $substitutionarray['__MEMBER_FIRSTNAME__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->firstname) : $object->firstname;
                 $substitutionarray['__MEMBER_LASTNAME__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->lastname) : $object->lastname;
-                if (method_exists($object, 'getFullName'))
-                    $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);
+                if (method_exists($object, 'getFullName')) {
+                                    $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);
+                }
                 $substitutionarray['__MEMBER_COMPANY__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->societe) : $object->societe;
                 $substitutionarray['__MEMBER_ADDRESS__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->address) : $object->address;
                 $substitutionarray['__MEMBER_ZIP__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->zip) : $object->zip;
@@ -5901,10 +6172,12 @@  discard block
 block discarded – undo
                     $dateplannedstart = '';
                     $datenextexpiration = '';
                     foreach ($object->lines as $line) {
-                        if ($line->date_ouverture_prevue > $dateplannedstart)
-                            $dateplannedstart = $line->date_ouverture_prevue;
-                        if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration))
-                            $datenextexpiration = $line->date_fin_prevue;
+                        if ($line->date_ouverture_prevue > $dateplannedstart) {
+                                                    $dateplannedstart = $line->date_ouverture_prevue;
+                        }
+                        if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+                                                    $datenextexpiration = $line->date_fin_prevue;
+                        }
                     }
                     $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = DolUtils::dol_print_date($dateplannedstart, 'dayrfc');
                     $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = DolUtils::dol_print_date($dateplannedstart, 'standard');
@@ -5914,8 +6187,9 @@  discard block
 block discarded – undo
 
 // Create dynamic tags for __EXTRAFIELD_FIELD__
                 if ($object->table_element && $object->id > 0) {
-                    if (!is_object($extrafields))
-                        $extrafields = new ExtraFields($db);
+                    if (!is_object($extrafields)) {
+                                            $extrafields = new ExtraFields($db);
+                    }
                     $extrafields->fetch_name_optionals_label($object->table_element, true);
 
                     if ($object->fetch_optionals() > 0) {
@@ -5936,12 +6210,15 @@  discard block
 block discarded – undo
                     require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';
                     $outputlangs->loadLangs(array('paypal', 'other'));
                     $typeforonlinepayment = 'free';
-                    if (is_object($object) && $object->element == 'commande')
-                        $typeforonlinepayment = 'order';
-                    if (is_object($object) && $object->element == 'facture')
-                        $typeforonlinepayment = 'invoice';
-                    if (is_object($object) && $object->element == 'member')
-                        $typeforonlinepayment = 'member';
+                    if (is_object($object) && $object->element == 'commande') {
+                                            $typeforonlinepayment = 'order';
+                    }
+                    if (is_object($object) && $object->element == 'facture') {
+                                            $typeforonlinepayment = 'invoice';
+                    }
+                    if (is_object($object) && $object->element == 'member') {
+                                            $typeforonlinepayment = 'member';
+                    }
                     $url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);
                     $paymenturl = $url;
                 }
@@ -5951,16 +6228,19 @@  discard block
 block discarded – undo
 
                 if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {
                     $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
-                } else
-                    $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+                }
                 if (!empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') {
                     $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);
-                } else
-                    $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+                }
                 if (!empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') {
                     $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);
-                } else
-                    $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+                }
             }
         }
         if (empty($exclude) || !in_array('objectamount', $exclude)) {
@@ -5970,18 +6250,22 @@  discard block
 block discarded – undo
             $substitutionarray['__AMOUNT__'] = is_object($object) ? $object->total_ttc : '';
             $substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';
             $substitutionarray['__AMOUNT_VAT__'] = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';
-            if ($onlykey != 2 || $mysoc->useLocalTax(1))
-                $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';
-            if ($onlykey != 2 || $mysoc->useLocalTax(2))
-                $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';
+            if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                            $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';
+            }
+            if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                            $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';
+            }
 
             $substitutionarray['__AMOUNT_FORMATED__'] = is_object($object) ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
             $substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
             $substitutionarray['__AMOUNT_VAT_FORMATED__'] = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : price($object->total_tva, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency)) : '';
-            if ($onlykey != 2 || $mysoc->useLocalTax(1))
-                $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
-            if ($onlykey != 2 || $mysoc->useLocalTax(2))
-                $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
+            if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                            $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
+            }
+            if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                            $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
+            }
 
 // TODO Add keys for foreign multicurrency
 // For backward compatibility
@@ -6051,23 +6335,27 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if (!is_array($substitutionarray))
-            return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+        if (!is_array($substitutionarray)) {
+                    return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+        }
 
-        if (empty($outputlangs))
-            $outputlangs = Globals::$langs;
+        if (empty($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
 
 // Make substitution for language keys
         if (is_object($outputlangs)) {
             while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {
                 $msgishtml = 0;
-                if (DolUtils::dol_textishtml($text, 1))
-                    $msgishtml = 1;
+                if (DolUtils::dol_textishtml($text, 1)) {
+                                    $msgishtml = 1;
+                }
 
 // If key is __(TranslationKey|langfile)__, then force load of langfile.lang
                 $tmp = explode('|', $reg[1]);
-                if (!empty($tmp[1]))
-                    $outputlangs->load($tmp[1]);
+                if (!empty($tmp[1])) {
+                                    $outputlangs->load($tmp[1]);
+                }
 
                 $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? DolUtils::dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);
             }
@@ -6077,23 +6365,29 @@  discard block
 block discarded – undo
 // it is also converted.
         while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {
             $msgishtml = 0;
-            if (DolUtils::dol_textishtml($text, 1))
-                $msgishtml = 1;
+            if (DolUtils::dol_textishtml($text, 1)) {
+                            $msgishtml = 1;
+            }
 
             $keyfound = $reg[1];
-            if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound))
-                $newval = '*****forbidden*****';
-            else
-                $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;
+            if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+                            $newval = '*****forbidden*****';
+            } else {
+                            $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;
+            }
             $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? DolUtils::dol_htmlentitiesbr($newval) : $newval, $text);
         }
 
 // Make substitition for array $substitutionarray
         foreach ($substitutionarray as $key => $value) {
-            if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))
-                $value = '';  // Protection
-            if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))
-                $value = ''; // Protection
+            if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                            $value = '';
+            }
+            // Protection
+            if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                            $value = '';
+            }
+            // Protection
 
             $text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
         }
@@ -6139,8 +6433,9 @@  discard block
 block discarded – undo
             $dir = dol_buildpath($reldir, 0);
 
 // Check if directory exists
-            if (!dol_is_dir($dir))
-                continue;
+            if (!dol_is_dir($dir)) {
+                            continue;
+            }
 
             $substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');
             foreach ($substitfiles as $substitfile) {
@@ -6152,8 +6447,9 @@  discard block
 block discarded – undo
                     require_once $dir . $substitfile['name'];
                     // Call the user's function, and only if it is defined
                     $function_name = $module . "_" . $callfunc;
-                    if (function_exists($function_name))
-                        $function_name($substitutionarray, $outputlangs, $object, $parameters);
+                    if (function_exists($function_name)) {
+                                            $function_name($substitutionarray, $outputlangs, $object, $parameters);
+                    }
                 }
             }
         }
@@ -6189,8 +6485,9 @@  discard block
 block discarded – undo
 
         $out = '';
 
-        if (!is_object($outputlangs))
-            $outputlangs = Globals::$langs;
+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
 
         if ($date_start && $date_end) {
             $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', DolUtils::dol_print_date($date_start, $format, false, $outputlangs), DolUtils::dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');
@@ -6219,20 +6516,22 @@  discard block
 block discarded – undo
 
         $ret = '';
 // If order not defined, we use the setup
-        if ($nameorder < 0)
-            $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+        if ($nameorder < 0) {
+                    $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+        }
         if ($nameorder && ((string) $nameorder != '2')) {
             $ret .= $firstname;
-            if ($firstname && $lastname)
-                $ret .= ' ';
+            if ($firstname && $lastname) {
+                            $ret .= ' ';
+            }
             $ret .= $lastname;
-        }
-        else if ($nameorder == 2) {
+        } else if ($nameorder == 2) {
             $ret .= $firstname;
         } else {
             $ret .= $lastname;
-            if ($firstname && $lastname)
-                $ret .= ' ';
+            if ($firstname && $lastname) {
+                            $ret .= ' ';
+            }
             $ret .= $firstname;
         }
         return $ret;
@@ -6252,13 +6551,14 @@  discard block
 block discarded – undo
     {
 //DolUtils::dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function
         if (!is_array($mesgs)) {  // If mesgs is a string
-            if ($mesgs)
-                $_SESSION['dol_events'][$style][] = $mesgs;
-        }
-        else {      // If mesgs is an array
+            if ($mesgs) {
+                            $_SESSION['dol_events'][$style][] = $mesgs;
+            }
+        } else {      // If mesgs is an array
             foreach ($mesgs as $mesg) {
-                if ($mesg)
-                    $_SESSION['dol_events'][$style][] = $mesg;
+                if ($mesg) {
+                                    $_SESSION['dol_events'][$style][] = $mesg;
+                }
             }
         }
     }
@@ -6278,13 +6578,16 @@  discard block
 block discarded – undo
         if (empty($mesg) && empty($mesgs)) {
             DolUtils::dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);
         } else {
-            if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))
-                dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');
-            if (empty($mesgs))
-                setEventMessage($mesg, $style);
-            else {
-                if (!empty($mesg) && !in_array($mesg, $mesgs))
-                    setEventMessage($mesg, $style); // Add message string if not already into array
+            if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
+                            dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');
+            }
+            if (empty($mesgs)) {
+                            setEventMessage($mesg, $style);
+            } else {
+                if (!empty($mesg) && !in_array($mesg, $mesgs)) {
+                                    setEventMessage($mesg, $style);
+                }
+                // Add message string if not already into array
                 setEventMessage($mesgs, $style);
             }
         }
@@ -6303,22 +6606,25 @@  discard block
 block discarded – undo
     {
 // Show mesgs
         if (isset($_SESSION['dol_events']['mesgs'])) {
-            if (empty($disabledoutputofmessages))
-                dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+            }
             unset($_SESSION['dol_events']['mesgs']);
         }
 
 // Show errors
         if (isset($_SESSION['dol_events']['errors'])) {
-            if (empty($disabledoutputofmessages))
-                dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+            }
             unset($_SESSION['dol_events']['errors']);
         }
 
 // Show warnings
         if (isset($_SESSION['dol_events']['warnings'])) {
-            if (empty($disabledoutputofmessages))
-                dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+            }
             unset($_SESSION['dol_events']['warnings']);
         }
     }
@@ -6359,8 +6665,9 @@  discard block
 block discarded – undo
                 foreach ($mesgarray as $message) {
                     $ret++;
                     $out .= Globals::$langs->trans($message);
-                    if ($ret < count($mesgarray))
-                        $out .= "<br>\n";
+                    if ($ret < count($mesgarray)) {
+                                            $out .= "<br>\n";
+                    }
                 }
             }
             if ($mesgstring) {
@@ -6426,8 +6733,9 @@  discard block
 block discarded – undo
      */
     static function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'ok', $keepembedded = 0)
     {
-        if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0))
-            return;
+        if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) {
+                    return;
+        }
 
         $iserror = 0;
         $iswarning = 0;
@@ -6442,14 +6750,17 @@  discard block
 block discarded – undo
                     break;
                 }
             }
-        } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring))
-            $iserror++;
-        else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring))
-            $iswarning++;
-        if ($style == 'error')
-            $iserror++;
-        if ($style == 'warning')
-            $iswarning++;
+        } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring)) {
+                    $iserror++;
+        } else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) {
+                    $iswarning++;
+        }
+        if ($style == 'error') {
+                    $iserror++;
+        }
+        if ($style == 'warning') {
+                    $iswarning++;
+        }
 
         if ($iserror || $iswarning) {
 // Remove div from texts
@@ -6468,8 +6779,9 @@  discard block
 block discarded – undo
                 $mesgarray = $newmesgarray;
             }
             print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);
-        } else
-            print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+        } else {
+                    print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+        }
     }
 
     /**
@@ -6510,15 +6822,17 @@  discard block
 block discarded – undo
             $sizearray = count($array);
             if ($sizearray > 0) {
                 $temp = array();
-                foreach (array_keys($array) as $key)
-                    $temp[$key] = $array[$key][$index];
+                foreach (array_keys($array) as $key) {
+                                    $temp[$key] = $array[$key][$index];
+                }
 
-                if (!$natsort)
-                    ($order == 'asc') ? asort($temp) : arsort($temp);
-                else {
+                if (!$natsort) {
+                                    ($order == 'asc') ? asort($temp) : arsort($temp);
+                } else {
                     ($case_sensitive) ? natsort($temp) : natcasesort($temp);
-                    if ($order != 'asc')
-                        $temp = array_reverse($temp, true);
+                    if ($order != 'asc') {
+                                            $temp = array_reverse($temp, true);
+                    }
                 }
 
                 $sorted = array();
@@ -6544,23 +6858,38 @@  discard block
 block discarded – undo
         // We must use here a binary strlen static function (so not DolUtils::dol_strlen)
         $strLength = DolUtils::dol_strlen($str);
         for ($i = 0; $i < $strLength; $i++) {
-            if (ord($str[$i]) < 0x80)
-                continue; // 0bbbbbbb
-            elseif ((ord($str[$i]) & 0xE0) == 0xC0)
-                $n = 1; // 110bbbbb
-            elseif ((ord($str[$i]) & 0xF0) == 0xE0)
-                $n = 2; // 1110bbbb
-            elseif ((ord($str[$i]) & 0xF8) == 0xF0)
-                $n = 3; // 11110bbb
-            elseif ((ord($str[$i]) & 0xFC) == 0xF8)
-                $n = 4; // 111110bb
-            elseif ((ord($str[$i]) & 0xFE) == 0xFC)
-                $n = 5; // 1111110b
-            else
-                return false; // Does not match any model
+            if (ord($str[$i]) < 0x80) {
+                            continue;
+            }
+            // 0bbbbbbb
+            elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+                            $n = 1;
+            }
+            // 110bbbbb
+            elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+                            $n = 2;
+            }
+            // 1110bbbb
+            elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+                            $n = 3;
+            }
+            // 11110bbb
+            elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+                            $n = 4;
+            }
+            // 111110bb
+            elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+                            $n = 5;
+            }
+            // 1111110b
+            else {
+                            return false;
+            }
+            // Does not match any model
             for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?
-                if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))
-                    return false;
+                if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+                                    return false;
+                }
             }
         }
         return true;
@@ -6578,15 +6907,21 @@  discard block
 block discarded – undo
         // global Globals::$conf;
 
         $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0
-        if (empty($tmp) && !empty($_SERVER["WINDIR"]))
-            $tmp = 'iso-8859-1'; // By default for windows
-        if (empty($tmp))
-            $tmp = 'utf-8';          // By default for other
-        if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING))
-            $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;
-
-        if ($tmp == 'iso-8859-1')
-            return utf8_decode($str);
+        if (empty($tmp) && !empty($_SERVER["WINDIR"])) {
+                    $tmp = 'iso-8859-1';
+        }
+        // By default for windows
+        if (empty($tmp)) {
+                    $tmp = 'utf-8';
+        }
+        // By default for other
+        if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING)) {
+                    $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;
+        }
+
+        if ($tmp == 'iso-8859-1') {
+                    return utf8_decode($str);
+        }
         return $str;
     }
 
@@ -6607,8 +6942,9 @@  discard block
 block discarded – undo
     {
         // global $cache_codes;
 // If key empty
-        if ($key == '')
-            return '';
+        if ($key == '') {
+                    return '';
+        }
 
 // Check in cache
         if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''
@@ -6620,20 +6956,21 @@  discard block
 block discarded – undo
         $sql = "SELECT " . $fieldid . " as valuetoget";
         $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;
         $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";
-        if (!empty($entityfilter))
-            $sql .= " AND entity IN (" . getEntity($tablename) . ")";
+        if (!empty($entityfilter)) {
+                    $sql .= " AND entity IN (" . getEntity($tablename) . ")";
+        }
 
         $resql = $db->query($sql);
         if ($resql) {
             $obj = $db->fetch_object($resql);
-            if ($obj)
-                $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
-            else
-                $cache_codes[$tablename][$key][$fieldid] = '';
+            if ($obj) {
+                            $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
+            } else {
+                            $cache_codes[$tablename][$key][$fieldid] = '';
+            }
             $db->free($resql);
             return $cache_codes[$tablename][$key][$fieldid];
-        }
-        else {
+        } else {
             return -1;
         }
     }
@@ -6679,16 +7016,17 @@  discard block
 block discarded – undo
         // global $soc;       // For backward compatibility
 //print $s."<br>\n";
         if ($returnvalue) {
-            if ($hideerrors)
-                return @eval('return ' . $s . ';');
-            else
-                return eval('return ' . $s . ';');
-        }
-        else {
-            if ($hideerrors)
-                @eval($s);
-            else
-                eval($s);
+            if ($hideerrors) {
+                            return @eval('return ' . $s . ';');
+            } else {
+                            return eval('return ' . $s . ';');
+            }
+        } else {
+            if ($hideerrors) {
+                            @eval($s);
+            } else {
+                            eval($s);
+            }
         }
     }
 
@@ -6714,8 +7052,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$langs;
 
-        if (empty($codelang))
-            return '';
+        if (empty($codelang)) {
+                    return '';
+        }
 
         if ($codelang == 'auto') {
             return '<span class="fa fa-globe"></span>';
@@ -6729,9 +7068,9 @@  discard block
 block discarded – undo
             'sv_SV' => 'se'
         );
 
-        if (isset($langtocountryflag[$codelang]))
-            $flagImage = $langtocountryflag[$codelang];
-        else {
+        if (isset($langtocountryflag[$codelang])) {
+                    $flagImage = $langtocountryflag[$codelang];
+        } else {
             $tmparray = explode('_', $codelang);
             $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
         }
@@ -6749,15 +7088,20 @@  discard block
 block discarded – undo
     {
         // global $mysoc;
 
-        if (strtoupper($countrycode) == 'MQ')
-            return 'fr_CA';
-        if (strtoupper($countrycode) == 'SE')
-            return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country
+        if (strtoupper($countrycode) == 'MQ') {
+                    return 'fr_CA';
+        }
+        if (strtoupper($countrycode) == 'SE') {
+                    return 'sv_SE';
+        }
+        // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country
         if (strtoupper($countrycode) == 'CH') {
-            if ($mysoc->country_code == 'FR')
-                return 'fr_CH';
-            if ($mysoc->country_code == 'DE')
-                return 'de_CH';
+            if ($mysoc->country_code == 'FR') {
+                            return 'fr_CH';
+            }
+            if ($mysoc->country_code == 'DE') {
+                            return 'de_CH';
+            }
         }
 
 // Locale list taken from:
@@ -6935,8 +7279,9 @@  discard block
 block discarded – undo
         );
 
         $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);
-        if (in_array($buildprimarykeytotest, $locales))
-            return strtolower($countrycode) . '_' . strtoupper($countrycode);
+        if (in_array($buildprimarykeytotest, $locales)) {
+                    return strtolower($countrycode) . '_' . strtoupper($countrycode);
+        }
 
         foreach ($locales as $locale) {
             $locale_language = locale_get_primary_language($locale);
@@ -6990,18 +7335,21 @@  discard block
 block discarded – undo
 
                 if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {
                     if (count($values) == 6) {       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
-                        if ($values[0] != $type)
-                            continue;
+                        if ($values[0] != $type) {
+                                                    continue;
+                        }
 
                         if (verifCond($values[4])) {
-                            if ($values[3])
-                                Globals::$langs->load($values[3]);
+                            if ($values[3]) {
+                                                            Globals::$langs->load($values[3]);
+                            }
                             if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {
                                 $substitutionarray = array();
                                 complete_substitutions_array($substitutionarray, Globals::$langs, $object, array('needforkey' => $values[2]));
                                 $label = make_substitutions($reg[1], $substitutionarray);
-                            } else
-                                $label = Globals::$langs->trans($values[2]);
+                            } else {
+                                                            $label = Globals::$langs->trans($values[2]);
+                            }
 
                             //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);
                             $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);
@@ -7009,30 +7357,32 @@  discard block
 block discarded – undo
                             $head[$h][2] = str_replace('+', '', $values[1]);
                             $h++;
                         }
-                    }
-                    else if (count($values) == 5) {       // deprecated
+                    } else if (count($values) == 5) {       // deprecated
                         DolUtils::dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);
 
-                        if ($values[0] != $type)
-                            continue;
-                        if ($values[3])
-                            Globals::$langs->load($values[3]);
+                        if ($values[0] != $type) {
+                                                    continue;
+                        }
+                        if ($values[3]) {
+                                                    Globals::$langs->load($values[3]);
+                        }
                         if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {
                             $substitutionarray = array();
                             complete_substitutions_array($substitutionarray, Globals::$langs, $object, array('needforkey' => $values[2]));
                             $label = make_substitutions($reg[1], $substitutionarray);
-                        } else
-                            $label = Globals::$langs->trans($values[2]);
+                        } else {
+                                                    $label = Globals::$langs->trans($values[2]);
+                        }
 
                         $head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);
                         $head[$h][1] = $label;
                         $head[$h][2] = str_replace('+', '', $values[1]);
                         $h++;
                     }
-                }
-                else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {
-                    if ($values[0] != $type)
-                        continue;
+                } else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {
+                    if ($values[0] != $type) {
+                                            continue;
+                    }
                     $tabname = str_replace('-', '', $values[1]);
                     foreach ($head as $key => $val) {
                         $condition = (!empty($values[3]) ? verifCond($values[3]) : 1);
@@ -7074,10 +7424,11 @@  discard block
 block discarded – undo
         // global $action;
         // global $micro_start_time;
 
-        if ($zone == 'private')
-            print "\n" . '<!-- Common footer for private page -->' . "\n";
-        else
-            print "\n" . '<!-- Common footer for public page -->' . "\n";
+        if ($zone == 'private') {
+                    print "\n" . '<!-- Common footer for private page -->' . "\n";
+        } else {
+                    print "\n" . '<!-- Common footer for public page -->' . "\n";
+        }
 
 // A div to store page_y POST parameter so we can read it using javascript
         print "\n<!-- A div to store page_y POST paramater -->\n";
@@ -7086,8 +7437,9 @@  discard block
 block discarded – undo
         $parameters = array();
         $reshook = Globals::$hookManager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks
         if (empty($reshook)) {
-            if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER))
-                print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";
+            if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER)) {
+                            print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";
+            }
 
             print "\n";
             if (!empty(Globals::$conf->use_javascript_ajax)) {
@@ -7110,8 +7462,9 @@  discard block
 block discarded – undo
                     print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";
                     $relativepathstring = $_SERVER["PHP_SELF"];
                     // Clean $relativepathstring
-                    if (constant('DOL_BASE_URI'))
-                        $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                    if (constant('DOL_BASE_URI')) {
+                                            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                    }
                     $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
                     $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
@@ -7122,14 +7475,17 @@  discard block
 block discarded – undo
                                 $tmpqueryarraytohave = explode('&', $defkey);
                                 $foundintru = 0;
                                 foreach ($tmpqueryarraytohave as $tmpquerytohave) {
-                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave))
-                                        $foundintru = 1;
+                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                            $foundintru = 1;
+                                    }
                                 }
-                                if (!$foundintru)
-                                    $qualified = 1;
+                                if (!$foundintru) {
+                                                                    $qualified = 1;
+                                }
                                 //var_dump($defkey.'-'.$qualified);
-                            } else
-                                $qualified = 1;
+                            } else {
+                                                            $qualified = 1;
+                            }
 
                             if ($qualified) {
                                 foreach ($defval as $paramkey => $paramval) {
@@ -7148,14 +7504,17 @@  discard block
 block discarded – undo
                                 $tmpqueryarraytohave = explode('&', $defkey);
                                 $foundintru = 0;
                                 foreach ($tmpqueryarraytohave as $tmpquerytohave) {
-                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave))
-                                        $foundintru = 1;
+                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                            $foundintru = 1;
+                                    }
                                 }
-                                if (!$foundintru)
-                                    $qualified = 1;
+                                if (!$foundintru) {
+                                                                    $qualified = 1;
+                                }
                                 //var_dump($defkey.'-'.$qualified);
-                            } else
-                                $qualified = 1;
+                            } else {
+                                                            $qualified = 1;
+                            }
 
                             if ($qualified) {
                                 foreach ($defval as $paramkey => $paramval) {
@@ -7194,8 +7553,9 @@  discard block
 block discarded – undo
                     print "\n";
                     print "/* JS CODE TO ENABLE to add memory info */\n";
                     print 'window.console && console.log("';
-                    if (!empty(Globals::$conf->global->MEMCACHED_SERVER))
-                        print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';
+                    if (!empty(Globals::$conf->global->MEMCACHED_SERVER)) {
+                                            print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';
+                    }
                     print 'MAIN_OPTIMIZE_SPEED=' . (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');
                     if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in// global variable.
                         $micro_end_time = microtime(true);
@@ -7325,8 +7685,9 @@  discard block
 block discarded – undo
 
         $crits = explode(' ', $value);
         $res = '';
-        if (!is_array($fields))
-            $fields = array($fields);
+        if (!is_array($fields)) {
+                    $fields = array($fields);
+        }
 
         $nboffields = count($fields);
         $end2 = count($crits);
@@ -7389,8 +7750,9 @@  discard block
 block discarded – undo
                     $tmpcrits = explode('|', $crit);
                     $i3 = 0;
                     foreach ($tmpcrits as $tmpcrit) {
-                        if (empty($tmpcrit))
-                            continue;
+                        if (empty($tmpcrit)) {
+                                                    continue;
+                        }
 
                         $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
 
@@ -7426,8 +7788,9 @@  discard block
 block discarded – undo
                 }
                 $i++;
             }
-            if ($newres)
-                $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');
+            if ($newres) {
+                            $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');
+            }
             $j++;
         }
         $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";
@@ -7467,29 +7830,37 @@  discard block
 block discarded – undo
     static function getImageFileNameForSize($file, $extName, $extImgTarget = '')
     {
         $dirName = dirname($file);
-        if ($dirName == '.')
-            $dirName = '';
+        if ($dirName == '.') {
+                    $dirName = '';
+        }
 
         $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove extension, whatever is its case
         $fileName = basename($fileName);
 
-        if (empty($extImgTarget))
-            $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
-        if (empty($extImgTarget))
-            $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
-        if (empty($extImgTarget))
-            $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
-        if (empty($extImgTarget))
-            $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
-        if (empty($extImgTarget))
-            $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
-
-        if (!$extImgTarget)
-            return $file;
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
+        }
+
+        if (!$extImgTarget) {
+                    return $file;
+        }
 
         $subdir = '';
-        if ($extName)
-            $subdir = 'thumbs/';
+        if ($extName) {
+                    $subdir = 'thumbs/';
+        }
 
         return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb
     }
@@ -7507,8 +7878,9 @@  discard block
 block discarded – undo
     {
         // global Globals::$conf, Globals::$langs;
 
-        if (empty(Globals::$conf->use_javascript_ajax))
-            return '';
+        if (empty(Globals::$conf->use_javascript_ajax)) {
+                    return '';
+        }
 
         $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');
 //$mime_preview[]='vnd.oasis.opendocument.presentation';
@@ -7516,17 +7888,19 @@  discard block
 block discarded – undo
         $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);
 
         if ($alldata == 1) {
-            if ($num_mime !== false)
-                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);
-            else
-                return array();
+            if ($num_mime !== false) {
+                            return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);
+            } else {
+                            return array();
+            }
         }
 
 // old behavior
-        if ($num_mime !== false)
-            return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')';
-        else
-            return '';
+        if ($num_mime !== false) {
+                    return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')';
+        } else {
+                    return '';
+        }
     }
 
     /**
@@ -7544,8 +7918,9 @@  discard block
 block discarded – undo
 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );
 				});
 		    </script>';
-        if ($addlink)
-            $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>';
+        if ($addlink) {
+                    $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>';
+        }
         return $out;
     }
 
@@ -7927,8 +8302,9 @@  discard block
 block discarded – undo
         if (!isset($dictvalues[$tablename])) {
             $dictvalues[$tablename] = array();
             $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';
-            if ($checkentity)
-                $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';
+            if ($checkentity) {
+                            $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';
+            }
 
             $resql = $db->query($sql);
             if ($resql) {
@@ -7940,11 +8316,14 @@  discard block
 block discarded – undo
             }
         }
 
-        if (!empty($dictvalues[$tablename][$id]))
-            return $dictvalues[$tablename][$id]->{$field}; // Found
+        if (!empty($dictvalues[$tablename][$id])) {
+                    return $dictvalues[$tablename][$id]->{$field};
+        }
+        // Found
         else { // Not found
-            if ($id > 0)
-                return $id;
+            if ($id > 0) {
+                            return $id;
+            }
             return '';
         }
     }
@@ -7974,8 +8353,9 @@  discard block
 block discarded – undo
                 $b = hexdec($hexb);
             }
             $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm
-            if ($bright > 0.6)
-                $res = 1;
+            if ($bright > 0.6) {
+                            $res = 1;
+            }
         }
         return $res;
     }
@@ -7993,8 +8373,10 @@  discard block
 block discarded – undo
         // global Globals::$conf;
 //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
 //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-        if (empty($menuentry['enabled']))
-            return 0; // Entry disabled by condition
+        if (empty($menuentry['enabled'])) {
+                    return 0;
+        }
+        // Entry disabled by condition
         if ($type_user && $menuentry['module']) {
             $tmploops = explode('|', $menuentry['module']);
             $found = 0;
@@ -8004,15 +8386,23 @@  discard block
 block discarded – undo
                     break;
                 }
             }
-            if (!$found)
-                return 0; // Entry is for menus all excluded to external users
-        }
-        if (!$menuentry['perms'] && $type_user)
-            return 0;            // No permissions and user is external
-        if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
-            return 0; // No permissions and option to hide when not allowed, even for internal user, is on
-        if (!$menuentry['perms'])
-            return 2;               // No permissions and user is external
+            if (!$found) {
+                            return 0;
+            }
+            // Entry is for menus all excluded to external users
+        }
+        if (!$menuentry['perms'] && $type_user) {
+                    return 0;
+        }
+        // No permissions and user is external
+        if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+                    return 0;
+        }
+        // No permissions and option to hide when not allowed, even for internal user, is on
+        if (!$menuentry['perms']) {
+                    return 2;
+        }
+        // No permissions and user is external
         return 1;
     }
 

Please login to merge, or discard this patch.

Helpers/EldyLib.php 1 patch

Braces +34 added lines, -22 removed lines patch added patch discarded remove patch

@@ -303,8 +303,9 @@  discard block
 block discarded – undo
             if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") {
                 $classname = 'class="tmenusel"';
                 $_SESSION['idmenu'] = '';
-            } else
-                $classname = 'class="tmenu"';
+            } else {
+                            $classname = 'class="tmenu"';
+            }
             $idsel = 'bank';
 
 //$menu->add('/compta/bank/list.php?mainmenu=bank&leftmenu=', Globals::$langs->trans("MenuBankCash"), 0, $showmode, $atarget, "bank", '', 52, $id, $idsel, $classname);
@@ -1383,25 +1384,33 @@  discard block
 block discarded – undo
                                     $nature = '';
 
 // Must match array $sourceList defined into journals_list.php
-                                    if ($objp->nature == 2 && !empty(Globals::$conf->facture->enabled))
-                                        $nature = "sells";
-                                    if ($objp->nature == 3 && !empty(Globals::$conf->fournisseur->enabled))
-                                        $nature = "purchases";
-                                    if ($objp->nature == 4 && !empty(Globals::$conf->banque->enabled))
-                                        $nature = "bank";
-                                    if ($objp->nature == 5 && !empty(Globals::$conf->expensereport->enabled))
-                                        $nature = "expensereports";
-                                    if ($objp->nature == 1)
-                                        $nature = "various";
-                                    if ($objp->nature == 8)
-                                        $nature = "inventory";
-                                    if ($objp->nature == 9)
-                                        $nature = "hasnew";
+                                    if ($objp->nature == 2 && !empty(Globals::$conf->facture->enabled)) {
+                                                                            $nature = "sells";
+                                    }
+                                    if ($objp->nature == 3 && !empty(Globals::$conf->fournisseur->enabled)) {
+                                                                            $nature = "purchases";
+                                    }
+                                    if ($objp->nature == 4 && !empty(Globals::$conf->banque->enabled)) {
+                                                                            $nature = "bank";
+                                    }
+                                    if ($objp->nature == 5 && !empty(Globals::$conf->expensereport->enabled)) {
+                                                                            $nature = "expensereports";
+                                    }
+                                    if ($objp->nature == 1) {
+                                                                            $nature = "various";
+                                    }
+                                    if ($objp->nature == 8) {
+                                                                            $nature = "inventory";
+                                    }
+                                    if ($objp->nature == 9) {
+                                                                            $nature = "hasnew";
+                                    }
 
 // To enable when page exists
                                     if (empty(Globals::$conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {
-                                        if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory')
-                                            $nature = '';
+                                        if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') {
+                                                                                    $nature = '';
+                                        }
                                     }
 
                                     if ($nature) {
@@ -1416,8 +1425,9 @@  discard block
 block discarded – undo
 // Should not happend. Entries are added
                                 $newmenu->add('', Globals::$langs->trans("NoJournalDefined"), 2, Globals::$user->rights->accounting->comptarapport->lire);
                             }
-                        } else
-                            dol_print_error(Config::$dbEngine);
+                        } else {
+                                                    dol_print_error(Config::$dbEngine);
+                        }
                         Config::$dbEngine->free($resql);
                     }
 
@@ -1451,8 +1461,10 @@  discard block
 block discarded – undo
                     }
 
                     $modecompta = 'CREANCES-DETTES';
-                    if (!empty(Globals::$conf->accounting->enabled) && !empty(Globals::$user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')
-                        $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+                    if (!empty(Globals::$conf->accounting->enabled) && !empty(Globals::$user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+                                            $modecompta = 'BOOKKEEPING';
+                    }
+                    // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
                     if ($modecompta) {
                         if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
                             /*

Please login to merge, or discard this patch.

Helpers/NoValeConfig.php 1 patch

Braces +60 added lines, -30 removed lines patch added patch discarded remove patch

@@ -44,9 +44,16 @@  discard block
 block discarded – undo
 
 
 // Chargement des includes principaux de librairies communes
-if (! defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';		// Need 500ko memory
-if (! defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
-if (! defined('NOREQUIRESOC'))  require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+if (! defined('NOREQUIREUSER')) {
+    require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
+}
+// Need 500ko memory
+if (! defined('NOREQUIRETRAN')) {
+    require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
+}
+if (! defined('NOREQUIRESOC')) {
+    require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+}
 
 
 
@@ -78,26 +85,32 @@  discard block
 block discarded – undo
  */
 
 // By default conf->entity is 1, but we change this if we ask another value.
-if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session
+if (session_id() && ! empty($_SESSION["dol_entity"])) {
+    // Entity inside an opened session
 {
-	Globals::$conf->entity = $_SESSION["dol_entity"];
-}
-else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script
+	Globals::$conf->entity = $_SESSION["dol_entity"];
+}
+} else if (! empty($_ENV["dol_entity"])) {
+    // Entity inside a CLI script
 {
-	Globals::$conf->entity = $_ENV["dol_entity"];
-}
-else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int'))	// Just after a login page
+	Globals::$conf->entity = $_ENV["dol_entity"];
+}
+} else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int')) {
+    // Just after a login page
 {
-	Globals::$conf->entity = GETPOST("entity", 'int');
-}
-else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
+	Globals::$conf->entity = GETPOST("entity", 'int');
+}
+} else if (defined('DOLENTITY') && is_numeric(DOLENTITY)) {
+    // For public page with MultiCompany module
 {
-	Globals::$conf->entity = DOLENTITY;
+	Globals::$conf->entity = DOLENTITY;
+}
 }
 
 // Sanitize entity
-if (!is_numeric(Globals::$conf->entity))
-    Globals::$conf->entity = 1;
+if (!is_numeric(Globals::$conf->entity)) {
+    Globals::$conf->entity = 1;
+}
 
 if (! defined('NOREQUIREDB'))
 {
@@ -123,13 +136,26 @@  discard block
 block discarded – undo
 // If software has been locked. Only login Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
 if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
 	$ok=0;
-	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
-	elseif (isset($_POST["username"]) && $_POST["username"] == Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED)
-        $ok = 1;    // We let working pages that is a login submission (login submit, to allow login by admin)
-    elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)
-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)
-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED)
-        $ok = 1; // We let working if user is allowed admin
+	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) {
+	    $ok=1;
+	}
+	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
+	elseif (isset($_POST["username"]) && $_POST["username"] == Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+	        $ok = 1;
+	}
+	// We let working pages that is a login submission (login submit, to allow login by admin)
+    elseif (defined('NOREQUIREDB')) {
+        $ok=1;
+    }
+    // We let working pages that don't need database access (xxx.css.php)
+	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) {
+	    $ok=1;
+	}
+	// We let working pages that ask to work even if only login enabled (logout.php)
+	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+	        $ok = 1;
+	}
+	// We let working if user is allowed admin
     if (! $ok)
 	{
 		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
@@ -137,8 +163,7 @@  discard block
 block discarded – undo
 			print 'You are logged with user "' . $_SESSION["dol_login"] . '" and only administrator user "' . Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED . '" is allowed to connect for the moment.' . "\n";
             $nexturl=DOL_URL_ROOT.'/user/logout.php';
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
-		}
-		else
+		} else
 		{
 			print 'Sorry, your application is offline. Only administrator user "' . Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED . '" is allowed to connect for the moment.' . "\n";
             $nexturl=DOL_URL_ROOT.'/';
@@ -157,21 +182,26 @@  discard block
 block discarded – undo
 	$mysoc->setMysoc($conf);
 
 	// For some countries, we need to invert our address with customer address
-	if ($mysoc->country_code == 'DE' && !isset(Globals::$conf->global->MAIN_INVERT_SENDER_RECIPIENT))
-        Globals::$conf->global->MAIN_INVERT_SENDER_RECIPIENT = 1;
-}
+	if ($mysoc->country_code == 'DE' && !isset(Globals::$conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+	        Globals::$conf->global->MAIN_INVERT_SENDER_RECIPIENT = 1;
+	}
+	}
 
 
 // Set default language (must be after the setValues setting global Globals::$conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
 if (! defined('NOREQUIRETRAN'))
 {
     $langcode = (GETPOST('lang', 'aZ09') ? GETPOST('lang', 'aZ09', 1) : (empty(Globals::$conf->global->MAIN_LANG_DEFAULT) ? 'auto' : Globals::$conf->global->MAIN_LANG_DEFAULT));
-    if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');
+    if (defined('MAIN_LANG_DEFAULT')) {
+        $langcode=constant('MAIN_LANG_DEFAULT');
+    }
     $langs->setDefaultLang($langcode);
 }
 
 
 
 
-if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');
+if (! defined('MAIN_LABEL_MENTION_NPR') ) {
+    define('MAIN_LABEL_MENTION_NPR','NPR');
+}
 

Please login to merge, or discard this patch.

Helpers/AjaxLib.php 1 patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -141,14 +141,16 @@
 block discarded – undo
         $reshook = Globals::$hookManager->executeHooks('addSearchEntry', $parameters);
         if (empty($reshook)) {
             $arrayresult = array_merge($arrayresult, Globals::$hookManager->resArray);
-        } else
-            $arrayresult = Globals::$hookManager->resArray;
+        } else {
+                    $arrayresult = Globals::$hookManager->resArray;
+        }
 
 // This allow to keep a search entry to the top
         if (!empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
             $key = 'searchinto' . $conf->global->DEFAULT_SEARCH_INTO_MODULE;
-            if (array_key_exists($key, $arrayresult))
-                $arrayresult[$key]['position'] = -10;
+            if (array_key_exists($key, $arrayresult)) {
+                            $arrayresult[$key]['position'] = -10;
+            }
         }
 
 // Sort on position

Please login to merge, or discard this patch.

Helpers/DateLib.php 1 patch

Braces +310 added lines, -184 removed lines patch added patch discarded remove patch

@@ -88,19 +88,19 @@  discard block
 block discarded – undo
             $yearref = dol_print_date($gmtnow, '%Y');
             $monthref = dol_print_date($gmtnow, '%m');
             $dayref = dol_print_date($gmtnow, '%d');
-            if ($refgmtdate == 'now')
-                $newrefgmtdate = $yearref . '-' . $monthref . '-' . $dayref;
-            elseif ($refgmtdate == 'summer')
-                $newrefgmtdate = $yearref . '-08-01';
-            else
-                $newrefgmtdate = $yearref . '-01-01';
+            if ($refgmtdate == 'now') {
+                            $newrefgmtdate = $yearref . '-' . $monthref . '-' . $dayref;
+            } elseif ($refgmtdate == 'summer') {
+                            $newrefgmtdate = $yearref . '-08-01';
+            } else {
+                            $newrefgmtdate = $yearref . '-01-01';
+            }
             $newrefgmtdate .= 'T00:00:00+00:00';
             $localtz = new DateTimeZone(getServerTimeZoneString());
             $localdt = new DateTime($newrefgmtdate, $localtz);
             $tmp = -1 * $localtz->getOffset($localdt);
             //print $refgmtdate.'='.$tmp;
-        }
-        else {
+        } else {
             $tmp = 0;
             dol_print_error('', 'PHP version must be 5.3+');
         }
@@ -120,12 +120,15 @@  discard block
 block discarded – undo
     {
         global $conf;
 
-        if ($duration_value == 0)
-            return $time;
-        if ($duration_unit == 'h')
-            return $time + (3600 * $duration_value);
-        if ($duration_unit == 'w')
-            return $time + (3600 * 24 * 7 * $duration_value);
+        if ($duration_value == 0) {
+                    return $time;
+        }
+        if ($duration_unit == 'h') {
+                    return $time + (3600 * $duration_value);
+        }
+        if ($duration_unit == 'w') {
+                    return $time + (3600 * 24 * 7 * $duration_value);
+        }
 
         $deltastring = 'P';
 
@@ -148,15 +151,17 @@  discard block
 block discarded – undo
         }
 
         $date = new DateTime();
-        if (!empty(Globals::$conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT))
-            $date->setTimezone(new DateTimeZone('UTC'));
+        if (!empty(Globals::$conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) {
+                    $date->setTimezone(new DateTimeZone('UTC'));
+        }
         $date->setTimestamp($time);
         $interval = new DateInterval($deltastring);
 
-        if ($sub)
-            $date->sub($interval);
-        else
-            $date->add($interval);
+        if ($sub) {
+                    $date->sub($interval);
+        } else {
+                    $date->add($interval);
+        }
 
         return $date->getTimestamp();
     }
@@ -200,14 +205,20 @@  discard block
 block discarded – undo
     {
         global $langs;
 
-        if (empty($lengthOfDay))
-            $lengthOfDay = 86400;         // 1 day = 24 hours
-        if (empty($lengthOfWeek))
-            $lengthOfWeek = 7;            // 1 week = 7 days
+        if (empty($lengthOfDay)) {
+                    $lengthOfDay = 86400;
+        }
+        // 1 day = 24 hours
+        if (empty($lengthOfWeek)) {
+                    $lengthOfWeek = 7;
+        }
+        // 1 week = 7 days
 
         if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin') {
-            if ((int) $iSecond === 0)
-                return '0'; // This is to avoid having 0 return a 12:00 AM for en_US
+            if ((int) $iSecond === 0) {
+                            return '0';
+            }
+            // This is to avoid having 0 return a 12:00 AM for en_US
 
             $sTime = '';
             $sDay = 0;
@@ -219,8 +230,9 @@  discard block
 block discarded – undo
                     $iSecond -= $lengthOfDay;
                 }
                 $dayTranslate = $langs->trans("Day");
-                if ($iSecond >= ($lengthOfDay * 2))
-                    $dayTranslate = $langs->trans("Days");
+                if ($iSecond >= ($lengthOfDay * 2)) {
+                                    $dayTranslate = $langs->trans("Days");
+                }
             }
 
             if ($lengthOfWeek < 7) {
@@ -229,16 +241,18 @@  discard block
 block discarded – undo
                         $sWeek = (int) (($sDay - $sDay % $lengthOfWeek ) / $lengthOfWeek);
                         $sDay = $sDay % $lengthOfWeek;
                         $weekTranslate = $langs->trans("DurationWeek");
-                        if ($sWeek >= 2)
-                            $weekTranslate = $langs->trans("DurationWeeks");
+                        if ($sWeek >= 2) {
+                                                    $weekTranslate = $langs->trans("DurationWeeks");
+                        }
                         $sTime .= $sWeek . ' ' . $weekTranslate . ' ';
                     }
                 }
             }
             if ($sDay > 0) {
                 $dayTranslate = $langs->trans("Day");
-                if ($sDay > 1)
-                    $dayTranslate = $langs->trans("Days");
+                if ($sDay > 1) {
+                                    $dayTranslate = $langs->trans("Days");
+                }
                 $sTime .= $sDay . ' ' . $dayTranslate . ' ';
             }
 
@@ -294,8 +308,9 @@  discard block
 block discarded – undo
             } else if ($year_date > 0 && !empty($day_date)) {
                 $sqldate .= " AND " . $datefield . " BETWEEN '" . $db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
                 $sqldate .= "' AND '" . $db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date)) . "'";
-            } else
-                $sqldate .= " AND date_format( " . $datefield . ", '%m') = '" . $db->escape($month_date) . "'";
+            } else {
+                            $sqldate .= " AND date_format( " . $datefield . ", '%m') = '" . $db->escape($month_date) . "'";
+            }
         } else if ($year_date > 0) {
             $sqldate .= " AND " . $datefield . " BETWEEN '" . $db->idate(dol_get_first_day($year_date, 1, false));
             $sqldate .= "' AND '" . $db->idate(dol_get_last_day($year_date, 12, false)) . "'";
@@ -334,13 +349,14 @@  discard block
 block discarded – undo
             $shour = $reg[4];
             $smin = $reg[5];
             $ssec = $reg[6];
-            if ($syear < 50)
-                $syear += 1900;
-            if ($syear >= 50 && $syear < 100)
-                $syear += 2000;
+            if ($syear < 50) {
+                            $syear += 1900;
+            }
+            if ($syear >= 50 && $syear < 100) {
+                            $syear += 2000;
+            }
             $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
-        }
-        else if (
+        } else if (
             preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg) // Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
             || preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg) // Convert date with format YYYY-MM-DD HH:MM:SS
             || preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)  // Convert date with format YYYYMMDDTHHMMSSZ
@@ -474,8 +490,9 @@  discard block
 block discarded – undo
      */
     function dol_get_first_day($year, $month = 1, $gm = false)
     {
-        if ($year > 9999)
-            return '';
+        if ($year > 9999) {
+                    return '';
+        }
         return dol_mktime(0, 0, 0, $month, 1, $year, $gm);
     }
 
@@ -488,8 +505,9 @@  discard block
 block discarded – undo
      */
     function dol_get_last_day($year, $month = 12, $gm = false)
     {
-        if ($year > 9999)
-            return '';
+        if ($year > 9999) {
+                    return '';
+        }
         if ($month == 12) {
             $month = 1;
             $year += 1;
@@ -525,8 +543,9 @@  discard block
 block discarded – undo
         $tmparray = dol_getdate($date, true); // detail of current day
         //Calculate days = offset from current day
         $days = $start_week - $tmparray['wday'];
-        if ($days >= 1)
-            $days = 7 - $days;
+        if ($days >= 1) {
+                    $days = 7 - $days;
+        }
         $days = abs($days);
         $seconds = $days * 24 * 60 * 60;
         //print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
@@ -590,8 +609,9 @@  discard block
 block discarded – undo
         $nbFerie = 0;
 
         // Check to ensure we use correct parameters
-        if ((($timestampEnd - $timestampStart) % 86400) != 0)
-            return 'ErrorDates must use same hours and must be GMT dates';
+        if ((($timestampEnd - $timestampStart) % 86400) != 0) {
+                    return 'ErrorDates must use same hours and must be GMT dates';
+        }
 
         $i = 0;
         while (( ($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd) ) && ($i < 50000)) {  // Loop end when equals (Test on i is a security loop to avoid infinite loop)
@@ -610,12 +630,13 @@  discard block
 block discarded – undo
                 foreach ($arrayofdaystring as $daystring) {
                     $tmp = explode('-', $daystring);
                     if ($tmp[2]) {
-                        if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour)
-                            $ferie = true;
-                    }
-                    else {
-                        if ($tmp[0] == $mois && $tmp[1] == $jour)
-                            $ferie = true;
+                        if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) {
+                                                    $ferie = true;
+                        }
+                    } else {
+                        if ($tmp[0] == $mois && $tmp[1] == $jour) {
+                                                    $ferie = true;
+                        }
                     }
                 }
             }
@@ -624,22 +645,38 @@  discard block
 block discarded – undo
                 $countryfound = 1;
 
                 // Definition of fixed working days
-                if ($jour == 1 && $mois == 1)
-                    $ferie = true; // 1er january
-                if ($jour == 1 && $mois == 5)
-                    $ferie = true; // 1er may
-                if ($jour == 8 && $mois == 5)
-                    $ferie = true; // 5 may
-                if ($jour == 14 && $mois == 7)
-                    $ferie = true; // 14 july
-                if ($jour == 15 && $mois == 8)
-                    $ferie = true; // 15 august
-                if ($jour == 1 && $mois == 11)
-                    $ferie = true; // 1 november
-                if ($jour == 11 && $mois == 11)
-                    $ferie = true; // 11 november
-                if ($jour == 25 && $mois == 12)
-                    $ferie = true; // 25 december
+                if ($jour == 1 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // 1er january
+                if ($jour == 1 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // 1er may
+                if ($jour == 8 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // 5 may
+                if ($jour == 14 && $mois == 7) {
+                                    $ferie = true;
+                }
+                // 14 july
+                if ($jour == 15 && $mois == 8) {
+                                    $ferie = true;
+                }
+                // 15 august
+                if ($jour == 1 && $mois == 11) {
+                                    $ferie = true;
+                }
+                // 1 november
+                if ($jour == 11 && $mois == 11) {
+                                    $ferie = true;
+                }
+                // 11 november
+                if ($jour == 25 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // 25 december
 
 
                     
@@ -647,8 +684,9 @@  discard block
 block discarded – undo
                 $date_paques = easter_date($annee);
                 $jour_paques = date("d", $date_paques);
                 $mois_paques = date("m", $date_paques);
-                if ($jour_paques == $jour && $mois_paques == $mois)
-                    $ferie = true;
+                if ($jour_paques == $jour && $mois_paques == $mois) {
+                                    $ferie = true;
+                }
                 // Pâques
                 // Calculation for the monday of easter date
                 $date_lundi_paques = mktime(
@@ -656,8 +694,9 @@  discard block
 block discarded – undo
                 );
                 $jour_lundi_ascension = date("d", $date_lundi_paques);
                 $mois_lundi_ascension = date("m", $date_lundi_paques);
-                if ($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois)
-                    $ferie = true;
+                if ($jour_lundi_ascension == $jour && $mois_lundi_ascension == $mois) {
+                                    $ferie = true;
+                }
                 // Lundi de Pâques
                 // Calcul du jour de l'ascension (38 days after easter day)
                 $date_ascension = mktime(
@@ -665,8 +704,9 @@  discard block
 block discarded – undo
                 );
                 $jour_ascension = date("d", $date_ascension);
                 $mois_ascension = date("m", $date_ascension);
-                if ($jour_ascension == $jour && $mois_ascension == $mois)
-                    $ferie = true;
+                if ($jour_ascension == $jour && $mois_ascension == $mois) {
+                                    $ferie = true;
+                }
                 // Ascension
                 // Calculation of "Pentecote" (11 days after easter day)
                 $date_pentecote = mktime(
@@ -674,8 +714,9 @@  discard block
 block discarded – undo
                 );
                 $jour_pentecote = date("d", $date_pentecote);
                 $mois_pentecote = date("m", $date_pentecote);
-                if ($jour_pentecote == $jour && $mois_pentecote == $mois)
-                    $ferie = true;
+                if ($jour_pentecote == $jour && $mois_pentecote == $mois) {
+                                    $ferie = true;
+                }
                 // "Pentecote"
             }
 
@@ -685,26 +726,46 @@  discard block
 block discarded – undo
                 $countryfound = 1;
 
                 // Definition des dates feriees fixes
-                if ($jour == 1 && $mois == 1)
-                    $ferie = true; // Capodanno
-                if ($jour == 6 && $mois == 1)
-                    $ferie = true; // Epifania
-                if ($jour == 25 && $mois == 4)
-                    $ferie = true; // Anniversario Liberazione
-                if ($jour == 1 && $mois == 5)
-                    $ferie = true; // Festa del Lavoro
-                if ($jour == 2 && $mois == 6)
-                    $ferie = true; // Festa della Repubblica
-                if ($jour == 15 && $mois == 8)
-                    $ferie = true; // Ferragosto
-                if ($jour == 1 && $mois == 11)
-                    $ferie = true; // Tutti i Santi
-                if ($jour == 8 && $mois == 12)
-                    $ferie = true; // Immacolata Concezione
-                if ($jour == 25 && $mois == 12)
-                    $ferie = true; // 25 decembre
-                if ($jour == 26 && $mois == 12)
-                    $ferie = true; // Santo Stefano
+                if ($jour == 1 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Capodanno
+                if ($jour == 6 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Epifania
+                if ($jour == 25 && $mois == 4) {
+                                    $ferie = true;
+                }
+                // Anniversario Liberazione
+                if ($jour == 1 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // Festa del Lavoro
+                if ($jour == 2 && $mois == 6) {
+                                    $ferie = true;
+                }
+                // Festa della Repubblica
+                if ($jour == 15 && $mois == 8) {
+                                    $ferie = true;
+                }
+                // Ferragosto
+                if ($jour == 1 && $mois == 11) {
+                                    $ferie = true;
+                }
+                // Tutti i Santi
+                if ($jour == 8 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Immacolata Concezione
+                if ($jour == 25 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // 25 decembre
+                if ($jour == 26 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Santo Stefano
 
 
                     
@@ -712,50 +773,81 @@  discard block
 block discarded – undo
                 $date_paques = easter_date($annee);
                 $jour_paques = date("d", $date_paques);
                 $mois_paques = date("m", $date_paques);
-                if ($jour_paques == $jour && $mois_paques == $mois)
-                    $ferie = true;
+                if ($jour_paques == $jour && $mois_paques == $mois) {
+                                    $ferie = true;
+                }
                 // Paques
             }
 
             if ($countrycode == 'IN') {
                 $countryfound = 1;
 
-                if ($jour == 1 && $mois == 1)
-                    $ferie = true; // New Year's Day
-                if ($jour == 26 && $mois == 1)
-                    $ferie = true; // Republic Day
-                if ($jour == 1 && $mois == 5)
-                    $ferie = true; // May Day
-                if ($jour == 15 && $mois == 8)
-                    $ferie = true; // Independence Day
-                if ($jour == 2 && $mois == 10)
-                    $ferie = true; // Gandhi Jayanti
-                if ($jour == 25 && $mois == 12)
-                    $ferie = true; // Christmas
+                if ($jour == 1 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // New Year's Day
+                if ($jour == 26 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Republic Day
+                if ($jour == 1 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // May Day
+                if ($jour == 15 && $mois == 8) {
+                                    $ferie = true;
+                }
+                // Independence Day
+                if ($jour == 2 && $mois == 10) {
+                                    $ferie = true;
+                }
+                // Gandhi Jayanti
+                if ($jour == 25 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Christmas
             }
 
             if ($countrycode == 'ES') {
                 $countryfound = 1;
 
                 // Definition des dates feriees fixes
-                if ($jour == 1 && $mois == 1)
-                    $ferie = true; // Año nuevo
-                if ($jour == 6 && $mois == 1)
-                    $ferie = true; // Día Reyes
-                if ($jour == 1 && $mois == 5)
-                    $ferie = true; // 1 Mayo
-                if ($jour == 15 && $mois == 8)
-                    $ferie = true; // 15 Agosto
-                if ($jour == 12 && $mois == 10)
-                    $ferie = true; // Día Hispanidad
-                if ($jour == 1 && $mois == 11)
-                    $ferie = true; // 1 noviembre
-                if ($jour == 6 && $mois == 12)
-                    $ferie = true; // Constitución
-                if ($jour == 8 && $mois == 12)
-                    $ferie = true; // Inmaculada
-                if ($jour == 25 && $mois == 12)
-                    $ferie = true; // 25 diciembre
+                if ($jour == 1 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Año nuevo
+                if ($jour == 6 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Día Reyes
+                if ($jour == 1 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // 1 Mayo
+                if ($jour == 15 && $mois == 8) {
+                                    $ferie = true;
+                }
+                // 15 Agosto
+                if ($jour == 12 && $mois == 10) {
+                                    $ferie = true;
+                }
+                // Día Hispanidad
+                if ($jour == 1 && $mois == 11) {
+                                    $ferie = true;
+                }
+                // 1 noviembre
+                if ($jour == 6 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Constitución
+                if ($jour == 8 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Inmaculada
+                if ($jour == 25 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // 25 diciembre
 
 
                     
@@ -763,8 +855,9 @@  discard block
 block discarded – undo
                 $date_paques = easter_date($annee);
                 $jour_paques = date("d", $date_paques);
                 $mois_paques = date("m", $date_paques);
-                if ($jour_paques == $jour && $mois_paques == $mois)
-                    $ferie = true;
+                if ($jour_paques == $jour && $mois_paques == $mois) {
+                                    $ferie = true;
+                }
                 // Paques
                 // Viernes Santo
                 $date_viernes = mktime(
@@ -772,8 +865,9 @@  discard block
 block discarded – undo
                 );
                 $jour_viernes = date("d", $date_viernes);
                 $mois_viernes = date("m", $date_viernes);
-                if ($jour_viernes == $jour && $mois_viernes == $mois)
-                    $ferie = true;
+                if ($jour_viernes == $jour && $mois_viernes == $mois) {
+                                    $ferie = true;
+                }
                 //Viernes Santo
             }
 
@@ -781,28 +875,50 @@  discard block
 block discarded – undo
                 $countryfound = 1;
 
                 // Definition des dates feriees fixes
-                if ($jour == 1 && $mois == 1)
-                    $ferie = true; // Neujahr
-                if ($jour == 6 && $mois == 1)
-                    $ferie = true; // Hl. 3 Koenige
-                if ($jour == 1 && $mois == 5)
-                    $ferie = true; // 1. Mai
-                if ($jour == 15 && $mois == 8)
-                    $ferie = true; // Mariae Himmelfahrt
-                if ($jour == 26 && $mois == 10)
-                    $ferie = true; // 26. Oktober
-                if ($jour == 1 && $mois == 11)
-                    $ferie = true; // Allerheiligen
-                if ($jour == 8 && $mois == 12)
-                    $ferie = true; // Mariae Empfaengnis
-                if ($jour == 24 && $mois == 12)
-                    $ferie = true; // Heilig abend
-                if ($jour == 25 && $mois == 12)
-                    $ferie = true; // Christtag
-                if ($jour == 26 && $mois == 12)
-                    $ferie = true; // Stefanietag
-                if ($jour == 31 && $mois == 12)
-                    $ferie = true; // Silvester
+                if ($jour == 1 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Neujahr
+                if ($jour == 6 && $mois == 1) {
+                                    $ferie = true;
+                }
+                // Hl. 3 Koenige
+                if ($jour == 1 && $mois == 5) {
+                                    $ferie = true;
+                }
+                // 1. Mai
+                if ($jour == 15 && $mois == 8) {
+                                    $ferie = true;
+                }
+                // Mariae Himmelfahrt
+                if ($jour == 26 && $mois == 10) {
+                                    $ferie = true;
+                }
+                // 26. Oktober
+                if ($jour == 1 && $mois == 11) {
+                                    $ferie = true;
+                }
+                // Allerheiligen
+                if ($jour == 8 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Mariae Empfaengnis
+                if ($jour == 24 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Heilig abend
+                if ($jour == 25 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Christtag
+                if ($jour == 26 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Stefanietag
+                if ($jour == 31 && $mois == 12) {
+                                    $ferie = true;
+                }
+                // Silvester
 
 
                     
@@ -810,8 +926,9 @@  discard block
 block discarded – undo
                 $date_paques = easter_date($annee);
                 $jour_paques = date("d", $date_paques);
                 $mois_paques = date("m", $date_paques);
-                if ($jour_paques == $jour && $mois_paques == $mois)
-                    $ferie = true;
+                if ($jour_paques == $jour && $mois_paques == $mois) {
+                                    $ferie = true;
+                }
                 // Easter sunday
                 // Monday after easter
                 $date_eastermonday = mktime(
@@ -819,8 +936,9 @@  discard block
 block discarded – undo
                 );
                 $jour_eastermonday = date("d", $date_eastermonday);
                 $mois_eastermonday = date("m", $date_eastermonday);
-                if ($jour_eastermonday == $jour && $mois_eastermonday == $mois)
-                    $ferie = true;
+                if ($jour_eastermonday == $jour && $mois_eastermonday == $mois) {
+                                    $ferie = true;
+                }
                 // Easter monday
                 // Christi Himmelfahrt (39 days after easter sunday)
                 $date_ch = mktime(
@@ -828,8 +946,9 @@  discard block
 block discarded – undo
                 );
                 $jour_ch = date("d", $date_ch);
                 $mois_ch = date("m", $date_ch);
-                if ($jour_ch == $jour && $mois_ch == $mois)
-                    $ferie = true;
+                if ($jour_ch == $jour && $mois_ch == $mois) {
+                                    $ferie = true;
+                }
                 // Christi Himmelfahrt
                 // Pfingsten (50 days after easter sunday)
                 $date_pentecote = mktime(
@@ -837,8 +956,9 @@  discard block
 block discarded – undo
                 );
                 $jour_pentecote = date("d", $date_pentecote);
                 $mois_pentecote = date("m", $date_pentecote);
-                if ($jour_pentecote == $jour && $mois_pentecote == $mois)
-                    $ferie = true;
+                if ($jour_pentecote == $jour && $mois_pentecote == $mois) {
+                                    $ferie = true;
+                }
                 // Pfingsten
                 // Fronleichnam (60 days after easter sunday)
                 $date_fronleichnam = mktime(
@@ -846,8 +966,9 @@  discard block
 block discarded – undo
                 );
                 $jour_fronleichnam = date("d", $date_fronleichnam);
                 $mois_fronleichnam = date("m", $date_fronleichnam);
-                if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois)
-                    $ferie = true;
+                if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) {
+                                    $ferie = true;
+                }
                 // Fronleichnam
             }
 
@@ -855,14 +976,16 @@  discard block
 block discarded – undo
             if ($includesaturdayandsunday) {
                 $jour_julien = unixtojd($timestampStart);
                 $jour_semaine = jddayofweek($jour_julien, 0);
-                if ($jour_semaine == 0 || $jour_semaine == 6)
-                    $ferie = true;
+                if ($jour_semaine == 0 || $jour_semaine == 6) {
+                                    $ferie = true;
+                }
                 //Saturday (6) and Sunday (0)
             }
 
             // On incremente compteur
-            if ($ferie)
-                $nbFerie++;
+            if ($ferie) {
+                            $nbFerie++;
+            }
 
             // Increase number of days (on go up into loop)
             $timestampStart = dol_time_plus_duree($timestampStart, 1, 'd');
@@ -914,16 +1037,19 @@  discard block
 block discarded – undo
     {
         global $langs, $mysoc;
 
-        if (empty($country_code))
-            $country_code = $mysoc->country_code;
+        if (empty($country_code)) {
+                    $country_code = $mysoc->country_code;
+        }
 
         dol_syslog('num_open_day timestampStart=' . $timestampStart . ' timestampEnd=' . $timestampEnd . ' bit=' . $lastday . ' country_code=' . $country_code);
 
         // Check parameters
-        if (!is_int($timestampStart) && !is_float($timestampStart))
-            return 'ErrorBadParameter_num_open_day';
-        if (!is_int($timestampEnd) && !is_float($timestampEnd))
-            return 'ErrorBadParameter_num_open_day';
+        if (!is_int($timestampStart) && !is_float($timestampStart)) {
+                    return 'ErrorBadParameter_num_open_day';
+        }
+        if (!is_int($timestampEnd) && !is_float($timestampEnd)) {
+                    return 'ErrorBadParameter_num_open_day';
+        }
 
         //print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
         if ($timestampStart < $timestampEnd) {
@@ -931,17 +1057,17 @@  discard block
 block discarded – undo
             $numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
             $nbOpenDay = $numdays - $numholidays;
             $nbOpenDay .= " " . $langs->trans("Days");
-            if ($inhour == 1 && $nbOpenDay <= 3)
-                $nbOpenDay = $nbOpenDay * 24 . $langs->trans("HourShort");
+            if ($inhour == 1 && $nbOpenDay <= 3) {
+                            $nbOpenDay = $nbOpenDay * 24 . $langs->trans("HourShort");
+            }
             return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-        }
-        elseif ($timestampStart == $timestampEnd) {
+        } elseif ($timestampStart == $timestampEnd) {
             $nbOpenDay = $lastday;
-            if ($inhour == 1)
-                $nbOpenDay = $nbOpenDay * 24 . $langs->trans("HourShort");
+            if ($inhour == 1) {
+                            $nbOpenDay = $nbOpenDay * 24 . $langs->trans("HourShort");
+            }
             return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-        }
-        else {
+        } else {
             return $langs->trans("Error");
         }
     }

Please login to merge, or discard this patch.

		@@ -196,24 +196,29 @@ discard block
		block discarded – undo
196	196	// Get more permissions checks from hooks
197	197	$parameters = array('features' => $features, 'objectid' => $objectid, 'idtype' => $dbt_select);
198	198	$reshook = $hookmanager->executeHooks('restrictedArea', $parameters);
199		- if (!empty($hookmanager->resArray['result']))
200		- return true;
201		- if ($reshook > 0)
202		- return false;
	199	+ if (!empty($hookmanager->resArray['result'])) {
	200	+ return true;
	201	+ }
	202	+ if ($reshook > 0) {
	203	+ return false;
	204	+ }
203	205
204		- if ($dbt_select != 'rowid' && $dbt_select != 'id')
205		- $objectid = "'" . $objectid . "'";
	206	+ if ($dbt_select != 'rowid' && $dbt_select != 'id') {
	207	+ $objectid = "'" . $objectid . "'";
	208	+ }
206	209
207	210	// Features/modules to check
208	211	$featuresarray = array($features);
209		- if (preg_match('/&/', $features))
210		- $featuresarray = explode("&", $features);
211		- else if (preg_match('/\\|/', $features))
212		- $featuresarray = explode("\|", $features);
	212	+ if (preg_match('/&/', $features)) {
	213	+ $featuresarray = explode("&", $features);
	214	+ } else if (preg_match('/\\|/', $features)) {
	215	+ $featuresarray = explode("\|", $features);
	216	+ }
213	217
214	218	// More subfeatures to check
215		- if (!empty($feature2))
216		- $feature2 = explode("\|", $feature2);
	219	+ if (!empty($feature2)) {
	220	+ $feature2 = explode("\|", $feature2);
	221	+ }
217	222
218	223	// More parameters
219	224	$params = explode('&', $tableandshare);
		@@ -227,8 +232,9 @@ discard block
		block discarded – undo
227	232	$nbko = 0;
228	233	foreach ($featuresarray as $feature) { // first we check nb of test ko
229	234	$featureforlistofmodule = $feature;
230		- if ($featureforlistofmodule == 'produit')
231		- $featureforlistofmodule = 'product';
	235	+ if ($featureforlistofmodule == 'produit') {
	236	+ $featureforlistofmodule = 'product';
	237	+ }
232	238	if (!empty($user->societe_id) && !empty(Globals::$conf->global->MAIN_MODULES_FOR_EXTERNAL) && !in_array($featureforlistofmodule, $listofmodules)) { // If limits on modules for external users, module must be into list of modules for external users
233	239	$readok = 0;
234	240	$nbko++;
		@@ -290,11 +296,13 @@ discard block
		block discarded – undo
290	296	}
291	297
292	298	// If a or and at least one ok
293		- if (preg_match('/\\|/', $features) && $nbko < count($featuresarray))
294		- $readok = 1;
	299	+ if (preg_match('/\\|/', $features) && $nbko < count($featuresarray)) {
	300	+ $readok = 1;
	301	+ }
295	302
296		- if (!$readok)
297		- accessforbidden();
	303	+ if (!$readok) {
	304	+ accessforbidden();
	305	+ }
298	306	//print "Read access is ok";
299	307	// Check write permission from module (we need to know write permission to create but also to delete drafts record)
300	308	$createok = 1;
		@@ -351,22 +359,26 @@ discard block
		block discarded – undo
351	359	}
352	360
353	361	// If a or and at least one ok
354		- if (preg_match('/\\|/', $features) && $nbko < count($featuresarray))
355		- $createok = 1;
	362	+ if (preg_match('/\\|/', $features) && $nbko < count($featuresarray)) {
	363	+ $createok = 1;
	364	+ }
356	365
357		- if (GETPOST('action', 'aZ09') == 'create' && !$createok)
358		- accessforbidden();
	366	+ if (GETPOST('action', 'aZ09') == 'create' && !$createok) {
	367	+ accessforbidden();
	368	+ }
359	369	//print "Write access is ok";
360	370	}
361	371
362	372	// Check create user permission
363	373	$createuserok = 1;
364	374	if (GETPOST('action', 'aZ09') == 'confirm_create_user' && GETPOST("confirm", 'aZ09') == 'yes') {
365		- if (!$user->rights->user->user->creer)
366		- $createuserok = 0;
	375	+ if (!$user->rights->user->user->creer) {
	376	+ $createuserok = 0;
	377	+ }
367	378
368		- if (!$createuserok)
369		- accessforbidden();
	379	+ if (!$createuserok) {
	380	+ accessforbidden();
	381	+ }
370	382	//print "Create user access is ok";
371	383	}
372	384
		@@ -376,62 +388,66 @@ discard block
		block discarded – undo
376	388	if ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') \|\| GETPOST("action", "aZ09") == 'delete') {
377	389	foreach ($featuresarray as $feature) {
378	390	if ($feature == 'contact') {
379		- if (!$user->rights->societe->contact->supprimer)
380		- $deleteok = 0;
381		- }
382		- else if ($feature == 'produit\|service') {
383		- if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer)
384		- $deleteok = 0;
385		- }
386		- else if ($feature == 'commande_fournisseur') {
387		- if (!$user->rights->fournisseur->commande->supprimer)
388		- $deleteok = 0;
389		- }
390		- else if ($feature == 'banque') {
391		- if (!$user->rights->banque->modifier)
392		- $deleteok = 0;
393		- }
394		- else if ($feature == 'cheque') {
395		- if (!$user->rights->banque->cheque)
396		- $deleteok = 0;
397		- }
398		- else if ($feature == 'ecm') {
399		- if (!$user->rights->ecm->upload)
400		- $deleteok = 0;
401		- }
402		- else if ($feature == 'ftp') {
403		- if (!$user->rights->ftp->write)
404		- $deleteok = 0;
405		- }else if ($feature == 'salaries') {
406		- if (!$user->rights->salaries->delete)
407		- $deleteok = 0;
408		- }
409		- else if ($feature == 'salaries') {
410		- if (!$user->rights->salaries->delete)
411		- $deleteok = 0;
412		- }
413		- else if (!empty($feature2)) { // This should be used for permissions on 2 levels
	391	+ if (!$user->rights->societe->contact->supprimer) {
	392	+ $deleteok = 0;
	393	+ }
	394	+ } else if ($feature == 'produit\|service') {
	395	+ if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) {
	396	+ $deleteok = 0;
	397	+ }
	398	+ } else if ($feature == 'commande_fournisseur') {
	399	+ if (!$user->rights->fournisseur->commande->supprimer) {
	400	+ $deleteok = 0;
	401	+ }
	402	+ } else if ($feature == 'banque') {
	403	+ if (!$user->rights->banque->modifier) {
	404	+ $deleteok = 0;
	405	+ }
	406	+ } else if ($feature == 'cheque') {
	407	+ if (!$user->rights->banque->cheque) {
	408	+ $deleteok = 0;
	409	+ }
	410	+ } else if ($feature == 'ecm') {
	411	+ if (!$user->rights->ecm->upload) {
	412	+ $deleteok = 0;
	413	+ }
	414	+ } else if ($feature == 'ftp') {
	415	+ if (!$user->rights->ftp->write) {
	416	+ $deleteok = 0;
	417	+ }
	418	+ } else if ($feature == 'salaries') {
	419	+ if (!$user->rights->salaries->delete) {
	420	+ $deleteok = 0;
	421	+ }
	422	+ } else if ($feature == 'salaries') {
	423	+ if (!$user->rights->salaries->delete) {
	424	+ $deleteok = 0;
	425	+ }
	426	+ } else if (!empty($feature2)) { // This should be used for permissions on 2 levels
414	427	foreach ($feature2 as $subfeature) {
415		- if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete))
416		- $deleteok = 0;
417		- else {
	428	+ if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) {
	429	+ $deleteok = 0;
	430	+ } else {
418	431	$deleteok = 1;
419	432	break;
420	433	} // For bypass the second test if the first is ok
421	434	}
422	435	} else if (!empty($feature)) { // This is used for permissions on 1 level
423	436	//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
424		- if (empty($user->rights->$feature->supprimer) && empty($user->rights->$feature->delete) && empty($user->rights->$feature->run))
425		- $deleteok = 0;
	437	+ if (empty($user->rights->$feature->supprimer) && empty($user->rights->$feature->delete) && empty($user->rights->$feature->run)) {
	438	+ $deleteok = 0;
	439	+ }
426	440	}
427	441	}
428	442
429	443	// If a or and at least one ok
430		- if (preg_match('/\\|/', $features) && $nbko < count($featuresarray))
431		- $deleteok = 1;
	444	+ if (preg_match('/\\|/', $features) && $nbko < count($featuresarray)) {
	445	+ $deleteok = 1;
	446	+ }
432	447
433		- if (!$deleteok && !($isdraft && $createok))
434		- accessforbidden();
	448	+ if (!$deleteok && !($isdraft && $createok)) {
	449	+ accessforbidden();
	450	+ }
435	451	//print "Delete access is ok";
436	452	}
437	453
		@@ -472,12 +488,15 @@ discard block
		block discarded – undo
472	488	$sql = '';
473	489
474	490	// For backward compatibility
475		- if ($feature == 'member')
476		- $feature = 'adherent';
477		- if ($feature == 'project')
478		- $feature = 'projet';
479		- if ($feature == 'task')
480		- $feature = 'projet_task';
	491	+ if ($feature == 'member') {
	492	+ $feature = 'adherent';
	493	+ }
	494	+ if ($feature == 'project') {
	495	+ $feature = 'projet';
	496	+ }
	497	+ if ($feature == 'task') {
	498	+ $feature = 'projet_task';
	499	+ }
481	500
482	501	$check = array('adherent', 'banque', 'don', 'user', 'usergroup', 'product', 'produit', 'service', 'produit\|service', 'categorie', 'resource'); // Test on entity only (Objects with no link to company)
483	502	$checksoc = array('societe'); // Test for societe object
		@@ -519,8 +538,9 @@ discard block
		block discarded – undo
519	538	} else if (in_array($feature, $checksoc)) { // We check feature = checksoc
520	539	// If external user: Check permission for external users
521	540	if ($user->socid > 0) {
522		- if ($user->socid <> $objectid)
523		- return false;
	541	+ if ($user->socid <> $objectid) {
	542	+ return false;
	543	+ }
524	544	}
525	545	// If internal user: Check permission for internal users that are restricted on their objects
526	546	else if (!empty(Globals::$conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {
		@@ -569,10 +589,10 @@ discard block
		block discarded – undo
569	589	$projectstatic = new Project($db);
570	590	$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
571	591	$tmparray = explode(',', $tmps);
572		- if (!in_array($objectid, $tmparray))
573		- return false;
574		- }
575		- else {
	592	+ if (!in_array($objectid, $tmparray)) {
	593	+ return false;
	594	+ }
	595	+ } else {
576	596	$sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";
577	597	$sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
578	598	$sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";
		@@ -587,10 +607,10 @@ discard block
		block discarded – undo
587	607	$projectstatic = new Project($db);
588	608	$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
589	609	$tmparray = explode(',', $tmps);
590		- if (!in_array($task->fk_project, $tmparray))
591		- return false;
592		- }
593		- else {
	610	+ if (!in_array($task->fk_project, $tmparray)) {
	611	+ return false;
	612	+ }
	613	+ } else {
594	614	$sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";
595	615	$sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
596	616	$sql .= " WHERE dbt." . $dbt_select . " IN (" . $objectid . ")";
		@@ -599,8 +619,9 @@ discard block
		block discarded – undo
599	619	} else if (!in_array($feature, $nocheck)) { // By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
600	620	// If external user: Check permission for external users
601	621	if ($user->socid > 0) {
602		- if (empty($dbt_keyfield))
603		- dol_print_error('', 'Param dbt_keyfield is required but not defined');
	622	+ if (empty($dbt_keyfield)) {
	623	+ dol_print_error('', 'Param dbt_keyfield is required but not defined');
	624	+ }
604	625	$sql = "SELECT COUNT(dbt." . $dbt_keyfield . ") as nb";
605	626	$sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
606	627	$sql .= " WHERE dbt.rowid IN (" . $objectid . ")";
		@@ -608,8 +629,9 @@ discard block
		block discarded – undo
608	629	}
609	630	// If internal user: Check permission for internal users that are restricted on their objects
610	631	else if (!empty(Globals::$conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {
611		- if (empty($dbt_keyfield))
612		- dol_print_error('', 'Param dbt_keyfield is required but not defined');
	632	+ if (empty($dbt_keyfield)) {
	633	+ dol_print_error('', 'Param dbt_keyfield is required but not defined');
	634	+ }
613	635	$sql = "SELECT COUNT(sc.fk_soc) as nb";
614	636	$sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
615	637	$sql .= ", " . MAIN_DB_PREFIX . "societe as s";
		@@ -633,10 +655,10 @@ discard block
		block discarded – undo
633	655	$resql = $db->query($sql);
634	656	if ($resql) {
635	657	$obj = $db->fetch_object($resql);
636		- if (!$obj \|\| $obj->nb < count(explode(',', $objectid)))
637		- return false;
638		- }
639		- else {
	658	+ if (!$obj \|\| $obj->nb < count(explode(',', $objectid))) {
	659	+ return false;
	660	+ }
	661	+ } else {
640	662	return false;
641	663	}
642	664	}
		@@ -666,16 +688,18 @@ discard block
		block discarded – undo
666	688	$langs->load("errors");
667	689
668	690	if ($printheader) {
669		- if (function_exists("llxHeader"))
670		- llxHeader('');
671		- else if (function_exists("llxHeaderVierge"))
672		- llxHeaderVierge('');
	691	+ if (function_exists("llxHeader")) {
	692	+ llxHeader('');
	693	+ } else if (function_exists("llxHeaderVierge")) {
	694	+ llxHeaderVierge('');
	695	+ }
673	696	}
674	697	print '<div class="error">';
675		- if (!$message)
676		- print $langs->trans("ErrorForbidden");
677		- else
678		- print $message;
	698	+ if (!$message) {
	699	+ print $langs->trans("ErrorForbidden");
	700	+ } else {
	701	+ print $message;
	702	+ }
679	703	print '</div>';
680	704	print '<br>';
681	705	if (empty($showonlymessage)) {
		@@ -686,8 +710,9 @@ discard block
		block discarded – undo
686	710	print $langs->trans("ErrorForbidden3");
687	711	}
688	712	}
689		- if ($printfooter && function_exists("llxFooter"))
690		- llxFooter();
	713	+ if ($printfooter && function_exists("llxFooter")) {
	714	+ llxFooter();
	715	+ }
691	716	exit(0);
692	717	}
693	718	}

		@@ -303,8 +303,9 @@ discard block
		block discarded – undo
303	303	if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") {
304	304	$classname = 'class="tmenusel"';
305	305	$_SESSION['idmenu'] = '';
306		- } else
307		- $classname = 'class="tmenu"';
	306	+ } else {
	307	+ $classname = 'class="tmenu"';
	308	+ }
308	309	$idsel = 'bank';
309	310
310	311	//$menu->add('/compta/bank/list.php?mainmenu=bank&leftmenu=', Globals::$langs->trans("MenuBankCash"), 0, $showmode, $atarget, "bank", '', 52, $id, $idsel, $classname);
		@@ -1383,25 +1384,33 @@ discard block
		block discarded – undo
1383	1384	$nature = '';
1384	1385
1385	1386	// Must match array $sourceList defined into journals_list.php
1386		- if ($objp->nature == 2 && !empty(Globals::$conf->facture->enabled))
1387		- $nature = "sells";
1388		- if ($objp->nature == 3 && !empty(Globals::$conf->fournisseur->enabled))
1389		- $nature = "purchases";
1390		- if ($objp->nature == 4 && !empty(Globals::$conf->banque->enabled))
1391		- $nature = "bank";
1392		- if ($objp->nature == 5 && !empty(Globals::$conf->expensereport->enabled))
1393		- $nature = "expensereports";
1394		- if ($objp->nature == 1)
1395		- $nature = "various";
1396		- if ($objp->nature == 8)
1397		- $nature = "inventory";
1398		- if ($objp->nature == 9)
1399		- $nature = "hasnew";
	1387	+ if ($objp->nature == 2 && !empty(Globals::$conf->facture->enabled)) {
	1388	+ $nature = "sells";
	1389	+ }
	1390	+ if ($objp->nature == 3 && !empty(Globals::$conf->fournisseur->enabled)) {
	1391	+ $nature = "purchases";
	1392	+ }
	1393	+ if ($objp->nature == 4 && !empty(Globals::$conf->banque->enabled)) {
	1394	+ $nature = "bank";
	1395	+ }
	1396	+ if ($objp->nature == 5 && !empty(Globals::$conf->expensereport->enabled)) {
	1397	+ $nature = "expensereports";
	1398	+ }
	1399	+ if ($objp->nature == 1) {
	1400	+ $nature = "various";
	1401	+ }
	1402	+ if ($objp->nature == 8) {
	1403	+ $nature = "inventory";
	1404	+ }
	1405	+ if ($objp->nature == 9) {
	1406	+ $nature = "hasnew";
	1407	+ }
1400	1408
1401	1409	// To enable when page exists
1402	1410	if (empty(Globals::$conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {
1403		- if ($nature == 'various' \|\| $nature == 'hasnew' \|\| $nature == 'inventory')
1404		- $nature = '';
	1411	+ if ($nature == 'various' \|\| $nature == 'hasnew' \|\| $nature == 'inventory') {
	1412	+ $nature = '';
	1413	+ }
1405	1414	}
1406	1415
1407	1416	if ($nature) {
		@@ -1416,8 +1425,9 @@ discard block
		block discarded – undo
1416	1425	// Should not happend. Entries are added
1417	1426	$newmenu->add('', Globals::$langs->trans("NoJournalDefined"), 2, Globals::$user->rights->accounting->comptarapport->lire);
1418	1427	}
1419		- } else
1420		- dol_print_error(Config::$dbEngine);
	1428	+ } else {
	1429	+ dol_print_error(Config::$dbEngine);
	1430	+ }
1421	1431	Config::$dbEngine->free($resql);
1422	1432	}
1423	1433
		@@ -1451,8 +1461,10 @@ discard block
		block discarded – undo
1451	1461	}
1452	1462
1453	1463	$modecompta = 'CREANCES-DETTES';
1454		- if (!empty(Globals::$conf->accounting->enabled) && !empty(Globals::$user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')
1455		- $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
	1464	+ if (!empty(Globals::$conf->accounting->enabled) && !empty(Globals::$user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
	1465	+ $modecompta = 'BOOKKEEPING';
	1466	+ }
	1467	+ // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
1456	1468	if ($modecompta) {
1457	1469	if ($usemenuhider \|\| empty($leftmenu) \|\| preg_match('/accountancy_report/', $leftmenu)) {
1458	1470	/*

		@@ -44,9 +44,16 @@ discard block
		block discarded – undo
44	44
45	45
46	46	// Chargement des includes principaux de librairies communes
47		-if (! defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php'; // Need 500ko memory
48		-if (! defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
49		-if (! defined('NOREQUIRESOC')) require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
	47	+if (! defined('NOREQUIREUSER')) {
	48	+ require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
	49	+}
	50	+// Need 500ko memory
	51	+if (! defined('NOREQUIRETRAN')) {
	52	+ require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
	53	+}
	54	+if (! defined('NOREQUIRESOC')) {
	55	+ require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
	56	+}
50	57
51	58
52	59
		@@ -78,26 +85,32 @@ discard block
		block discarded – undo
78	85	*/
79	86
80	87	// By default conf->entity is 1, but we change this if we ask another value.
81		-if (session_id() && ! empty($_SESSION["dol_entity"])) // Entity inside an opened session
	88	+if (session_id() && ! empty($_SESSION["dol_entity"])) {
	89	+ // Entity inside an opened session
82	90	{
83		- Globals::$conf->entity = $_SESSION["dol_entity"];
84		-}
85		-else if (! empty($_ENV["dol_entity"])) // Entity inside a CLI script
	91	+ Globals::$conf->entity = $_SESSION["dol_entity"];
	92	+}
	93	+} else if (! empty($_ENV["dol_entity"])) {
	94	+ // Entity inside a CLI script
86	95	{
87		- Globals::$conf->entity = $_ENV["dol_entity"];
88		-}
89		-else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int')) // Just after a login page
	96	+ Globals::$conf->entity = $_ENV["dol_entity"];
	97	+}
	98	+} else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int')) {
	99	+ // Just after a login page
90	100	{
91		- Globals::$conf->entity = GETPOST("entity", 'int');
92		-}
93		-else if (defined('DOLENTITY') && is_numeric(DOLENTITY)) // For public page with MultiCompany module
	101	+ Globals::$conf->entity = GETPOST("entity", 'int');
	102	+}
	103	+} else if (defined('DOLENTITY') && is_numeric(DOLENTITY)) {
	104	+ // For public page with MultiCompany module
94	105	{
95		- Globals::$conf->entity = DOLENTITY;
	106	+ Globals::$conf->entity = DOLENTITY;
	107	+}
96	108	}
97	109
98	110	// Sanitize entity
99		-if (!is_numeric(Globals::$conf->entity))
100		- Globals::$conf->entity = 1;
	111	+if (!is_numeric(Globals::$conf->entity)) {
	112	+ Globals::$conf->entity = 1;
	113	+}
101	114
102	115	if (! defined('NOREQUIREDB'))
103	116	{
		@@ -123,13 +136,26 @@ discard block
		block discarded – undo
123	136	// If software has been locked. Only login Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
124	137	if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
125	138	$ok=0;
126		- if ((! session_id() \|\| ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)
127		- elseif (isset($_POST["username"]) && $_POST["username"] == Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED)
128		- $ok = 1; // We let working pages that is a login submission (login submit, to allow login by admin)
129		- elseif (defined('NOREQUIREDB')) $ok=1; // We let working pages that don't need database access (xxx.css.php)
130		- elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1; // We let working pages that ask to work even if only login enabled (logout.php)
131		- elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED)
132		- $ok = 1; // We let working if user is allowed admin
	139	+ if ((! session_id() \|\| ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) {
	140	+ $ok=1;
	141	+ }
	142	+ // We let working pages if not logged and inside a web browser (login form, to allow login by admin)
	143	+ elseif (isset($_POST["username"]) && $_POST["username"] == Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
	144	+ $ok = 1;
	145	+ }
	146	+ // We let working pages that is a login submission (login submit, to allow login by admin)
	147	+ elseif (defined('NOREQUIREDB')) {
	148	+ $ok=1;
	149	+ }
	150	+ // We let working pages that don't need database access (xxx.css.php)
	151	+ elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) {
	152	+ $ok=1;
	153	+ }
	154	+ // We let working pages that ask to work even if only login enabled (logout.php)
	155	+ elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
	156	+ $ok = 1;
	157	+ }
	158	+ // We let working if user is allowed admin
133	159	if (! $ok)
134	160	{
135	161	if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
		@@ -137,8 +163,7 @@ discard block
		block discarded – undo
137	163	print 'You are logged with user "' . $_SESSION["dol_login"] . '" and only administrator user "' . Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED . '" is allowed to connect for the moment.' . "\n";
138	164	$nexturl=DOL_URL_ROOT.'/user/logout.php';
139	165	print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
140		- }
141		- else
	166	+ } else
142	167	{
143	168	print 'Sorry, your application is offline. Only administrator user "' . Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED . '" is allowed to connect for the moment.' . "\n";
144	169	$nexturl=DOL_URL_ROOT.'/';
		@@ -157,21 +182,26 @@ discard block
		block discarded – undo
157	182	$mysoc->setMysoc($conf);
158	183
159	184	// For some countries, we need to invert our address with customer address
160		- if ($mysoc->country_code == 'DE' && !isset(Globals::$conf->global->MAIN_INVERT_SENDER_RECIPIENT))
161		- Globals::$conf->global->MAIN_INVERT_SENDER_RECIPIENT = 1;
162		-}
	185	+ if ($mysoc->country_code == 'DE' && !isset(Globals::$conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
	186	+ Globals::$conf->global->MAIN_INVERT_SENDER_RECIPIENT = 1;
	187	+ }
	188	+ }
163	189
164	190
165	191	// Set default language (must be after the setValues setting global Globals::$conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
166	192	if (! defined('NOREQUIRETRAN'))
167	193	{
168	194	$langcode = (GETPOST('lang', 'aZ09') ? GETPOST('lang', 'aZ09', 1) : (empty(Globals::$conf->global->MAIN_LANG_DEFAULT) ? 'auto' : Globals::$conf->global->MAIN_LANG_DEFAULT));
169		- if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');
	195	+ if (defined('MAIN_LANG_DEFAULT')) {
	196	+ $langcode=constant('MAIN_LANG_DEFAULT');
	197	+ }
170	198	$langs->setDefaultLang($langcode);
171	199	}
172	200
173	201
174	202
175	203
176		-if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');
	204	+if (! defined('MAIN_LABEL_MENTION_NPR') ) {
	205	+ define('MAIN_LABEL_MENTION_NPR','NPR');
	206	+}
177	207

		@@ -141,14 +141,16 @@
		block discarded – undo
141	141	$reshook = Globals::$hookManager->executeHooks('addSearchEntry', $parameters);
142	142	if (empty($reshook)) {
143	143	$arrayresult = array_merge($arrayresult, Globals::$hookManager->resArray);
144		- } else
145		- $arrayresult = Globals::$hookManager->resArray;
	144	+ } else {
	145	+ $arrayresult = Globals::$hookManager->resArray;
	146	+ }
146	147
147	148	// This allow to keep a search entry to the top
148	149	if (!empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
149	150	$key = 'searchinto' . $conf->global->DEFAULT_SEARCH_INTO_MODULE;
150		- if (array_key_exists($key, $arrayresult))
151		- $arrayresult[$key]['position'] = -10;
	151	+ if (array_key_exists($key, $arrayresult)) {
	152	+ $arrayresult[$key]['position'] = -10;
	153	+ }
152	154	}
153	155
154	156	// Sort on position

alxarafe / alixar

Push — master ( 1007d6...492b54 )

Status

Category

Braces +149 added lines, -89 removed lines patch added patch discarded remove patch

Braces +726 added lines, -385 removed lines patch added patch discarded remove patch

Braces +129 added lines, -104 removed lines patch added patch discarded remove patch

Braces +1399 added lines, -1009 removed lines patch added patch discarded remove patch

Braces +34 added lines, -22 removed lines patch added patch discarded remove patch

Braces +60 added lines, -30 removed lines patch added patch discarded remove patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

Braces +310 added lines, -184 removed lines patch added patch discarded remove patch