alxarafe / alixar

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

Spacing +77 added lines, -77 removed lines

@@ -48,86 +48,86 @@ 
  * @param	string		$fileprefix				Prefix to add into filename of generated PDF
  * @return	int									Error code
  */
-function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $filesuffix='', $paymentbankid='', $thirdpartiesid='', $fileprefix='mergedpdf')
+function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate = 0, $filesuffix = '', $paymentbankid = '', $thirdpartiesid = '', $fileprefix = 'mergedpdf')
 {
 	$sql = "SELECT DISTINCT f.rowid, f.ref";
-	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-	$sqlwhere='';
-	$sqlorder='';
-	if (in_array('all',$filter))
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+	$sqlwhere = '';
+	$sqlorder = '';
+	if (in_array('all', $filter))
 	{
 		$sqlorder = " ORDER BY f.ref ASC";
 	}
-	if (in_array('date',$filter))
+	if (in_array('date', $filter))
 	{
-		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)."'";
+		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)."'";
 		$sqlorder = " ORDER BY f.datef ASC";
 	}
-	if (in_array('nopayment',$filter))
+	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";
-		$sqlwhere.= " f.fk_statut > 0";
-		$sqlwhere.= " AND pf.fk_paiement IS NULL";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
+		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))
+	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";
-		$sqlwhere.= " f.fk_statut > 0";
-		$sqlwhere.= " AND f.rowid = pf.fk_facture";
-		$sqlwhere.= " AND pf.fk_paiement = p.rowid";
-		if (in_array('payments',$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";
+		$sqlwhere .= " f.fk_statut > 0";
+		$sqlwhere .= " AND f.rowid = pf.fk_facture";
+		$sqlwhere .= " AND pf.fk_paiement = p.rowid";
+		if (in_array('payments', $filter))
 		{
-			$sqlwhere.= " AND p.datep >= '".$db->idate($paymentdateafter)."'";
-			$sqlwhere.= " AND p.datep <= '".$db->idate($paymentdatebefore)."'";
+			$sqlwhere .= " AND p.datep >= '".$db->idate($paymentdateafter)."'";
+			$sqlwhere .= " AND p.datep <= '".$db->idate($paymentdatebefore)."'";
 		}
-		if (in_array('bank',$filter))
+		if (in_array('bank', $filter))
 		{
-			$sqlwhere.= " AND p.fk_bank = b.rowid";
-			$sqlwhere.= " AND b.fk_account = ".$paymentbankid;
+			$sqlwhere .= " AND p.fk_bank = b.rowid";
+			$sqlwhere .= " AND b.fk_account = ".$paymentbankid;
 		}
 		$sqlorder = " ORDER BY p.datep ASC";
 	}
-	if (in_array('nodeposit',$filter))
+	if (in_array('nodeposit', $filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 3';
+	    if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+	    else $sqlwhere .= " AND";
+	    $sqlwhere .= ' type <> 3';
 	}
-	if (in_array('noreplacement',$filter))
+	if (in_array('noreplacement', $filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 1';
+	    if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+	    else $sqlwhere .= " AND";
+	    $sqlwhere .= ' type <> 1';
 	}
-	if (in_array('nocreditnote',$filter))
+	if (in_array('nocreditnote', $filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 2';
+	    if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
+	    else $sqlwhere .= " AND";
+	    $sqlwhere .= ' type <> 2';
 	}
-	if (in_array('excludethirdparties',$filter) && is_array($thirdpartiesid))
+	if (in_array('excludethirdparties', $filter) && is_array($thirdpartiesid))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')';
+	    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 (in_array('onlythirdparties', $filter) && is_array($thirdpartiesid))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')';
+	    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);
@@ -139,10 +139,10 @@ 
 
 	$error = 0;
 	$result = 0;
-	$files = array() ;		// liste les fichiers
+	$files = array(); // liste les fichiers
 
 	dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG);
-	if ( $resql=$db->query($sql) )
+	if ($resql = $db->query($sql))
 	{
 	    $num = $db->num_rows($resql);
 	    $cpt = 0;
@@ -160,23 +160,23 @@ 
 	            $obj = $db->fetch_object($resql);
 
 				$fac = new Facture($db);
-				$result=$fac->fetch($obj->rowid);
+				$result = $fac->fetch($obj->rowid);
 				if ($result > 0)
 				{
 					$outputlangs = $langs;
-					if (! empty($newlangid))
+					if (!empty($newlangid))
 					{
 						if ($outputlangs->defaultlang != $newlangid)
 						{
-							$outputlangs = new Translate("",$conf);
+							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlangid);
 						}
 					}
-					$filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf';
-					if ($regenerate || ! dol_is_file($filename))
+					$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";
-	    				$result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
+	    				$result = $fac->generateDocument($regenerate ? $regenerate : $fac->modelpdf, $outputlangs);
 					}
 					else {
 					    if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
@@ -189,8 +189,8 @@ 
 				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++;
@@ -198,20 +198,20 @@ 
 
 
 	        // Define format of output PDF
-	        $formatarray=pdf_getFormat($langs);
+	        $formatarray = pdf_getFormat($langs);
 	        $page_largeur = $formatarray['width'];
 	        $page_hauteur = $formatarray['height'];
-	        $format = array($page_largeur,$page_hauteur);
+	        $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
 			//---------------------------------------------------------
 
 	        // Create empty PDF
-	        $pdf=pdf_getInstance($format);
+	        $pdf = pdf_getInstance($format);
 	        if (class_exists('TCPDF'))
 	        {
 	            $pdf->setPrintHeader(false);
@@ -223,7 +223,7 @@ 
 			//$pdf->SetCompression(false);
 
 			// Add all others
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
 	            if ($usestdout) print "Merge PDF file for invoice ".$file."\n";
 	            else dol_syslog("Merge PDF file for invoice ".$file);
@@ -243,21 +243,21 @@ 
 			dol_mkdir($diroutputpdf);
 
 			// Save merged file
-			$filename=$fileprefix;
-			if (empty($filename)) $filename='mergedpdf';
-			if (! empty($filesuffix)) $filename.='_'.$filesuffix;
-			$file=$diroutputpdf.'/'.$filename.'.pdf';
+			$filename = $fileprefix;
+			if (empty($filename)) $filename = 'mergedpdf';
+			if (!empty($filesuffix)) $filename .= '_'.$filesuffix;
+			$file = $diroutputpdf.'/'.$filename.'.pdf';
 
-			if (! $error && $pagecount)
+			if (!$error && $pagecount)
 			{
-				$pdf->Output($file,'F');
-				if (! empty($conf->global->MAIN_UMASK))
+				$pdf->Output($file, 'F');
+				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";
+				if (!$error) print "Merged PDF has been built in ".$file."\n";
 				else print "Can't build PDF ".$file."\n";
 			}
 

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

Spacing +5 added lines, -5 removed lines

@@ -63,9 +63,9 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'prelevement');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'prelevement');
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'prelevement','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'prelevement', 'remove');
 
     return $head;
 }
@@ -78,9 +78,9 @@ 
 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

Spacing +113 added lines, -113 removed lines

@@ -27,18 +27,18 @@ 
 /* ******************************************************************** */
 /*                          COLORS                                      */
 /* ******************************************************************** */
-$bar_color=array(0,0,0);
-$bg_color=array(255,255,255);
-$text_color=array(0,0,0);
+$bar_color = array(0, 0, 0);
+$bg_color = array(255, 255, 255);
+$text_color = array(0, 0, 0);
 
 
 /* ******************************************************************** */
 /*                          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 (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,7 +50,7 @@ 
 * 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');
+if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND');
 else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
 
 
@@ -65,20 +65,20 @@ 
  * @param	string	       $mode		'png' or 'jpg' ...
  * @return	array|string   $bars		array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info) or string with error message
  */
-function barcode_print($code, $encoding="ANY", $scale = 2 ,$mode = "png")
+function barcode_print($code, $encoding = "ANY", $scale = 2, $mode = "png")
 {
     dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode");
 
-    $bars=barcode_encode($code,$encoding);
-    if (! $bars || ! empty($bars['error']))
+    $bars = barcode_encode($code, $encoding);
+    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
@@ -108,7 +108,7 @@ 
  * @param	string	$encoding	Encoding
  * @return	array				array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info)
  */
-function barcode_encode($code,$encoding)
+function barcode_encode($code, $encoding)
 {
     global $genbarcode_loc;
 
@@ -116,23 +116,23 @@ 
     (preg_match("/^ean$/i", $encoding))
 
     || (($encoding) && (preg_match("/^isbn$/i", $encoding))
-    && (( strlen($code)==9 || strlen($code)==10) ||
-    (((preg_match("/^978/", $code) && strlen($code)==12) ||
-    (strlen($code)==13)))))
+    && ((strlen($code) == 9 || strlen($code) == 10) ||
+    (((preg_match("/^978/", $code) && strlen($code) == 12) ||
+    (strlen($code) == 13)))))
 
-    || (( !isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding) ))
+    || ((!isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding)))
     && (preg_match("/^[0-9]{12,13}$/", $code)))
     )
     {
         /* use built-in EAN-Encoder */
         dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
-        $bars=barcode_encode_ean($code, $encoding);
+        $bars = barcode_encode_ean($code, $encoding);
     }
     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);
