alxarafe / alixar

dolibarr/htdocs/core/modules/export/export_csv.modules.php

Braces +16 added lines, -9 removed lines

@@ -68,7 +68,9 @@ 
 		$this->db = $db;
 
 		$this->separator=',';
-		if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) {
+		    $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		}
 		$this->escape='"';
 		$this->enclosure='"';
 
@@ -216,8 +218,7 @@ 
 		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
@@ -252,8 +253,7 @@ 
 		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
@@ -261,15 +261,22 @@ 
 		$this->col=0;
 		foreach($array_selected_sorted as $code => $value)
 		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-			if (empty($alias)) dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
+			if (strpos($code,' as ') == 0) {
+			    $alias=str_replace(array('.','-','(',')'),'_',$code);
+			} else {
+			    $alias=substr($code, strpos($code, ' as ') + 4);
+			}
+			if (empty($alias)) {
+			    dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
+			}
 
 			$newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
 			$typefield=isset($array_types[$code])?$array_types[$code]:'';
 
 			// Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) {
+			    $newvalue=$outputlangs->transnoentities($reg[1]);
+			}
 
 			$newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
 

dolibarr/htdocs/core/modules/export/export_tsv.modules.php

Braces +11 added lines, -4 removed lines

@@ -237,15 +237,22 @@
 		$this->col=0;
  		foreach($array_selected_sorted as $code => $value)
         {
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			if (strpos($code,' as ') == 0) {
+			    $alias=str_replace(array('.','-','(',')'),'_',$code);
+			} else {
+			    $alias=substr($code, strpos($code, ' as ') + 4);
+			}
+            if (empty($alias)) {
+                dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+            }
 
             $newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
             $typefield=isset($array_types[$code])?$array_types[$code]:'';
 
             // Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) {
+			    $newvalue=$outputlangs->transnoentities($reg[1]);
+			}
 
 			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
 

dolibarr/htdocs/core/modules/syslog/mod_syslog_chromephp.php

Braces +28 added lines, -16 removed lines

@@ -67,20 +67,20 @@ 
 			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
 
 		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
+		    if (! $res) {
+		        $res=@include_once 'ChromePhp.class.php';
+		    }
 
 		    restore_include_path();
 
 		    if ($res)
 		    {
         		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
-		    }
-		    else
+		    } else
 		    {
 		        return 0;
 		    }
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 		    print '<!-- ChromePHP not available into PHP -->'."\n";
 		}
@@ -122,11 +122,12 @@ 
 		if (! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && ! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
 		{
 			$conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP = 1; // avoid infinite loop
-			if (is_object($langs))   // $langs may not be defined yet.
+			if (is_object($langs)) {
+			    // $langs may not be defined yet.
 			{
 				$errors[] = $langs->trans("ErrorFailedToOpenFile", 'ChromePhp.class.php or ChromePhp.php');
 			}
-			else
+			} else
 			{
 				$errors[] = "ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php";
 			}
@@ -145,10 +146,15 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) return;	// Global option to disable output of this handler
+		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) {
+		    return;
+		}
+		// Global option to disable output of this handler
 
 		//We check the configuration to avoid showing PHP warnings
-		if (count($this->checkConfiguration()) > 0) return false;
+		if (count($this->checkConfiguration()) > 0) {
+		    return false;
+		}
 
 		try
 		{
@@ -157,16 +163,22 @@ 
 			$oldinclude=get_include_path();
 			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
 		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
+		    if (! $res) {
+		        $res=@include_once 'ChromePhp.class.php';
+		    }
 			set_include_path($oldinclude);
 			
 			ob_start();	// To be sure headers are not flushed until all page is completely processed
-			if ($content['level'] == LOG_ERR) ChromePhp::error($content['message']);
-			elseif ($content['level'] == LOG_WARNING) ChromePhp::warn($content['message']);
-			elseif ($content['level'] == LOG_INFO) ChromePhp::log($content['message']);
-			else ChromePhp::log($content['message']);
-		}
-		catch (Exception $e)
+			if ($content['level'] == LOG_ERR) {
+			    ChromePhp::error($content['message']);
+			} elseif ($content['level'] == LOG_WARNING) {
+			    ChromePhp::warn($content['message']);
+			} elseif ($content['level'] == LOG_INFO) {
+			    ChromePhp::log($content['message']);
+			} else {
+			    ChromePhp::log($content['message']);
+			}
+		} catch (Exception $e)
 		{
 			// Do not use dol_syslog here to avoid infinite loop
 		}

