alxarafe / alixar

dolibarr/htdocs/core/lib/invoice2.lib.php

Braces +104 added lines, -46 removed lines

@@ -60,8 +60,11 @@ 
 	}
 	if (in_array('date',$filter))
 	{
-		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-		else $sqlwhere.=" AND";
+		if (empty($sqlwhere)) {
+		    $sqlwhere=' WHERE ';
+		} else {
+		    $sqlwhere.=" AND";
+		}
 		$sqlwhere.= " f.fk_statut > 0";
 		$sqlwhere.= " AND f.datef >= '".$db->idate($dateafterdate)."'";
 		$sqlwhere.= " AND f.datef <= '".$db->idate($datebeforedate)."'";
@@ -70,17 +73,25 @@ 
 	if (in_array('nopayment',$filter))
 	{
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
-		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-		else $sqlwhere.=" AND";
+		if (empty($sqlwhere)) {
+		    $sqlwhere=' WHERE ';
+		} else {
+		    $sqlwhere.=" AND";
+		}
 		$sqlwhere.= " f.fk_statut > 0";
 		$sqlwhere.= " AND pf.fk_paiement IS NULL";
 	}
 	if (in_array('payments',$filter) || in_array('bank',$filter))
 	{
 		$sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-		if (in_array('bank',$filter)) $sql.= ", ".MAIN_DB_PREFIX."bank as b";
-		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-		else $sqlwhere.=" AND";
+		if (in_array('bank',$filter)) {
+		    $sql.= ", ".MAIN_DB_PREFIX."bank as b";
+		}
+		if (empty($sqlwhere)) {
+		    $sqlwhere=' WHERE ';
+		} else {
+		    $sqlwhere.=" AND";
+		}
 		$sqlwhere.= " f.fk_statut > 0";
 		$sqlwhere.= " AND f.rowid = pf.fk_facture";
 		$sqlwhere.= " AND pf.fk_paiement = p.rowid";
@@ -98,41 +109,62 @@ 
 	}
 	if (in_array('nodeposit',$filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
+	    if (empty($sqlwhere)) {
+	        $sqlwhere=' WHERE ';
+	    } else {
+	        $sqlwhere.=" AND";
+	    }
 	    $sqlwhere.=' type <> 3';
 	}
 	if (in_array('noreplacement',$filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
+	    if (empty($sqlwhere)) {
+	        $sqlwhere=' WHERE ';
+	    } else {
+	        $sqlwhere.=" AND";
+	    }
 	    $sqlwhere.=' type <> 1';
 	}
 	if (in_array('nocreditnote',$filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
+	    if (empty($sqlwhere)) {
+	        $sqlwhere=' WHERE ';
+	    } else {
+	        $sqlwhere.=" AND";
+	    }
 	    $sqlwhere.=' type <> 2';
 	}
 	if (in_array('excludethirdparties',$filter) && is_array($thirdpartiesid))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
+	    if (empty($sqlwhere)) {
+	        $sqlwhere=' WHERE ';
+	    } else {
+	        $sqlwhere.=" AND";
+	    }
 	    $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')';
 	}
 	if (in_array('onlythirdparties',$filter) && is_array($thirdpartiesid))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
+	    if (empty($sqlwhere)) {
+	        $sqlwhere=' WHERE ';
+	    } else {
+	        $sqlwhere.=" AND";
+	    }
 	    $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')';
 	}
-	if ($sqlwhere) $sql.=$sqlwhere;
-	if ($sqlorder) $sql.=$sqlorder;
+	if ($sqlwhere) {
+	    $sql.=$sqlwhere;
+	}
+	if ($sqlorder) {
+	    $sql.=$sqlorder;
+	}
 
 	//print $sql; exit;
 	dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG);
 
-	if ($usestdout) print '--- start'."\n";
+	if ($usestdout) {
+	    print '--- start'."\n";
+	}
 
 	// Start of transaction
 	//$db->begin();
@@ -175,11 +207,14 @@ 
 					$filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf';
 					if ($regenerate || ! dol_is_file($filename))
 					{
-	            	    if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
+	            	    if ($usestdout) {
+	            	        print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
+	            	    }
 	    				$result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
-					}
-					else {
-					    if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
+					} else {
+					    if ($usestdout) {
+					        print "PDF for invoice ".$obj->ref." already exists\n";
+					    }
 					}
 
 					// Add file into files array
@@ -189,8 +224,11 @@ 
 				if ($result <= 0)
 				{
 					$error++;
-					if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n";
-					else dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR);
+					if ($usestdout) {
+					    print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n";
+					} else {
+					    dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR);
+					}
 				}
 
 	            $cpt++;