+        $bars = barcode_encode_genbarcode($code, $encoding);
     }
     else
     {
@@ -160,14 +160,14 @@ 
  */
 function barcode_gen_ean_sum($ean)
 {
-    $even=true; $esum=0; $osum=0;
-    $ln=strlen($ean)-1;
-    for ($i=$ln; $i>=0; $i--)
+    $even = true; $esum = 0; $osum = 0;
+    $ln = strlen($ean) - 1;
+    for ($i = $ln; $i >= 0; $i--)
     {
-        if ($even) $esum+=$ean[$i];	else $osum+=$ean[$i];
-        $even=!$even;
+        if ($even) $esum += $ean[$i]; else $osum += $ean[$i];
+        $even = !$even;
     }
-    return (10-((3*$esum+$osum)%10))%10;
+    return (10 - ((3 * $esum + $osum) % 10)) % 10;
 }
 
 /**
@@ -179,48 +179,48 @@ 
  */
 function barcode_encode_ean($ean, $encoding = "EAN-13")
 {
-    $digits=array(3211,2221,2122,1411,1132,1231,1114,1312,1213,3112);
-    $mirror=array("000000","001011","001101","001110","010011","011001","011100","010101","010110","011010");
-    $guards=array("9a1a","1a1a1","a1a");
+    $digits = array(3211, 2221, 2122, 1411, 1132, 1231, 1114, 1312, 1213, 3112);
+    $mirror = array("000000", "001011", "001101", "001110", "010011", "011001", "011100", "010101", "010110", "011010");
+    $guards = array("9a1a", "1a1a1", "a1a");
 
-    $ean=trim($ean);
-    if (preg_match("/[^0-9]/i",$ean))
+    $ean = trim($ean);
+    if (preg_match("/[^0-9]/i", $ean))
     {
         return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");
     }
-    $encoding=strtoupper($encoding);
-    if ($encoding=="ISBN")
+    $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 (strlen($ean)<12 || strlen($ean)>13)
+    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)");
     }
 
