alxarafe / alixar

dolibarr/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php

Indentation +756 added lines, -756 removed lines

@@ -55,84 +55,84 @@ 
  */
 class doc_generic_task_odt extends ModelePDFTask
 {
-	/**
-	 * Issuer
-	 * @var Company object that emits
-	 */
-	public $emetteur;
-
-	/**
-   * @var array() Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.4 = array(5, 4)
-   */
-	public $phpmin = array(5, 4);
-
-	/**
+    /**
+     * Issuer
+     * @var Company object that emits
+     */
+    public $emetteur;
+
+    /**
+     * @var array() Minimum version of PHP required by module.
+     * e.g.: PHP ≥ 5.4 = array(5, 4)
+     */
+    public $phpmin = array(5, 4);
+
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs, $mysoc;
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs, $mysoc;
 
-		// Load translation files required by the page
+        // Load translation files required by the page
         $langs->loadLangs(array("main","companies"));
 
-		$this->db = $db;
-		$this->name = "ODT templates";
-		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'PROJECT_TASK_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
-
-		// Dimension page pour format A4
-		$this->type = 'odt';
-		$this->page_largeur = 0;
-		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 0;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
-
-		// 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
-	}
+        $this->db = $db;
+        $this->name = "ODT templates";
+        $this->description = $langs->trans("DocumentModelOdt");
+        $this->scandir = 'PROJECT_TASK_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+
+        // Dimension page pour format A4
+        $this->type = 'odt';
+        $this->page_largeur = 0;
+        $this->page_hauteur = 0;
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=0;
+        $this->marge_droite=0;
+        $this->marge_haute=0;
+        $this->marge_basse=0;
+
+        $this->option_logo = 1;                    // Affiche logo
+        $this->option_tva = 0;                     // Gere option tva COMMANDE_TVAOPTION
+        $this->option_modereg = 0;                 // Affiche mode reglement
+        $this->option_condreg = 0;                 // Affiche conditions reglement
+        $this->option_codeproduitservice = 0;      // Affiche code produit-service
+        $this->option_multilang = 0;               // Dispo en plusieurs langues
+        $this->option_escompte = 0;                // Affiche si il y a eu escompte
+        $this->option_credit_note = 0;             // Support credit notes
+        $this->option_freetext = 1;				   // Support add of a personalised text
+        $this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+
+        // 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
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Define array with couple substitution key => substitution value
-	 *
-	 * @param   Project			$object             Main object to use as data source
-	 * @param   Translate		$outputlangs        Lang object to use for output
+    /**
+     * Define array with couple substitution key => substitution value
+     *
+     * @param   Project			$object             Main object to use as data source
+     * @param   Translate		$outputlangs        Lang object to use for output
      * @param   string		    $array_key	        Name of the key for return array
-	 * @return	array								Array of substitution
-	 */
-	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
-	{
+     * @return	array								Array of substitution
+     */
+    function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$resarray=array(
+        $resarray=array(
             $array_key.'_id'=>$object->id,
             $array_key.'_ref'=>$object->ref,
             $array_key.'_title'=>$object->title,
@@ -145,735 +145,735 @@ 
             $array_key.'_note_public'=>$object->note_public,
             $array_key.'_public'=>$object->public,
             $array_key.'_statut'=>$object->getLibStatut()
-		);
+        );
 
-		// Retrieve extrafields
-		if (is_array($object->array_options) && count($object->array_options))
-		{
-			$extrafieldkey=$object->element;
+        // Retrieve extrafields
+        if (is_array($object->array_options) && count($object->array_options))
+        {
+            $extrafieldkey=$object->element;
 
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields = new ExtraFields($this->db);
-			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-			$object->fetch_optionals();
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+            $object->fetch_optionals();
 
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
-		}
+            $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+        }
 
-		return $resarray;
-	}
+        return $resarray;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$task				Task Object
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_tasks($task,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$task				Task Object
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_tasks($task,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'task_ref'=>$task->ref,
-		'task_fk_project'=>$task->fk_project,
-		'task_projectref'=>$task->projectref,
-		'task_projectlabel'=>$task->projectlabel,
-		'task_label'=>$task->label,
-		'task_description'=>$task->description,
-		'task_fk_parent'=>$task->fk_parent,
-		'task_duration'=>$task->duration,
-		'task_progress'=>$task->progress,
-		'task_public'=>$task->public,
-		'task_date_start'=>dol_print_date($task->date_start,'day'),
-		'task_date_end'=>dol_print_date($task->date_end,'day'),
-		'task_note_private'=>$task->note_private,
-		'task_note_public'=>$task->note_public
-		);
-	}
+        global $conf;
+
+        return array(
+        'task_ref'=>$task->ref,
+        'task_fk_project'=>$task->fk_project,
+        'task_projectref'=>$task->projectref,
+        'task_projectlabel'=>$task->projectlabel,
+        'task_label'=>$task->label,
+        'task_description'=>$task->description,
+        'task_fk_parent'=>$task->fk_parent,
+        'task_duration'=>$task->duration,
+        'task_progress'=>$task->progress,
+        'task_public'=>$task->public,
+        'task_date_start'=>dol_print_date($task->date_start,'day'),
+        'task_date_end'=>dol_print_date($task->date_end,'day'),
+        'task_note_private'=>$task->note_private,
+        'task_note_public'=>$task->note_public
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$contact			Contact array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_project_contacts($contact,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$contact			Contact array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_project_contacts($contact,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'projcontacts_id'=>$contact['id'],
-		'projcontacts_rowid'=>$contact['rowid'],
-		'projcontacts_role'=>$contact['libelle'],
-		'projcontacts_lastname'=>$contact['lastname'],
-		'projcontacts_firstname'=>$contact['firstname'],
-		'projcontacts_fullcivname'=>$contact['fullname'],
-		'projcontacts_socname'=>$contact['socname'],
-		'projcontacts_email'=>$contact['email']
-		);
-	}
+        global $conf;
+
+        return array(
+        'projcontacts_id'=>$contact['id'],
+        'projcontacts_rowid'=>$contact['rowid'],
+        'projcontacts_role'=>$contact['libelle'],
+        'projcontacts_lastname'=>$contact['lastname'],
+        'projcontacts_firstname'=>$contact['firstname'],
+        'projcontacts_fullcivname'=>$contact['fullname'],
+        'projcontacts_socname'=>$contact['socname'],
+        'projcontacts_email'=>$contact['email']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$file				file array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_project_file($file,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$file				file array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_project_file($file,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		return array(
-		'projfile_name'=>$file['name'],
-		'projfile_date'=>dol_print_date($file['date'],'day'),
-		'projfile_size'=>$file['size']
-		);
-	}
+        return array(
+        'projfile_name'=>$file['name'],
+        'projfile_date'=>dol_print_date($file['date'],'day'),
+        'projfile_size'=>$file['size']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$refdetail			Reference array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_project_reference($refdetail,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$refdetail			Reference array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_project_reference($refdetail,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'projref_type'=>$refdetail['type'],
-		'projref_ref'=>$refdetail['ref'],
-		'projref_date'=>dol_print_date($refdetail['date'],'day'),
-		'projref_socname'=>$refdetail['socname'],
-		'projref_amountht'=>price($refdetail['amountht'],0,$outputlangs),
-		'projref_amountttc'=>price($refdetail['amountttc'],0,$outputlangs),
-		'projref_status'=>$refdetail['status']
-		);
-	}
+        global $conf;
+
+        return array(
+        'projref_type'=>$refdetail['type'],
+        'projref_ref'=>$refdetail['ref'],
+        'projref_date'=>dol_print_date($refdetail['date'],'day'),
+        'projref_socname'=>$refdetail['socname'],
+        'projref_amountht'=>price($refdetail['amountht'],0,$outputlangs),
+        'projref_amountttc'=>price($refdetail['amountttc'],0,$outputlangs),
+        'projref_status'=>$refdetail['status']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$taskressource			Reference array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_tasksressource($taskressource,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$taskressource			Reference array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_tasksressource($taskressource,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-		//dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
-		return array(
-		'taskressource_rowid'=>$taskressource['rowid'],
-		'taskressource_role'=>$taskressource['libelle'],
-		'taskressource_lastname'=>$taskressource['lastname'],
-		'taskressource_firstname'=>$taskressource['firstname'],
-		'taskressource_fullcivname'=>$taskressource['fullname'],
-		'taskressource_socname'=>$taskressource['socname'],
-		'taskressource_email'=>$taskressource['email']
-		);
-	}
+        global $conf;
+        //dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
+        return array(
+        'taskressource_rowid'=>$taskressource['rowid'],
+        'taskressource_role'=>$taskressource['libelle'],
+        'taskressource_lastname'=>$taskressource['lastname'],
+        'taskressource_firstname'=>$taskressource['firstname'],
+        'taskressource_fullcivname'=>$taskressource['fullname'],
+        'taskressource_socname'=>$taskressource['socname'],
+        'taskressource_email'=>$taskressource['email']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  object			$tasktime			times object
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_taskstime($tasktime,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  object			$tasktime			times object
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_taskstime($tasktime,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'tasktime_rowid'=>$tasktime['rowid'],
-		'tasktime_task_date'=>dol_print_date($tasktime['task_date'],'day'),
-		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'],'all'),
-		'tasktime_note'=>$tasktime['note'],
-		'tasktime_fk_user'=>$tasktime['fk_user'],
-		'tasktime_user_name'=>$tasktime['name'],
-		'tasktime_user_first'=>$tasktime['firstname'],
-		'tasktime_fullcivname'=>$tasktime['fullcivname']
-		);
-	}
+        global $conf;
+
+        return array(
+        'tasktime_rowid'=>$tasktime['rowid'],
+        'tasktime_task_date'=>dol_print_date($tasktime['task_date'],'day'),
+        'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'],'all'),
+        'tasktime_note'=>$tasktime['note'],
+        'tasktime_fk_user'=>$tasktime['fk_user'],
+        'tasktime_user_name'=>$tasktime['name'],
+        'tasktime_user_first'=>$tasktime['firstname'],
+        'tasktime_fullcivname'=>$tasktime['fullcivname']
+        );
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  array			$file				file array
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_task_file($file,$outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  array			$file				file array
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_task_file($file,$outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		return array(
-		'tasksfile_name'=>$file['name'],
-		'tasksfile_date'=>dol_print_date($file['date'],'day'),
-		'tasksfile_size'=>$file['size']
-		);
-	}
-
-
-	/**
-	 *	Return description of a module
-	 *
-	 *	@param	Translate	$langs      Lang object to use for output
-	 *	@return string       			Description
-	 */
-	function info($langs)
-	{
-		global $conf,$langs;
-
-		// Load translation files required by the page
+        global $conf;
+
+        return array(
+        'tasksfile_name'=>$file['name'],
+        'tasksfile_date'=>dol_print_date($file['date'],'day'),
+        'tasksfile_size'=>$file['size']
+        );
+    }
+
+
+    /**
+     *	Return description of a module
+     *
+     *	@param	Translate	$langs      Lang object to use for output
+     *	@return string       			Description
+     */
+    function info($langs)
+    {
+        global $conf,$langs;
+
+        // Load translation files required by the page
         $langs->loadLangs(array("errors","companies"));
 
-		$form = new Form($this->db);
-
-		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="PROJECT_TASK_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
-		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) {
-				unset($listofdir[$key]); continue;
-			}
-			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);
-			}
-		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
-		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
-
-		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH))
-		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
-			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=$nbofiles;
-			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
-		}
-
-		if ($nbofiles)
-		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
-   			{
+        $form = new Form($this->db);
+
+        $texte = $this->description.".<br>\n";
+        $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+        $texte.= '<input type="hidden" name="param1" value="PROJECT_TASK_ADDON_PDF_ODT_PATH">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
+
+        // List of directories area
+        $texte.= '<tr><td>';
+        $texttitle=$langs->trans("ListOfDirectories");
+        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)));
+        $listoffiles=array();
+        foreach($listofdir as $key=>$tmpdir)
+        {
+            $tmpdir=trim($tmpdir);
+            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+            if (! $tmpdir) {
+                unset($listofdir[$key]); continue;
+            }
+            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);
+            }
+        }
+        $texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+        // Add list of substitution keys
+        $texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+        $texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+
+        $texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
+        $texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+        $texte.= '<textarea class="flat" cols="60" name="value1">';
+        $texte.=$conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH;
+        $texte.= '</textarea>';
+        $texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
+        $texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+        $texte.= '<br></div></div>';
+
+        // Scan directories
+        $nbofiles=count($listoffiles);
+        if (! empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH))
+        {
+            $texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+            //$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
+            $texte.=$nbofiles;
+            //$texte.=$nbofiles?'</a>':'';
+            $texte.='</b>';
+        }
+
+        if ($nbofiles)
+        {
+                $texte.='<div id="div_'.get_class($this).'" class="hidden">';
+                foreach($listoffiles as $file)
+                {
                 $texte.=$file['name'].'<br>';
-   			}
-   			$texte.='<div id="div_'.get_class($this).'">';
-		}
+                }
+                $texte.='<div id="div_'.get_class($this).'">';
+        }
 
-		$texte.= '</td>';
+        $texte.= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+        $texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+        $texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+        $texte.= '</td>';
+        $texte.= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+        $texte.= '</table>';
+        $texte.= '</form>';
 