@@ -203,8 +241,11 @@ 
 	        $page_hauteur = $formatarray['height'];
 	        $format = array($page_largeur,$page_hauteur);
 
-	        if ($usestdout) print "Using output PDF format ".join('x',$format)."\n";
-	        else dol_syslog("Using output PDF format ".join('x',$format), LOG_ERR);
+	        if ($usestdout) {
+	            print "Using output PDF format ".join('x',$format)."\n";
+	        } else {
+	            dol_syslog("Using output PDF format ".join('x',$format), LOG_ERR);
+	        }
 
 
 	        // Now, build a merged files with all files in $files array
@@ -219,14 +260,19 @@ 
 	        }
 	        $pdf->SetFont(pdf_getPDFFont($langs));
 
-	        if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
+	        if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) {
+	            $pdf->SetCompression(false);
+	        }
 			//$pdf->SetCompression(false);
 
 			// Add all others
 			foreach($files as $file)
 			{
-	            if ($usestdout) print "Merge PDF file for invoice ".$file."\n";
-	            else dol_syslog("Merge PDF file for invoice ".$file);
+	            if ($usestdout) {
+	                print "Merge PDF file for invoice ".$file."\n";
+	            } else {
+	                dol_syslog("Merge PDF file for invoice ".$file);
+	            }
 
 				// Charge un document PDF depuis un fichier.
 				$pagecount = $pdf->setSourceFile($file);
@@ -244,40 +290,52 @@ 
 
 			// Save merged file
 			$filename=$fileprefix;
-			if (empty($filename)) $filename='mergedpdf';
-			if (! empty($filesuffix)) $filename.='_'.$filesuffix;
+			if (empty($filename)) {
+			    $filename='mergedpdf';
+			}
+			if (! empty($filesuffix)) {
+			    $filename.='_'.$filesuffix;
+			}
 			$file=$diroutputpdf.'/'.$filename.'.pdf';
 
 			if (! $error && $pagecount)
 			{
 				$pdf->Output($file,'F');
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 			}
 
 			if ($usestdout)
 			{
-				if (! $error) print "Merged PDF has been built in ".$file."\n";
-				else print "Can't build PDF ".$file."\n";
+				if (! $error) {
+				    print "Merged PDF has been built in ".$file."\n";
+				} else {
+				    print "Can't build PDF ".$file."\n";
+				}
 			}
 
 			$result = 1;
-	    }
-	    else
+	    } else
 	    {
-	        if ($usestdout) print "No invoices found for criteria.\n";
-	        else dol_syslog("No invoices found for criteria");
+	        if ($usestdout) {
+	            print "No invoices found for criteria.\n";
+	        } else {
+	            dol_syslog("No invoices found for criteria");
+	        }
 	        $result = 0;
 	    }
-	}
-	else
+	} else
 	{
 	    dol_print_error($db);
 	    dol_syslog("scripts/invoices/rebuild_merge.php: Error");
 	    $error++;
 	}
 
-	if ($error) return -1;
-	else return $result;
-}
+	if ($error) {
+	    return -1;
+	} else {
+	    return $result;
+	}
+	}
 