-    $ean=substr($ean,0,12);
-    $eansum=barcode_gen_ean_sum($ean);
-    $ean.=$eansum;
-    $line=$guards[0];
-    for ($i=1;$i<13;$i++)
+    $ean = substr($ean, 0, 12);
+    $eansum = barcode_gen_ean_sum($ean);
+    $ean .= $eansum;
+    $line = $guards[0];
+    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];
+        $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];
     }
-    $line.=$guards[2];
+    $line .= $guards[2];
 
     /* create text */
-    $pos=0;
-    $text="";
-    for ($a=0;$a<13;$a++)
+    $pos = 0;
+    $text = "";
+    for ($a = 0; $a < 13; $a++)
     {
-        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) $text .= " ";
+        $text .= "$pos:12:{$ean[$a]}";
+        if ($a == 0) $pos += 12;
+        else if ($a == 6) $pos += 12;
+        else $pos += 7;
     }
 
     return array(
@@ -238,30 +238,30 @@ 
  * @param	string	$encoding	Encoding
  * @return	array				array('encoding': the encoding which has been used, 'bars': the bars, 'text': text-positioning info)
  */
-function barcode_encode_genbarcode($code,$encoding)
+function barcode_encode_genbarcode($code, $encoding)
 {
     global $genbarcode_loc;
 
     // Clean parameters
-    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);
+    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);
 
