alxarafe / alixar

dolibarr/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php

Braces +67 added lines, -57 removed lines

@@ -81,7 +81,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 	}
 
 
@@ -119,11 +122,14 @@ 
 			if (! $tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-			else
+			if (! is_dir($tmpdir)) {
+			    $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			} else
 			{
 				$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+				if (count($tmpfiles)) {
+				    $listoffiles=array_merge($listoffiles,$tmpfiles);
+				}
 			}
 		}
 		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
@@ -205,7 +211,9 @@ 
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
@@ -231,7 +239,9 @@ 
 
 			$dir = $conf->reception->dir_output."/reception";
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (! preg_match('/specimen/i',$objectref)) {
+			    $dir.= "/" . $objectref;
+			}
 			$file = $dir . "/" . $objectref . ".odt";
 
 			if (! file_exists($dir))
@@ -257,10 +267,11 @@ 
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
 				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+				    if ($format == '1') {
+				        $format='%Y%m%d%H%M%S';
+				    }
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
+				} else
 				{
 					$filename=$newfiletmp.'.'.$newfileformat;
 				}
@@ -286,10 +297,12 @@ 
 				if (! empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else $socobject = $object->thirdparty;
-				}
-				else
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+					    $socobject = $object->contact;
+					} else {
+					    $socobject = $object->thirdparty;
+					}
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -327,8 +340,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -343,8 +355,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 				}
 
@@ -354,18 +365,19 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -375,18 +387,19 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key))	// Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else	// Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -395,17 +408,18 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key))	// Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else	// Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -418,17 +432,18 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -448,19 +463,16 @@ 
 							try
 							{
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
+							} catch(OdfException $e)
 							{
-							}
-							catch(SegmentException $e)
+							} catch(SegmentException $e)
 							{
 							}
 						}
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -473,8 +485,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -487,15 +498,14 @@ 
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
-					}catch (Exception $e){
+					} catch (Exception $e){
 						$this->error=$e->getMessage();
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					$odfHandler->saveToDisk($file);
-					}catch (Exception $e){
+					} catch (Exception $e){
 						$this->error=$e->getMessage();
 						return -1;
 					}
@@ -503,14 +513,14 @@ 
 				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
 				$reshook=$hookmanager->executeHooks('afterODTCreation',$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));
+				}
 
 				$odfHandler=null;	// Destroy object
 
 				return 1;   // Success
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return -1;

dolibarr/htdocs/core/modules/reception/mod_reception_beryl.php

Braces +13 added lines, -6 removed lines

@@ -111,10 +111,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+			    $max = intval($obj->max);
+			} else {
+			    $max=0;
+			}
+		} else
 		{
 			dol_syslog("mod_reception_beryl::getNextValue", LOG_DEBUG);
 			return -1;
@@ -123,8 +125,13 @@ 
 		$date=time();
 		$yymm = strftime("%y%m",$date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) {
+		    $num=$max+1;
+		}
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else {
+		    $num = sprintf("%04s",$max+1);
+		}
 
 		dol_syslog("mod_reception_beryl::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

dolibarr/htdocs/core/modules/payment/mod_payment_cicada.php

Braces +13 added lines, -6 removed lines

@@ -134,10 +134,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+			    $max = intval($obj->max);
+			} else {
+			    $max=0;
+			}
+		} else
 		{
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
@@ -147,8 +149,13 @@ 
 		$date=$object->datepaye;
 		$yymm = strftime("%y%m",$date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) {
+    	    $num=$max+1;
+    	}
+    	// If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else {
+    	    $num = sprintf("%04s",$max+1);
+    	}
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

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

Braces +3 added lines, -1 removed lines

@@ -263,11 +263,13 @@
 		// Add extra fields
 		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'user' 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/export/export_excel2007.modules.php

Braces +2 added lines, -4 removed lines

@@ -94,8 +94,7 @@ 
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
     			$this->label_lib='PhpWriteExcel';
                 $this->version_lib='unknown';