dolibarr/htdocs/core/lib/prelevement.lib.php

Braces +9 added lines, -3 removed lines

@@ -78,9 +78,15 @@
 function prelevement_check_config()
 {
 	global $conf;
-	if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
-	if(empty($conf->global->PRELEVEMENT_ICS)) return -1;
-    if(empty($conf->global->PRELEVEMENT_USER)) return -1;
+	if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) {
+	    return -1;
+	}
+	if(empty($conf->global->PRELEVEMENT_ICS)) {
+	    return -1;
+	}
+    if(empty($conf->global->PRELEVEMENT_USER)) {
+        return -1;
+    }
 	return 0;
 }
 

dolibarr/htdocs/core/lib/barcode.lib.php

Braces +87 added lines, -38 removed lines

@@ -35,11 +35,17 @@ 
 /* ******************************************************************** */
 /*                          FONT FILE                                   */
 /* ******************************************************************** */
-if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc=constant('DOL_DEFAULT_TTF_BOLD');
+if (defined('DOL_DEFAULT_TTF_BOLD')) {
+    $font_loc=constant('DOL_DEFAULT_TTF_BOLD');
+}
 // Automatic-Detection of Font if running Windows
 // @CHANGE LDR
-if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
-if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');
+if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) {
+    $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
+}
+if (empty($font_loc)) {
+    die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');
+}
 
 
 /* ******************************************************************** */
@@ -50,8 +56,11 @@ 
 * genbarcode is needed to render encodings other than EAN-12/EAN-13/ISBN
 */
 
-if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND');
-else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
+if (defined('PHP-BARCODE_PATH_COMMAND')) {
+    $genbarcode_loc=constant('PHP-BARCODE_PATH_COMMAND');
+} else {
+    $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
+}
 
 
 
@@ -73,12 +82,17 @@ 
     if (! $bars || ! empty($bars['error']))
     {
         // Return error message instead of array
-        if (empty($bars['error'])) $error='Bad Value '.$code.' for encoding '.$encoding;
-        else $error=$bars['error'];
+        if (empty($bars['error'])) {
+            $error='Bad Value '.$code.' for encoding '.$encoding;
+        } else {
+            $error=$bars['error'];
+        }
         dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);
         return $error;
     }
-    if (! $mode) $mode="png";
+    if (! $mode) {
+        $mode="png";
+    }
     //if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);
     //elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);
     //else
@@ -127,14 +141,14 @@ 
         /* use built-in EAN-Encoder */
         dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
         $bars=barcode_encode_ean($code, $encoding);