-    $command=escapeshellarg($genbarcode_loc);
+    $command = escapeshellarg($genbarcode_loc);
     //$paramclear=" \"".str_replace("\"", "\\\"",$code)."\" \"".str_replace("\"", "\\\"",strtoupper($encoding))."\"";
-    $paramclear=" ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
+    $paramclear = " ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
 
-    $fullcommandclear=$command." ".$paramclear." 2>&1";
+    $fullcommandclear = $command." ".$paramclear." 2>&1";
     //print $fullcommandclear."<br>\n";exit;
 
     dol_syslog("Run command ".$fullcommandclear);
-    $fp=popen($fullcommandclear, "r");
+    $fp = popen($fullcommandclear, "r");
     if ($fp)
     {
-        $bars=fgets($fp, 1024);
-        $text=fgets($fp, 1024);
-        $encoding=fgets($fp, 1024);
+        $bars = fgets($fp, 1024);
+        $text = fgets($fp, 1024);
+        $encoding = fgets($fp, 1024);
         pclose($fp);
     }
     else
@@ -270,16 +270,16 @@ 
         return false;
     }
     //var_dump($bars);
-    $ret=array(
+    $ret = array(
 		"bars" => trim($bars),
 		"text" => trim($text),
 		"encoding" => trim($encoding),
     	"error" => ""
     );
     //var_dump($ret);
-    if (preg_match('/permission denied/i',$ret['bars']))
+    if (preg_match('/permission denied/i', $ret['bars']))
     {
-    	$ret['error']=$ret['bars']; $ret['bars']='';
+    	$ret['error'] = $ret['bars']; $ret['bars'] = '';
     	return $ret;
     }
     if (!$ret['bars']) return false;
@@ -310,101 +310,101 @@ 
     //var_dump($font_loc);
 
     /* set defaults */
-    if ($scale<1) $scale=2;
-    $total_y=(int) $total_y;
-    if ($total_y<1) $total_y=(int) $scale * 60;
+    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);
+    $space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale);
 
     /* count total width */
-    $xpos=0;
-    $width=true;
-    $ln=strlen($bars);
-    for ($i=0; $i<$ln; $i++)
+    $xpos = 0;
+    $width = true;
+    $ln = strlen($bars);
+    for ($i = 0; $i < $ln; $i++)
     {
-        $val=strtolower($bars[$i]);
+        $val = strtolower($bars[$i]);
         if ($width)
         {
-            $xpos+=$val*$scale;
-            $width=false;
+            $xpos += $val * $scale;
+            $width = false;
             continue;
         }
         if (preg_match("/[a-z]/", $val))
         {
             /* tall bar */
-            $val=ord($val)-ord('a')+1;
+            $val = ord($val) - ord('a') + 1;
         }
-        $xpos+=$val*$scale;
-        $width=true;
+        $xpos += $val * $scale;
+        $width = true;
     }
 
     /* allocate the image */
-    $total_x=( $xpos )+$space['right']+$space['right'];
-    $xpos=$space['left'];
-    if (! function_exists("imagecreate"))
+    $total_x = ($xpos) + $space['right'] + $space['right'];
+    $xpos = $space['left'];
+    if (!function_exists("imagecreate"))
     {
         print "You don't have the gd2 extension enabled<br>\n";
         return "";
     }
-    $im=imagecreate($total_x, $total_y);
+    $im = imagecreate($total_x, $total_y);
     /* create two images */
