alxarafe / alixar

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++;
 

dolibarr/htdocs/core/lib/website.lib.php

Braces +106 added lines, -68 removed lines

@@ -39,28 +39,40 @@ 
 
 	// Replace php code. Note $content may come from database and does not contains body tags.
 	$replacewith='...php...';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	$content = preg_replace('/value="<\?php((?!\?>).)*\?>\n*/ims', 'value="'.$replacewith.'"', $content);
 
 	$replacewith='"callto=#';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	$content = preg_replace('/"callto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	$replacewith='"mailto=#';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	$content = preg_replace('/"mailto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	$replacewith='src="php';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	$content = preg_replace('/src="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	$replacewith='href="php';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	$content = preg_replace('/href="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	//$replacewith='<span class="phptag">...php...</span>';
 	$replacewith='<span class="phptag">...php...</span>';
-	if ($removephppart) $replacewith='';
+	if ($removephppart) {
+	    $replacewith='';
+	}
 	//$content = preg_replace('/<\?php((?!\?toremove>).)*\?toremove>\n*/ims', $replacewith, $content);
 	/*if ($content === null) {
 		if (preg_last_error() == PREG_JIT_STACKLIMIT_ERROR) $content = 'preg_replace error (when removing php tags) PREG_JIT_STACKLIMIT_ERROR';
@@ -113,9 +125,11 @@ 
 		$i=0;
 		foreach($parts as $part)
 		{
-			if ($i == 0) 	// The first part is never php code
+			if ($i == 0) {
+			    // The first part is never php code
 			{
 				$i++;
+			}
 				$newstr .= $part;
 				continue;
 			}
@@ -124,7 +138,9 @@ 
 			if (!empty($partlings))
 			{
 				//remove content before closing tag
-				if (count($partlings) > 1) $partlings[0] = '';
+				if (count($partlings) > 1) {
+				    $partlings[0] = '';
+				}
 				//append to out string
 				$newstr .= $replacewith.implode('',$partlings);
 			}
@@ -154,16 +170,19 @@ 
 	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-	if (defined('USEDOLIBARREDITOR'))		// REPLACEMENT OF LINKS When page called from Dolibarr editor
+	if (defined('USEDOLIBARREDITOR')) {
+	    // REPLACEMENT OF LINKS When page called from Dolibarr editor
 	{
 		// We remove the <head> part of content
 		$content = preg_replace('/<head>.*<\/head>/ims', '', $content);
+	}
 		$content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $content);
 		$content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
-	}
-	elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server
+	} elseif (defined('USEDOLIBARRSERVER')) {
+	    // REPLACEMENT OF LINKS When page called from Dolibarr server
 	{
 		global $website;
+	}
 
 		// Replace relative link / with dolibarr URL:  ...href="/"...
 		$content=preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'"', $content, -1, $nbrep);
@@ -194,8 +213,7 @@ 
 
 		// action="newpage.php" => action="dolibarr/website/index.php?website=...&pageref=newpage
 		$content = preg_replace('/(action=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
-	}
-	else									// REPLACEMENT OF LINKS When page called from virtual host
+	} else									// REPLACEMENT OF LINKS When page called from virtual host
 	{
 		$symlinktomediaexists=1;
 
@@ -217,8 +235,7 @@ 
 			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/',  '\1/wrapper.php\2hashp\3\4', $content, -1, $nbrep);
 
 			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
-		}
-		else
+		} else
 		{
 			$content=preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep);
 
@@ -293,20 +310,21 @@ 
 		if ($result > 0)
 		{
 			$containerref = $tmpwebsitepage->pageurl;
-		}
-		else
+		} else
 		{
 			print "Error, page contains a redirect to the alternative alias '".$containeraliasalt."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 			exit;
 		}
 	}
 
-	if (defined('USEDOLIBARRSERVER'))	// When page called from Dolibarr server
+	if (defined('USEDOLIBARRSERVER')) {
+	    // When page called from Dolibarr server
 	{
 		// Check new container exists
 		if (! $containeraliasalt)	// If containeraliasalt set, we already did the test
 		{
 			include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+	}
 			$tmpwebsitepage=new WebsitePage($db);
 			$result = $tmpwebsitepage->fetch(0, $website->id, $containerref);
 			unset($tmpwebsitepage);
@@ -320,19 +338,16 @@ 
 				{
 					print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containerref."' in web site '".$website->ref."'";
 					exit;
-				}
-				else
+				} else
 				{
 					$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containerref, $currenturi);
 				}
-			}
-			else
+			} else
 			{
 				$newurl = $currenturi.'&pageref='.urlencode($containerref);
 			}
 		}
-	}
-	else								// When page called from virtual host server
+	} else								// When page called from virtual host server
 	{
 		$newurl = '/'.$containerref.'.php';
 	}
@@ -341,8 +356,7 @@ 
 	{
 		header("Location: ".$newurl);
 		exit;
-	}
-	else
+	} else
 	{
 		print "Error, page contains a redirect to the alias page '".$containerref."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 		exit;
@@ -365,11 +379,15 @@ 
 
 	$MAXLEVEL=20;
 
-	if (! preg_match('/\.php$/i', $containerref)) $containerref.='.php';
+	if (! preg_match('/\.php$/i', $containerref)) {
+	    $containerref.='.php';
+	}
 
 	$fullpathfile=DOL_DATA_ROOT.'/website/'.$websitekey.'/'.$containerref;
 
-	if (empty($includehtmlcontentopened)) $includehtmlcontentopened=0;
+	if (empty($includehtmlcontentopened)) {
+	    $includehtmlcontentopened=0;
+	}
 	$includehtmlcontentopened++;
 	if ($includehtmlcontentopened > $MAXLEVEL)
 	{
@@ -422,7 +440,9 @@ 
 
 	$alreadygrabbed=array();
 
-	if (preg_match('/\/$/', $urltograb)) $urltograb.='.';
+	if (preg_match('/\/$/', $urltograb)) {
+	    $urltograb.='.';
+	}
 	$urltograb = dirname($urltograb);							// So urltograb is now http://www.nltechno.com or http://www.nltechno.com/dir1
 
 	// Search X in "img...src=X"
@@ -430,21 +450,25 @@ 
 
 	foreach ($regs[0] as $key => $val)
 	{
-		if (preg_match('/^data:image/i', $regs[2][$key])) continue;		// We do nothing for such images
+		if (preg_match('/^data:image/i', $regs[2][$key])) {
+		    continue;
+		}
+		// We do nothing for such images
 
 		if (preg_match('/^\//', $regs[2][$key]))
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
-		}
-		else
+		} else
 		{
 			$urltograbbis = $urltograb.'/'.$regs[2][$key];	// We use dir of grabbed file
 		}
 
 		$linkwithoutdomain = $regs[2][$key];
 		$dirforimages = '/'.$objectpage->pageurl;
-		if ($grabimagesinto == 'root') $dirforimages='';
+		if ($grabimagesinto == 'root') {
+		    $dirforimages='';
+		}
 
 		// Define $filetosave and $filename
 		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
@@ -474,14 +498,12 @@ 
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action='create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
+				} elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action='create';
-				}
-				else
+				} else
 				{
 					$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
 
@@ -490,8 +512,9 @@ 
 					$fp = fopen($filetosave, "w");
 					fputs($fp, $tmpgeturl['content']);
 					fclose($fp);
-					if (! empty($conf->global->MAIN_UMASK))
-						@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					if (! empty($conf->global->MAIN_UMASK)) {
+											@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					}
 				}
 			}
 		}
@@ -507,14 +530,16 @@ 
 
 	foreach ($regs[0] as $key => $val)
 	{
-		if (preg_match('/^data:image/i', $regs[2][$key])) continue;		// We do nothing for such images
+		if (preg_match('/^data:image/i', $regs[2][$key])) {
+		    continue;
+		}
+		// We do nothing for such images
 
 		if (preg_match('/^\//', $regs[2][$key]))
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key];	// We use dirroot
-		}
-		else
+		} else
 		{
 			$urltograbbis = $urltograb.'/'.$regs[2][$key];	// We use dir of grabbed file
 		}
@@ -522,7 +547,9 @@ 
 		$linkwithoutdomain = $regs[2][$key];
 
 		$dirforimages = '/'.$objectpage->pageurl;
-		if ($grabimagesinto == 'root') $dirforimages='';
+		if ($grabimagesinto == 'root') {
+		    $dirforimages='';
+		}
 
 		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
 
@@ -553,14 +580,12 @@ 
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action='create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
+				} elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action='create';
-				}
-				else
+				} else
 				{
 					$alreadygrabbed[$urltograbbis]=1;	// Track that file was alreay grabbed.
 
@@ -569,8 +594,9 @@ 
 					$fp = fopen($filetosave, "w");
 					fputs($fp, $tmpgeturl['content']);
 					fclose($fp);
-					if (! empty($conf->global->MAIN_UMASK))
-						@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					if (! empty($conf->global->MAIN_UMASK)) {
+											@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					}
 				}
 			}
 		}
@@ -603,8 +629,9 @@ 
 	$mastercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
 	$mastercontent.= '?>'."\n";
 	$result = file_put_contents($filemaster, $mastercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -657,7 +684,10 @@ 
 	dol_delete_file($filetpl);
 
 	$shortlangcode = '';
-	if ($objectpage->lang) $shortlangcode=preg_replace('/[_-].*$/', '', $objectpage->lang);		// en_US or en-US -> en
+	if ($objectpage->lang) {
+	    $shortlangcode=preg_replace('/[_-].*$/', '', $objectpage->lang);
+	}
+	// en_US or en-US -> en
 
 	$tplcontent ='';
 	$tplcontent.= "<?php // BEGIN PHP\n";
@@ -699,8 +729,9 @@ 
 
 	//var_dump($filetpl);exit;
 	$result = file_put_contents($filetpl, $tplcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+	}
 
 		return $result;
 }
@@ -737,16 +768,18 @@ 
 	$indexcontent.= "include_once './".basename($filetpl)."'\n";
 	$indexcontent.= '// END PHP ?>'."\n";
 	$result1 = file_put_contents($fileindex, $indexcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
+	}
 
 	dol_delete_file($filewrapper);
 
 	$wrappercontent=file_get_contents(DOL_DOCUMENT_ROOT.'/website/samples/wrapper.html');
 
 	$result2 = file_put_contents($filewrapper, $wrappercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filewrapper, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filewrapper, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return ($result1 && $result2);
 }
@@ -767,8 +800,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filehtmlheader, $htmlheadercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
+	}
 
 		if (! $result)
 		{
@@ -794,8 +828,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filecss, $csscontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filecss, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filecss, octdec($conf->global->MAIN_UMASK));
+	}
 
 		if (! $result)
 		{
@@ -821,8 +856,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filejs, $jscontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filejs, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filejs, octdec($conf->global->MAIN_UMASK));
+	}
 
 		if (! $result)
 		{
@@ -848,8 +884,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filerobot, $robotcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
+	}
 
 		if (! $result)
 		{
@@ -875,8 +912,9 @@ 
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filehtaccess, $htaccess);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
+	if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
+	}
 
 		if (! $result)
 		{

dolibarr/htdocs/core/lib/supplier_proposal.lib.php

Braces +15 added lines, -5 removed lines

@@ -49,7 +49,9 @@ 
 		$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/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++;
 	}
@@ -63,11 +65,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.'/supplier_proposal/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++;
     }
@@ -79,7 +87,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/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] = 'document';
 	$h++;