-		return $texte;
-	}
+        return $texte;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Function to build a document on disk using the generic odt module.
-	 *
-	 *	@param	Commande	$object					Object source to build document
-	 *	@param	Translate	$outputlangs			Lang output object
-	 * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
-	 *	@return	int         						1 if OK, <=0 if KO
-	 */
-	function write_file($object,$outputlangs,$srctemplatepath)
-	{
+    /**
+     *	Function to build a document on disk using the generic odt module.
+     *
+     *	@param	Commande	$object					Object source to build document
+     *	@param	Translate	$outputlangs			Lang output object
+     * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
+     *	@return	int         						1 if OK, <=0 if KO
+     */
+    function write_file($object,$outputlangs,$srctemplatepath)
+    {
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
-
-		if (empty($srctemplatepath))
-		{
-			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
-			return -1;
-		}
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
-
-		// Load translation files required by the page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
-
-		if ($conf->projet->dir_output)
-		{
-			// If $object is id instead of object
-			if (! is_object($object))
-			{
-				$id = $object;
-				$object = new Task($this->db);
-				$result=$object->fetch($id);
-				if ($result < 0)
-				{
-					dol_print_error($this->db,$object->error);
-					return -1;
-				}
-			}
-			$project= new Project($this->db);
-			$project->fetch($object->fk_project);
-			$project->fetch_thirdparty();
-
-			$dir = $conf->projet->dir_output. "/" . $project->ref. "/";
-			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
-
-			if (! file_exists($dir))
-			{
-				print '$dir'.$dir;
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return -1;
-				}
-			}
-
-
-			if (file_exists($dir))
-			{
-				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.(ods|odt)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
-				$newfiletmp=$objectref.'_'.$newfiletmp;
-				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
-				$file=$dir.'/'.$newfiletmp.'.odt';
-				//print "newdir=".$dir;
-				//print "newfile=".$newfile;
-				//print "file=".$file;
-				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
-
-				dol_mkdir($conf->projet->dir_temp);
-
-				$socobject=$project->thirdparty;
-
-				// Make substitution
-				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->name,
-				'__FROM_EMAIL__' => $this->emetteur->email,
-				);
-				complete_substitutions_array($substitutionarray, $langs, $object);
-				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				// Open and load template
-				require_once ODTPHP_PATH.'odf.php';
-				try {
-					$odfHandler = new odf(
-						$srctemplatepath,
-						array(
-						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
-						'DELIMITER_LEFT'  => '{',
-						'DELIMITER_RIGHT' => '}'
-						)
-					);
-				}
-				catch(Exception $e)
-				{
-					$this->error=$e->getMessage();
-					return -1;
-				}
-				// After construction $odfHandler->contentXml contains content and
-				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
-				// [!-- BEGIN lines --]*[!-- END lines --]
-				//print html_entity_decode($odfHandler->__toString());
-				//print exit;
-
-
-				// Define substitution array
-				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_objet=$this->get_substitutionarray_object($project,$outputlangs);
-				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
-
-				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
-				complete_substitutions_array($tmparray, $outputlangs, $object);
-
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					} catch (OdfException $e) {
+        global $user,$langs,$conf,$mysoc,$hookmanager;
+
+        if (empty($srctemplatepath))
+        {
+            dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+            return -1;
+        }
+
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        $sav_charset_output=$outputlangs->charset_output;
+        $outputlangs->charset_output='UTF-8';
+
+        // Load translation files required by the page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
+
+        if ($conf->projet->dir_output)
+        {
+            // If $object is id instead of object
+            if (! is_object($object))
+            {
+                $id = $object;
+                $object = new Task($this->db);
+                $result=$object->fetch($id);
+                if ($result < 0)
+                {
+                    dol_print_error($this->db,$object->error);
+                    return -1;
+                }
+            }
+            $project= new Project($this->db);
+            $project->fetch($object->fk_project);
+            $project->fetch_thirdparty();
+
+            $dir = $conf->projet->dir_output. "/" . $project->ref. "/";
+            $objectref = dol_sanitizeFileName($object->ref);
+            if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+            $file = $dir . "/" . $objectref . ".odt";
+
+            if (! file_exists($dir))
+            {
+                print '$dir'.$dir;
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                    return -1;
+                }
+            }
+
+
+            if (file_exists($dir))
+            {
+                //print "srctemplatepath=".$srctemplatepath;	// Src filename
+                $newfile=basename($srctemplatepath);
+                $newfiletmp=preg_replace('/\.(ods|odt)/i','',$newfile);
+                $newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+                $newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+                $newfiletmp=$objectref.'_'.$newfiletmp;
+                //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
+                $file=$dir.'/'.$newfiletmp.'.odt';
+                //print "newdir=".$dir;
+                //print "newfile=".$newfile;
+                //print "file=".$file;
+                //print "conf->societe->dir_temp=".$conf->societe->dir_temp;
+
+                dol_mkdir($conf->projet->dir_temp);
+
+                $socobject=$project->thirdparty;
+
+                // Make substitution
+                $substitutionarray=array(
+                '__FROM_NAME__' => $this->emetteur->name,
+                '__FROM_EMAIL__' => $this->emetteur->email,
+                );
+                complete_substitutions_array($substitutionarray, $langs, $object);
+                // Call the ODTSubstitution hook
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                // Open and load template
+                require_once ODTPHP_PATH.'odf.php';
+                try {
+                    $odfHandler = new odf(
+                        $srctemplatepath,
+                        array(
+                        'PATH_TO_TMP'	  => $conf->projet->dir_temp,
+                        'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+                        'DELIMITER_LEFT'  => '{',
+                        'DELIMITER_RIGHT' => '}'
+                        )
+                    );
+                }
+                catch(Exception $e)
+                {
+                    $this->error=$e->getMessage();
+                    return -1;
+                }
+                // After construction $odfHandler->contentXml contains content and
+                // [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
+                // [!-- BEGIN lines --]*[!-- END lines --]
+                //print html_entity_decode($odfHandler->__toString());
+                //print exit;
+
+
+                // Define substitution array
+                $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+                $array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+                $array_objet=$this->get_substitutionarray_object($project,$outputlangs);
+                $array_user=$this->get_substitutionarray_user($user,$outputlangs);
+                $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+                $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+                $array_other=$this->get_substitutionarray_other($outputlangs);
+
+                $tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
+                complete_substitutions_array($tmparray, $outputlangs, $object);
+
+                foreach($tmparray as $key=>$value)
+                {
+                    try {
+                        if (preg_match('/logo$/',$key)) // Image
+                        {
+                            if (file_exists($value)) $odfHandler->setImage($key, $value);
+                            else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+                        }
+                        else    // Text
+                        {
+                            $odfHandler->setVars($key, $value, true, 'UTF-8');
+                        }
+                    } catch (OdfException $e) {
                         dol_syslog($e->getMessage(), LOG_INFO);
-					}
-				}
-
-				// Replace tags of lines for tasks
-				try
-				{
-					// Security check
-					$socid=0;
-					if (!empty($project->fk_soc)) $socid = $project->fk_soc;
-
-					$tmparray=$this->get_substitutionarray_tasks($object,$outputlangs);
-					complete_substitutions_array($tmparray, $outputlangs, $object);
-					foreach($tmparray as $key => $val)
-					{
-						try {
-							$odfHandler->setVars($key, $val, true, 'UTF-8');
-						} catch (OdfException $e) {
-							dol_syslog($e->getMessage(), LOG_INFO);
-						} catch(SegmentException $e) {
-							dol_syslog($e->getMessage(), LOG_INFO);
-						}
-					}
-
-					// Replace tags of lines for contacts task
-					$sourcearray=array('internal','external');
-					$contact_arrray=array();
-					foreach ($sourcearray as $source) {
-						$contact_temp=$object->liste_contact(-1,$source);
-						if ((is_array($contact_temp) && count($contact_temp) > 0))
-						{
-							$contact_arrray=array_merge($contact_arrray,$contact_temp);
-						}
-					}
-					if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-					{
-						$listlinestaskres = $odfHandler->setSegment('tasksressources');
-
-						foreach ($contact_arrray as $contact)
-						{
-							if ($contact['source']=='internal') {
-								$objectdetail=new User($this->db);
-								$objectdetail->fetch($contact['id']);
-								$contact['socname']=$mysoc->name;
-							} elseif ($contact['source']=='external') {
-								$objectdetail=new Contact($this->db);
-								$objectdetail->fetch($contact['id']);
-
-								$soc=new Societe($this->db);
-								$soc->fetch($contact['socid']);
-								$contact['socname']=$soc->name;
-							}
-							$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
-
-							$tmparray=$this->get_substitutionarray_tasksressource($contact,$outputlangs);
-
-							foreach($tmparray as $key => $val)
-							{
-								try {
-									$listlinestaskres->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e) {
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e) {
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-							}
-							$listlinestaskres->merge();
-						}
-						$odfHandler->mergeSegment($listlinestaskres);
-					}
-
-					// Time ressources
-					$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
-					$sql.= ", u.lastname, u.firstname";
-					$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-					$sql .= " , ".MAIN_DB_PREFIX."user as u";
-					$sql .= " WHERE t.fk_task =".$object->id;
-					$sql .= " AND t.fk_user = u.rowid";
-					$sql .= " ORDER BY t.task_date DESC";
-
-					$resql = $this->db->query($sql);
-					if ($resql)
-					{
-						$num = $this->db->num_rows($resql);
-						$i = 0;
-						$tasks = array();
-						$listlinestasktime = $odfHandler->setSegment('taskstimes');
-						while ($i < $num)
-						{
-							$row = $this->db->fetch_array($resql);
-							if (!empty($row['fk_user'])) {
-								$objectdetail=new User($this->db);
-								$objectdetail->fetch($row['fk_user']);
-								// TODO Use a cache to aoid fetch for same user
-								$row['fullcivname']=$objectdetail->getFullName($outputlangs,1);
-							} else {
-								$row['fullcivname']='';
-							}
-
-							$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
-
-							foreach($tmparray as $key => $val)
-							{
-								try
-								{
-									$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-							}
-							$listlinestasktime->merge();
-							$i++;
-						}
-						$this->db->free($resql);
-
-						$odfHandler->mergeSegment($listlinestasktime);
-					}
-
-
-					// Replace tags of project files
-					$listtasksfiles = $odfHandler->setSegment('tasksfiles');
-
-					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
-
-
-					foreach ($filearray as $filedetail)
-					{
-						$tmparray=$this->get_substitutionarray_task_file($filedetail,$outputlangs);
-						//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch(SegmentException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-						}
-						$listtasksfiles->merge();
-					}
-					//$listlines->merge();
-
-					$odfHandler->mergeSegment($listtasksfiles);
-				}
-				catch(OdfException $e)
-				{
-					$this->error=$e->getMessage();
-					dol_syslog($this->error, LOG_WARNING);
-					return -1;
-				}
-
-
-
-				// Replace tags of project files
-				try
-				{
-					$listlines = $odfHandler->setSegment('projectfiles');
-
-					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
-
-
-					foreach ($filearray as $filedetail)
-					{
-						//dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true));
-						$tmparray=$this->get_substitutionarray_project_file($filedetail,$outputlangs);
-
-						foreach($tmparray as $key => $val)
-						{
-							try
-							{
-								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch(OdfException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch(SegmentException $e)
-							{
-								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-						}
-						$listlines->merge();
-					}
-					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
-				{
-					$this->error=$e->getMessage();
-					dol_syslog($this->error, LOG_WARNING);
-					return -1;
-				}
-
-				// Replace tags of lines for contacts
-				$sourcearray=array('internal','external');
-				$contact_arrray=array();
-				foreach ($sourcearray as $source) {
-					$contact_temp=$project->liste_contact(-1,$source);
-					if ((is_array($contact_temp) && count($contact_temp) > 0))
-					{
-						$contact_arrray=array_merge($contact_arrray,$contact_temp);
-					}
-				}
-				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-				{
-					try
-					{
-						$listlines = $odfHandler->setSegment('projectcontacts');
-
-						foreach ($contact_arrray as $contact)
-						{
-							if ($contact['source']=='internal') {
-								$objectdetail=new User($this->db);
-								$objectdetail->fetch($contact['id']);
-								$contact['socname']=$mysoc->name;
-							} elseif ($contact['source']=='external') {
-								$objectdetail=new Contact($this->db);
-								$objectdetail->fetch($contact['id']);
-
-								$soc=new Societe($this->db);
-								$soc->fetch($contact['socid']);
-								$contact['socname']=$soc->name;
-							}
-							$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
-
-							$tmparray=$this->get_substitutionarray_project_contacts($contact,$outputlangs);
-
-							foreach($tmparray as $key => $val)
-							{
-								try
-								{
-									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch(OdfException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch(SegmentException $e)
-								{
-									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-							}
-							$listlines->merge();
-						}
-						$odfHandler->mergeSegment($listlines);
-					}
-					catch(OdfException $e)
-					{
-						$this->error=$e->getMessage();
-						dol_syslog($this->error, LOG_WARNING);
-						return -1;
-					}
-				}
-
-
-				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-
-				// Write new file
-				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
-					try {
-						$odfHandler->exportAsAttachedPDF($file);
-					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+                    }
+                }
+
+                // Replace tags of lines for tasks
+                try
+                {
+                    // Security check
+                    $socid=0;
+                    if (!empty($project->fk_soc)) $socid = $project->fk_soc;
+
+                    $tmparray=$this->get_substitutionarray_tasks($object,$outputlangs);
+                    complete_substitutions_array($tmparray, $outputlangs, $object);
+                    foreach($tmparray as $key => $val)
+                    {
+                        try {
+                            $odfHandler->setVars($key, $val, true, 'UTF-8');
+                        } catch (OdfException $e) {
+                            dol_syslog($e->getMessage(), LOG_INFO);
+                        } catch(SegmentException $e) {
+                            dol_syslog($e->getMessage(), LOG_INFO);
+                        }
+                    }
+
+                    // Replace tags of lines for contacts task
+                    $sourcearray=array('internal','external');
+                    $contact_arrray=array();
+                    foreach ($sourcearray as $source) {
+                        $contact_temp=$object->liste_contact(-1,$source);
+                        if ((is_array($contact_temp) && count($contact_temp) > 0))
+                        {
+                            $contact_arrray=array_merge($contact_arrray,$contact_temp);
+                        }
+                    }
+                    if ((is_array($contact_arrray) && count($contact_arrray) > 0))
+                    {
+                        $listlinestaskres = $odfHandler->setSegment('tasksressources');
+
+                        foreach ($contact_arrray as $contact)
+                        {
+                            if ($contact['source']=='internal') {
+                                $objectdetail=new User($this->db);
+                                $objectdetail->fetch($contact['id']);
+                                $contact['socname']=$mysoc->name;
+                            } elseif ($contact['source']=='external') {
+                                $objectdetail=new Contact($this->db);
+                                $objectdetail->fetch($contact['id']);
+
+                                $soc=new Societe($this->db);
+                                $soc->fetch($contact['socid']);
+                                $contact['socname']=$soc->name;
+                            }
+                            $contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+
+                            $tmparray=$this->get_substitutionarray_tasksressource($contact,$outputlangs);
+
+                            foreach($tmparray as $key => $val)
+                            {
+                                try {
+                                    $listlinestaskres->setVars($key, $val, true, 'UTF-8');
+                                } catch (OdfException $e) {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                                catch (SegmentException $e) {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                            }
+                            $listlinestaskres->merge();
+                        }
+                        $odfHandler->mergeSegment($listlinestaskres);
+                    }
+
+                    // Time ressources
+                    $sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
+                    $sql.= ", u.lastname, u.firstname";
+                    $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+                    $sql .= " , ".MAIN_DB_PREFIX."user as u";
+                    $sql .= " WHERE t.fk_task =".$object->id;
+                    $sql .= " AND t.fk_user = u.rowid";
+                    $sql .= " ORDER BY t.task_date DESC";
+
+                    $resql = $this->db->query($sql);
+                    if ($resql)
+                    {
+                        $num = $this->db->num_rows($resql);
+                        $i = 0;
+                        $tasks = array();
+                        $listlinestasktime = $odfHandler->setSegment('taskstimes');
+                        while ($i < $num)
+                        {
+                            $row = $this->db->fetch_array($resql);
+                            if (!empty($row['fk_user'])) {
+                                $objectdetail=new User($this->db);
+                                $objectdetail->fetch($row['fk_user']);
+                                // TODO Use a cache to aoid fetch for same user
+                                $row['fullcivname']=$objectdetail->getFullName($outputlangs,1);
+                            } else {
+                                $row['fullcivname']='';
+                            }
+
+                            $tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
+
+                            foreach($tmparray as $key => $val)
+                            {
+                                try
+                                {
+                                    $listlinestasktime->setVars($key, $val, true, 'UTF-8');
+                                }
+                                catch(OdfException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                                catch(SegmentException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                            }
+                            $listlinestasktime->merge();
+                            $i++;
+                        }
+                        $this->db->free($resql);
+
+                        $odfHandler->mergeSegment($listlinestasktime);
+                    }
+
+
+                    // Replace tags of project files
+                    $listtasksfiles = $odfHandler->setSegment('tasksfiles');
+
+                    $upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($object->ref);
+                    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+
+
+                    foreach ($filearray as $filedetail)
+                    {
+                        $tmparray=$this->get_substitutionarray_task_file($filedetail,$outputlangs);
+                        //dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
+                        foreach($tmparray as $key => $val)
+                        {
+                            try
+                            {
+                                $listtasksfiles->setVars($key, $val, true, 'UTF-8');
+                            }
+                            catch(OdfException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                            catch(SegmentException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                        }
+                        $listtasksfiles->merge();
+                    }
+                    //$listlines->merge();
+
+                    $odfHandler->mergeSegment($listtasksfiles);
+                }
+                catch(OdfException $e)
+                {
+                    $this->error=$e->getMessage();
+                    dol_syslog($this->error, LOG_WARNING);
+                    return -1;
+                }
+
+
+
+                // Replace tags of project files
+                try
+                {
+                    $listlines = $odfHandler->setSegment('projectfiles');
+
+                    $upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
+                    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+
+
+                    foreach ($filearray as $filedetail)
+                    {
+                        //dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true));
+                        $tmparray=$this->get_substitutionarray_project_file($filedetail,$outputlangs);
+
+                        foreach($tmparray as $key => $val)
+                        {
+                            try
+                            {
+                                $listlines->setVars($key, $val, true, 'UTF-8');
+                            }
+                            catch(OdfException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                            catch(SegmentException $e)
+                            {
+                                dol_syslog($e->getMessage(), LOG_INFO);
+                            }
+                        }
+                        $listlines->merge();
+                    }
+                    $odfHandler->mergeSegment($listlines);
+                }
+                catch(OdfException $e)
+                {
+                    $this->error=$e->getMessage();
+                    dol_syslog($this->error, LOG_WARNING);
+                    return -1;
+                }
+
+                // Replace tags of lines for contacts
+                $sourcearray=array('internal','external');
+                $contact_arrray=array();
+                foreach ($sourcearray as $source) {
+                    $contact_temp=$project->liste_contact(-1,$source);
+                    if ((is_array($contact_temp) && count($contact_temp) > 0))
+                    {
+                        $contact_arrray=array_merge($contact_arrray,$contact_temp);
+                    }
+                }
+                if ((is_array($contact_arrray) && count($contact_arrray) > 0))
+                {
+                    try
+                    {
+                        $listlines = $odfHandler->setSegment('projectcontacts');
+
+                        foreach ($contact_arrray as $contact)
+                        {
+                            if ($contact['source']=='internal') {
+                                $objectdetail=new User($this->db);
+                                $objectdetail->fetch($contact['id']);
+                                $contact['socname']=$mysoc->name;
+                            } elseif ($contact['source']=='external') {
+                                $objectdetail=new Contact($this->db);
+                                $objectdetail->fetch($contact['id']);
+
+                                $soc=new Societe($this->db);
+                                $soc->fetch($contact['socid']);
+                                $contact['socname']=$soc->name;
+                            }
+                            $contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+
+                            $tmparray=$this->get_substitutionarray_project_contacts($contact,$outputlangs);
+
+                            foreach($tmparray as $key => $val)
+                            {
+                                try
+                                {
+                                    $listlines->setVars($key, $val, true, 'UTF-8');
+                                }
+                                catch(OdfException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                                catch(SegmentException $e)
+                                {
+                                    dol_syslog($e->getMessage(), LOG_INFO);
+                                }
+                            }
+                            $listlines->merge();
+                        }
+                        $odfHandler->mergeSegment($listlines);
+                    }
+                    catch(OdfException $e)
+                    {
+                        $this->error=$e->getMessage();
+                        dol_syslog($this->error, LOG_WARNING);
+                        return -1;
+                    }
+                }
+
+
+                // Call the beforeODTSave hook
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
+                $reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+
+                // Write new file
+                if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+                    try {
+                        $odfHandler->exportAsAttachedPDF($file);
+                    } catch (Exception $e) {
+                        $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
-						return -1;
-					}
-				}
-				else {
-					try {
-						$odfHandler->saveToDisk($file);
-					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+                        return -1;
+                    }
+                }
+                else {
+                    try {
+                        $odfHandler->saveToDisk($file);
+                    } catch (Exception $e) {
+                        $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
-						return -1;
-					}
-				}
-				$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));
-
-				$odfHandler=null;	// Destroy object
-
-				$this->result = array('fullpath'=>$file);
-
-				return 1;   // Success
-			}
-			else
-			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-				return -1;
-			}
-		}
-
-		return -1;
-	}
+                        return -1;
+                    }
+                }
+                $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));
+
+                $odfHandler=null;	// Destroy object
+
+                $this->result = array('fullpath'=>$file);
+
+                return 1;   // Success
+            }
+            else
+            {
+                $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                return -1;
+            }
+        }
+
+        return -1;
+    }
 }

Spacing +204 added lines, -204 removed lines

@@ -38,16 +38,16 @@ 
 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';
 
 
 /**
@@ -84,37 +84,37 @@ 
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main","companies"));
+        $langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
 		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'PROJECT_TASK_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'PROJECT_TASK_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
 
 		// Dimension page pour format A4
 		$this->type = 'odt';
 		$this->page_largeur = 0;
 		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 0;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
+		$this->option_modereg = 0; // Affiche mode reglement
+		$this->option_condreg = 0; // Affiche conditions reglement
+		$this->option_codeproduitservice = 0; // Affiche code produit-service
+		$this->option_multilang = 0; // Dispo en plusieurs langues
+		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
 		// 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
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->pays_code) $this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
 	}
 
 
@@ -127,20 +127,20 @@ 
      * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
-	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+	function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
         // phpcs:enable
 		global $conf;
 
-		$resarray=array(
+		$resarray = array(
             $array_key.'_id'=>$object->id,
             $array_key.'_ref'=>$object->ref,
             $array_key.'_title'=>$object->title,
             $array_key.'_description'=>$object->description,
-            $array_key.'_date_creation'=>dol_print_date($object->date_c,'day'),
-            $array_key.'_date_modification'=>dol_print_date($object->date_m,'day'),
-            $array_key.'_date_start'=>dol_print_date($object->date_start,'day'),
-            $array_key.'_date_end'=>dol_print_date($object->date_end,'day'),
+            $array_key.'_date_creation'=>dol_print_date($object->date_c, 'day'),
+            $array_key.'_date_modification'=>dol_print_date($object->date_m, 'day'),
+            $array_key.'_date_start'=>dol_print_date($object->date_start, 'day'),
+            $array_key.'_date_end'=>dol_print_date($object->date_end, 'day'),
             $array_key.'_note_private'=>$object->note_private,
             $array_key.'_note_public'=>$object->note_public,
             $array_key.'_public'=>$object->public,
@@ -150,14 +150,14 @@ 
 		// Retrieve extrafields
 		if (is_array($object->array_options) && count($object->array_options))
 		{
-			$extrafieldkey=$object->element;
+			$extrafieldkey = $object->element;
 
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
-			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey, true);
 			$object->fetch_optionals();
 
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+			$resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs);
 		}
 
 		return $resarray;
@@ -171,7 +171,7 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_tasks($task,$outputlangs)
+	function get_substitutionarray_tasks($task, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -187,8 +187,8 @@ 
 		'task_duration'=>$task->duration,
 		'task_progress'=>$task->progress,
 		'task_public'=>$task->public,
-		'task_date_start'=>dol_print_date($task->date_start,'day'),
-		'task_date_end'=>dol_print_date($task->date_end,'day'),
+		'task_date_start'=>dol_print_date($task->date_start, 'day'),
+		'task_date_end'=>dol_print_date($task->date_end, 'day'),
 		'task_note_private'=>$task->note_private,
 		'task_note_public'=>$task->note_public
 		);
@@ -202,7 +202,7 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_project_contacts($contact,$outputlangs)
+	function get_substitutionarray_project_contacts($contact, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -227,14 +227,14 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_project_file($file,$outputlangs)
+	function get_substitutionarray_project_file($file, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
 
 		return array(
 		'projfile_name'=>$file['name'],
-		'projfile_date'=>dol_print_date($file['date'],'day'),
+		'projfile_date'=>dol_print_date($file['date'], 'day'),
 		'projfile_size'=>$file['size']
 		);
 	}
@@ -247,7 +247,7 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_project_reference($refdetail,$outputlangs)
+	function get_substitutionarray_project_reference($refdetail, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -255,10 +255,10 @@ 
 		return array(
 		'projref_type'=>$refdetail['type'],
 		'projref_ref'=>$refdetail['ref'],
-		'projref_date'=>dol_print_date($refdetail['date'],'day'),
+		'projref_date'=>dol_print_date($refdetail['date'], 'day'),
 		'projref_socname'=>$refdetail['socname'],
-		'projref_amountht'=>price($refdetail['amountht'],0,$outputlangs),
-		'projref_amountttc'=>price($refdetail['amountttc'],0,$outputlangs),
+		'projref_amountht'=>price($refdetail['amountht'], 0, $outputlangs),
+		'projref_amountttc'=>price($refdetail['amountttc'], 0, $outputlangs),
 		'projref_status'=>$refdetail['status']
 		);
 	}
@@ -271,7 +271,7 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_tasksressource($taskressource,$outputlangs)
+	function get_substitutionarray_tasksressource($taskressource, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -295,15 +295,15 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_taskstime($tasktime,$outputlangs)
+	function get_substitutionarray_taskstime($tasktime, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
 
 		return array(
 		'tasktime_rowid'=>$tasktime['rowid'],
-		'tasktime_task_date'=>dol_print_date($tasktime['task_date'],'day'),
-		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'],'all'),
+		'tasktime_task_date'=>dol_print_date($tasktime['task_date'], 'day'),
+		'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'], 'all'),
 		'tasktime_note'=>$tasktime['note'],
 		'tasktime_fk_user'=>$tasktime['fk_user'],
 		'tasktime_user_name'=>$tasktime['name'],
@@ -320,14 +320,14 @@ 
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array								Return a substitution array
 	 */
-	function get_substitutionarray_task_file($file,$outputlangs)
+	function get_substitutionarray_task_file($file, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
 
 		return array(
 		'tasksfile_name'=>$file['name'],
-		'tasksfile_date'=>dol_print_date($file['date'],'day'),
+		'tasksfile_date'=>dol_print_date($file['date'], 'day'),
 		'tasksfile_size'=>$file['size']
 		);
 	}
@@ -341,83 +341,83 @@ 
 	 */
 	function info($langs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors","companies"));
+        $langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="PROJECT_TASK_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="PROJECT_TASK_ADDON_PDF_ODT_PATH">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key=>$tmpdir)
 		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-			if (! $tmpdir) {
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			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);
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
 		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
 		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
-
-		$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<br></div></div>';
 
 		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH))
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH))
 		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=$nbofiles;
+			$texte .= $nbofiles;
 			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
+			$texte .= '</b>';
 		}
 
 		if ($nbofiles)
 		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
+   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+   			foreach ($listoffiles as $file)
    			{
-                $texte.=$file['name'].'<br>';
+                $texte .= $file['name'].'<br>';
    			}
-   			$texte.='<div id="div_'.get_class($this).'">';
+   			$texte .= '<div id="div_'.get_class($this).'">';
 		}
 
