Dolibarr / dolibarr

htdocs/core/class/commondocgenerator.class.php

Braces +29 added lines, -21 removed lines

@@ -210,8 +210,7 @@ 
         		if($extrafields->attribute_type[$key] == 'price')
         		{
         			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
-        		}
-        		else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+        		} else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
         		{
         			$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
         		}
@@ -281,8 +280,7 @@ 
 			if ($extrafields->attribute_type[$key] == 'price')
 			{
 				$object->array_options['options_' . $key] = price($object->array_options ['options_' . $key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
-			}
-			elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			} elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
 				$object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]];
 			}
@@ -319,8 +317,11 @@ 
 
     	foreach($conf->global as $key => $val)
     	{
-    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
-    		else $newval = $val;
+    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+    			$newval = '*****forbidden*****';
+    		} else {
+    			$newval = $val;
+    		}
     		$array_other['__['.$key.']__'] = $newval;
     	}
 
@@ -449,12 +450,16 @@ 
 			foreach ($object->lines as $line)
 			{
 			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
-				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
+				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) {
+					$resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
+				}
 				$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
 			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
 				$vatformated=vatrate($line->tva_tx);
-				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
+				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) {
+					$resarray[$array_key.'_total_vat_'.$vatformated]=0;
+				}
 				$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
 			}
@@ -543,8 +548,9 @@ 
 		{
 			$tmpproduct = new Product($this->db);
 			$result = $tmpproduct->fetch($line->fk_product);
-			foreach($tmpproduct->array_options as $key=>$label)
-				$resarray["line_".$key] = $label;
+			foreach($tmpproduct->array_options as $key=>$label) {
+							$resarray["line_".$key] = $label;
+			}
 		}
 
 		return $resarray;
@@ -592,7 +598,9 @@ 
     	// Add vat by rates
     	foreach ($object->lines as $line)
     	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
+    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) {
+    			$array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
+    		}
     		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
     	}
 
@@ -691,12 +699,10 @@ 
 				$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
 				//Add value to store price with currency
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
-			}
-			else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			} else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
 				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
-			}
-			else if($extrafields->attribute_type[$key] == 'date')
+			} else if($extrafields->attribute_type[$key] == 'date')
 			{
 				if (strlen($object->array_options['options_'.$key])>0)
 				{
@@ -704,8 +710,7 @@ 
 					$object->array_options['options_'.$key] = dol_print_date($date,'day');                                       // using company output language
 					$object->array_options['options_'.$key.'_locale'] = dol_print_date($date,'day','tzserver',$outputlangs);     // using output language format
 					$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date,'dayrfc');                             // international format
-				}
-				else
+				} else
 				{
 					$object->array_options['options_'.$key] = '';
 					$object->array_options['options_'.$key.'_locale'] = '';
@@ -713,8 +718,7 @@ 
 				}
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-			}
-			else if($extrafields->attribute_type[$key] == 'datetime')
+			} else if($extrafields->attribute_type[$key] == 'datetime')
 			{
 				$datetime = $object->array_options['options_'.$key];
 				$object->array_options['options_'.$key] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');                            // using company output language
@@ -745,9 +749,13 @@ 
 	 */
     function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
     {
-	    if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
+	    if (empty($hidetop) || $hidetop==-1) {
+	    	$pdf->line($x, $y, $x+$l, $y);
+	    }
 	    $pdf->line($x+$l, $y, $x+$l, $y+$h);
-	    if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
+	    if (empty($hidebottom)) {
+	    	$pdf->line($x+$l, $y+$h, $x, $y+$h);
+	    }
 	    $pdf->line($x, $y+$h, $x, $y);
     }
 }

htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php

Braces +48 added lines, -42 removed lines

@@ -84,7 +84,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+		if (! $this->emetteur->country_code) {
+			$this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// Par defaut, si n'etait pas defini
 	}
 
 
@@ -122,11 +125,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");
@@ -206,7 +212,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';
 
@@ -232,7 +240,9 @@ 
 
 			$dir = $conf->facture->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))
@@ -259,10 +269,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;
 				}
@@ -289,14 +300,14 @@ 
 				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 {
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+						$socobject = $object->contact;
+					} else {
 			                        $socobject = $object->thirdparty;
                         			// if we have a BILLING contact and we dont use it as recipient we store the contact object for later use
                         			$contactobject = $object->contact;
                     			}
-				}
-				else
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -340,8 +351,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -356,8 +366,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 				}
 
@@ -372,7 +381,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in invoice as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact) {
+					$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_propal,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -385,18 +396,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)
 					{
 					}
 				}
@@ -406,8 +418,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;
@@ -427,11 +438,9 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 								}
 							}
@@ -439,8 +448,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -453,8 +461,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -467,15 +474,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;
 					}
@@ -483,16 +489,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;

htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php

Braces +98 added lines, -79 removed lines