-    $col_bg=ImageColorAllocate($im,$bg_color[0],$bg_color[1],$bg_color[2]);
-    $col_bar=ImageColorAllocate($im,$bar_color[0],$bar_color[1],$bar_color[2]);
-    $col_text=ImageColorAllocate($im,$text_color[0],$text_color[1],$text_color[2]);
-    $height=round($total_y-($scale*10));
-    $height2=round($total_y-$space['bottom']);
+    $col_bg = ImageColorAllocate($im, $bg_color[0], $bg_color[1], $bg_color[2]);
+    $col_bar = ImageColorAllocate($im, $bar_color[0], $bar_color[1], $bar_color[2]);
+    $col_text = ImageColorAllocate($im, $text_color[0], $text_color[1], $text_color[2]);
+    $height = round($total_y - ($scale * 10));
+    $height2 = round($total_y - $space['bottom']);
 
     /* paint the bars */
-    $width=true;
-    $ln=strlen($bars);
-    for ($i=0; $i<$ln; $i++)
+    $width = true;
+    $ln = strlen($bars);
+    for ($i = 0; $i < $ln; $i++)
     {
-        $val=strtolower($bars[$i]);
+        $val = strtolower($bars[$i]);
         if ($width)
         {
-            $xpos+=$val*$scale;
-            $width=false;
+            $xpos += $val * $scale;
+            $width = false;
             continue;
         }
         if (preg_match("/[a-z]/", $val))
         {
             /* tall bar */
-            $val=ord($val)-ord('a')+1;
-            $h=$height2;
-        } else $h=$height;
-        imagefilledrectangle($im, $xpos, $space['top'], $xpos+($val*$scale)-1, $h, $col_bar);
-        $xpos+=$val*$scale;
-        $width=true;
+            $val = ord($val) - ord('a') + 1;
+            $h = $height2;
+        } else $h = $height;
+        imagefilledrectangle($im, $xpos, $space['top'], $xpos + ($val * $scale) - 1, $h, $col_bar);
+        $xpos += $val * $scale;
+        $width = true;
     }
 
-    $chars=explode(" ", $text);
+    $chars = explode(" ", $text);
     reset($chars);
-    while (list($n, $v)=each($chars))
+    while (list($n, $v) = each($chars))
     {
         if (trim($v))
         {
-            $inf=explode(":", $v);
-            $fontsize=$scale*($inf[1]/1.8);
-            $fontheight=$total_y-($fontsize/2.7)+2;
-            imagettftext($im, $fontsize, 0, $space['left']+($scale*$inf[0])+2, $fontheight, $col_text, $font_loc, $inf[2]);
+            $inf = explode(":", $v);
+            $fontsize = $scale * ($inf[1] / 1.8);
+            $fontheight = $total_y - ($fontsize / 2.7) + 2;
+            imagettftext($im, $fontsize, 0, $space['left'] + ($scale * $inf[0]) + 2, $fontheight, $col_text, $font_loc, $inf[2]);
         }
     }
 
     /* output the image */
-    $mode=strtolower($mode);
-    if ($mode=='jpg' || $mode=='jpeg')
+    $mode = strtolower($mode);
+    if ($mode == 'jpg' || $mode == 'jpeg')
     {
         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);