-    }
-    else if (file_exists($genbarcode_loc))	// For example C39
+    } else if (file_exists($genbarcode_loc)) {
+        // For example C39
     {
         /* use genbarcode */
         dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
-        $bars=barcode_encode_genbarcode($code, $encoding);
     }
-    else
+        $bars=barcode_encode_genbarcode($code, $encoding);
+    } else
     {
         print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<BR>\n";
         print "<UL>\n";
@@ -164,7 +178,11 @@ 
     $ln=strlen($ean)-1;
     for ($i=$ln; $i>=0; $i--)
     {
-        if ($even) $esum+=$ean[$i];	else $osum+=$ean[$i];
+        if ($even) {
+            $esum+=$ean[$i];
+        } else {
+            $osum+=$ean[$i];
+        }
         $even=!$even;
     }
     return (10-((3*$esum+$osum)%10))%10;
@@ -191,9 +209,13 @@ 
     $encoding=strtoupper($encoding);
     if ($encoding=="ISBN")
     {
-        if (!preg_match("/^978/", $ean)) $ean="978".$ean;
+        if (!preg_match("/^978/", $ean)) {
+            $ean="978".$ean;
+        }
+    }
+    if (preg_match("/^978/", $ean)) {
+        $encoding="ISBN";
     }
-    if (preg_match("/^978/", $ean)) $encoding="ISBN";
     if (strlen($ean)<12 || strlen($ean)>13)
     {
         return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");
@@ -206,8 +228,14 @@ 
     for ($i=1;$i<13;$i++)
     {
         $str=$digits[$ean[$i]];
-        if ($i<7 && $mirror[$ean[0]][$i-1]==1) $line.=strrev($str); else $line.=$str;
-        if ($i==6) $line.=$guards[1];
+        if ($i<7 && $mirror[$ean[0]][$i-1]==1) {
+            $line.=strrev($str);
+        } else {
+            $line.=$str;
+        }
+        if ($i==6) {
+            $line.=$guards[1];
+        }
     }
     $line.=$guards[2];
 
@@ -216,11 +244,17 @@ 
     $text="";
     for ($a=0;$a<13;$a++)
     {
-        if ($a>0) $text.=" ";
+        if ($a>0) {
+            $text.=" ";
+        }
         $text.="$pos:12:{$ean[$a]}";
-        if ($a==0) $pos+=12;
-        else if ($a==6) $pos+=12;
-        else $pos+=7;
+        if ($a==0) {
+            $pos+=12;
+        } else if ($a==6) {
+            $pos+=12;
+        } else {
+            $pos+=7;
+        }
     }
 
     return array(
@@ -243,8 +277,12 @@ 
     global $genbarcode_loc;
 
     // Clean parameters
-    if (preg_match("/^ean$/i", $encoding) && strlen($code)==13) $code=substr($code,0,12);
-    if (!$encoding) $encoding="ANY";
+    if (preg_match("/^ean$/i", $encoding) && strlen($code)==13) {
+        $code=substr($code,0,12);
+    }
+    if (!$encoding) {
+        $encoding="ANY";
+    }
     $encoding=preg_replace("/[\\\|]/", "_", $encoding);
     $code=preg_replace("/[\\\|]/", "_", $code);
 
@@ -263,8 +301,7 @@ 
         $text=fgets($fp, 1024);
         $encoding=fgets($fp, 1024);
         pclose($fp);
-    }
-    else
+    } else
     {
         dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR);
         return false;
@@ -282,9 +319,15 @@ 
     	$ret['error']=$ret['bars']; $ret['bars']='';
     	return $ret;
     }
-    if (!$ret['bars']) return false;
-    if (!$ret['text']) return false;
-    if (!$ret['encoding']) return false;
+    if (!$ret['bars']) {
+        return false;
+    }
+    if (!$ret['text']) {
+        return false;
+    }
+    if (!$ret['encoding']) {
+        return false;
+    }
     return $ret;
 }
 
@@ -310,11 +353,16 @@ 
     //var_dump($font_loc);
 
     /* set defaults */
-    if ($scale<1) $scale=2;
+    if ($scale<1) {
+        $scale=2;
+    }
     $total_y=(int) $total_y;
-    if ($total_y<1) $total_y=(int) $scale * 60;
-    if (!$space)
-    $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale);
+    if ($total_y<1) {
+        $total_y=(int) $scale * 60;
+    }
+    if (!$space) {
+        $space=array('top'=>2*$scale,'bottom'=>2*$scale,'left'=>2*$scale,'right'=>2*$scale);
+    }
 
     /* count total width */
     $xpos=0;
@@ -371,7 +419,9 @@ 
             /* tall bar */
             $val=ord($val)-ord('a')+1;
             $h=$height2;
-        } else $h=$height;
+        } else {
+            $h=$height;
+        }
         imagefilledrectangle($im, $xpos, $space['top'], $xpos+($val*$scale)-1, $h, $col_bar);
         $xpos+=$val*$scale;
         $width=true;
