alxarafe / alixar

dolibarr/htdocs/core/modules/cheque/mod_chequereceipt_mint.php

Braces +13 added lines, -6 removed lines

@@ -124,10 +124,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;
@@ -137,8 +139,13 @@ 
 		$date=$object->date_bordereau;
 		$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/cheque/modules_chequereceipts.php

Braces +15 added lines, -10 removed lines

@@ -108,10 +108,18 @@ 
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+		    return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+		    return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+		    return DOL_VERSION;
+		}
+		if ($this->version) {
+		    return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -177,8 +185,7 @@ 
 		if (! empty($conf->global->CHEQUERECEIPT_ADDON_PDF))
 		{
 			$modele = $conf->global->CHEQUERECEIPT_ADDON_PDF;
-		}
-		else
+		} else
 		{
 			//print $langs->trans("Error")." ".$langs->trans("Error_FACTURE_ADDON_PDF_NotDefined");
 			//return 0;
@@ -202,15 +209,13 @@ 
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			return 1;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			dol_print_error($db,"chequereceipt_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$dir.$file));
 		return -1;

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

Braces +12 added lines, -4 removed lines

@@ -129,17 +129,25 @@
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
 		$this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'deplacement as d';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON d.fk_soc = s.rowid';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+		    $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
 		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
+		if (empty($user->rights->societe->client->voir)) {
+		    $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
+		}
 
-		if (! empty($user))   // Not defined during migration process
+		if (! empty($user)) {
+		    // Not defined during migration process
 		{
     		$childids = $user->getAllChildIds();
+		}
     		$childids[]=$user->id;
 
-    		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
+    		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
+    		    $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
+    		}
 		}
 	}
 

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

Braces +6 added lines, -2 removed lines

@@ -235,7 +235,9 @@ 
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+		    $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande as c';
@@ -249,7 +251,9 @@ 
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
 		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('commande').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND sc.fk_user = '.(empty($user)?0:$user->id);
+		if (empty($user->rights->societe->client->voir)) {
+		    $this->export_sql_end[$r] .=' AND sc.fk_user = '.(empty($user)?0:$user->id);
+		}
 	}
 
 

dolibarr/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php

Braces +6 added lines, -2 removed lines

@@ -110,7 +110,9 @@ 
 		global $_GET;
 
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
-		if (empty($tcpdfEncoding)) return -1;
+		if (empty($tcpdfEncoding)) {
+		    return -1;
+		}
 
 		$color = array(0,0,0);
 
@@ -160,7 +162,9 @@ 
 		$file=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
-		if (empty($tcpdfEncoding)) return -1;
+		if (empty($tcpdfEncoding)) {
+		    return -1;
+		}
 
 		$color = array(0,0,0);
 

dolibarr/htdocs/core/modules/barcode/doc/phpbarcode.modules.php

Braces +33 added lines, -11 removed lines

@@ -96,16 +96,28 @@ 
         //print 'genbarcode_loc='.$genbarcode_loc.' encoding='.$encoding;exit;
 
 		$supported=0;
-		if ($encoding == 'EAN13') $supported=1;
-		if ($encoding == 'ISBN')  $supported=1;
+		if ($encoding == 'EAN13') {
+		    $supported=1;
+		}
+		if ($encoding == 'ISBN') {
+		    $supported=1;
+		}
 		// Formats that hangs on Windows (when genbarcode.exe for Windows is called, so they are not
 		// activated on Windows)
 		if (file_exists($genbarcode_loc) && empty($_SERVER["WINDIR"]))
 		{
-			if ($encoding == 'EAN8')  $supported=1;
-			if ($encoding == 'UPC')   $supported=1;
-			if ($encoding == 'C39')   $supported=1;
-			if ($encoding == 'C128')  $supported=1;
+			if ($encoding == 'EAN8') {
+			    $supported=1;
+			}
+			if ($encoding == 'UPC') {
+			    $supported=1;
+			}
+			if ($encoding == 'C39') {
+			    $supported=1;
+			}
+			if ($encoding == 'C128') {
+			    $supported=1;
+			}
 		}
 		return $supported;
 	}
@@ -126,10 +138,16 @@ 
 		global $conf;
 		global $genbarcode_loc, $bar_color, $bg_color, $text_color, $font_loc;
 
-		if (! $this->encodingIsSupported($encoding)) return -1;
+		if (! $this->encodingIsSupported($encoding)) {
+		    return -1;
+		}
 
-		if ($encoding == 'EAN8' || $encoding == 'EAN13') $encoding = 'EAN';
-		if ($encoding == 'C39' || $encoding == 'C128')   $encoding = substr($encoding,1);
+		if ($encoding == 'EAN8' || $encoding == 'EAN13') {
+		    $encoding = 'EAN';
+		}
+		if ($encoding == 'C39' || $encoding == 'C128') {
+		    $encoding = substr($encoding,1);
+		}
 
 		$mode='png';
 
@@ -139,12 +157,16 @@ 
 		$_GET["mode"]=$mode;
 
 		dol_syslog(get_class($this)."::buildBarCode $code,$encoding,$scale,$mode");