-		$texte.= '</td>';
+		$texte .= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+		$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -431,10 +431,10 @@ 
 	 * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
 	 *	@return	int         						1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath)
+	function write_file($object, $outputlangs, $srctemplatepath)
 	{
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
+		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -442,9 +442,9 @@ 
 			return -1;
 		}
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
@@ -452,32 +452,32 @@ 
 		if ($conf->projet->dir_output)
 		{
 			// If $object is id instead of object
-			if (! is_object($object))
+			if (!is_object($object))
 			{
 				$id = $object;
 				$object = new Task($this->db);
-				$result=$object->fetch($id);
+				$result = $object->fetch($id);
 				if ($result < 0)
 				{
-					dol_print_error($this->db,$object->error);
+					dol_print_error($this->db, $object->error);
 					return -1;
 				}
 			}
-			$project= new Project($this->db);
+			$project = new Project($this->db);
 			$project->fetch($object->fk_project);
 			$project->fetch_thirdparty();
 
-			$dir = $conf->projet->dir_output. "/" . $project->ref. "/";
+			$dir = $conf->projet->dir_output."/".$project->ref."/";
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			$file = $dir."/".$objectref.".odt";
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				print '$dir'.$dir;
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -486,13 +486,13 @@ 
 			if (file_exists($dir))
 			{
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.(ods|odt)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
-				$newfiletmp=$objectref.'_'.$newfiletmp;
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.(ods|odt)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
-				$file=$dir.'/'.$newfiletmp.'.odt';
+				$file = $dir.'/'.$newfiletmp.'.odt';
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -500,17 +500,17 @@ 
 
 				dol_mkdir($conf->projet->dir_temp);
 
-				$socobject=$project->thirdparty;
+				$socobject = $project->thirdparty;
 
 				// Make substitution
-				$substitutionarray=array(
+				$substitutionarray = array(
 				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
@@ -519,15 +519,15 @@ 
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					return -1;
 				}
 				// After construction $odfHandler->contentXml contains content and
@@ -540,19 +540,19 @@ 
 				// Define substitution array
 				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_objet=$this->get_substitutionarray_object($project,$outputlangs);
-				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
+				$array_objet = $this->get_substitutionarray_object($project, $outputlangs);
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
 
-				$tmparray = array_merge($substitutionarray,$array_object_from_properties,$array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
+				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
-				foreach($tmparray as $key=>$value)
+				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');
@@ -570,30 +570,30 @@ 
 				try
 				{
 					// Security check
-					$socid=0;
+					$socid = 0;
 					if (!empty($project->fk_soc)) $socid = $project->fk_soc;
 
-					$tmparray=$this->get_substitutionarray_tasks($object,$outputlangs);
+					$tmparray = $this->get_substitutionarray_tasks($object, $outputlangs);
 					complete_substitutions_array($tmparray, $outputlangs, $object);
-					foreach($tmparray as $key => $val)
+					foreach ($tmparray as $key => $val)
 					{
 						try {
 							$odfHandler->setVars($key, $val, true, 'UTF-8');
 						} catch (OdfException $e) {
 							dol_syslog($e->getMessage(), LOG_INFO);
-						} catch(SegmentException $e) {
+						} catch (SegmentException $e) {
 							dol_syslog($e->getMessage(), LOG_INFO);
 						}
 					}
 
 					// Replace tags of lines for contacts task
-					$sourcearray=array('internal','external');
-					$contact_arrray=array();
+					$sourcearray = array('internal', 'external');
+					$contact_arrray = array();
 					foreach ($sourcearray as $source) {
-						$contact_temp=$object->liste_contact(-1,$source);
+						$contact_temp = $object->liste_contact(-1, $source);
 						if ((is_array($contact_temp) && count($contact_temp) > 0))
 						{
-							$contact_arrray=array_merge($contact_arrray,$contact_temp);
+							$contact_arrray = array_merge($contact_arrray, $contact_temp);
 						}
 					}
 					if ((is_array($contact_arrray) && count($contact_arrray) > 0))
@@ -602,23 +602,23 @@ 
 
 						foreach ($contact_arrray as $contact)
 						{
-							if ($contact['source']=='internal') {
-								$objectdetail=new User($this->db);
+							if ($contact['source'] == 'internal') {
+								$objectdetail = new User($this->db);
 								$objectdetail->fetch($contact['id']);
-								$contact['socname']=$mysoc->name;
-							} elseif ($contact['source']=='external') {
-								$objectdetail=new Contact($this->db);
+								$contact['socname'] = $mysoc->name;
+							} elseif ($contact['source'] == 'external') {
+								$objectdetail = new Contact($this->db);
 								$objectdetail->fetch($contact['id']);
 
-								$soc=new Societe($this->db);
+								$soc = new Societe($this->db);
 								$soc->fetch($contact['socid']);
-								$contact['socname']=$soc->name;
+								$contact['socname'] = $soc->name;
 							}
-							$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+							$contact['fullname'] = $objectdetail->getFullName($outputlangs, 1);
 
-							$tmparray=$this->get_substitutionarray_tasksressource($contact,$outputlangs);
+							$tmparray = $this->get_substitutionarray_tasksressource($contact, $outputlangs);
 
-							foreach($tmparray as $key => $val)
+							foreach ($tmparray as $key => $val)
 							{
 								try {
 									$listlinestaskres->setVars($key, $val, true, 'UTF-8');
@@ -636,7 +636,7 @@ 
 
 					// Time ressources
 					$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
-					$sql.= ", u.lastname, u.firstname";
+					$sql .= ", u.lastname, u.firstname";
 					$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 					$sql .= " , ".MAIN_DB_PREFIX."user as u";
 					$sql .= " WHERE t.fk_task =".$object->id;
@@ -654,27 +654,27 @@ 
 						{
 							$row = $this->db->fetch_array($resql);
 							if (!empty($row['fk_user'])) {
-								$objectdetail=new User($this->db);
+								$objectdetail = new User($this->db);
 								$objectdetail->fetch($row['fk_user']);
 								// TODO Use a cache to aoid fetch for same user
-								$row['fullcivname']=$objectdetail->getFullName($outputlangs,1);
+								$row['fullcivname'] = $objectdetail->getFullName($outputlangs, 1);
 							} else {
-								$row['fullcivname']='';
+								$row['fullcivname'] = '';
 							}
 
-							$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
+							$tmparray = $this->get_substitutionarray_taskstime($row, $outputlangs);
 
-							foreach($tmparray as $key => $val)
+							foreach ($tmparray as $key => $val)
 							{
 								try
 								{
 									$listlinestasktime->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);
 								}
@@ -692,24 +692,24 @@ 
 					$listtasksfiles = $odfHandler->setSegment('tasksfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+					$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 
 					foreach ($filearray as $filedetail)
 					{
-						$tmparray=$this->get_substitutionarray_task_file($filedetail,$outputlangs);
+						$tmparray = $this->get_substitutionarray_task_file($filedetail, $outputlangs);
 						//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
-						foreach($tmparray as $key => $val)
+						foreach ($tmparray as $key => $val)
 						{
 							try
 							{
 								$listtasksfiles->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);
 							}
@@ -720,9 +720,9 @@ 
 
 					$odfHandler->mergeSegment($listtasksfiles);
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
@@ -735,25 +735,25 @@ 
 					$listlines = $odfHandler->setSegment('projectfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
-					$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$','name',SORT_ASC,1);
+					$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 
 					foreach ($filearray as $filedetail)
 					{
 						//dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true));
-						$tmparray=$this->get_substitutionarray_project_file($filedetail,$outputlangs);
+						$tmparray = $this->get_substitutionarray_project_file($filedetail, $outputlangs);
 
-						foreach($tmparray as $key => $val)
+						foreach ($tmparray as $key => $val)
 						{
 							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);
 							}
@@ -762,21 +762,21 @@ 
 					}
 					$odfHandler->mergeSegment($listlines);
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
 
 				// Replace tags of lines for contacts
-				$sourcearray=array('internal','external');
-				$contact_arrray=array();
+				$sourcearray = array('internal', 'external');
+				$contact_arrray = array();
 				foreach ($sourcearray as $source) {
-					$contact_temp=$project->liste_contact(-1,$source);
+					$contact_temp = $project->liste_contact(-1, $source);
 					if ((is_array($contact_temp) && count($contact_temp) > 0))
 					{
-						$contact_arrray=array_merge($contact_arrray,$contact_temp);
+						$contact_arrray = array_merge($contact_arrray, $contact_temp);
 					}
 				}
 				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
@@ -787,33 +787,33 @@ 
 
 						foreach ($contact_arrray as $contact)
 						{
-							if ($contact['source']=='internal') {
-								$objectdetail=new User($this->db);
+							if ($contact['source'] == 'internal') {
+								$objectdetail = new User($this->db);
 								$objectdetail->fetch($contact['id']);
-								$contact['socname']=$mysoc->name;
-							} elseif ($contact['source']=='external') {
-								$objectdetail=new Contact($this->db);
+								$contact['socname'] = $mysoc->name;
+							} elseif ($contact['source'] == 'external') {
+								$objectdetail = new Contact($this->db);
 								$objectdetail->fetch($contact['id']);
 
-								$soc=new Societe($this->db);
+								$soc = new Societe($this->db);
 								$soc->fetch($contact['socid']);
-								$contact['socname']=$soc->name;
+								$contact['socname'] = $soc->name;
 							}
-							$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
+							$contact['fullname'] = $objectdetail->getFullName($outputlangs, 1);
 
-							$tmparray=$this->get_substitutionarray_project_contacts($contact,$outputlangs);
+							$tmparray = $this->get_substitutionarray_project_contacts($contact, $outputlangs);
 
-							foreach($tmparray as $key => $val)
+							foreach ($tmparray as $key => $val)
 							{
 								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);
 								}
@@ -822,9 +822,9 @@ 
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 						return -1;
 					}
@@ -832,8 +832,8 @@ 
 
 
 				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 
 				// Write new file
@@ -841,7 +841,7 @@ 
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
@@ -850,26 +850,26 @@ 
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
-				$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
+				$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))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				$odfHandler=null;	// Destroy object
+				$odfHandler = null; // Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Success
+				return 1; // Success
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}

Braces +73 added lines, -53 removed lines

@@ -38,16 +38,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';
+}
 
 
 /**
@@ -114,7 +134,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");
@@ -442,7 +468,9 @@ 
 			return -1;
 		}
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
@@ -469,7 +497,9 @@ 
 
 			$dir = $conf->projet->dir_output. "/" . $project->ref. "/";
 			$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))
@@ -524,8 +554,7 @@ 
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					return -1;
@@ -552,12 +581,14 @@ 
 				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');
 						}
@@ -571,7 +602,9 @@ 
 				{
 					// Security check
 					$socid=0;
-					if (!empty($project->fk_soc)) $socid = $project->fk_soc;
+					if (!empty($project->fk_soc)) {
+					    $socid = $project->fk_soc;
+					}
 
 					$tmparray=$this->get_substitutionarray_tasks($object,$outputlangs);
 					complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -624,8 +657,7 @@ 
 									$listlinestaskres->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e) {
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -669,12 +701,10 @@ 
 								try
 								{
 									$listlinestasktime->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);
 								}
@@ -704,12 +734,10 @@ 
 							try
 							{
 								$listtasksfiles->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);
 							}
@@ -719,8 +747,7 @@ 
 					//$listlines->merge();
 
 					$odfHandler->mergeSegment($listtasksfiles);
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -748,12 +775,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);
 							}
@@ -761,8 +786,7 @@ 
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch(OdfException $e)
+				} catch(OdfException $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -808,12 +832,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);
 								}
@@ -821,8 +843,7 @@ 
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 						$this->error=$e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
@@ -845,8 +866,7 @@ 
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -858,16 +878,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;

dolibarr/htdocs/core/modules/project/task/mod_task_simple.php

Indentation +65 added lines, -65 removed lines

@@ -31,30 +31,30 @@ 
  */
 class mod_task_simple extends ModeleNumRefTask
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	public $prefix='TK';
+    public $prefix='TK';
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Simple';
+    /**
+     * @var string
+     * @deprecated
+     * @see name
+     */
+    public $nom='Simple';
 
-	/**
-	 * @var string name
-	 */
-	public $name='Simple';
+    /**
+     * @var string name
+     */
+    public $name='Simple';
 
 
     /**
@@ -64,8 +64,8 @@ 
      */
     function info()
     {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+        global $langs;
+            return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
     }
 
 
@@ -87,16 +87,16 @@ 
      */
     function canBeActivated()
     {
-    	global $conf,$langs,$db;
+        global $conf,$langs,$db;
 
         $coyymm=''; $max='';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM " . $posindice . ") AS SIGNED)) as max";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task AS task, ";
-		$sql .= MAIN_DB_PREFIX . "projet AS project WHERE task.fk_projet=project.rowid";
-		$sql .= " AND task.ref LIKE '" . $db->escape($this->prefix) . "____-%'";
-		$sql .= " AND project.entity = " . $conf->entity;
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM " . $posindice . ") AS SIGNED)) as max";
+        $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task AS task, ";
+        $sql .= MAIN_DB_PREFIX . "projet AS project WHERE task.fk_projet=project.rowid";
+        $sql .= " AND task.ref LIKE '" . $db->escape($this->prefix) . "____-%'";
+        $sql .= " AND project.entity = " . $conf->entity;
         $resql=$db->query($sql);
         if ($resql)
         {
@@ -109,53 +109,53 @@ 
         }
         else
         {
-			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+            $langs->load("errors");
+            $this->error=$langs->trans('ErrorNumRefModel',$max);
             return false;
         }
     }
 
 
-   /**
-	*  Return next value
-	*
-	*  @param   Societe	$objsoc		Object third party
-	*  @param   Task	$object		Object Task
-	*  @return	string				Value if OK, 0 if KO
-	*/
+    /**
+     *  Return next value
+     *
+     *  @param   Societe	$objsoc		Object third party
+     *  @param   Task	$object		Object Task
+     *  @return	string				Value if OK, 0 if KO
+     */
     function getNextValue($objsoc,$object)
     {
-		global $db,$conf;
-
-		// D'abord on recupere la valeur max
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
-		{
-			dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
-			return -1;
-		}
-
-		$date=empty($object->date_c)?dol_now():$object->date_c;
-
-		//$yymm = strftime("%y%m",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);
-
-		dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
-		return $this->prefix.$yymm."-".$num;
+        global $db,$conf;
+
+        // D'abord on recupere la valeur max
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $max = intval($obj->max);
+            else $max=0;
+        }
+        else
+        {
+            dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
+            return -1;
+        }
+
+        $date=empty($object->date_c)?dol_now():$object->date_c;
+
+        //$yymm = strftime("%y%m",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);
+
+        dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
+        return $this->prefix.$yymm."-".$num;
     }
 
 

Spacing +32 added lines, -32 removed lines

@@ -23,7 +23,7 @@ 
  *	\brief      File with class to manage the numbering module Simple for project references
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/project/task/modules_task.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 
 
 /**
@@ -35,26 +35,26 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefix='TK';
+	public $prefix = 'TK';
 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Simple';
+	public $nom = 'Simple';
 
 	/**
 	 * @var string name
 	 */
-	public $name='Simple';
+	public $name = 'Simple';
 
 
     /**
@@ -65,7 +65,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -87,30 +87,30 @@ 
      */
     function canBeActivated()
     {
-    	global $conf,$langs,$db;
+    	global $conf, $langs, $db;
 
-        $coyymm=''; $max='';
+        $coyymm = ''; $max = '';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM " . $posindice . ") AS SIGNED)) as max";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task AS task, ";
-		$sql .= MAIN_DB_PREFIX . "projet AS project WHERE task.fk_projet=project.rowid";
-		$sql .= " AND task.ref LIKE '" . $db->escape($this->prefix) . "____-%'";
-		$sql .= " AND project.entity = " . $conf->entity;
-        $resql=$db->query($sql);
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task AS task, ";
+		$sql .= MAIN_DB_PREFIX."projet AS project WHERE task.fk_projet=project.rowid";
+		$sql .= " AND task.ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND project.entity = ".$conf->entity;
+        $resql = $db->query($sql);
         if ($resql)
         {
             $row = $db->fetch_row($resql);
-            if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+            if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
         }