+        imagepng($im, $filebarcode);
     }
     else
     {

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

Spacing +20 added lines, -20 removed lines

@@ -34,12 +34,12 @@ 
 	global $langs, $conf;
 
 	$h = 0;
-	$head = array ();
+	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
-	$h ++;
+	$h++;
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
@@ -60,7 +60,7 @@ 
  */
 function clean_account($account)
 {
-	$account = rtrim($account,"0");
+	$account = rtrim($account, "0");
 
 	return $account;
 }
@@ -77,18 +77,18 @@ 
 
 	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)) {
+	if (!empty($g)) {
 		// Clean parameters
 		$i = strlen($account);
 
 		if ($i >= 1) {
-			while ( $i < $g ) {
+			while ($i < $g) {
 				$account .= '0';
 
-				$i ++;
+				$i++;
 			}
 
 			return $account;
@@ -112,18 +112,18 @@ 
 
 	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)) {
+	if (!empty($a)) {
 		// Clean parameters
 		$i = strlen($accounta);
 
 		if ($i >= 1) {
-			while ( $i < $a ) {
+			while ($i < $a) {
 				$accounta .= '0';
 
-				$i ++;
+				$i++;
 			}
 
 			return $accounta;
@@ -152,17 +152,17 @@ 
  *  @param  string              $varlink        Add a variable into the address of the page
  *	@return	void
  */
-function journalHead($nom,$variante,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='', $varlink='')
+function journalHead($nom, $variante, $period, $periodlink, $description, $builddate, $exportlink = '', $moreparam = array(), $calcmode = '', $varlink = '')
 {
     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;
+    $h = 0;
     $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
     $head[$h][1] = $langs->trans("Journalization");
     $head[$h][2] = 'journal';
@@ -171,7 +171,7 @@ 
 
     dol_fiche_head($head, 'journal');
 
-    foreach($moreparam as $key => $value)
+    foreach ($moreparam as $key => $value)
     {
         print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
     }
@@ -180,7 +180,7 @@ 
     // Ligne de titre
     print '<tr>';
     print '<td width="110">'.$langs->trans("Name").'</td>';
-    if (! $variantexxx) print '<td colspan="3">';
+    if (!$variantexxx) print '<td colspan="3">';
     else print '<td>';
     print $nom;
     if ($variantexxx) print '</td><td colspan="2">'.$variantexxx;
@@ -192,7 +192,7 @@ 
     {
         print '<tr>';
         print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
-        if (! $variante) print '<td colspan="3">';
+        if (!$variante) print '<td colspan="3">';
         else print '<td>';
         print $calcmode;
         if ($variante) print '</td><td colspan="2">'.$variante;
@@ -203,7 +203,7 @@ 
     // Ligne de la periode d'analyse du rapport
     print '<tr>';
     print '<td>'.$langs->trans("ReportPeriod").'</td>';
-    if (! $periodlink) print '<td colspan="3">';
+    if (!$periodlink) print '<td colspan="3">';
     else print '<td>';
     if ($period) print $period;
     if ($periodlink) print '</td><td colspan="2">'.$periodlink;

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

Spacing +16 added lines, -16 removed lines

@@ -35,17 +35,17 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath('/resource/card.php',1).'?id='.$object->id;
+	$head[$h][0] = dol_buildpath('/resource/card.php', 1).'?id='.$object->id;
 	$head[$h][1] = $langs->trans("ResourceCard");
     	$head[$h][2] = 'resource';
 	$h++;
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY)))
 	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $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++;
 	}
@@ -54,35 +54,35 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'resource');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'resource');
 
 	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++;
 	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	$upload_dir = $conf->resource->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+	$upload_dir = $conf->resource->dir_output."/".dol_sanitizeFileName($object->ref);
+	$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++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/resource/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	{
-		$head[$h][1].= '/';
-		$head[$h][1].= $langs->trans("Agenda");
+		$head[$h][1] .= '/';
+		$head[$h][1] .= $langs->trans("Agenda");
 	}
 	$head[$h][2] = 'agenda';
 	$h++;
@@ -92,7 +92,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;*/
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'resource', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'resource', 'remove');
 
 	return $head;
 }
@@ -119,14 +119,14 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'resource_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/resource_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$head[$h][2] = 'attributes';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'resource_admin', 'remove');
 
 	return $head;
 }

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

Spacing +21 added lines, -21 removed lines

@@ -32,63 +32,63 @@
  *  @param  string	$errorlabel		Error string label
  *  @return User						Return user object identified by login/pass/entity into authentication array
  */
-function check_authentication($authentication,&$error,&$errorcode,&$errorlabel)
+function check_authentication($authentication, &$error, &$errorcode, &$errorlabel)
 {
-    global $db,$conf,$langs;
-    global $dolibarr_main_authentication,$dolibarr_auto_user;
+    global $db, $conf, $langs;
+    global $dolibarr_main_authentication, $dolibarr_auto_user;
 
-    $fuser=new User($db);
+    $fuser = new User($db);
 
-    if (! $error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))
+    if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))
     {
         $error++;
-        $errorcode='BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel='Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
+        $errorcode = 'BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel = 'Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
     }
 
-    if (! $error && ! empty($authentication['entity']) && ! is_numeric($authentication['entity']))
+    if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity']))
     {
         $error++;
-        $errorcode='BAD_PARAMETERS'; $errorlabel="The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";
+        $errorcode = 'BAD_PARAMETERS'; $errorlabel = "The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";
     }
 