@@ -396,17 +446,16 @@ 
     {
         header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
         imagejpeg($im);
-    }
-    else if ($mode=='gif')
+    } else if ($mode=='gif')
     {
         header("Content-Type: image/gif; name=\"barcode.gif\"");
         imagegif($im);
-    }
-    else if (! empty($filebarcode))    // To wxrite into  afile onto disk
+    } else if (! empty($filebarcode)) {
+        // To wxrite into  afile onto disk
     {
         imagepng($im,$filebarcode);
     }
-    else
+    } else
     {
         header("Content-Type: image/png; name=\"barcode.png\"");
         imagepng($im);

dolibarr/htdocs/core/lib/accounting.lib.php

Braces +45 added lines, -16 removed lines

@@ -75,9 +75,13 @@ 
 {
 	global $conf;
 
-	if ($account < 0 || empty($account)) return '';
+	if ($account < 0 || empty($account)) {
+	    return '';
+	}
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+	    return $account;
+	}
 
 	$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
 	if (! empty($g)) {
@@ -110,9 +114,13 @@ 
 {
 	global $conf, $langs;
 
-	if ($accounta < 0 || empty($accounta)) return '';
+	if ($accounta < 0 || empty($accounta)) {
+	    return '';
+	}
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
+	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+	    return $accounta;
+	}
 
 	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
 	if (! empty($a)) {
@@ -156,11 +164,15 @@ 
 {
     global $langs;
 
-    if (empty($hselected)) $hselected='report';
+    if (empty($hselected)) {
+        $hselected='report';
+    }
 
     print "\n\n<!-- debut cartouche journal -->\n";
 
-    if(! empty($varlink)) $varlink = '?'.$varlink;
+    if(! empty($varlink)) {
+        $varlink = '?'.$varlink;
+    }
 
     $h=0;
     $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
@@ -180,10 +192,15 @@ 
     // Ligne de titre
     print '<tr>';
     print '<td width="110">'.$langs->trans("Name").'</td>';
-    if (! $variantexxx) print '<td colspan="3">';
-    else print '<td>';
+    if (! $variantexxx) {
+        print '<td colspan="3">';
+    } else {
+        print '<td>';
+    }
     print $nom;
-    if ($variantexxx) print '</td><td colspan="2">'.$variantexxx;
+    if ($variantexxx) {
+        print '</td><td colspan="2">'.$variantexxx;
+    }
     print '</td>';
     print '</tr>';
 
@@ -192,10 +209,15 @@ 
     {
         print '<tr>';
         print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
-        if (! $variante) print '<td colspan="3">';
-        else print '<td>';
+        if (! $variante) {
+            print '<td colspan="3">';
+        } else {
+            print '<td>';
+        }
         print $calcmode;
-        if ($variante) print '</td><td colspan="2">'.$variante;
+        if ($variante) {
+            print '</td><td colspan="2">'.$variante;
+        }
         print '</td>';
         print '</tr>';
     }
@@ -203,10 +225,17 @@ 
     // Ligne de la periode d'analyse du rapport
     print '<tr>';
     print '<td>'.$langs->trans("ReportPeriod").'</td>';
-    if (! $periodlink) print '<td colspan="3">';
-    else print '<td>';
-    if ($period) print $period;
-    if ($periodlink) print '</td><td colspan="2">'.$periodlink;
+    if (! $periodlink) {
+        print '<td colspan="3">';
+    } else {
+        print '<td>';
+    }
+    if ($period) {
+        print $period;
+    }
+    if ($periodlink) {
+        print '</td><td colspan="2">'.$periodlink;
+    }
     print '</td>';
     print '</tr>';
 

dolibarr/htdocs/core/lib/resource.lib.php

Braces +15 added lines, -5 removed lines

@@ -45,7 +45,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -59,11 +61,17 @@ 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+		if(!empty($object->note_private)) {
+		    $nbNote++;
+		}
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/resource/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -73,7 +81,9 @@ 
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
 	$head[$h][0] = DOL_URL_ROOT.'/resource/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
+	if($nbFiles > 0) {
+	    $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 

dolibarr/htdocs/core/lib/ws.lib.php

Braces +7 added lines, -4 removed lines

@@ -58,8 +58,7 @@ 
         {
             $error++;
             $errorcode='ERROR_FETCH_USER'; $errorlabel='A technical error occurred during fetch of user';
-        }
-        else if ($result == 0)
+        } else if ($result == 0)
         {
             $error++;
             $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
@@ -77,9 +76,13 @@ 
 			$fuser->getrights();	// Load permission of user
 
         	// Authentication mode
-        	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+        	if (empty($dolibarr_main_authentication)) {
+        	    $dolibarr_main_authentication='http,dolibarr';
+        	}
         	// Authentication mode: forceuser
-        	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+        	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
+        	    $dolibarr_auto_user='auto';
+        	}
         	// Set authmode
         	$authmode=explode(',',$dolibarr_main_authentication);
 

dolibarr/htdocs/core/lib/fichinter.lib.php

Braces +18 added lines, -6 removed lines

@@ -51,7 +51,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('InterventionContact');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -82,7 +84,9 @@ 
 
    		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;
 		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResource > 0) $head[$h][1].= ' <span class="badge">'.$nbResource.'</span>';
+		if ($nbResource > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbResource.'</span>';
+		}
 		$head[$h][2] = 'resource';
 		$h++;
 	}
@@ -90,11 +94,17 @@ 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if(!empty($object->note_private)) {
+            $nbNote++;
+        }
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
     	$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;
     	$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -106,7 +116,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 

dolibarr/htdocs/core/lib/emailing.lib.php

Braces +3 added lines, -1 removed lines

@@ -43,7 +43,9 @@
 	{
     	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
     	$head[$h][1] = $langs->trans("MailRecipients");
-		if ($object->nbemail > 0) $head[$h][1].= ' <span class="badge">'.$object->nbemail.'</span>';
+		if ($object->nbemail > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$object->nbemail.'</span>';
+		}
     	$head[$h][2] = 'targets';
     	$h++;
 	}

dolibarr/htdocs/core/lib/order.lib.php

Braces +39 added lines, -13 removed lines

@@ -34,7 +34,9 @@ 
 function commande_prepare_head(Commande $object)
 {
 	global $db, $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+	if (! empty($conf->expedition->enabled)) {
+	    $langs->load("sendings");
+	}
 	$langs->load("orders");
 
 	$h = 0;
@@ -53,7 +55,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -64,13 +68,27 @@ 
 		$nbShipments=$object->getNbOfShipments(); $nbReceiption=0;
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
 		$text='';
-		if ($conf->expedition_bon->enabled) $text.=$langs->trans("Shipments");
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
-		if ($conf->livraison_bon->enabled)  $text.=$langs->trans("Receivings");
-		if ($nbShipments > 0 || $nbReceiption > 0) $text.= ' <span class="badge">'.($nbShipments?$nbShipments:0);
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
-		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text.= ($nbReceiption?$nbReceiption:0);
-		if ($nbShipments > 0 || $nbReceiption > 0) $text.= '</span>';
+		if ($conf->expedition_bon->enabled) {
+		    $text.=$langs->trans("Shipments");
+		}
+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) {
+		    $text.='/';
+		}
+		if ($conf->livraison_bon->enabled) {
+		    $text.=$langs->trans("Receivings");
+		}
+		if ($nbShipments > 0 || $nbReceiption > 0) {
+		    $text.= ' <span class="badge">'.($nbShipments?$nbShipments:0);
+		}
+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) {
+		    $text.='/';
+		}
+		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled && ($nbShipments > 0 || $nbReceiption > 0)) {
+		    $text.= ($nbReceiption?$nbReceiption:0);
+		}
+		if ($nbShipments > 0 || $nbReceiption > 0) {
+		    $text.= '</span>';
+		}
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
@@ -85,11 +103,17 @@ 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if(!empty($object->note_private)) {
+            $nbNote++;
+        }
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/commande/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -101,7 +125,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;