dolibarr/htdocs/core/modules/syslog/mod_syslog_syslog.php

Braces +16 added lines, -7 removed lines

@@ -51,7 +51,9 @@ 
 	    global $conf;
 
 		// This function does not exists on some ISP (Ex: Free in France)
-		if (!function_exists('openlog')) return 0;
+		if (!function_exists('openlog')) {
+		    return 0;
+		}
 
 		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
 	}
@@ -89,11 +91,12 @@ 
 	    if ($facility)
 		{
 			// Only LOG_USER supported on Windows
-			if (! empty($_SERVER["WINDIR"])) $facility=constant('LOG_USER');
+			if (! empty($_SERVER["WINDIR"])) {
+			    $facility=constant('LOG_USER');
+			}
 
 			dol_syslog("admin/syslog: facility ".$facility);
-		}
-		else
+		} else
 		{
 		    $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
 		}
@@ -111,13 +114,19 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
+		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) {
+		    return;
+		}
+		// Global option to disable output of this handler
 
-		if (! empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
+		if (! empty($conf->global->SYSLOG_FACILITY)) {
+		    // Example LOG_USER
 		{
 			$facility = constant($conf->global->SYSLOG_FACILITY);
 		}
-		else $facility = constant('LOG_USER');
+		} else {
+		    $facility = constant('LOG_USER');
+		}
 
 		// (int) is required to avoid error parameter 3 expected to be long
 		openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);

dolibarr/htdocs/core/modules/syslog/mod_syslog_firephp.php

Braces +21 added lines, -12 removed lines

@@ -80,8 +80,7 @@ 
 			} else {
 				return 0;
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			print '<!-- FirePHP not available into PHP -->'."\n";
 		}
@@ -123,11 +122,12 @@ 
 		if (!file_exists($conf->global->SYSLOG_FIREPHP_INCLUDEPATH . self::$firephp_class_path))
 		{
 			$conf->global->MAIN_SYSLOG_DISABLE_FIREPHP = 1; // avoid infinite loop
-			if (is_object($langs))   // $langs may not be defined yet.
+			if (is_object($langs)) {
+			    // $langs may not be defined yet.
 			{
 				$errors[] = $langs->trans("ErrorFailedToOpenFile", self::$firephp_class_path);
 			}
-			else
+			} else
 			{
 				$errors[] = "ErrorFailedToOpenFile " . self::$firephp_class_path;
 			}
@@ -146,10 +146,15 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_FIREPHP)) return;	// Global option to disable output of this handler
+		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_FIREPHP)) {
+		    return;
+		}
+		// Global option to disable output of this handler
 
 		//We check the configuration to avoid showing PHP warnings