-    		}
-    		else
+    		} else
     		{
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
@@ -122,8 +121,7 @@ 
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     	{
 	        $this->workbook->close();
-    	}
-    	else
+    	} else
     	{
             require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
     	    $objWriter = new PHPExcel_Writer_Excel2007($this->workbook);

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

Braces +32 added lines, -31 removed lines

@@ -94,8 +94,7 @@ 
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
     			$this->label_lib='PhpWriteExcel';
                 $this->version_lib='unknown';
-    		}
-    		else
+    		} else
     		{
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
@@ -211,17 +210,18 @@ 
     		$this->workbook->set_tempdir($conf->export->dir_temp);			// Set temporary directory
     		$this->workbook->set_sheetname($outputlangs->trans("Sheet"));
     		$this->worksheet = &$this->workbook->addworksheet();
-		}
-		else
+		} else
 		{
             require_once PHPEXCEL_PATH.'PHPExcel.php';
             require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
 
 		    if ($this->id == 'excel2007')
 		    {
-	            if (! class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
+	            if (! class_exists('ZipArchive')) {
+	                // For Excel2007, PHPExcel need ZipArchive
 	            {
 	            	$langs->load("errors");
+	            }
 	            	$this->error=$langs->trans('ErrorPHPNeedModule','zip');
 	            	return -1;
 	            }
@@ -291,8 +291,7 @@ 
     		//$formatheader->set_size(12);
     		//$formatheader->set_font("Courier New");
     		//$formatheader->set_align('center');
-		}
-		else
+		} else
 		{
             $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
 		    $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
@@ -303,17 +302,20 @@ 
 		{
             $alias=$array_export_fields_label[$code];
 			//print "dd".$alias;
-			if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			if (empty($alias)) {
+			    dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			}
     		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-    		}
-    		else
+    		} else
     		{
                 $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $outputlangs->transnoentities($alias));
-    		    if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto')))		// Set autowidth for some types
+    		    if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto'))) {
+    		        // Set autowidth for some types
                 {
                 	$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
+    		    }
                 }
     		}
 			$this->col++;
@@ -348,9 +350,14 @@ 
 
 		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=$objp->$alias;
 
 			$newvalue=$this->excel_clean($newvalue);
@@ -367,8 +374,7 @@ 
 			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
 			{
 				$newvalue=$outputlangs->transnoentities($reg[1]);
-			}
-			else
+			} else
 			{
 				$newvalue=$outputlangs->convToOutputCharset($newvalue);
 			}
@@ -384,16 +390,14 @@ 
     				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
     				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
         		    $this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
-        		}
-        		else
+        		} else
         		{
         		    $newvalue=dol_stringtotime($newvalue);
         		    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
         		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
         		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
         		}
-			}
-			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
+			} elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
 			{
 				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		    {
@@ -404,22 +408,19 @@ 
     				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
     				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
     		        $this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
-    		    }
-    		    else
+    		    } else
     		    {
         		    $newvalue=dol_stringtotime($newvalue);
     		        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
         		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
         		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
     		    }
-			}
-			else
+			} else
 			{
 				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		    {
 			        $this->worksheet->write($this->row, $this->col, $newvalue);
-    		    }
-    		    else
+    		    } else
 				{
     		    	if ($typefield == 'Text' || $typefield == 'TextAuto')
     		    	{
@@ -428,8 +429,7 @@ 
     		    		$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
     		    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
     		    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-    		    	}
-    		    	else
+    		    	} else
     		    	{
     		    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
     		    	}
@@ -470,8 +470,7 @@ 
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     	{
 	        $this->workbook->close();
-    	}
-    	else
+    	} else
     	{
             require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
     	    $objWriter = new PHPExcel_Writer_Excel5($this->workbook);
@@ -510,7 +509,9 @@ 
     {
 
     	$c = intval($c);
-    	if ($c <= 0) return '';
+    	if ($c <= 0) {
+    	    return '';
+    	}
 
     	while ($c != 0)
     	{

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
 		}