-        if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+        if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
         {
             return true;
         }
         else
         {
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
             return false;
         }
     }
@@ -123,22 +123,22 @@ 
 	*  @param   Task	$object		Object Task
 	*  @return	string				Value if OK, 0 if KO
 	*/
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -146,13 +146,13 @@ 
 			return -1;
 		}
 
-		$date=empty($object->date_c)?dol_now():$object->date_c;
+		$date = empty($object->date_c) ?dol_now() : $object->date_c;
 
 		//$yymm = strftime("%y%m",time());
-		$yymm = strftime("%y%m",$date);
+		$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_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -167,8 +167,8 @@ 
      *  @param  Task	$object     Object task
      *  @return string              Next not used reference
      */
-    function task_get_num($objsoc=0,$object='')
+    function task_get_num($objsoc = 0, $object = '')
     {
-        return $this->getNextValue($objsoc,$object);
+        return $this->getNextValue($objsoc, $object);
     }
 }

Braces +14 added lines, -8 removed lines

@@ -106,8 +106,7 @@ 
         if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
         {
             return true;
-        }
-        else
+        } else
         {
 			$langs->load("errors");
 			$this->error=$langs->trans('ErrorNumRefModel',$max);
@@ -137,10 +136,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_task_simple::getNextValue", LOG_DEBUG);
 			return -1;
@@ -151,8 +152,13 @@ 
 		//$yymm = strftime("%y%m",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_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

dolibarr/htdocs/core/modules/project/task/mod_task_universal.php

Indentation +68 added lines, -68 removed lines

@@ -30,28 +30,28 @@ 
  */
 class mod_task_universal extends ModeleNumRefTask
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	/**
+    /**
      * @var string Error code (or message)
      */
     public $error = '';
 
-	/**
-	 * @var string
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Universal';
+    /**
+     * @var string
+     * @deprecated
+     * @see name
+     */
+    public $nom='Universal';
 
-	/**
-	 * @var string name
-	 */
-	public $name='Universal';
+    /**
+     * @var string name
+     */
+    public $name='Universal';
 
 
     /**
@@ -59,40 +59,40 @@ 
      *
      *  @return     string      Texte descripif
      */
-	function info()
+    function info()
     {
-    	global $conf,$langs;
+        global $conf,$langs;
 
-		// Load translation files required by the page
+        // Load translation files required by the page
         $langs->loadLangs(array("projects","admin"));
 
-		$form = new Form($this->db);
+        $form = new Form($this->db);
 
-		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMaskTask">';
-		$texte.= '<input type="hidden" name="maskconsttask" value="PROJECT_TASK_UNIVERSAL_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+        $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="updateMaskTask">';
+        $texte.= '<input type="hidden" name="maskconsttask" value="PROJECT_TASK_UNIVERSAL_MASK">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+        $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
+        $tooltip.=$langs->trans("GenericMaskCodes2");
+        $tooltip.=$langs->trans("GenericMaskCodes3");
+        $tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
+        $tooltip.=$langs->trans("GenericMaskCodes5");
 
-		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
+        // Parametrage du prefix
+        $texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
+        $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+        $texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+        $texte.= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+        $texte.= '</table>';
+        $texte.= '</form>';
 
-		return $texte;
+        return $texte;
     }
 
     /**
@@ -102,47 +102,47 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
-
-		if (! $numExample)
-		{
-			$numExample = $langs->trans('NotConfigured');
-		}
-		return $numExample;
+        global $conf,$langs,$mysoc;
+
+        $old_code_client=$mysoc->code_client;
+        $mysoc->code_client='CCCCCCCCCC';
+        $numExample = $this->getNextValue($mysoc,'');
+        $mysoc->code_client=$old_code_client;
+
+        if (! $numExample)
+        {
+            $numExample = $langs->trans('NotConfigured');
+        }
+        return $numExample;
     }
 
-   /**
-	*  Return next value
-	*
-	*  @param	Societe		$objsoc		Object third party
-	*  @param   Task		$object	    Object task
-	*  @return  string					Value if OK, 0 if KO
-	*/
+    /**
+     *  Return next value
+     *
+     *  @param	Societe		$objsoc		Object third party
+     *  @param   Task		$object	    Object task
+     *  @return  string					Value if OK, 0 if KO
+     */
     function getNextValue($objsoc,$object)
     {
-		global $db,$conf;
+        global $db,$conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
 
-		// On defini critere recherche compteur
-		$mask=$conf->global->PROJECT_TASK_UNIVERSAL_MASK;
+        // On defini critere recherche compteur
+        $mask=$conf->global->PROJECT_TASK_UNIVERSAL_MASK;
 
-		if (! $mask)
-		{
-			$this->error='NotConfigured';
-			return 0;
-		}
+        if (! $mask)
+        {
+            $this->error='NotConfigured';
+            return 0;
+        }
 
-		$date=empty($object->date_c)?dol_now():$object->date_c;
-		$numFinal=get_next_value($db,$mask,'projet_task','ref','',(is_object($objsoc)?$objsoc->code_client:''),$date);
+        $date=empty($object->date_c)?dol_now():$object->date_c;
+        $numFinal=get_next_value($db,$mask,'projet_task','ref','',(is_object($objsoc)?$objsoc->code_client:''),$date);
 
-		return  $numFinal;
-	}
+        return  $numFinal;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

Spacing +38 added lines, -38 removed lines

@@ -22,7 +22,7 @@ 
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de projet Universal
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/project/task/modules_task.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 
 
 /**
@@ -34,7 +34,7 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
      * @var string Error code (or message)
@@ -46,12 +46,12 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Universal';
+	public $nom = 'Universal';
 
 	/**
 	 * @var string name
 	 */
-	public $name='Universal';
+	public $name = 'Universal';
 
 
     /**
@@ -61,36 +61,36 @@ 
      */
 	function info()
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("projects","admin"));
+        $langs->loadLangs(array("projects", "admin"));
 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMaskTask">';
-		$texte.= '<input type="hidden" name="maskconsttask" value="PROJECT_TASK_UNIVERSAL_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMaskTask">';
+		$texte .= '<input type="hidden" name="maskconsttask" value="PROJECT_TASK_UNIVERSAL_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Task"), $langs->transnoentities("Task"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Task"), $langs->transnoentities("Task"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -102,14 +102,14 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
+    	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+    	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -123,23 +123,23 @@ 
 	*  @param   Task		$object	    Object task
 	*  @return  string					Value if OK, 0 if KO
 	*/
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask=$conf->global->PROJECT_TASK_UNIVERSAL_MASK;
+		$mask = $conf->global->PROJECT_TASK_UNIVERSAL_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$date=empty($object->date_c)?dol_now():$object->date_c;
-		$numFinal=get_next_value($db,$mask,'projet_task','ref','',(is_object($objsoc)?$objsoc->code_client:''),$date);
+		$date = empty($object->date_c) ?dol_now() : $object->date_c;
+		$numFinal = get_next_value($db, $mask, 'projet_task', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
 
 		return  $numFinal;
 	}
@@ -153,7 +153,7 @@ 
      *  @param  Task		$object	    Object task
      *  @return string      			Next not used reference
      */