-    if (! $error)
+    if (!$error)
     {
-        $result=$fuser->fetch('',$authentication['login'],'',0);
+        $result = $fuser->fetch('', $authentication['login'], '', 0);
         if ($result < 0)
         {
             $error++;
-            $errorcode='ERROR_FETCH_USER'; $errorlabel='A technical error occurred during fetch of user';
+            $errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';
         }
         else if ($result == 0)
         {
             $error++;
-            $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
+            $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
         }
 
-		if (! $error && $fuser->statut == 0)
+		if (!$error && $fuser->statut == 0)
 		{
 			$error++;
-			$errorcode='ERROR_USER_DISABLED'; $errorlabel='This user has been locked or disabled';
+			$errorcode = 'ERROR_USER_DISABLED'; $errorlabel = 'This user has been locked or disabled';
 		}
 
     	// Validation of login
-		if (! $error)
+		if (!$error)
 		{
-			$fuser->getrights();	// Load permission of user
+			$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);
+        	$authmode = explode(',', $dolibarr_main_authentication);
 
             include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-        	$login = checkLoginPassEntity($authentication['login'],$authentication['password'],$authentication['entity'],$authmode);
+        	$login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode);
 			if (empty($login))
 			{
 			    $error++;
-                $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
+                $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
 			}
 		}
     }

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

Spacing +19 added lines, -19 removed lines

@@ -48,10 +48,10 @@ 
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $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++;
 	}
@@ -60,29 +60,29 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'intervention');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention');
 
 	// Tab to link resources
 	if ($conf->resource->enabled)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
  		$nbResource = 0;
-		$objectres=new Dolresource($db);
+		$objectres = new Dolresource($db);
 		if (is_array($objectres->available_resources))
 		{
 	 		foreach ($objectres->available_resources as $modresources => $resources)
 			{
-				$resources=(array) $resources;  // To be sure $resources is an array
-				foreach($resources as $resource_obj)
+				$resources = (array) $resources; // To be sure $resources is an array
+				foreach ($resources as $resource_obj)
 				{
-					$linked_resources = $object->getElementResources('fichinter',$object->id,$resource_obj);
+					$linked_resources = $object->getElementResources('fichinter', $object->id, $resource_obj);
 				}
 			}
 		}
 
    		$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,23 +90,23 @@ 
     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++;
     }
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->ficheinter->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->ficheinter->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $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++;
 
@@ -115,7 +115,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'intervention','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention', 'remove');
 
     return $head;
 }
@@ -143,7 +143,7 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'fichinter_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinter_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -157,7 +157,7 @@ 
 
 
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'fichinter_admin', 'remove');
 
 		return $head;
 }
@@ -182,7 +182,7 @@ 
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention-rec');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h,'intervention-rec','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention-rec', 'remove');
 
 
 	return $head;

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

Spacing +5 added lines, -5 removed lines

@@ -39,16 +39,16 @@ 
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
+	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
 	{
     	$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++;
 	}
 
-	if (! empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
+	if (!empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/comm/mailing/advtargetemailing.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("MailAdvTargetRecipients");
@@ -61,9 +61,9 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'emailing');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'emailing', 'remove');
 
 	return $head;
 }

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

Spacing +24 added lines, -24 removed lines

@@ -34,13 +34,13 @@ 
 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;
 	$head = array();
 
-	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/commande/card.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("OrderCard");
@@ -50,10 +50,10 @@ 
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $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++;
 	}
@@ -61,16 +61,16 @@ 
 	if (($conf->expedition_bon->enabled && $user->rights->expedition->lire)
 	|| ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))
 	{
-		$nbShipments=$object->getNbOfShipments(); $nbReceiption=0;
+		$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>';
+		$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>';
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
@@ -80,28 +80,28 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'order');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order');
 
 	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++;
 	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $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++;
 
@@ -110,7 +110,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');
 
     return $head;
 }
@@ -132,7 +132,7 @@ 
 	$head[$h][2] = 'general';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'order_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'order_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/order_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -144,7 +144,7 @@ 
 	$head[$h][2] = 'attributeslines';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'order_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'order_admin', 'remove');
 
 	return $head;
 }