-		if (count($this->checkConfiguration())) return false;
+		if (count($this->checkConfiguration())) {
+		    return false;
+		}
 
 		try
 		{
@@ -161,12 +166,16 @@ 
 			set_include_path($oldinclude);
 			ob_start();	// To be sure headers are not flushed until all page is completely processed
 			$firephp = FirePHP::getInstance(true);
-			if ($content['level'] == LOG_ERR) $firephp->error($content['message']);
-			elseif ($content['level'] == LOG_WARNING) $firephp->warn($content['message']);
-			elseif ($content['level'] == LOG_INFO) $firephp->log($content['message']);
-			else $firephp->log($content['message']);
-		}
-		catch (Exception $e)
+			if ($content['level'] == LOG_ERR) {
+			    $firephp->error($content['message']);
+			} elseif ($content['level'] == LOG_WARNING) {
+			    $firephp->warn($content['message']);
+			} elseif ($content['level'] == LOG_INFO) {
+			    $firephp->log($content['message']);
+			} else {
+			    $firephp->log($content['message']);
+			}
+		} catch (Exception $e)
 		{
 			// Do not use dol_syslog here to avoid infinite loop
 			return false;

dolibarr/htdocs/core/modules/modAdherent.class.php

Braces +3 added lines, -1 removed lines

@@ -326,11 +326,13 @@
 		// Add extra fields
 		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity IN (0,".$conf->entity.")";
 		$resql=$this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		if ($resql) {
+		    // This can fail when class is used on old database (during migration for example)
 		{
 		    while ($obj=$this->db->fetch_object($resql))
 		    {
 		        $fieldname='extra.'.$obj->name;
+		}
 		        $fieldlabel=ucfirst($obj->label);
 		        $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
 		    }

dolibarr/htdocs/core/modules/modCategorie.class.php

Braces +6 added lines, -2 removed lines

@@ -187,11 +187,13 @@ 
         // Add extra fields
         $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'";
         $resql=$this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
+        if ($resql) {
+            // This can fail when class is used on old database (during migration for example)
         {
             while ($obj=$this->db->fetch_object($resql))
             {
                 $fieldname='extra.'.$obj->name;
+        }
                 $fieldlabel=ucfirst($obj->label);
                 $typeFilter="Text";
                 switch($obj->type)
@@ -352,11 +354,13 @@ 
         // Add extra fields
         $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople'";
         $resql=$this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
+        if ($resql) {
+            // This can fail when class is used on old database (during migration for example)
         {
         	while ($obj=$this->db->fetch_object($resql))
         	{
         		$fieldname='extra.'.$obj->name;
+        }
         		$fieldlabel=ucfirst($obj->label);
         		$typeFilter="Text";
         		switch($obj->type)

dolibarr/htdocs/core/modules/modMultiCurrency.class.php

Braces +3 added lines, -1 removed lines

@@ -311,7 +311,9 @@
 			$multicurrency->name = $langs->cache_currencies[$conf->currency]['label'].' ('.$langs->getCurrencySymbol($conf->currency).')';
 			$r = $multicurrency->create($user);
 
-			if ($r > 0)	$multicurrency->addRate(1);
+			if ($r > 0) {
+			    $multicurrency->addRate(1);
+			}
 		}
 	}
 }

dolibarr/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php

Braces +172 added lines, -88 removed lines

@@ -133,7 +133,10 @@ 
 
 		// Get source company
 		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default, if was not defined
 
 		// Define position of columns
 		$this->posxdesc=$this->marge_gauche+1;
@@ -163,9 +166,13 @@ 
 	    // phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblignes;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		// Translations
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
@@ -183,8 +190,7 @@ 
 			{
 				$dir = $conf->commande->dir_output;
 				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
+			} else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->commande->dir_output . "/" . $objectref;
@@ -244,7 +250,9 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfOrderTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+				    $pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
@@ -268,7 +276,9 @@ 
 
 				// New page
 				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (! empty($tplidx)) {
+				    $pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
@@ -310,7 +320,9 @@ 
 						$salereparray=$object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj=new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (! empty($salerepobj->signature)) $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (! empty($salerepobj->signature)) {
+						    $notetoshow=dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 
@@ -342,8 +354,12 @@ 
 				        while ($pagenb < $pageposafternote) {
 				            $pdf->AddPage();
 				            $pagenb++;
-				            if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-				            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+				            if (! empty($tplidx)) {
+				                $pdf->useTemplate($tplidx);
+				            }
+				            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+				                $this->_pagehead($pdf, $object, 0, $outputlangs);
+				            }
 				            // $this->_pagefoot($pdf,$object,$outputlangs,1);
 				            $pdf->setTopMargin($tab_top_newpage);
 				            // The only function to edit the bottom margin of current page to set it.
@@ -359,9 +375,11 @@ 
 
 				        $posyafter = $pdf->GetY();
 
-				        if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+20)))	// There is no space left for total+free text
+				        if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+20))) {
+				            // There is no space left for total+free text
 				        {
 				            $pdf->AddPage('','',true);
+				        }
 				            $pagenb++;
 				            $pageposafternote++;
 				            $pdf->setPage($pageposafternote);
@@ -383,8 +401,7 @@ 
 				            if($i>$pageposbeforenote){
 				                $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
 				                $pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note + 1);
-				            }
-				            else{
+				            } else{
 				                $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 				                $pdf->Rect($this->marge_gauche, $tab_top-1, $tab_width, $height_note + 1);
 				            }
@@ -398,12 +415,15 @@ 
 
 				        // apply note frame to last page
 				        $pdf->setPage($pageposafternote);