-    function project_get_num($objsoc=0,$object='')
+    function project_get_num($objsoc = 0, $object = '')
     {
         // phpcs:enable
         return $this->getNextValue($objsoc, $object);

dolibarr/htdocs/core/modules/project/task/modules_task.php

Indentation +93 added lines, -93 removed lines

@@ -32,33 +32,33 @@ 
  */
 abstract class ModelePDFTask extends CommonDocGenerator
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return list of active generation modules
-	 *
+    /**
+     *  Return list of active generation modules
+     *
      *  @param	DoliDB	$db     			Database handler
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
     static function liste_modeles($db,$maxfilenamelength=0)
-	{
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$type='project_task';
-		$liste=array();
+        $type='project_task';
+        $liste=array();
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $liste=getListOfModels($db,$type,$maxfilenamelength);
 
-		return $liste;
-	}
+        return $liste;
+    }
 }
 
 
@@ -68,82 +68,82 @@ 
  */
 abstract class ModeleNumRefTask
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	/**
-	 *  Return if a module can be used or not
-	 *
-	 *  @return		boolean     true if module can be used
-	 */
-	function isEnabled()
-	{
-		return true;
-	}
-
-	/**
-	 *  Renvoi la description par defaut du modele de numerotation
-	 *
-	 *  @return     string      Texte descripif
-	 */
-	function info()
-	{
-		global $langs;
-		$langs->load("projects");
-		return $langs->trans("NoDescription");
-	}
-
-	/**
-	 *  Renvoi un exemple de numerotation
-	 *
-	 *  @return     string      Example
-	 */
-	function getExample()
-	{
-		global $langs;
-		$langs->load("projects");
-		return $langs->trans("NoExample");
-	}
-
-	/**
-	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-	 *  de conflits qui empechera cette numerotation de fonctionner.
-	 *
-	 *  @return     boolean     false si conflit, true si ok
-	 */
-	function canBeActivated()
-	{
-		return true;
-	}
-
-	/**
-	 *  Renvoi prochaine valeur attribuee
-	 *
-	 *	@param	Societe		$objsoc		Object third party
-	 *	@param	Project		$project	Object project
-	 *	@return	string					Valeur
-	 */
-	function getNextValue($objsoc, $project)
-	{
-		global $langs;
-		return $langs->trans("NotAvailable");
-	}
-
-	/**
-	 *  Renvoi version du module numerotation
-	 *
-	 *  @return     string      Valeur
-	 */
-	function getVersion()
-	{
-		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;
-		return $langs->trans("NotAvailable");
-	}
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    /**
+     *  Return if a module can be used or not
+     *
+     *  @return		boolean     true if module can be used
+     */
+    function isEnabled()
+    {
+        return true;
+    }
+
+    /**
+     *  Renvoi la description par defaut du modele de numerotation
+     *
+     *  @return     string      Texte descripif
+     */
+    function info()
+    {
+        global $langs;
+        $langs->load("projects");
+        return $langs->trans("NoDescription");
+    }
+
+    /**
+     *  Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
+     */
+    function getExample()
+    {
+        global $langs;
+        $langs->load("projects");
+        return $langs->trans("NoExample");
+    }
+
+    /**
+     *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+     *  de conflits qui empechera cette numerotation de fonctionner.
+     *
+     *  @return     boolean     false si conflit, true si ok
+     */
+    function canBeActivated()
+    {
+        return true;
+    }
+
+    /**
+     *  Renvoi prochaine valeur attribuee
+     *
+     *	@param	Societe		$objsoc		Object third party
+     *	@param	Project		$project	Object project
+     *	@return	string					Valeur
+     */
+    function getNextValue($objsoc, $project)
+    {
+        global $langs;
+        return $langs->trans("NotAvailable");
+    }
+
+    /**
+     *  Renvoi version du module numerotation
+     *
+     *  @return     string      Valeur
+     */
+    function getVersion()
+    {
+        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;
+        return $langs->trans("NotAvailable");
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -46,16 +46,16 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
-    static function liste_modeles($db,$maxfilenamelength=0)
+    static function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		global $conf;
 
-		$type='project_task';
-		$liste=array();
+		$type = 'project_task';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -71,7 +71,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 *  Return if a module can be used or not

Braces +9 added lines, -3 removed lines

@@ -141,9 +141,15 @@
 		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 == 'development') {
+		    return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+		    return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+		    return DOL_VERSION;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

dolibarr/htdocs/core/modules/project/mod_project_universal.php

Indentation +68 added lines, -68 removed lines

@@ -30,28 +30,28 @@ 
  */
 class mod_project_universal extends ModeleNumRefProjects
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
 
-	/**
+    /**
      * @var string Error code (or message)
      */
     public $error = '';
 
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Universal';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Universal';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Universal';
+    /**
+     * @var string model name
+     */
+    public $name='Universal';
 
 
     /**
@@ -59,40 +59,40 @@ 
      *
      *  @return     string      Texte descripif
      */
-	function info()
+    function info()
     {
-    	global $conf, $langs;
+        global $conf, $langs;
 
-		// Load translation files required by the page
+        // Load translation files required by the page
         $langs->loadLangs(array("projects","admin"));
 
-		$form = new Form($this->db);
+        $form = new Form($this->db);
 
-		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstproject" value="PROJECT_UNIVERSAL_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+        $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="updateMask">';
+        $texte.= '<input type="hidden" name="maskconstproject" value="PROJECT_UNIVERSAL_MASK">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+        $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
+        $tooltip.=$langs->trans("GenericMaskCodes2");
+        $tooltip.=$langs->trans("GenericMaskCodes3");
+        $tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
+        $tooltip.=$langs->trans("GenericMaskCodes5");
 
-		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
+        // Parametrage du prefix
+        $texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
+        $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+        $texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+        $texte.= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+        $texte.= '</table>';
+        $texte.= '</form>';
 
-		return $texte;
+        return $texte;
     }
 
     /**
@@ -102,47 +102,47 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
-
-		if (! $numExample)
-		{
-			$numExample = $langs->trans('NotConfigured');
-		}
-		return $numExample;
+        global $conf,$langs,$mysoc;
+
+        $old_code_client=$mysoc->code_client;
+        $mysoc->code_client='CCCCCCCCCC';
+        $numExample = $this->getNextValue($mysoc,'');
+        $mysoc->code_client=$old_code_client;
+
+        if (! $numExample)
+        {
+            $numExample = $langs->trans('NotConfigured');
+        }
+        return $numExample;
     }
 
-   /**
-	*  Return next value
-	*
-	*  @param	Societe		$objsoc		Object third party
-	*  @param   Project		$project	Object project
-	*  @return  string					Value if OK, 0 if KO
-	*/
+    /**
+     *  Return next value
+     *
+     *  @param	Societe		$objsoc		Object third party
+     *  @param   Project		$project	Object project
+     *  @return  string					Value if OK, 0 if KO
+     */
     function getNextValue($objsoc, $project)
     {
-		global $db,$conf;
+        global $db,$conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
 
-		// On defini critere recherche compteur
-		$mask=$conf->global->PROJECT_UNIVERSAL_MASK;
+        // On defini critere recherche compteur
+        $mask=$conf->global->PROJECT_UNIVERSAL_MASK;
 
-		if (! $mask)
-		{
-			$this->error='NotConfigured';
-			return 0;
-		}
+        if (! $mask)
+        {
+            $this->error='NotConfigured';
+            return 0;
+        }
 
-		$date=empty($project->date_c)?dol_now():$project->date_c;
-		$numFinal=get_next_value($db, $mask, 'projet', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
+        $date=empty($project->date_c)?dol_now():$project->date_c;
+        $numFinal=get_next_value($db, $mask, 'projet', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
 
-		return  $numFinal;
-	}
+        return  $numFinal;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

Spacing +36 added lines, -36 removed lines

@@ -22,7 +22,7 @@ 
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de projet Universal
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/project/modules_project.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 
 
 /**
@@ -34,7 +34,7 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
      * @var string Error code (or message)
@@ -46,12 +46,12 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Universal';
+	public $nom = 'Universal';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Universal';
+	public $name = 'Universal';
 
 
     /**
@@ -64,33 +64,33 @@ 
     	global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("projects","admin"));
+        $langs->loadLangs(array("projects", "admin"));
 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstproject" value="PROJECT_UNIVERSAL_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Project"),$langs->transnoentities("Project"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstproject" value="PROJECT_UNIVERSAL_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Project"), $langs->transnoentities("Project"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Project"), $langs->transnoentities("Project"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -102,14 +102,14 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
+    	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+    	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -125,21 +125,21 @@ 
 	*/
     function getNextValue($objsoc, $project)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask=$conf->global->PROJECT_UNIVERSAL_MASK;
+		$mask = $conf->global->PROJECT_UNIVERSAL_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$date=empty($project->date_c)?dol_now():$project->date_c;
-		$numFinal=get_next_value($db, $mask, 'projet', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
+		$date = empty($project->date_c) ?dol_now() : $project->date_c;
+		$numFinal = get_next_value($db, $mask, 'projet', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
 
 		return  $numFinal;
 	}
@@ -153,7 +153,7 @@ 
      *  @param  Project		$project	Object project
      *  @return string      			Next not used reference
      */
-    function project_get_num($objsoc=0, $project='')
+    function project_get_num($objsoc = 0, $project = '')
     {
         // phpcs:enable
         return $this->getNextValue($objsoc, $project);

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

Indentation +92 added lines, -92 removed lines

@@ -33,106 +33,106 @@
 class modExternalRss extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->numero = 320;
-
-		$this->family = "technic";
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Ajout de files d'informations RSS dans les ecrans Dolibarr";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='rss';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/externalrss/temp");
-
-		// Config pages
-		$this->config_page_url = array("external_rss.php");
-
-		// Dependencies
-		$this->depends = array();
-		$this->requiredby = array();
-		$this->phpmin = array(4,2,0);
-		$this->phpmax = array();
-
-		// Constants
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array();
-		// Les boites sont ajoutees lors de la configuration des flux
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'externalrss';
-	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 320;
+
+        $this->family = "technic";
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Ajout de files d'informations RSS dans les ecrans Dolibarr";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='rss';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/externalrss/temp");
+
+        // Config pages
+        $this->config_page_url = array("external_rss.php");
+
+        // Dependencies
+        $this->depends = array();
+        $this->requiredby = array();
+        $this->phpmin = array(4,2,0);
+        $this->phpmax = array();
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array();
+        // Les boites sont ajoutees lors de la configuration des flux
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'externalrss';
+    }
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $conf;
-
-		$sql = array();
-
-		// Recherche configuration de boites
-		$this->boxes=array();
-		$sql="select name, value from ".MAIN_DB_PREFIX."const";
-		$sql.= " WHERE name like 'EXTERNAL_RSS_TITLE_%'";
-		$sql.= " AND entity = ".$conf->entity;
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			while ($obj = $this->db->fetch_object($result))
-			{
-				if (preg_match('/EXTERNAL_RSS_TITLE_([0-9]+)/i',$obj->name,$reg))
-				{
-					// Definie la boite si on a trouvee une ancienne configuration
-					//$this->boxes[$reg[1]][0] = "(ExternalRSSInformations)";
-					$this->boxes[$reg[1]]['file'] = "box_external_rss.php";
-					$this->boxes[$reg[1]]['note'] = $reg[1]." (".$obj->value.")";
-				}
-			}
-			$this->db->free($result);
-		}
-
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf;
+
+        $sql = array();
+
+        // Recherche configuration de boites
+        $this->boxes=array();
+        $sql="select name, value from ".MAIN_DB_PREFIX."const";
+        $sql.= " WHERE name like 'EXTERNAL_RSS_TITLE_%'";
+        $sql.= " AND entity = ".$conf->entity;
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            while ($obj = $this->db->fetch_object($result))
+            {
+                if (preg_match('/EXTERNAL_RSS_TITLE_([0-9]+)/i',$obj->name,$reg))
+                {
+                    // Definie la boite si on a trouvee une ancienne configuration
+                    //$this->boxes[$reg[1]][0] = "(ExternalRSSInformations)";
+                    $this->boxes[$reg[1]]['file'] = "box_external_rss.php";
+                    $this->boxes[$reg[1]]['note'] = $reg[1]." (".$obj->value.")";
+                }
+            }
+            $this->db->free($result);
+        }
+
+        $sql = array();
+
+        return $this->_init($sql,$options);
+    }
 
     /**
-	 *		Function called when module is disabled.
-	 *      Remove from database constants, boxes and permissions from Dolibarr database.
-	 *		Data directories are not deleted
-	 *
+     *		Function called when module is disabled.
+     *      Remove from database constants, boxes and permissions from Dolibarr database.
+     *		Data directories are not deleted
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
+     *      @return     int             	1 if OK, 0 if KO
      */
     function remove($options='')
     {
-		$sql = array();
+        $sql = array();
 
-		// Delete old declarations of RSS box
-		$this->boxes[0]['file'] = "box_external_rss.php";
+        // Delete old declarations of RSS box
+        $this->boxes[0]['file'] = "box_external_rss.php";
 
-		return $this->_remove($sql,$options);
+        return $this->_remove($sql,$options);
     }
 }

Spacing +14 added lines, -14 removed lines

@@ -24,7 +24,7 @@ 
  *	\brief      Fichier de description et activation du module externalrss
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -47,12 +47,12 @@ 
 
 		$this->family = "technic";
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Ajout de files d'informations RSS dans les ecrans Dolibarr";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='rss';
+		$this->picto = 'rss';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/externalrss/temp");
@@ -63,7 +63,7 @@ 
 		// Dependencies
 		$this->depends = array();
 		$this->requiredby = array();
-		$this->phpmin = array(4,2,0);
+		$this->phpmin = array(4, 2, 0);
 		$this->phpmax = array();
 
 		// Constants
@@ -86,23 +86,23 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		global $conf;
 
 		$sql = array();
 
 		// Recherche configuration de boites
-		$this->boxes=array();
-		$sql="select name, value from ".MAIN_DB_PREFIX."const";
-		$sql.= " WHERE name like 'EXTERNAL_RSS_TITLE_%'";
-		$sql.= " AND entity = ".$conf->entity;
-		$result=$this->db->query($sql);
+		$this->boxes = array();
+		$sql = "select name, value from ".MAIN_DB_PREFIX."const";
+		$sql .= " WHERE name like 'EXTERNAL_RSS_TITLE_%'";
+		$sql .= " AND entity = ".$conf->entity;
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			while ($obj = $this->db->fetch_object($result))
 			{
-				if (preg_match('/EXTERNAL_RSS_TITLE_([0-9]+)/i',$obj->name,$reg))
+				if (preg_match('/EXTERNAL_RSS_TITLE_([0-9]+)/i', $obj->name, $reg))
 				{
 					// Definie la boite si on a trouvee une ancienne configuration
 					//$this->boxes[$reg[1]][0] = "(ExternalRSSInformations)";
@@ -115,7 +115,7 @@ 
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 
     /**
@@ -126,13 +126,13 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
      */
-    function remove($options='')
+    function remove($options = '')
     {
 		$sql = array();
 
 		// Delete old declarations of RSS box
 		$this->boxes[0]['file'] = "box_external_rss.php";
 
-		return $this->_remove($sql,$options);
+		return $this->_remove($sql, $options);
     }
 }

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

Indentation +11 added lines, -11 removed lines

@@ -32,26 +32,26 @@ 
 {
 
     /**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
-    	global $langs,$conf;
+        global $langs,$conf;
 
         $this->db = $db;
         $this->numero = 3400;
 
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
         $this->family = "interface";
         // Module position in the family on 2 digits ('01', '10', '20', ...)
         $this->module_position = '20';
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
         $this->name = preg_replace('/^mod/i','',get_class($this));
         $this->description = "Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...)";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
@@ -66,10 +66,10 @@ 
 
         // Dependencies
         $this->hidden = ! empty($conf->global->MODULE_SOCIALNETWORKS_DISABLED);	// A condition to hide module
-		$this->depends = array('modSociete');	// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->depends = array('modSociete');	// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
         $this->langfiles = array();
 
         // Constants

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
  *  \ingroup    socialnetworks
  *  \brief      Description and activation file for module SocialNetworks
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe a SocialNetworks module
@@ -38,7 +38,7 @@ 
      */
     function __construct($db)
     {
-    	global $langs,$conf;
+    	global $langs, $conf;
 
         $this->db = $db;
         $this->numero = 3400;
@@ -49,14 +49,14 @@ 
         // Module position in the family on 2 digits ('01', '10', '20', ...)
         $this->module_position = '20';
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
         $this->description = "Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...)";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Name of image file used for this module.
-        $this->picto='generic';
+        $this->picto = 'generic';
 
         // Data directories to create when module is enabled
         $this->dirs = array();
@@ -65,11 +65,11 @@ 
         $this->config_page_url = array("socialnetworks.php");
 
         // Dependencies
-        $this->hidden = ! empty($conf->global->MODULE_SOCIALNETWORKS_DISABLED);	// A condition to hide module
-		$this->depends = array('modSociete');	// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->hidden = !empty($conf->global->MODULE_SOCIALNETWORKS_DISABLED); // A condition to hide module
+		$this->depends = array('modSociete'); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
         $this->langfiles = array();
 
         // Constants

dolibarr/htdocs/core/modules/member/doc/pdf_standard.class.php

Indentation +394 added lines, -394 removed lines

@@ -34,288 +34,288 @@ 
 class pdf_standard extends CommonStickerGenerator
 {
 
-	/**
-	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
-	 *
-	 * @param	PDF			$pdf			PDF reference
-	 * @param	Translate	$outputlangs	Output langs
-	 * @param	array		$param			Associative array containing label content and optional parameters
-	 * @return	void
-	 */
+    /**
+     * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
+     *
+     * @param	PDF			$pdf			PDF reference
+     * @param	Translate	$outputlangs	Output langs
+     * @param	array		$param			Associative array containing label content and optional parameters
+     * @return	void
+     */
     function addSticker(&$pdf,$outputlangs,$param)
     {
-		// use this method in future refactoring
-	}
+        // use this method in future refactoring
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
-	 * - __LOGO__ is replace with company logo
-	 * - __PHOTO__ is replace with photo provided as parameter
-	 *
-	 * @param	 PDF		$pdf			PDF
-	 * @param	 string		$textleft		Text left
-	 * @param	 string		$header			Header
-	 * @param	 string		$footer			Footer
-	 * @param	 Translate	$outputlangs	Output langs
-	 * @param	 string		$textright		Text right
-	 * @param	 int		$idmember		Id member
-	 * @param	 string		$photo			Photo (full path to image file used as replacement for key __PHOTOS__ into left, right, header or footer text)
-	 * @return	 void
-	 */
-	function Add_PDF_card(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$idmember=0,$photo='')
-	{
+    /**
+     * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
+     * - __LOGO__ is replace with company logo
+     * - __PHOTO__ is replace with photo provided as parameter
+     *
+     * @param	 PDF		$pdf			PDF
+     * @param	 string		$textleft		Text left
+     * @param	 string		$header			Header
+     * @param	 string		$footer			Footer
+     * @param	 Translate	$outputlangs	Output langs
+     * @param	 string		$textright		Text right
+     * @param	 int		$idmember		Id member
+     * @param	 string		$photo			Photo (full path to image file used as replacement for key __PHOTOS__ into left, right, header or footer text)
+     * @return	 void
+     */
+    function Add_PDF_card(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$idmember=0,$photo='')
+    {
         // phpcs:enable
-		global $db,$mysoc,$conf,$langs;
-		global $forceimgscalewidth,$forceimgscaleheight;
-
-		$imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth);	// Scale of image for width (1=Full width of sticker)
-		$imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth);	// Scale of image for height (1=Full height of sticker)
-
-		// We are in a new page, then we must add a page
-		if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) {
-			$pdf->AddPage();
-		}
-		$this->_First=0;
-		$_PosX = $this->_Margin_Left+($this->_COUNTX*($this->_Width+$this->_X_Space));
-		$_PosY = $this->_Margin_Top+($this->_COUNTY*($this->_Height+$this->_Y_Space));
-
-		// Define logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if (! is_readable($logo))
-		{
-			$logo='';
-			if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
-			{
-				$logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
-			{
-				$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-			}
-		}
-
-		$member=new Adherent($db);
-		$member->id = $idmember;
-		$member->ref = $idmember;
-
-		// Define photo
-		$dir=$conf->adherent->dir_output;
-		if (! empty($photo))
-		{
-			$file=get_exdir(0,0,0,0,$member,'member').'photos/'.$photo;
-			$photo=$dir.'/'.$file;
-			if (! is_readable($photo)) $photo='';
-		}
-
-		// Define background image
-		$backgroundimage='';
-		if(! empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND))
-		{
-			$backgroundimage=$conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND;
-		}
-
-		// Print lines
-		if ($this->code == "CARD")
-		{
-			$this->Tformat=$this->_Avery_Labels["CARD"];
-			//$this->_Pointille($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.3,25);
-			$this->_Croix($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.1,10);
-		}
-
-		// Background
-		if ($backgroundimage)
-		{
-			$pdf->image($backgroundimage,$_PosX,$_PosY,$this->_Width,$this->_Height);
-		}
-
-		$xleft=2; $ytop=2;
-
-		// Top
-		if ($header!='')
-		{
-			if ($this->code == "CARD")
-			{
-				$pdf->SetDrawColor(128,128,128);
-				$pdf->Line($_PosX, $_PosY+$this->_Line_Height+1, $_PosX+$this->_Width, $_PosY+$this->_Line_Height+1); // Only 1 mm and not ytop for top text
-				$pdf->SetDrawColor(0,0,0);
-			}
-			$pdf->SetXY($_PosX+$xleft, $_PosY+1); // Only 1 mm and not ytop for top text
-			$pdf->Cell($this->_Width-2*$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header),0,1,'C');
-		}
-
-
-		$ytop+=(empty($header)?0:(1+$this->_Line_Height));
-
-		// Define widthtouse and heighttouse
-		$maxwidthtouse=round(($this->_Width - 2*$xleft)*$imgscalewidth); $maxheighttouse=round(($this->_Height - 2*$ytop)*$imgscaleheight);
-		$defaultratio=($maxwidthtouse/$maxheighttouse);
-		$widthtouse=$maxwidthtouse; $heighttouse=0;		// old value for image
-		$tmp=dol_getImageSize($photo, false);
-		if ($tmp['height'])
-		{
-			$imgratio=$tmp['width']/$tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
-			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
-		}
-		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
-
-		// Center
-		if ($textright=='')	// Only a left part
-		{
-			// Output left area
-			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else
-			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-			}
-		}
-		else if ($textleft!='' && $textright!='')	//
-		{
-			if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
-			{
-				if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				$pdf->SetXY($_PosX+$xleft+$widthtouse+1, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$xleft-$xleft-$widthtouse-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
-			}
-			else if ($textright == '__LOGO__' || $textright == '__PHOTO__')
-			{
-				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$widthtouse-$xleft-$xleft-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-			}
-			else	// text on halft left and text on half right
-			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell(round($this->_Width/2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-				$pdf->SetXY($_PosX+round($this->_Width/2), $_PosY+$ytop);
-				$pdf->MultiCell(round($this->_Width/2)-2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
-			}
-		}
-		else	// Only a right part
-		{
-			// Output right area
-			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else
-			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
-			}
-		}
-
-		// Bottom
-		if ($footer!='')
-		{
-			if ($this->code == "CARD")
-			{
-				$pdf->SetDrawColor(128,128,128);
-				$pdf->Line($_PosX, $_PosY+$this->_Height-$this->_Line_Height-2, $_PosX+$this->_Width, $_PosY+$this->_Height-$this->_Line_Height-2);
-				$pdf->SetDrawColor(0,0,0);
-			}
-			$pdf->SetXY($_PosX, $_PosY+$this->_Height-$this->_Line_Height-1);
-			$pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer),0,1,'C');
-		}
-		//print "$_PosY+$this->_Height-$this->_Line_Height-1<br>\n";
-
-		$this->_COUNTY++;
-
-		if ($this->_COUNTY == $this->_Y_Number) {
-			// Si on est en bas de page, on remonte le 'curseur' de position
-			$this->_COUNTX++;
-			$this->_COUNTY=0;
-		}
-
-		if ($this->_COUNTX == $this->_X_Number) {
-			// Si on est en bout de page, alors on repart sur une nouvelle page
-			$this->_COUNTX=0;
-			$this->_COUNTY=0;
-		}
-	}
+        global $db,$mysoc,$conf,$langs;
+        global $forceimgscalewidth,$forceimgscaleheight;
+
+        $imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth);	// Scale of image for width (1=Full width of sticker)
+        $imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth);	// Scale of image for height (1=Full height of sticker)
+
+        // We are in a new page, then we must add a page
+        if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) {
+            $pdf->AddPage();
+        }
+        $this->_First=0;
+        $_PosX = $this->_Margin_Left+($this->_COUNTX*($this->_Width+$this->_X_Space));
+        $_PosY = $this->_Margin_Top+($this->_COUNTY*($this->_Height+$this->_Y_Space));
+
+        // Define logo
+        $logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+        if (! is_readable($logo))
+        {
+            $logo='';
+            if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
+            {
+                $logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+            }
+            elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+            {
+                $logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+            }
+        }
+
+        $member=new Adherent($db);
+        $member->id = $idmember;
+        $member->ref = $idmember;
+
+        // Define photo
+        $dir=$conf->adherent->dir_output;
+        if (! empty($photo))
+        {
+            $file=get_exdir(0,0,0,0,$member,'member').'photos/'.$photo;
+            $photo=$dir.'/'.$file;
+            if (! is_readable($photo)) $photo='';
+        }
+
+        // Define background image
+        $backgroundimage='';
+        if(! empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND))
+        {
+            $backgroundimage=$conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND;
+        }
+
+        // Print lines
+        if ($this->code == "CARD")
+        {
+            $this->Tformat=$this->_Avery_Labels["CARD"];
+            //$this->_Pointille($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.3,25);
+            $this->_Croix($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.1,10);
+        }
+
+        // Background
+        if ($backgroundimage)
+        {
+            $pdf->image($backgroundimage,$_PosX,$_PosY,$this->_Width,$this->_Height);
+        }
+
+        $xleft=2; $ytop=2;
+
+        // Top
+        if ($header!='')
+        {
+            if ($this->code == "CARD")
+            {
+                $pdf->SetDrawColor(128,128,128);
+                $pdf->Line($_PosX, $_PosY+$this->_Line_Height+1, $_PosX+$this->_Width, $_PosY+$this->_Line_Height+1); // Only 1 mm and not ytop for top text
+                $pdf->SetDrawColor(0,0,0);
+            }
+            $pdf->SetXY($_PosX+$xleft, $_PosY+1); // Only 1 mm and not ytop for top text
+            $pdf->Cell($this->_Width-2*$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header),0,1,'C');
+        }
+
+
+        $ytop+=(empty($header)?0:(1+$this->_Line_Height));
+
+        // Define widthtouse and heighttouse
+        $maxwidthtouse=round(($this->_Width - 2*$xleft)*$imgscalewidth); $maxheighttouse=round(($this->_Height - 2*$ytop)*$imgscaleheight);
+        $defaultratio=($maxwidthtouse/$maxheighttouse);
+        $widthtouse=$maxwidthtouse; $heighttouse=0;		// old value for image
+        $tmp=dol_getImageSize($photo, false);
+        if ($tmp['height'])
+        {
+            $imgratio=$tmp['width']/$tmp['height'];
+            if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
+            else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+        }
+        //var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
+
+        // Center
+        if ($textright=='')	// Only a left part
+        {
+            // Output left area
+            if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+            else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+            else
+            {
+                $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
+                $pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+            }
+        }
+        else if ($textleft!='' && $textright!='')	//
+        {
+            if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
+            {
+                if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+                else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+                $pdf->SetXY($_PosX+$xleft+$widthtouse+1, $_PosY+$ytop);
+                $pdf->MultiCell($this->_Width-$xleft-$xleft-$widthtouse-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+            }
+            else if ($textright == '__LOGO__' || $textright == '__PHOTO__')
+            {
+                if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+                else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+                $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
+                $pdf->MultiCell($this->_Width-$widthtouse-$xleft-$xleft-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+            }
+            else	// text on halft left and text on half right
+            {
+                $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
+                $pdf->MultiCell(round($this->_Width/2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+                $pdf->SetXY($_PosX+round($this->_Width/2), $_PosY+$ytop);
+                $pdf->MultiCell(round($this->_Width/2)-2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+            }
+        }
+        else	// Only a right part
+        {
+            // Output right area
+            if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+            else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+            else
+            {
+                $pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
+                $pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+            }
+        }
+
+        // Bottom
+        if ($footer!='')
+        {
+            if ($this->code == "CARD")
+            {
+                $pdf->SetDrawColor(128,128,128);
+                $pdf->Line($_PosX, $_PosY+$this->_Height-$this->_Line_Height-2, $_PosX+$this->_Width, $_PosY+$this->_Height-$this->_Line_Height-2);
+                $pdf->SetDrawColor(0,0,0);
+            }
+            $pdf->SetXY($_PosX, $_PosY+$this->_Height-$this->_Line_Height-1);
+            $pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer),0,1,'C');
+        }
+        //print "$_PosY+$this->_Height-$this->_Line_Height-1<br>\n";
+
+        $this->_COUNTY++;
+
+        if ($this->_COUNTY == $this->_Y_Number) {
+            // Si on est en bas de page, on remonte le 'curseur' de position
+            $this->_COUNTX++;
+            $this->_COUNTY=0;
+        }
+
+        if ($this->_COUNTX == $this->_X_Number) {
+            // Si on est en bout de page, alors on repart sur une nouvelle page
+            $this->_COUNTX=0;
+            $this->_COUNTY=0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Function to build PDF on disk, then output on HTTP stream.
-	 *
-	 *	@param	Adherent	$object		        Member object. Old usage: Array of record informations (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
-	 *	@param	Translate	$outputlangs		Lang object for output language
-	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file. Example: '5161', 'AVERYC32010', 'CARD', ...
-	 *	@param	string		$mode				Tell if doc module is called for 'member', ...
-	 *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
-	 *	@return	int								1=OK, 0=KO
-	 */
-	function write_file($object, $outputlangs, $srctemplatepath, $mode='member', $nooutput=0)
-	{
+    /**
+     *	Function to build PDF on disk, then output on HTTP stream.
+     *
+     *	@param	Adherent	$object		        Member object. Old usage: Array of record informations (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
+     *	@param	Translate	$outputlangs		Lang object for output language
+     *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file. Example: '5161', 'AVERYC32010', 'CARD', ...
+     *	@param	string		$mode				Tell if doc module is called for 'member', ...
+     *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
+     *	@return	int								1=OK, 0=KO
+     */
+    function write_file($object, $outputlangs, $srctemplatepath, $mode='member', $nooutput=0)
+    {
         // phpcs:enable
-		global $user,$conf,$langs,$mysoc,$_Avery_Labels;
-
-		$this->code=$srctemplatepath;
-
-		if (is_object($object))
-		{
-		    if ($object->country == '-') $object->country='';
-
-    		// List of values to scan for a replacement
-    		$substitutionarray = array (
-    		    '__ID__'=>$object->rowid,
-    		    '__LOGIN__'=>$object->login,
-    		    '__FIRSTNAME__'=>$object->firstname,
-    		    '__LASTNAME__'=>$object->lastname,
-    		    '__FULLNAME__'=>$object->getFullName($langs),
-    		    '__COMPANY__'=>$object->company,
-    		    '__ADDRESS__'=>$object->address,
-    		    '__ZIP__'=>$object->zip,
-    		    '__TOWN__'=>$object->town,
-    		    '__COUNTRY__'=>$object->country,
-    		    '__COUNTRY_CODE__'=>$object->country_code,
-    		    '__EMAIL__'=>$object->email,
-    		    '__BIRTH__'=>dol_print_date($object->birth,'day'),
-    		    '__TYPE__'=>$object->type,
-    		    '__YEAR__'=>$year,
-    		    '__MONTH__'=>$month,
-    		    '__DAY__'=>$day,
-    		    '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-    		    '__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
-    		);
-    		complete_substitutions_array($substitutionarray, $langs);
-
-    		// For business cards
-		    $textleft=make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-		    $textheader=make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-		    $textfooter=make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-		    $textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
-
-		    $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-		    if ($nb <= 0) $nb=1;  // Protection to avoid empty page
-
-		    for($j=0;$j<$nb;$j++)
-	        {
-	            $arrayofmembers[]=array(
-	                'textleft'=>$textleft,
-	                'textheader'=>$textheader,
-	                'textfooter'=>$textfooter,
-	                'textright'=>$textright,
-	                'id'=>$object->rowid,
-	                'photo'=>$object->photo
-	            );
-	        }
-
-    		$arrayofrecords = $arrayofmembers;
-		}
-		else
-		{
-		    $arrayofrecords = $object;
-		}
-
-		//var_dump($arrayofrecords);exit;
-
-		$this->Tformat = $_Avery_Labels[$this->code];
-		if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; }
-		$this->type = 'pdf';
+        global $user,$conf,$langs,$mysoc,$_Avery_Labels;
+
+        $this->code=$srctemplatepath;
+
+        if (is_object($object))
+        {
+            if ($object->country == '-') $object->country='';
+
+            // List of values to scan for a replacement
+            $substitutionarray = array (
+                '__ID__'=>$object->rowid,
+                '__LOGIN__'=>$object->login,
+                '__FIRSTNAME__'=>$object->firstname,
+                '__LASTNAME__'=>$object->lastname,
+                '__FULLNAME__'=>$object->getFullName($langs),
+                '__COMPANY__'=>$object->company,
+                '__ADDRESS__'=>$object->address,
+                '__ZIP__'=>$object->zip,
+                '__TOWN__'=>$object->town,
+                '__COUNTRY__'=>$object->country,
+                '__COUNTRY_CODE__'=>$object->country_code,
+                '__EMAIL__'=>$object->email,
+                '__BIRTH__'=>dol_print_date($object->birth,'day'),
+                '__TYPE__'=>$object->type,
+                '__YEAR__'=>$year,
+                '__MONTH__'=>$month,
+                '__DAY__'=>$day,
+                '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+                '__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
+            );
+            complete_substitutions_array($substitutionarray, $langs);
+
+            // For business cards
+            $textleft=make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
+            $textheader=make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
+            $textfooter=make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
+            $textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+
+            $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
+            if ($nb <= 0) $nb=1;  // Protection to avoid empty page
+
+            for($j=0;$j<$nb;$j++)
+            {
+                $arrayofmembers[]=array(
+                    'textleft'=>$textleft,
+                    'textheader'=>$textheader,
+                    'textfooter'=>$textfooter,
+                    'textright'=>$textright,
+                    'id'=>$object->rowid,
+                    'photo'=>$object->photo
+                );
+            }
+
+            $arrayofrecords = $arrayofmembers;
+        }
+        else
+        {
+            $arrayofrecords = $object;
+        }
+
+        //var_dump($arrayofrecords);exit;
+
+        $this->Tformat = $_Avery_Labels[$this->code];
+        if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; }
+        $this->type = 'pdf';
         // standard format or custom
         if ($this->Tformat['paper-size']!='custom') {
             $this->format = $this->Tformat['paper-size'];
@@ -325,124 +325,124 @@ 
             $this->format = $resolution;
         }
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
-
-		if (empty($mode) || $mode == 'member')
-		{
-			$title=$outputlangs->transnoentities('MembersCards');
-			$keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
-		}
-		else
-		{
-			dol_print_error('','Bad value for $mode');
-			return -1;
-		}
-
-		$filename = 'tmp_cards.pdf';
-		if (is_object($object))
-		{
-		    $outputdir = $conf->adherent->dir_output;
-		    $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
-		    $file = $dir.'/'.$filename;
-		}
-		else
-		{
-		    $outputdir = $conf->adherent->dir_temp;
-		    $dir = $outputdir;
-		    $file = $dir.'/'.$filename;
-		}
-
-		//var_dump($file);exit;
-
-		if (! file_exists($dir))
-		{
-			if (dol_mkdir($dir) < 0)
-			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-
-		$pdf=pdf_getInstance($this->format,$this->Tformat['metric'], $this->Tformat['orientation']);
-
-		if (class_exists('TCPDF'))
-		{
-			$pdf->setPrintHeader(false);
-			$pdf->setPrintFooter(false);
-		}
-		$pdf->SetFont(pdf_getPDFFont($outputlangs));
-
-		$pdf->SetTitle($title);
-		$pdf->SetSubject($title);
-		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-		$pdf->SetKeyWords($keywords);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
-
-		$pdf->SetMargins(0,0);
-		$pdf->SetAutoPageBreak(false);
-
-		$this->_Metric_Doc = $this->Tformat['metric'];
-		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
-		$posX=1;
-		$posY=1;
-		if ($posX > 0) $posX--; else $posX=0;
-		if ($posY > 0) $posY--; else $posY=0;
-		$this->_COUNTX = $posX;
-		$this->_COUNTY = $posY;
-		$this->_Set_Format($pdf, $this->Tformat);
-
-
-		$pdf->Open();
-		$pdf->AddPage();
-
-
-		// Add each record
-		foreach($arrayofrecords as $val)
-		{
-			// imprime le texte specifique sur la carte
-			$this->Add_PDF_card($pdf,$val['textleft'],$val['textheader'],$val['textfooter'],$langs,$val['textright'],$val['id'],$val['photo']);
-		}
-
-		//$pdf->SetXY(10, 295);
-		//$pdf->Cell($this->_Width, $this->_Line_Height, 'XXX',0,1,'C');
-
-
-		// Output to file
-		$pdf->Output($file,'F');
-
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-
-		$this->result = array('fullpath'=>$file);
-
-		// Output to http stream
-		if (empty($nooutput))
-		{
-    		clearstatcache();
-
-    		$attachment=true;
-    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
-    		$type=dol_mimetype($filename);
-
-    		//if ($encoding)   header('Content-Encoding: '.$encoding);
-    		if ($type)		 header('Content-Type: '.$type);
-    		if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-    		else header('Content-Disposition: inline; filename="'.$filename.'"');
-
-    		// Ajout directives pour resoudre bug IE
-    		header('Cache-Control: Public, must-revalidate');
-    		header('Pragma: public');
-
-    		readfile($file);
-		}
-
-		return 1;
-	}
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
+
+        if (empty($mode) || $mode == 'member')
+        {
+            $title=$outputlangs->transnoentities('MembersCards');
+            $keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
+        }
+        else
+        {
+            dol_print_error('','Bad value for $mode');
+            return -1;
+        }
+
+        $filename = 'tmp_cards.pdf';
+        if (is_object($object))
+        {
+            $outputdir = $conf->adherent->dir_output;
+            $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
+            $file = $dir.'/'.$filename;
+        }
+        else
+        {
+            $outputdir = $conf->adherent->dir_temp;
+            $dir = $outputdir;
+            $file = $dir.'/'.$filename;
+        }
+
+        //var_dump($file);exit;
+
+        if (! file_exists($dir))
+        {
+            if (dol_mkdir($dir) < 0)
+            {
+                $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+
+        $pdf=pdf_getInstance($this->format,$this->Tformat['metric'], $this->Tformat['orientation']);
+
+        if (class_exists('TCPDF'))
+        {
+            $pdf->setPrintHeader(false);
+            $pdf->setPrintFooter(false);
+        }
+        $pdf->SetFont(pdf_getPDFFont($outputlangs));
+
+        $pdf->SetTitle($title);
+        $pdf->SetSubject($title);
+        $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+        $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+        $pdf->SetKeyWords($keywords);
+        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+        $pdf->SetMargins(0,0);
+        $pdf->SetAutoPageBreak(false);
+
+        $this->_Metric_Doc = $this->Tformat['metric'];
+        // Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
+        $posX=1;
+        $posY=1;
+        if ($posX > 0) $posX--; else $posX=0;
+        if ($posY > 0) $posY--; else $posY=0;
+        $this->_COUNTX = $posX;
+        $this->_COUNTY = $posY;
+        $this->_Set_Format($pdf, $this->Tformat);
+
+
+        $pdf->Open();
+        $pdf->AddPage();
+
+
+        // Add each record
+        foreach($arrayofrecords as $val)
+        {
+            // imprime le texte specifique sur la carte
+            $this->Add_PDF_card($pdf,$val['textleft'],$val['textheader'],$val['textfooter'],$langs,$val['textright'],$val['id'],$val['photo']);
+        }
+
+        //$pdf->SetXY(10, 295);
+        //$pdf->Cell($this->_Width, $this->_Line_Height, 'XXX',0,1,'C');
+
+
+        // Output to file
+        $pdf->Output($file,'F');
+
+        if (! empty($conf->global->MAIN_UMASK))
+            @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+
+        $this->result = array('fullpath'=>$file);
+
+        // Output to http stream
+        if (empty($nooutput))
+        {
+            clearstatcache();
+
+            $attachment=true;
+            if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
+            $type=dol_mimetype($filename);
+
+            //if ($encoding)   header('Content-Encoding: '.$encoding);
+            if ($type)		 header('Content-Type: '.$type);
+            if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
+            else header('Content-Disposition: inline; filename="'.$filename.'"');
+
+            // Ajout directives pour resoudre bug IE
+            header('Cache-Control: Public, must-revalidate');
+            header('Pragma: public');
+
+            readfile($file);
+        }
+
+        return 1;
+    }
 }

Spacing +110 added lines, -110 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param	array		$param			Associative array containing label content and optional parameters
 	 * @return	void
 	 */
-    function addSticker(&$pdf,$outputlangs,$param)
+    function addSticker(&$pdf, $outputlangs, $param)
     {
 		// use this method in future refactoring
 	}
@@ -63,162 +63,162 @@ 
 	 * @param	 string		$photo			Photo (full path to image file used as replacement for key __PHOTOS__ into left, right, header or footer text)
 	 * @return	 void
 	 */
-	function Add_PDF_card(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$idmember=0,$photo='')
+	function Add_PDF_card(&$pdf, $textleft, $header, $footer, $outputlangs, $textright = '', $idmember = 0, $photo = '')
 	{
         // phpcs:enable
-		global $db,$mysoc,$conf,$langs;
-		global $forceimgscalewidth,$forceimgscaleheight;
+		global $db, $mysoc, $conf, $langs;
+		global $forceimgscalewidth, $forceimgscaleheight;
 
-		$imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth);	// Scale of image for width (1=Full width of sticker)
-		$imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth);	// Scale of image for height (1=Full height of sticker)
+		$imgscalewidth = (empty($forceimgscalewidth) ? 0.3 : $forceimgscalewidth); // Scale of image for width (1=Full width of sticker)
+		$imgscaleheight = (empty($forceimgscalewidth) ? 0.5 : $forceimgscalewidth); // Scale of image for height (1=Full height of sticker)
 
 		// We are in a new page, then we must add a page
-		if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) {
+		if (($this->_COUNTX == 0) && ($this->_COUNTY == 0) and (!$this->_First == 1)) {
 			$pdf->AddPage();
 		}
-		$this->_First=0;
-		$_PosX = $this->_Margin_Left+($this->_COUNTX*($this->_Width+$this->_X_Space));
-		$_PosY = $this->_Margin_Top+($this->_COUNTY*($this->_Height+$this->_Y_Space));
+		$this->_First = 0;
+		$_PosX = $this->_Margin_Left + ($this->_COUNTX * ($this->_Width + $this->_X_Space));
+		$_PosY = $this->_Margin_Top + ($this->_COUNTY * ($this->_Height + $this->_Y_Space));
 
 		// Define logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if (! is_readable($logo))
+		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		if (!is_readable($logo))
 		{
-			$logo='';
-			if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
+			$logo = '';
+			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
-				$logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
 			}
-			elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
-				$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
 		}
 
-		$member=new Adherent($db);
+		$member = new Adherent($db);
 		$member->id = $idmember;
 		$member->ref = $idmember;
 
 		// Define photo
-		$dir=$conf->adherent->dir_output;
-		if (! empty($photo))
+		$dir = $conf->adherent->dir_output;
+		if (!empty($photo))
 		{
-			$file=get_exdir(0,0,0,0,$member,'member').'photos/'.$photo;
-			$photo=$dir.'/'.$file;
-			if (! is_readable($photo)) $photo='';
+			$file = get_exdir(0, 0, 0, 0, $member, 'member').'photos/'.$photo;
+			$photo = $dir.'/'.$file;
+			if (!is_readable($photo)) $photo = '';
 		}
 
 		// Define background image
-		$backgroundimage='';
-		if(! empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND))
+		$backgroundimage = '';
+		if (!empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND))
 		{
-			$backgroundimage=$conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND;
+			$backgroundimage = $conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND;
 		}
 
 		// Print lines
 		if ($this->code == "CARD")
 		{
-			$this->Tformat=$this->_Avery_Labels["CARD"];
+			$this->Tformat = $this->_Avery_Labels["CARD"];
 			//$this->_Pointille($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.3,25);
-			$this->_Croix($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.1,10);
+			$this->_Croix($pdf, $_PosX, $_PosY, $_PosX + $this->_Width, $_PosY + $this->_Height, 0.1, 10);
 		}
 
 		// Background
 		if ($backgroundimage)
 		{
-			$pdf->image($backgroundimage,$_PosX,$_PosY,$this->_Width,$this->_Height);
+			$pdf->image($backgroundimage, $_PosX, $_PosY, $this->_Width, $this->_Height);
 		}
 
-		$xleft=2; $ytop=2;
+		$xleft = 2; $ytop = 2;
 
 		// Top
-		if ($header!='')
+		if ($header != '')
 		{
 			if ($this->code == "CARD")
 			{
-				$pdf->SetDrawColor(128,128,128);
-				$pdf->Line($_PosX, $_PosY+$this->_Line_Height+1, $_PosX+$this->_Width, $_PosY+$this->_Line_Height+1); // Only 1 mm and not ytop for top text
-				$pdf->SetDrawColor(0,0,0);
+				$pdf->SetDrawColor(128, 128, 128);
+				$pdf->Line($_PosX, $_PosY + $this->_Line_Height + 1, $_PosX + $this->_Width, $_PosY + $this->_Line_Height + 1); // Only 1 mm and not ytop for top text
+				$pdf->SetDrawColor(0, 0, 0);
 			}
-			$pdf->SetXY($_PosX+$xleft, $_PosY+1); // Only 1 mm and not ytop for top text
-			$pdf->Cell($this->_Width-2*$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header),0,1,'C');
+			$pdf->SetXY($_PosX + $xleft, $_PosY + 1); // Only 1 mm and not ytop for top text
+			$pdf->Cell($this->_Width - 2 * $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header), 0, 1, 'C');
 		}
 
 