@@ -36,16 +36,36 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (! empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (! empty($conf->commande->enabled))    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (! empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (! empty($conf->contrat->enabled))     require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (! empty($conf->ficheinter->enabled))  require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (! empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if (! empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+if (! empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (! empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+}
+if (! empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+}
+if (! empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (! empty($conf->fournisseur->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+}
+if (! empty($conf->fournisseur->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+}
+if (! empty($conf->contrat->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+}
+if (! empty($conf->ficheinter->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+}
+if (! empty($conf->deplacement->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+}
+if (! empty($conf->agenda->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+}
 
 
 /**
@@ -99,7 +119,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->pays_code) $this->emetteur->pays_code=substr($langs->defaultlang,-2);    // Par defaut, si n'etait pas defini
+		if (! $this->emetteur->pays_code) {
+			$this->emetteur->pays_code=substr($langs->defaultlang,-2);
+		}
+		// Par defaut, si n'etait pas defini
 	}
 
 
@@ -367,11 +390,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");
@@ -449,7 +475,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';
 
@@ -475,7 +503,9 @@ 
 
 			$dir = $conf->projet->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))
@@ -501,10 +531,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;
 				}
@@ -556,8 +587,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -579,7 +609,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in project as contact_xxx tags
 				$array_project_contact = array();
-				if ($usecontact) $array_project_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact) {
+					$array_project_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_project_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -591,17 +623,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)
 					{
 					}
 				}
@@ -615,7 +648,9 @@ 
 
 					// Security check
 					$socid=0;
-					if (!empty($object->fk_soc)) $socid = $object->fk_soc;
+					if (!empty($object->fk_soc)) {
+						$socid = $object->fk_soc;
+					}
 
 					$tasksarray=$taskstatic->getTasksArray(0, 0, $object->id, $socid, 0);
 
@@ -629,11 +664,9 @@ 
 							try
 							{
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
+							} catch(OdfException $e)
 							{
-							}
-							catch(SegmentException $e)
+							} catch(SegmentException $e)
 							{
 							}
 						}
@@ -678,11 +711,9 @@ 
 									try
 									{
 										$listlinestaskres->setVars($key, $val, true, 'UTF-8');
-									}
-									catch(OdfException $e)
+									} catch(OdfException $e)
 									{
-									}
-									catch(SegmentException $e)
+									} catch(SegmentException $e)
 									{
 									}
 								}
@@ -724,11 +755,9 @@ 
 									try
 									{
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									}
-									catch(OdfException $e)
+									} catch(OdfException $e)
 									{
-									}
-									catch(SegmentException $e)
+									} catch(SegmentException $e)
 									{
 									}
 								}
@@ -755,11 +784,9 @@ 
 								try
 								{
 									$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 								}
 							}
@@ -768,8 +795,7 @@ 
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$ExceptionTrace=$e->getTrace();
 					// no segment defined on ODT is not an error
@@ -799,19 +825,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);
@@ -856,19 +879,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);
@@ -968,8 +988,12 @@ 
 
 									//Date object
 									$dateref=$element->date;
-									if (empty($dateref)) $dateref=$element->datep;
-									if (empty($dateref)) $dateref=$element->date_contrat;
+									if (empty($dateref)) {
+										$dateref=$element->datep;
+									}
+									if (empty($dateref)) {
+										$dateref=$element->date_contrat;
+									}
 									$ref_array['date']=$dateref;
 
 									//Soc object
@@ -984,11 +1008,11 @@ 
 										if (!empty($element->total_ht)) {
 											$ref_array['amountht']=$element->total_ht;
 											$ref_array['amountttc']=$element->total_ttc;
-										}else {
+										} else {
 											$ref_array['amountht']=0;
 											$ref_array['amountttc']=0;
 										}
-									}else {
+									} else {
 										$ref_array['amountht']='';
 										$ref_array['amountttc']='';
 									}
@@ -1002,11 +1026,9 @@ 
 										try
 										{
 											$listlines->setVars($key, $val, true, 'UTF-8');
-										}
-										catch(OdfException $e)
+										} catch(OdfException $e)
 										{
-										}
-										catch(SegmentException $e)
+										} catch(SegmentException $e)
 										{
 										}
 									}
@@ -1017,8 +1039,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -1031,8 +1052,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -1046,15 +1066,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;
 					}
@@ -1062,16 +1081,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;

htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php

Braces +48 added lines, -42 removed lines

@@ -83,7 +83,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
 	}
 
 
@@ -121,11 +124,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");
@@ -197,7 +203,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';
 
@@ -223,7 +231,9 @@ 
 
 			$dir = $conf->contrat->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))
@@ -250,10 +260,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;
 				}
@@ -279,14 +290,14 @@ 
 				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 {
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+						$socobject = $object->contact;
+					} else {
                         			$socobject = $object->thirdparty;
                         			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         			$contactobject = $object->contact;
                     			}
-				}
-				else
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -304,7 +315,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in contract as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact) {
+					$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				}
 
 				$substitutionarray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($substitutionarray, $outputlangs, $object);
@@ -336,8 +349,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -352,25 +364,25 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 				}
 
 				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)
 					{
 					}
 				}
@@ -381,8 +393,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;
@@ -402,11 +413,9 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 								}
 							}
@@ -414,8 +423,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -428,8 +436,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -442,15 +449,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;
 					}
@@ -458,16 +464,16 @@ 
 
 				$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;

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

Braces +47 added lines, -41 removed lines

@@ -83,7 +83,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
 	}
 
 
@@ -127,11 +130,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");
@@ -237,7 +243,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';
 
@@ -263,7 +271,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))
@@ -290,10 +300,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;
 				}
@@ -319,10 +330,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;
 				}
@@ -360,8 +373,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -376,8 +388,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 				}
 
@@ -399,17 +410,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)
 					{
 					}
 				}
@@ -419,8 +431,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;
@@ -440,11 +451,9 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 								}
 							}
@@ -452,8 +461,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -466,8 +474,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -480,15 +487,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;
 					}
@@ -496,16 +502,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;

htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php

Braces +48 added lines, -42 removed lines

@@ -84,7 +84,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
 	}
 
 
@@ -122,11 +125,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");
@@ -207,7 +213,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';
 
@@ -233,7 +241,9 @@ 
 
 			$dir = $conf->commande->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))
@@ -259,10 +269,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;
 				}
@@ -288,14 +299,14 @@ 
 				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 {
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+						$socobject = $object->contact;
+					} else {
                         $socobject = $object->thirdparty;
                			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
             			$contactobject = $object->contact;
                     }
-				}
-				else
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -333,8 +344,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -349,8 +359,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 				}
 
@@ -364,7 +373,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in order as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact) {
+					$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -376,17 +387,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)
 					{
 					}
 				}
@@ -396,8 +408,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;
@@ -417,11 +428,9 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 								}
 							}
@@ -429,8 +438,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -443,8 +451,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -458,15 +465,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;
 					}
@@ -475,16 +481,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;

htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php

Braces +48 added lines, -42 removed lines

@@ -83,7 +83,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
 	}
 
 
@@ -127,11 +130,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");
@@ -237,7 +243,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';
 
@@ -263,7 +271,9 @@ 
 
 			$dir = $conf->propal->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))
@@ -290,10 +300,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;
 				}
@@ -319,14 +330,14 @@ 
 				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 {
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+						$socobject = $object->contact;
+					} else {
                         			$socobject = $object->thirdparty;
                         			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         			$contactobject = $object->contact;
                     			}
-				}
-				else
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -363,8 +374,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -380,8 +390,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 				}
 
@@ -395,7 +404,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in proposal as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact) {
+					$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -407,17 +418,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)
 					{
 					}
 				}
@@ -427,8 +439,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;
@@ -448,11 +459,9 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 								}
 							}
@@ -460,8 +469,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -474,8 +482,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -488,15 +495,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;
 					}
@@ -504,16 +510,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;

htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php

Braces +47 added lines, -40 removed lines

@@ -82,7 +82,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
 	}
 
 
@@ -126,11 +129,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");
@@ -221,7 +227,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';
 
@@ -249,7 +257,9 @@ 
 
 			$dir = $conf->produit->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))
@@ -276,10 +286,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;
 				}
@@ -305,14 +316,14 @@ 
 				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 {
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+						$socobject = $object->contact;
+					} else {
                         			$socobject = $object->thirdparty;
                         			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         			$contactobject = $object->contact;
                     			}
-				}
-				else
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -349,8 +360,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -366,8 +376,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 				}
 
@@ -381,7 +390,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in product as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact) {
+					$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -393,17 +404,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)
 					{
 					}
 				}
@@ -424,11 +436,9 @@ 
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 								}
 							}
@@ -436,8 +446,7 @@ 
 						}
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -450,8 +459,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -464,15 +472,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;
 					}
@@ -480,16 +487,16 @@ 
 
 				$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;

htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php

Braces +48 added lines, -43 removed lines

@@ -83,7 +83,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
 	}
 
 
@@ -127,11 +130,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");
@@ -222,7 +228,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';
 
@@ -248,7 +256,9 @@ 
 
 			$dir = $conf->usergroup->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))
@@ -275,10 +285,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;
 				}
@@ -304,14 +315,14 @@ 
 				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 {
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+						$socobject = $object->contact;
+					} else {
                         			$socobject = $object->thirdparty;
                         			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         			$contactobject = $object->contact;
                     			}
-				}
-				else
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -348,8 +359,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -364,8 +374,7 @@ 
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 				}
 
@@ -378,8 +387,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 		                // retrieve contact information for use in user as contact_xxx tags
                 		$array_thirdparty_contact = array();
-                		if ($usecontact)
-                    			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+                		if ($usecontact) {
+                		                    			$array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+                		}
 
 				$tmparray = array_merge($array_global,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -391,17 +401,18 @@ 
 				{
 					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)
 					{
 					}
 				}
@@ -411,8 +422,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;
@@ -436,11 +446,9 @@ 
 									if(!is_array($val)) {
 										$listlines->setVars($key, $val, true, 'UTF-8');
 									}
-								}
-								catch(OdfException $e)
+								} catch(OdfException $e)
 								{
-								}
-								catch(SegmentException $e)
+								} catch(SegmentException $e)
 								{
 								}
 							}
@@ -448,8 +456,7 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -462,8 +469,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 					}
 				}
@@ -476,15 +482,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;
 					}
@@ -492,16 +497,16 @@ 
 
 				$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;