-				        if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-				        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+				        if (! empty($tplidx)) {
+				            $pdf->useTemplate($tplidx);
+				        }
+				        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+				            $this->_pagehead($pdf, $object, 0, $outputlangs);
+				        }
 				        $height_note=$posyafter-$tab_top_newpage;
 				        $pdf->Rect($this->marge_gauche, $tab_top_newpage-1, $tab_width, $height_note+1);
-				    }
-				    else // No pagebreak
+				    } else // No pagebreak
 				    {
 				        $pdf->commitTransaction();
 				        $posyafter = $pdf->GetY();
@@ -418,8 +438,12 @@ 
 				            $pagenb++;
 				            $pageposafternote++;
 				            $pdf->setPage($pageposafternote);
-				            if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-				            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+				            if (! empty($tplidx)) {
+				                $pdf->useTemplate($tplidx);
+				            }
+				            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+				                $this->_pagehead($pdf, $object, 0, $outputlangs);
+				            }
 
 				            $posyafter = $tab_top_newpage;
 				        }
@@ -427,8 +451,7 @@ 
 
 				    $tab_height = $tab_height - $height_note;
 				    $tab_top = $posyafter +6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -463,32 +486,36 @@ 
     					$pdf->startTransaction();
     					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->getColumnContentWidth('desc'),3,$this->getColumnContentXStart('desc'),$curY,$hideref,$hidedesc);
     					$pageposafter=$pdf->getPage();
-    					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+    					if ($pageposafter > $pageposbefore) {
+    					    // There is a pagebreak
     					{
     						$pdf->rollbackTransaction(true);
+    					}
     						$pageposafter=$pageposbefore;
     						//print $pageposafter.'-'.$pageposbefore;exit;
     						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
     						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->getColumnContentWidth('desc'),3,$this->getColumnContentXStart('desc'),$curY,$hideref,$hidedesc);
     						$pageposafter=$pdf->getPage();
     						$posyafter=$pdf->GetY();
-    						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+    						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))) {
+    						    // There is no space left for total+free text
     						{
     							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
     							{
     								$pdf->AddPage('','',true);
-    								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+    						}
+    								if (! empty($tplidx)) {
+    								    $pdf->useTemplate($tplidx);
+    								}
     								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
     								$pdf->setPage($pageposafter+1);
     							}
-    						}
-    						else
+    						} else
     						{
     							// We found a page break
     							$showpricebeforepagebreak=0;
     						}
-    					}
-    					else	// No pagebreak
+    					} else	// No pagebreak
     					{
     						$pdf->commitTransaction();
     					}