-		$ytop+=(empty($header)?0:(1+$this->_Line_Height));
+		$ytop += (empty($header) ? 0 : (1 + $this->_Line_Height));
 
 		// Define widthtouse and heighttouse
-		$maxwidthtouse=round(($this->_Width - 2*$xleft)*$imgscalewidth); $maxheighttouse=round(($this->_Height - 2*$ytop)*$imgscaleheight);
-		$defaultratio=($maxwidthtouse/$maxheighttouse);
-		$widthtouse=$maxwidthtouse; $heighttouse=0;		// old value for image
-		$tmp=dol_getImageSize($photo, false);
+		$maxwidthtouse = round(($this->_Width - 2 * $xleft) * $imgscalewidth); $maxheighttouse = round(($this->_Height - 2 * $ytop) * $imgscaleheight);
+		$defaultratio = ($maxwidthtouse / $maxheighttouse);
+		$widthtouse = $maxwidthtouse; $heighttouse = 0; // old value for image
+		$tmp = dol_getImageSize($photo, false);
 		if ($tmp['height'])
 		{
-			$imgratio=$tmp['width']/$tmp['height'];
+			$imgratio = $tmp['width'] / $tmp['height'];
 			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
 			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
 		// Center
-		if ($textright=='')	// Only a left part
+		if ($textright == '')	// Only a left part
 		{
 			// Output left area
-			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			else
 			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
 		}
-		else if ($textleft!='' && $textright!='')	//
+		else if ($textleft != '' && $textright != '')	//
 		{
 			if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
 			{
-				if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				$pdf->SetXY($_PosX+$xleft+$widthtouse+1, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$xleft-$xleft-$widthtouse-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+				if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				$pdf->SetXY($_PosX + $xleft + $widthtouse + 1, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width - $xleft - $xleft - $widthtouse - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 			else if ($textright == '__LOGO__' || $textright == '__PHOTO__')
 			{
-				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$widthtouse-$xleft-$xleft-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
 			else	// text on halft left and text on half right
 			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell(round($this->_Width/2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-				$pdf->SetXY($_PosX+round($this->_Width/2), $_PosY+$ytop);
-				$pdf->MultiCell(round($this->_Width/2)-2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
+				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
+				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 		}
 		else	// Only a right part
 		{
 			// Output right area
-			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			else
 			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 		}
 
 		// Bottom
-		if ($footer!='')
+		if ($footer != '')
 		{
 			if ($this->code == "CARD")
 			{
-				$pdf->SetDrawColor(128,128,128);
-				$pdf->Line($_PosX, $_PosY+$this->_Height-$this->_Line_Height-2, $_PosX+$this->_Width, $_PosY+$this->_Height-$this->_Line_Height-2);
-				$pdf->SetDrawColor(0,0,0);
+				$pdf->SetDrawColor(128, 128, 128);
+				$pdf->Line($_PosX, $_PosY + $this->_Height - $this->_Line_Height - 2, $_PosX + $this->_Width, $_PosY + $this->_Height - $this->_Line_Height - 2);
+				$pdf->SetDrawColor(0, 0, 0);
 			}
-			$pdf->SetXY($_PosX, $_PosY+$this->_Height-$this->_Line_Height-1);
-			$pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer),0,1,'C');
+			$pdf->SetXY($_PosX, $_PosY + $this->_Height - $this->_Line_Height - 1);
+			$pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer), 0, 1, 'C');
 		}
 		//print "$_PosY+$this->_Height-$this->_Line_Height-1<br>\n";
 
@@ -227,13 +227,13 @@ 
 		if ($this->_COUNTY == $this->_Y_Number) {
 			// Si on est en bas de page, on remonte le 'curseur' de position
 			$this->_COUNTX++;
-			$this->_COUNTY=0;
+			$this->_COUNTY = 0;
 		}
 
 		if ($this->_COUNTX == $this->_X_Number) {
 			// Si on est en bout de page, alors on repart sur une nouvelle page
-			$this->_COUNTX=0;
-			$this->_COUNTY=0;
+			$this->_COUNTX = 0;
+			$this->_COUNTY = 0;
 		}
 	}
 
@@ -248,19 +248,19 @@ 
 	 *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
 	 *	@return	int								1=OK, 0=KO
 	 */
-	function write_file($object, $outputlangs, $srctemplatepath, $mode='member', $nooutput=0)
+	function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0)
 	{
         // phpcs:enable
-		global $user,$conf,$langs,$mysoc,$_Avery_Labels;
+		global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 
-		$this->code=$srctemplatepath;
+		$this->code = $srctemplatepath;
 
 		if (is_object($object))
 		{
-		    if ($object->country == '-') $object->country='';
+		    if ($object->country == '-') $object->country = '';
 
     		// List of values to scan for a replacement
-    		$substitutionarray = array (
+    		$substitutionarray = array(
     		    '__ID__'=>$object->rowid,
     		    '__LOGIN__'=>$object->login,
     		    '__FIRSTNAME__'=>$object->firstname,
@@ -273,7 +273,7 @@ 
     		    '__COUNTRY__'=>$object->country,
     		    '__COUNTRY_CODE__'=>$object->country_code,
     		    '__EMAIL__'=>$object->email,
-    		    '__BIRTH__'=>dol_print_date($object->birth,'day'),
+    		    '__BIRTH__'=>dol_print_date($object->birth, 'day'),
     		    '__TYPE__'=>$object->type,
     		    '__YEAR__'=>$year,
     		    '__MONTH__'=>$month,
@@ -284,17 +284,17 @@ 
     		complete_substitutions_array($substitutionarray, $langs);
 
     		// For business cards
-		    $textleft=make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-		    $textheader=make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-		    $textfooter=make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-		    $textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+		    $textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
+		    $textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
+		    $textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
+		    $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
 		    $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-		    if ($nb <= 0) $nb=1;  // Protection to avoid empty page
+		    if ($nb <= 0) $nb = 1; // Protection to avoid empty page
 
-		    for($j=0;$j<$nb;$j++)
+		    for ($j = 0; $j < $nb; $j++)
 	        {
-	            $arrayofmembers[]=array(
+	            $arrayofmembers[] = array(
 	                'textleft'=>$textleft,
 	                'textheader'=>$textheader,
 	                'textfooter'=>$textfooter,
@@ -314,32 +314,32 @@ 
 		//var_dump($arrayofrecords);exit;
 
 		$this->Tformat = $_Avery_Labels[$this->code];
-		if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; }
+		if (empty($this->Tformat)) { dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit; }
 		$this->type = 'pdf';
         // standard format or custom
-        if ($this->Tformat['paper-size']!='custom') {
+        if ($this->Tformat['paper-size'] != 'custom') {
             $this->format = $this->Tformat['paper-size'];
         } else {
             //custom
-            $resolution= array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
+            $resolution = array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
             $this->format = $resolution;
         }
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
 
 		if (empty($mode) || $mode == 'member')
 		{
-			$title=$outputlangs->transnoentities('MembersCards');
-			$keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
+			$title = $outputlangs->transnoentities('MembersCards');
+			$keywords = $outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
 		}
 		else
 		{
-			dol_print_error('','Bad value for $mode');
+			dol_print_error('', 'Bad value for $mode');
 			return -1;
 		}
 
@@ -359,16 +359,16 @@ 
 
 		//var_dump($file);exit;
 
-		if (! file_exists($dir))
+		if (!file_exists($dir))
 		{
 			if (dol_mkdir($dir) < 0)
 			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 
-		$pdf=pdf_getInstance($this->format,$this->Tformat['metric'], $this->Tformat['orientation']);
+		$pdf = pdf_getInstance($this->format, $this->Tformat['metric'], $this->Tformat['orientation']);
 
 		if (class_exists('TCPDF'))
 		{
@@ -382,17 +382,17 @@ 
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($keywords);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-		$pdf->SetMargins(0,0);
+		$pdf->SetMargins(0, 0);
 		$pdf->SetAutoPageBreak(false);
 
 		$this->_Metric_Doc = $this->Tformat['metric'];
 		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
-		$posX=1;
-		$posY=1;
-		if ($posX > 0) $posX--; else $posX=0;
-		if ($posY > 0) $posY--; else $posY=0;
+		$posX = 1;
+		$posY = 1;
+		if ($posX > 0) $posX--; else $posX = 0;
+		if ($posY > 0) $posY--; else $posY = 0;
 		$this->_COUNTX = $posX;
 		$this->_COUNTY = $posY;
 		$this->_Set_Format($pdf, $this->Tformat);
@@ -403,10 +403,10 @@ 
 
 
 		// Add each record
-		foreach($arrayofrecords as $val)
+		foreach ($arrayofrecords as $val)
 		{
 			// imprime le texte specifique sur la carte
-			$this->Add_PDF_card($pdf,$val['textleft'],$val['textheader'],$val['textfooter'],$langs,$val['textright'],$val['id'],$val['photo']);
+			$this->Add_PDF_card($pdf, $val['textleft'], $val['textheader'], $val['textfooter'], $langs, $val['textright'], $val['id'], $val['photo']);
 		}
 
 		//$pdf->SetXY(10, 295);
@@ -414,9 +414,9 @@ 
 
 
 		// Output to file
-		$pdf->Output($file,'F');
+		$pdf->Output($file, 'F');
 
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 
@@ -427,9 +427,9 @@ 
 		{
     		clearstatcache();
 
-    		$attachment=true;
-    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
-    		$type=dol_mimetype($filename);
+    		$attachment = true;
+    		if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
+    		$type = dol_mimetype($filename);
 
     		//if ($encoding)   header('Content-Encoding: '.$encoding);
     		if ($type)		 header('Content-Type: '.$type);

Braces +71 added lines, -41 removed lines

@@ -88,8 +88,7 @@ 
 			if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -105,7 +104,9 @@ 
 		{
 			$file=get_exdir(0,0,0,0,$member,'member').'photos/'.$photo;
 			$photo=$dir.'/'.$file;
-			if (! is_readable($photo)) $photo='';
+			if (! is_readable($photo)) {
+			    $photo='';
+			}
 		}
 
 		// Define background image
@@ -155,53 +156,58 @@ 
 		if ($tmp['height'])
 		{
 			$imgratio=$tmp['width']/$tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
-			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); } else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
 		// Center
-		if ($textright=='')	// Only a left part
+		if ($textright=='') {
+		    // Only a left part
 		{
 			// Output left area
 			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else
+		} else if ($textleft == '__PHOTO__' && $photo) {
+			    $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			} else
 			{
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
 			}
-		}
-		else if ($textleft!='' && $textright!='')	//
+		} else if ($textleft!='' && $textright!='') {
+		    //
 		{
 			if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
 			{
 				if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+		} else if ($textleft == '__PHOTO__' && $photo) {
+				    $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				}
 				$pdf->SetXY($_PosX+$xleft+$widthtouse+1, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width-$xleft-$xleft-$widthtouse-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
-			}
-			else if ($textright == '__LOGO__' || $textright == '__PHOTO__')
+			} else if ($textright == '__LOGO__' || $textright == '__PHOTO__')
 			{
-				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				if ($textright == '__LOGO__' && $logo) {
+				    $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				} else if ($textright == '__PHOTO__' && $photo) {
+				    $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				}
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width-$widthtouse-$xleft-$xleft-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-			}
-			else	// text on halft left and text on half right
+			} else	// text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell(round($this->_Width/2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
 				$pdf->SetXY($_PosX+round($this->_Width/2), $_PosY+$ytop);
 				$pdf->MultiCell(round($this->_Width/2)-2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
 			}
-		}
-		else	// Only a right part
+		} else	// Only a right part
 		{
 			// Output right area
-			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textright == '__PHOTO__' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else
+			if ($textright == '__LOGO__' && $logo) {
+			    $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			} else if ($textright == '__PHOTO__' && $photo) {
+			    $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			} else
 			{
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
@@ -257,7 +263,9 @@ 
 
 		if (is_object($object))
 		{
-		    if ($object->country == '-') $object->country='';
+		    if ($object->country == '-') {
+		        $object->country='';
+		    }
 
     		// List of values to scan for a replacement
     		$substitutionarray = array (
@@ -290,7 +298,10 @@ 
 		    $textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
 		    $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-		    if ($nb <= 0) $nb=1;  // Protection to avoid empty page
+		    if ($nb <= 0) {
+		        $nb=1;
+		    }
+		    // Protection to avoid empty page
 
 		    for($j=0;$j<$nb;$j++)
 	        {
@@ -305,8 +316,7 @@ 
 	        }
 
     		$arrayofrecords = $arrayofmembers;
-		}
-		else
+		} else
 		{
 		    $arrayofrecords = $object;
 		}
@@ -325,9 +335,13 @@ 
             $this->format = $resolution;
         }
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
@@ -336,8 +350,7 @@ 
 		{
 			$title=$outputlangs->transnoentities('MembersCards');
 			$keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
-		}
-		else
+		} else
 		{
 			dol_print_error('','Bad value for $mode');
 			return -1;
@@ -349,8 +362,7 @@ 
 		    $outputdir = $conf->adherent->dir_output;
 		    $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
 		    $file = $dir.'/'.$filename;
-		}
-		else
+		} else
 		{
 		    $outputdir = $conf->adherent->dir_temp;
 		    $dir = $outputdir;
@@ -382,7 +394,9 @@ 
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($keywords);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+		    $pdf->SetCompression(false);
+		}
 
 		$pdf->SetMargins(0,0);
 		$pdf->SetAutoPageBreak(false);
@@ -391,8 +405,16 @@ 
 		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
 		$posX=1;
 		$posY=1;
-		if ($posX > 0) $posX--; else $posX=0;
-		if ($posY > 0) $posY--; else $posY=0;
+		if ($posX > 0) {
+		    $posX--;
+		} else {
+		    $posX=0;
+		}
+		if ($posY > 0) {
+		    $posY--;
+		} else {
+		    $posY=0;
+		}
 		$this->_COUNTX = $posX;
 		$this->_COUNTY = $posY;
 		$this->_Set_Format($pdf, $this->Tformat);
@@ -416,8 +438,9 @@ 
 		// Output to file
 		$pdf->Output($file,'F');
 
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($file, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 
 		$this->result = array('fullpath'=>$file);
@@ -428,13 +451,20 @@ 
     		clearstatcache();
 
     		$attachment=true;
-    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
+    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) {
+    		    $attachment=false;
+    		}
     		$type=dol_mimetype($filename);
 
     		//if ($encoding)   header('Content-Encoding: '.$encoding);
-    		if ($type)		 header('Content-Type: '.$type);
-    		if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-    		else header('Content-Disposition: inline; filename="'.$filename.'"');
+    		if ($type) {
+    		    header('Content-Type: '.$type);
+    		}
+    		if ($attachment) {
+    		    header('Content-Disposition: attachment; filename="'.$filename.'"');
+    		} else {
+    		    header('Content-Disposition: inline; filename="'.$filename.'"');
+    		}
 
     		// Ajout directives pour resoudre bug IE
     		header('Cache-Control: Public, must-revalidate');

dolibarr/htdocs/core/modules/member/modules_cards.php

Indentation +108 added lines, -108 removed lines

@@ -34,33 +34,33 @@ 
  */
 class ModelePDFCards
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return list of active generation modules
-	 *
-	 *	@param	DoliDB	$db					Database handler
-	 *	@param	integer	$maxfilenamelength	Max length of value to show
-	 *	@return	array						List of templates
-	 */
-	function liste_modeles($db,$maxfilenamelength=0)
-	{
+    /**
+     *	Return list of active generation modules
+     *
+     *	@param	DoliDB	$db					Database handler
+     *	@param	integer	$maxfilenamelength	Max length of value to show
+     *	@return	array						List of templates
+     */
+    function liste_modeles($db,$maxfilenamelength=0)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$type='member';
-		$liste=array();
+        $type='member';
+        $liste=array();
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $liste=getListOfModels($db,$type,$maxfilenamelength);
 
-		return $liste;
-	}
+        return $liste;
+    }
 }
 
 
@@ -79,92 +79,92 @@ 
 function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir='', $template='standard')
 {
     // phpcs:enable
-	global $conf,$langs;
-	$langs->load("members");
-
-	$error=0;
-
-	// Increase limit for PDF build
-	$err=error_reporting();
-	error_reporting(0);
-	@set_time_limit(120);
-	error_reporting($err);
-
-	$code='';
-	$srctemplatepath='';
-
-	// Positionne le modele sur le nom du modele a utiliser
-	if (! dol_strlen($modele))
-	{
-		if (! empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
-		{
-			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
-		}
-		else
-		{
-			$code = $modele;
-		}
-	}
-	else $code=$modele;
-
-	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$template,2);
-	if (! empty($tmp[1]))
-	{
-		$template=$tmp[0];
-		$srctemplatepath=$tmp[1];
-	}
-	else $srctemplatepath=$code;
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-		foreach(array('doc','pdf') as $prefix)
-		{
-			$file = $prefix."_".$template.".class.php";
-
-			// On verifie l'emplacement du modele
-			$file=dol_buildpath($reldir."core/modules/member/doc/".$file,0);
-			if (file_exists($file))
-			{
-				$filefound=1;
-				$classname=$prefix.'_'.$template;
-				break;
-			}
-		}
-		if ($filefound) break;
-	}
-
-
-	// Charge le modele
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db);
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($arrayofmembers, $outputlangs, $srctemplatepath) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"members_card_pdf_create Error: ".$obj->error);
-			return -1;
-		}
-	}
-
-	else
-	{
-		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
-		return -1;
-	}
+    global $conf,$langs;
+    $langs->load("members");
+
+    $error=0;
+
+    // Increase limit for PDF build
+    $err=error_reporting();
+    error_reporting(0);
+    @set_time_limit(120);
+    error_reporting($err);
+
+    $code='';
+    $srctemplatepath='';
+
+    // Positionne le modele sur le nom du modele a utiliser
+    if (! dol_strlen($modele))
+    {
+        if (! empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
+        {
+            $code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
+        }
+        else
+        {
+            $code = $modele;
+        }
+    }
+    else $code=$modele;
+
+    // If selected modele is a filename template (then $modele="modelname:filename")
+    $tmp=explode(':',$template,2);
+    if (! empty($tmp[1]))
+    {
+        $template=$tmp[0];
+        $srctemplatepath=$tmp[1];
+    }
+    else $srctemplatepath=$code;
+
+    // Search template files
+    $file=''; $classname=''; $filefound=0;
+    $dirmodels=array('/');
+    if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+    foreach($dirmodels as $reldir)
+    {
+        foreach(array('doc','pdf') as $prefix)
+        {
+            $file = $prefix."_".$template.".class.php";
+
+            // On verifie l'emplacement du modele
+            $file=dol_buildpath($reldir."core/modules/member/doc/".$file,0);
+            if (file_exists($file))
+            {
+                $filefound=1;
+                $classname=$prefix.'_'.$template;
+                break;
+            }
+        }
+        if ($filefound) break;
+    }
+
+
+    // Charge le modele
+    if ($filefound)
+    {
+        require_once $file;
+
+        $obj = new $classname($db);
+
+        // We save charset_output to restore it because write_file can change it if needed for
+        // output format that does not support UTF8.
+        $sav_charset_output=$outputlangs->charset_output;
+        if ($obj->write_file($arrayofmembers, $outputlangs, $srctemplatepath) > 0)
+        {
+            $outputlangs->charset_output=$sav_charset_output;
+            return 1;
+        }
+        else
+        {
+            $outputlangs->charset_output=$sav_charset_output;
+            dol_print_error($db,"members_card_pdf_create Error: ".$obj->error);
+            return -1;
+        }
+    }
+
+    else
+    {
+        dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
+        return -1;
+    }
 }