-		if ($code) $result=barcode_print($code,$encoding,$scale,$mode);
+		if ($code) {
+		    $result=barcode_print($code,$encoding,$scale,$mode);
+		}
 
 		if (! is_array($result))
 		{
 			$this->error=$result;
-			if (empty($nooutputiferror)) print $this->error;
+			if (empty($nooutputiferror)) {
+			    print $this->error;
+			}
 			return -1;
 		}
 

dolibarr/htdocs/core/modules/barcode/mod_barcode_product_standard.php

Braces +16 added lines, -17 removed lines

@@ -152,7 +152,9 @@ 
 
 		// Get Mask value
 		$mask = '';
-		if (! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		if (! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) {
+		    $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		}
 
 		if (empty($mask))
 		{
@@ -198,12 +200,10 @@ 
 		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
 		{
 			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) )
+		} else if (empty($code) && (! $this->code_null || ! empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) )
 		{
 			$result=-2;
-		}
-		else
+		} else
 		{
 			if ($this->verif_syntax($code, $type) >= 0)
 			{
@@ -211,19 +211,16 @@ 
 				if ($is_dispo <> 0)
 				{
 					$result=-3;
-				}
-				else
+				} else
 				{
 					$result=0;
 				}
-			}
-			else
+			} else
 			{
 				if (dol_strlen($code) == 0)
 				{
 					$result=-2;
-				}
-				else
+				} else
 				{
 					$result=-1;
 				}
@@ -249,7 +246,9 @@ 
         // phpcs:enable
 		$sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."product";
 		$sql.= " WHERE barcode = '".$code."'";
-		if ($product->id > 0) $sql.= " AND rowid <> ".$product->id;
+		if ($product->id > 0) {
+		    $sql.= " AND rowid <> ".$product->id;
+		}
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -257,13 +256,11 @@ 
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}
@@ -297,11 +294,13 @@ 
 		$newcodefortest=$codefortest;
 
 		// Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
-		if (in_array($typefortest,array('EAN13','ISBN')))	// We remove the CRC char not included into mask
+		if (in_array($typefortest,array('EAN13','ISBN'))) {
+		    // We remove the CRC char not included into mask
 		{
     		if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))
     	    {
     	        if (strlen($reg[1]) == 12) $newcodefortest=substr($newcodefortest,0,12);
+		}
     	        dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
     	    }
 		}

dolibarr/htdocs/core/modules/barcode/modules_barcode.class.php

Braces +36 added lines, -12 removed lines

@@ -111,10 +111,18 @@ 
         global $langs;
         $langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
+        if ($this->version == 'development') {
+            return $langs->trans("VersionDevelopment");
+        }
+        if ($this->version == 'experimental') {
+            return $langs->trans("VersionExperimental");
+        }
+        if ($this->version == 'dolibarr') {
+            return DOL_VERSION;
+        }
+        if ($this->version) {
+            return $this->version;
+        }
         return $langs->trans("NotAvailable");
     }
 
@@ -135,31 +143,45 @@ 
         $s='';
         $s.=$langs->trans("Name").': <b>'.$this->name.'</b><br>';
         $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-        if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        if ($type != -1) {
+            $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+        }
         $s.='<br>';
         $s.='<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
         if ($type == 0)
         {
             $s.=$langs->trans("RequiredIfProduct").': ';
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         if ($type == 1)
         {
             $s.=$langs->trans("RequiredIfService").': ';
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         if ($type == -1)
         {
             $s.=$langs->trans("Required").': ';
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='<strike>';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='<strike>';
+            }
             $s.=yn(!$this->code_null,1,2);
-            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            if (! empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) {
+                $s.='</strike> '.yn(1,1,2).' ('.$langs->trans("ForcedToByAModule",$langs->transnoentities("yes")).')';
+            }
             $s.='<br>';
         }
         /*$s.=$langs->trans("CanBeModifiedIfOk").': ';
@@ -171,7 +193,9 @@ 
         $s.='<br>';
 
         $nextval=$this->getNextValue($soc,'');
-        if (empty($nextval)) $nextval=$langs->trans("Undefined");
+        if (empty($nextval)) {
+            $nextval=$langs->trans("Undefined");
+        }
         $s.=$langs->trans("NextValue").': <b>'.$nextval.'</b><br>';
 
         return $s;

dolibarr/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php

Braces +45 added lines, -39 removed lines

@@ -97,7 +97,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
 	}
 
 
@@ -141,11 +144,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");
@@ -253,7 +259,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';
 
@@ -277,7 +285,9 @@ 
 
 			$dir = $conf->supplier_proposal->dir_output;
 			$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))
@@ -304,10 +314,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;
 				}
@@ -333,10 +344,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;
 				}
@@ -374,8 +387,7 @@ 
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -391,8 +403,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -415,17 +426,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)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -436,8 +448,7 @@ 
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -457,12 +468,10 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -471,8 +480,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -485,8 +493,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -505,8 +512,7 @@ 
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -518,16 +524,16 @@ 
 				$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
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Success
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return -1;