@@ -573,8 +600,11 @@ 
 
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne=$object->lines[$i]->total_tva;
+					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) {
+					    $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+					} else {
+					    $tvaligne=$object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
@@ -583,29 +613,43 @@ 
 					$localtax1_type=$object->lines[$i]->localtax1_type;
 					$localtax2_type=$object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+					if ($object->remise_percent) {
+					    $tvaligne-=($tvaligne*$object->remise_percent)/100;
+					}
+					if ($object->remise_percent) {
+					    $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
+					}
+					if ($object->remise_percent) {
+					    $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+					}
 
 					$vatrate=(string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
-					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
+					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) {
+					    // and there is local tax
 					{
 						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
+					}
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
 				    // retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
-						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
-						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+					if ($localtax1_type && $localtax1ligne != 0) {
+											$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
+											$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]=0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+					    $vatrate.='*';
+					}
+					if (! isset($this->tva[$vatrate])) {
+					    $this->tva[$vatrate]=0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
 					// Add line
@@ -627,8 +671,7 @@ 
 						if ($pagenb == $pageposbeforeprintlines)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
@@ -636,32 +679,38 @@ 
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
 					{
 					    if ($pagenb == $pageposafter)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
+						} else
 						{
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (! empty($tplidx)) {
+						    $pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						    $this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == $pageposbeforeprintlines)
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				if ($pagenb == $pageposbeforeprintlines) {
+									$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
+				} else {
+									$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				}
 				$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Affiche zone infos
@@ -680,7 +729,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -692,20 +743,19 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Pas d'erreur
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->transnoentities("ErrorConstantNotDefined","COMMANDE_OUTPUTDIR");
 			return 0;
@@ -811,10 +861,11 @@ 
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy=$pdf->GetY()+1;
-		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		} elseif ($object->availability_code || $object->availability) {
+            // Show availability conditions
 		{
 			$pdf->SetFont('','B', $default_font_size - 2);
+        }
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
@@ -894,7 +945,10 @@ 
 			if (! empty($object->fk_account) || ! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
 			{
 				$bankid=(empty($object->fk_account)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_account);
-				if (! empty($object->fk_bank)) $bankid=$object->fk_bank;   // For backward compatibility when object->fk_account is forced with object->fk_bank
+				if (! empty($object->fk_bank)) {
+				    $bankid=$object->fk_bank;
+				}
+				// For backward compatibility when object->fk_account is forced with object->fk_bank
 				$account = new Account($this->db);
 				$account->fetch($bankid);
 
@@ -933,10 +987,12 @@ 
 
 		// Tableau total
         $col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+		    // To work with US executive format
 		{
 			$col2x-=20;
 		}
+		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
 
 		$useborder=0;
@@ -963,22 +1019,25 @@ 
 			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
+			} else
 			{
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+						if (in_array((string) $localtax_type, array('1','3','5'))) {
+						    continue;
+						}
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey!=0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1002,16 +1061,20 @@ 
 				//{
 					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
+						if (in_array((string) $localtax_type, array('1','3','5'))) {
+						    continue;
+						}
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey!=0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1033,9 +1096,11 @@ 
 				// VAT
 				foreach($this->tva as $tvakey => $tvaval)
 				{
-					if ($tvakey != 0)    // On affiche pas taux 0
+					if ($tvakey != 0) {
+					    // On affiche pas taux 0
 					{
 						$this->atleastoneratenotnull++;
+					}
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1060,15 +1125,19 @@ 
 				//{
 					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+						if (in_array((string) $localtax_type, array('2','4','6'))) {
+						    continue;
+						}
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey != 0)    // On affiche pas taux 0
+							if ($tvakey != 0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1092,15 +1161,19 @@ 
 				//{
 					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+						if (in_array((string) $localtax_type, array('2','4','6'))) {
+						    continue;
+						}
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey != 0)    // On affiche pas taux 0
+							if ($tvakey != 0) {
+							    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
+							}
 								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
@@ -1141,7 +1214,9 @@ 
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if (! empty($object->paye)) $resteapayer=0;
+		if (! empty($object->paye)) {
+		    $resteapayer=0;
+		}
 
 		if ($deja_regle > 0)
 		{
@@ -1189,7 +1264,9 @@ 
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		if ($hidetop) {
+		    $hidetop=-1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1205,7 +1282,9 @@ 
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+			    $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128,128,128);
@@ -1217,7 +1296,9 @@ 
 
 		foreach ($this->cols as $colKey => $colDef)
 		{
-		    if(!$this->getColumnStatus($colKey)) continue;
+		    if(!$this->getColumnStatus($colKey)) {
+		        continue;
+		    }
 
 		    // get title label
 		    $colDef['title']['label'] = !empty($colDef['title']['label'])?$colDef['title']['label']:$outputlangs->transnoentities($colDef['title']['textkey']);
@@ -1286,16 +1367,14 @@ 
 				{
 				    $height=pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-				}
-				else
+				} else
 				{
 					$pdf->SetTextColor(200,0,0);
 					$pdf->SetFont('','B', $default_font_size -2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
+			} else
 			{
 				$text=$this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -1375,7 +1454,9 @@ 
 			// Show sender
 			$posy=42+$top_shift;
 			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			    $posx=$this->page_largeur-$this->marge_droite-80;
+			}
 			$hautcadre=40;
 
 			// Show sender frame
@@ -1424,10 +1505,15 @@ 
 
 			// Show recipient
 			$widthrecbox=100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+			if ($this->page_largeur < 210) {
+			    $widthrecbox=84;
+			}
+			// To work with US executive format
 			$posy=42+$top_shift;
 			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			    $posx=$this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0,0,0);
@@ -1659,12 +1745,10 @@ 
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
+	    } else
 	    {
 	        $this->cols = $hookmanager->resArray;
 	    }