Spacing +32 added lines, -32 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -48,16 +48,16 @@ 
 	 *	@param	integer	$maxfilenamelength	Max length of value to show
 	 *	@return	array						List of templates
 	 */
-	function liste_modeles($db,$maxfilenamelength=0)
+	function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		global $conf;
 
-		$type='member';
-		$liste=array();
+		$type = 'member';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 
 		return $liste;
 	}
@@ -76,27 +76,27 @@ 
  *	@param	string		$template		pdf generenate document class to use default 'standard'
  *	@return int							<0 if KO, >0 if OK
  */
-function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir='', $template='standard')
+function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir = '', $template = 'standard')
 {
     // phpcs:enable
-	global $conf,$langs;
+	global $conf, $langs;
 	$langs->load("members");
 
-	$error=0;
+	$error = 0;
 
 	// Increase limit for PDF build
-	$err=error_reporting();
+	$err = error_reporting();
 	error_reporting(0);
 	@set_time_limit(120);
 	error_reporting($err);
 
-	$code='';
-	$srctemplatepath='';
+	$code = '';
+	$srctemplatepath = '';
 
 	// Positionne le modele sur le nom du modele a utiliser
-	if (! dol_strlen($modele))
+	if (!dol_strlen($modele))
 	{
-		if (! empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
+		if (!empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
 		{
 			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
 		}
@@ -105,33 +105,33 @@ 
 			$code = $modele;
 		}
 	}
-	else $code=$modele;
+	else $code = $modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$template,2);
-	if (! empty($tmp[1]))
+	$tmp = explode(':', $template, 2);
+	if (!empty($tmp[1]))
 	{
-		$template=$tmp[0];
-		$srctemplatepath=$tmp[1];
+		$template = $tmp[0];
+		$srctemplatepath = $tmp[1];
 	}
-	else $srctemplatepath=$code;
+	else $srctemplatepath = $code;
 
 	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array('/');
+	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
 	{
-		foreach(array('doc','pdf') as $prefix)
+		foreach (array('doc', 'pdf') as $prefix)
 		{
 			$file = $prefix."_".$template.".class.php";
 
 			// On verifie l'emplacement du modele
-			$file=dol_buildpath($reldir."core/modules/member/doc/".$file,0);
+			$file = dol_buildpath($reldir."core/modules/member/doc/".$file, 0);
 			if (file_exists($file))
 			{
-				$filefound=1;
-				$classname=$prefix.'_'.$template;
+				$filefound = 1;
+				$classname = $prefix.'_'.$template;
 				break;
 			}
 		}
@@ -148,23 +148,23 @@ 
 
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
+		$sav_charset_output = $outputlangs->charset_output;
 		if ($obj->write_file($arrayofmembers, $outputlangs, $srctemplatepath) > 0)
 		{
-			$outputlangs->charset_output=$sav_charset_output;
+			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
 		}
 		else
 		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"members_card_pdf_create Error: ".$obj->error);
+			$outputlangs->charset_output = $sav_charset_output;
+			dol_print_error($db, "members_card_pdf_create Error: ".$obj->error);
 			return -1;
 		}
 	}
 
 	else
 	{
-		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
+		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
 }

Braces +13 added lines, -11 removed lines

@@ -99,13 +99,13 @@ 
 		if (! empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
 		{
 			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
-		}
-		else
+		} else
 		{
 			$code = $modele;
 		}
+	} else {
+	    $code=$modele;
 	}
-	else $code=$modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp=explode(':',$template,2);
@@ -113,13 +113,16 @@ 
 	{
 		$template=$tmp[0];
 		$srctemplatepath=$tmp[1];
+	} else {
+	    $srctemplatepath=$code;
 	}
-	else $srctemplatepath=$code;
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
 	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+	if (is_array($conf->modules_parts['models'])) {
+	    $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+	}
 	foreach($dirmodels as $reldir)
 	{
 		foreach(array('doc','pdf') as $prefix)
@@ -135,7 +138,9 @@ 
 				break;
 			}
 		}
-		if ($filefound) break;
+		if ($filefound) {
+		    break;
+		}
 	}
 
 
@@ -153,16 +158,13 @@ 
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			return 1;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			dol_print_error($db,"members_card_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-
-	else
+	} else
 	{
 		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
 		return -1;