alxarafe / alixar

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

Indentation +3 added lines, -3 removed lines

@@ -210,15 +210,15 @@
      */
     public function init($options = '')
     {
-    	global $langs;
+        global $langs;
 
-    	$this->_load_tables('/datapolicy/sql/');
+        $this->_load_tables('/datapolicy/sql/');
 
         // Create extrafields
         include_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
         $extrafields = new ExtraFields($this->db);
 
-		/*
+        /*
         // Extrafield contact
         $result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
         $result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');

Spacing +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
  *  \ingroup    datapolicy
  *  \brief      Description and activation file for module DATAPOLICY
  */
-include_once DOL_DOCUMENT_ROOT . '/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 
@@ -72,7 +72,7 @@ 
         // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
         $this->version = 'development';
         // Key used in llx_const table to save module status enabled/disabled (where datapolicy is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Name of image file used for this module.
         // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
         // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
@@ -102,15 +102,15 @@ 
         $this->config_page_url = array("setup.php@datapolicy");
 
         // Dependencies
-        $this->hidden = false;   // A condition to hide module
-        $this->depends = array('always'=>'modCron');  // List of module class names as string that must be enabled if this module is enabled
+        $this->hidden = false; // A condition to hide module
+        $this->depends = array('always'=>'modCron'); // 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->langfiles = array("datapolicy@datapolicy");
-        $this->phpmin = array(5, 3);     // Minimum version of PHP required by module
+        $this->phpmin = array(5, 3); // Minimum version of PHP required by module
         $this->need_dolibarr_version = array(4, 0); // Minimum version of Dolibarr required by module
-        $this->warnings_activation = array();                     // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array();                 // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+        $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+        $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
         //$this->automatic_activation = array('FR'=>'datapolicyWasAutomaticallyActivatedBecauseOfYourCountryChoice');
         //$this->always_enabled = true;								// If true, can't be disabled
         // Constants
@@ -194,9 +194,9 @@ 
         //                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>true)
         // );
         // Permissions
-        $this->rights = array();  // Permission array used by this module
+        $this->rights = array(); // Permission array used by this module
         // Main menu entries
-        $this->menu = array();   // List of menus to add
+        $this->menu = array(); // List of menus to add
         $r = 0;
     }
 
@@ -215,7 +215,7 @@ 
     	$this->_load_tables('/datapolicy/sql/');
 
         // Create extrafields
-        include_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
         $extrafields = new ExtraFields($this->db);
 
 		/*

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

Indentation +349 added lines, -349 removed lines

@@ -38,386 +38,386 @@
 class modAgenda extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $user;
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $user;
 
-		$this->db = $db;
-		$this->numero = 2400;
+        $this->db = $db;
+        $this->numero = 2400;
 
-		$this->family = "projects";
-		$this->module_position = '15';
-		// 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 = "Follow events or rendez-vous. Record manual events into Agendas or let application record automatic events for log tracking.";
-		// 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);
-		$this->picto='action';
+        $this->family = "projects";
+        $this->module_position = '15';
+        // 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 = "Follow events or rendez-vous. Record manual events into Agendas or let application record automatic events for log tracking.";
+        // 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);
+        $this->picto='action';
 
-		// Data directories to create when module is enabled
-		$this->dirs = array("/agenda/temp");
+        // Data directories to create when module is enabled
+        $this->dirs = array("/agenda/temp");
 
-		// Config pages
-		$this->config_page_url = array("agenda_other.php");
+        // Config pages
+        $this->config_page_url = array("agenda_other.php");
 
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// 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->langfiles = array("companies");
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// 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->langfiles = array("companies");
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
 
-		// Module parts
+        // Module parts
         $this->module_parts = array();
 
-		// Constants
+        // Constants
         //-----------
         // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
         // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
         //                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
         // );
-		$this->const = array();
-		//$this->const[] = array('AGENDA_DEFAULT_FILTER_TYPE', 'chaine', 'AC_NON_AUTO', 'Default filter for type of event on agenda', 0, 'current');
-		$sqlreadactions="SELECT code, label, description FROM ".MAIN_DB_PREFIX."c_action_trigger ORDER by rang";
-		$resql = $this->db->query($sqlreadactions);
-		if ($resql)
-		{
-		    while ($obj = $this->db->fetch_object($resql))
-		    {
-		        //if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
-		        if (preg_match('/^TASK_/',$obj->code)) continue;      // We don't track such events by default.
-		        //if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
-		        $this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
-		    }
-		}
-		else
-		{
-		    dol_print_error($this->db->lasterror());
-		}
+        $this->const = array();
+        //$this->const[] = array('AGENDA_DEFAULT_FILTER_TYPE', 'chaine', 'AC_NON_AUTO', 'Default filter for type of event on agenda', 0, 'current');
+        $sqlreadactions="SELECT code, label, description FROM ".MAIN_DB_PREFIX."c_action_trigger ORDER by rang";
+        $resql = $this->db->query($sqlreadactions);
+        if ($resql)
+        {
+            while ($obj = $this->db->fetch_object($resql))
+            {
+                //if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
+                if (preg_match('/^TASK_/',$obj->code)) continue;      // We don't track such events by default.
+                //if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
+                $this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
+            }
+        }
+        else
+        {
+            dol_print_error($this->db->lasterror());
+        }
 
-		// New pages on tabs
-		// -----------------
-		$this->tabs = array();
+        // New pages on tabs
+        // -----------------
+        $this->tabs = array();
 
-		// Boxes
-		//------
-		$this->boxes = array(0=>array('file'=>'box_actions.php','enabledbydefaulton'=>'Home'));
+        // Boxes
+        //------
+        $this->boxes = array(0=>array('file'=>'box_actions.php','enabledbydefaulton'=>'Home'));
 
-		// Cronjobs
-		//------------
-		$datestart=dol_now();
-		$this->cronjobs = array(
-			0=>array('label'=>'SendEmailsReminders', 'jobtype'=>'method', 'class'=>'comm/action/class/actioncomm.class.php', 'objectname'=>'ActionComm', 'method'=>'sendEmailsReminder', 'parameters'=>'', 'comment'=>'SendEMailsReminder', 'frequency'=>10, 'unitfrequency'=>60, 'priority'=>10, 'status'=>1, 'test'=>'$conf->agenda->enabled', 'datestart'=>$datestart),
-		);
+        // Cronjobs
+        //------------
+        $datestart=dol_now();
+        $this->cronjobs = array(
+            0=>array('label'=>'SendEmailsReminders', 'jobtype'=>'method', 'class'=>'comm/action/class/actioncomm.class.php', 'objectname'=>'ActionComm', 'method'=>'sendEmailsReminder', 'parameters'=>'', 'comment'=>'SendEMailsReminder', 'frequency'=>10, 'unitfrequency'=>60, 'priority'=>10, 'status'=>1, 'test'=>'$conf->agenda->enabled', 'datestart'=>$datestart),
+        );
 
-		// Permissions
-		//------------
-		$this->rights = array();
-		$this->rights_class = 'agenda';
-		$r=0;
+        // Permissions
+        //------------
+        $this->rights = array();
+        $this->rights_class = 'agenda';
+        $r=0;
 
-		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
-		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
-		// $this->rights[$r][2]     Non utilise
-		// $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
-		// $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
-		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
-		// $r++;
+        // $this->rights[$r][0]     Id permission (unique tous modules confondus)
+        // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+        // $this->rights[$r][2]     Non utilise
+        // $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+        // $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
+        // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
+        // $r++;
 
-		$this->rights[$r][0] = 2401;
-		$this->rights[$r][1] = 'Read actions/tasks linked to his account';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'myactions';
-		$this->rights[$r][5] = 'read';
-		$r++;
+        $this->rights[$r][0] = 2401;
+        $this->rights[$r][1] = 'Read actions/tasks linked to his account';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'myactions';
+        $this->rights[$r][5] = 'read';
+        $r++;
 
-		$this->rights[$r][0] = 2402;
-		$this->rights[$r][1] = 'Create/modify actions/tasks linked to his account';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'myactions';
-		$this->rights[$r][5] = 'create';
-		$r++;
+        $this->rights[$r][0] = 2402;
+        $this->rights[$r][1] = 'Create/modify actions/tasks linked to his account';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'myactions';
+        $this->rights[$r][5] = 'create';
+        $r++;
 
-		$this->rights[$r][0] = 2403;
-		$this->rights[$r][1] = 'Delete actions/tasks linked to his account';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'myactions';
-		$this->rights[$r][5] = 'delete';
-		$r++;
+        $this->rights[$r][0] = 2403;
+        $this->rights[$r][1] = 'Delete actions/tasks linked to his account';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'myactions';
+        $this->rights[$r][5] = 'delete';
+        $r++;
 
-		$this->rights[$r][0] = 2411;
-		$this->rights[$r][1] = 'Read actions/tasks of others';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'allactions';
-		$this->rights[$r][5] = 'read';
-		$r++;
+        $this->rights[$r][0] = 2411;
+        $this->rights[$r][1] = 'Read actions/tasks of others';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'allactions';
+        $this->rights[$r][5] = 'read';
+        $r++;
 
-		$this->rights[$r][0] = 2412;
-		$this->rights[$r][1] = 'Create/modify actions/tasks of others';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'allactions';
-		$this->rights[$r][5] = 'create';
-		$r++;
+        $this->rights[$r][0] = 2412;
+        $this->rights[$r][1] = 'Create/modify actions/tasks of others';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'allactions';
+        $this->rights[$r][5] = 'create';
+        $r++;
 
-		$this->rights[$r][0] = 2413;
-		$this->rights[$r][1] = 'Delete actions/tasks of others';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'allactions';
-		$this->rights[$r][5] = 'delete';
-		$r++;
+        $this->rights[$r][0] = 2413;
+        $this->rights[$r][1] = 'Delete actions/tasks of others';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'allactions';
+        $this->rights[$r][5] = 'delete';
+        $r++;
 
-		$this->rights[$r][0] = 2414;
-		$this->rights[$r][1] = 'Export actions/tasks of others';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'export';
+        $this->rights[$r][0] = 2414;
+        $this->rights[$r][1] = 'Export actions/tasks of others';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'export';
 
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
+        // Main menu entries
+        $this->menu = array();			// List of menus to add
+        $r=0;
 
-		// Add here entries to declare new menus
-		// Example to declare the Top Menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>0,			// Put 0 if this is a top menu
-		//							'type'=>'top',			// This is a Top menu entry
-		//							'titre'=>'MyModule top menu',
-		//							'mainmenu'=>'mymodule',
-		//							'url'=>'/mymodule/pagetop.php',
-		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'1',			// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		$this->menu[$r]=array('fk_menu'=>0,
-													'type'=>'top',
-													'titre'=>'TMenuAgenda',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php',
-													'langs'=>'agenda',
-													'position'=>86,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
-		$r++;
+        // Add here entries to declare new menus
+        // Example to declare the Top Menu entry:
+        // $this->menu[$r]=array(	'fk_menu'=>0,			// Put 0 if this is a top menu
+        //							'type'=>'top',			// This is a Top menu entry
+        //							'titre'=>'MyModule top menu',
+        //							'mainmenu'=>'mymodule',
+        //							'url'=>'/mymodule/pagetop.php',
+        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+        //							'position'=>100,
+        //							'enabled'=>'1',			// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
+        //							'perms'=>'1',			// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+        //							'target'=>'',
+        //							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+        // $r++;
+        $this->menu[$r]=array('fk_menu'=>0,
+                                                    'type'=>'top',
+                                                    'titre'=>'TMenuAgenda',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/index.php',
+                                                    'langs'=>'agenda',
+                                                    'position'=>86,
+                                                    'perms'=>'$user->rights->agenda->myactions->read',
+                                                    'enabled'=>'$conf->agenda->enabled',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
 
-		$this->menu[$r]=array('fk_menu'=>'r=0',
-													'type'=>'left',
-													'titre'=>'Actions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda',
-													'langs'=>'agenda',
-													'position'=>100,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
-		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=1',
-													'type'=>'left',
-													'titre'=>'NewAction',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/card.php?mainmenu=agenda&leftmenu=agenda&action=create',
-													'langs'=>'commercial',
-													'position'=>101,
-													'perms'=>'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
-		$r++;
-		// Calendar
-		$this->menu[$r]=array('fk_menu'=>'r=1',
-													'type'=>'left',
-													'titre'=>'Calendar',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda',
-													'langs'=>'agenda',
-													'position'=>140,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
-		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
-													'type'=>'left',
-													'titre'=>'MenuToDoMyActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine',
-													'langs'=>'agenda',
-													'position'=>141,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
-		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
-													'type'=>'left',
-													'titre'=>'MenuDoneMyActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=done&filter=mine',
-													'langs'=>'agenda',
-													'position'=>142,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
-		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
-													'type'=>'left',
-													'titre'=>'MenuToDoActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
-													'langs'=>'agenda',
-													'position'=>143,
-													'perms'=>'$user->rights->agenda->allactions->read',
-													'enabled'=>'$user->rights->agenda->allactions->read',
-													'target'=>'',
-													'user'=>2);
-		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
-													'type'=>'left',
-													'titre'=>'MenuDoneActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
-													'langs'=>'agenda',
-													'position'=>144,
-													'perms'=>'$user->rights->agenda->allactions->read',
-													'enabled'=>'$user->rights->agenda->allactions->read',
-													'target'=>'',
-													'user'=>2);
+        $this->menu[$r]=array('fk_menu'=>'r=0',
+                                                    'type'=>'left',
+                                                    'titre'=>'Actions',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda',
+                                                    'langs'=>'agenda',
+                                                    'position'=>100,
+                                                    'perms'=>'$user->rights->agenda->myactions->read',
+                                                    'enabled'=>'$conf->agenda->enabled',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
+        $this->menu[$r]=array('fk_menu'=>'r=1',
+                                                    'type'=>'left',
+                                                    'titre'=>'NewAction',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/card.php?mainmenu=agenda&leftmenu=agenda&action=create',
+                                                    'langs'=>'commercial',
+                                                    'position'=>101,
+                                                    'perms'=>'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)',
+                                                    'enabled'=>'$conf->agenda->enabled',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
+        // Calendar
+        $this->menu[$r]=array('fk_menu'=>'r=1',
+                                                    'type'=>'left',
+                                                    'titre'=>'Calendar',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda',
+                                                    'langs'=>'agenda',
+                                                    'position'=>140,
+                                                    'perms'=>'$user->rights->agenda->myactions->read',
+                                                    'enabled'=>'$conf->agenda->enabled',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
+        $this->menu[$r]=array('fk_menu'=>'r=3',
+                                                    'type'=>'left',
+                                                    'titre'=>'MenuToDoMyActions',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine',
+                                                    'langs'=>'agenda',
+                                                    'position'=>141,
+                                                    'perms'=>'$user->rights->agenda->myactions->read',
+                                                    'enabled'=>'$conf->agenda->enabled',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
+        $this->menu[$r]=array('fk_menu'=>'r=3',
+                                                    'type'=>'left',
+                                                    'titre'=>'MenuDoneMyActions',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=done&filter=mine',
+                                                    'langs'=>'agenda',
+                                                    'position'=>142,
+                                                    'perms'=>'$user->rights->agenda->myactions->read',
+                                                    'enabled'=>'$conf->agenda->enabled',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
+        $this->menu[$r]=array('fk_menu'=>'r=3',
+                                                    'type'=>'left',
+                                                    'titre'=>'MenuToDoActions',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
+                                                    'langs'=>'agenda',
+                                                    'position'=>143,
+                                                    'perms'=>'$user->rights->agenda->allactions->read',
+                                                    'enabled'=>'$user->rights->agenda->allactions->read',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
+        $this->menu[$r]=array('fk_menu'=>'r=3',
+                                                    'type'=>'left',
+                                                    'titre'=>'MenuDoneActions',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/index.php?action=default&mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
+                                                    'langs'=>'agenda',
+                                                    'position'=>144,
+                                                    'perms'=>'$user->rights->agenda->allactions->read',
+                                                    'enabled'=>'$user->rights->agenda->allactions->read',
+                                                    'target'=>'',
+                                                    'user'=>2);
 
-		// List
-		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=1',
-													'type'=>'left',
-													'titre'=>'List',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda',
-													'langs'=>'agenda',
-													'position'=>110,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
-		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
-													'type'=>'left',
-													'titre'=>'MenuToDoMyActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine',
-													'langs'=>'agenda',
-													'position'=>111,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
-		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
-													'type'=>'left',
-													'titre'=>'MenuDoneMyActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine',
-													'langs'=>'agenda',
-													'position'=>112,
-													'perms'=>'$user->rights->agenda->myactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
-		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
-													'type'=>'left',
-													'titre'=>'MenuToDoActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
-													'langs'=>'agenda',
-													'position'=>113,
-													'perms'=>'$user->rights->agenda->allactions->read',
-													'enabled'=>'$user->rights->agenda->allactions->read',
-													'target'=>'',
-													'user'=>2);
-		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
-													'type'=>'left',
-													'titre'=>'MenuDoneActions',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
-													'langs'=>'agenda',
-													'position'=>114,
-													'perms'=>'$user->rights->agenda->allactions->read',
-													'enabled'=>'$user->rights->agenda->allactions->read',
-													'target'=>'',
-													'user'=>2);
-		$r++;
-		// Reports
-		$this->menu[$r]=array('fk_menu'=>'r=1',
-													'type'=>'left',
-													'titre'=>'Reportings',
-													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda',
-													'langs'=>'agenda',
-													'position'=>160,
-													'perms'=>'$user->rights->agenda->allactions->read',
-													'enabled'=>'$conf->agenda->enabled',
-													'target'=>'',
-													'user'=>2);
-		$r++;
+        // List
+        $r++;
+        $this->menu[$r]=array('fk_menu'=>'r=1',
+                                                    'type'=>'left',
+                                                    'titre'=>'List',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda',
+                                                    'langs'=>'agenda',
+                                                    'position'=>110,
+                                                    'perms'=>'$user->rights->agenda->myactions->read',
+                                                    'enabled'=>'$conf->agenda->enabled',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
+        $this->menu[$r]=array('fk_menu'=>'r=8',
+                                                    'type'=>'left',
+                                                    'titre'=>'MenuToDoMyActions',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine',
+                                                    'langs'=>'agenda',
+                                                    'position'=>111,
+                                                    'perms'=>'$user->rights->agenda->myactions->read',
+                                                    'enabled'=>'$conf->agenda->enabled',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
+        $this->menu[$r]=array('fk_menu'=>'r=8',
+                                                    'type'=>'left',
+                                                    'titre'=>'MenuDoneMyActions',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine',
+                                                    'langs'=>'agenda',
+                                                    'position'=>112,
+                                                    'perms'=>'$user->rights->agenda->myactions->read',
+                                                    'enabled'=>'$conf->agenda->enabled',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
+        $this->menu[$r]=array('fk_menu'=>'r=8',
+                                                    'type'=>'left',
+                                                    'titre'=>'MenuToDoActions',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
+                                                    'langs'=>'agenda',
+                                                    'position'=>113,
+                                                    'perms'=>'$user->rights->agenda->allactions->read',
+                                                    'enabled'=>'$user->rights->agenda->allactions->read',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
+        $this->menu[$r]=array('fk_menu'=>'r=8',
+                                                    'type'=>'left',
+                                                    'titre'=>'MenuDoneActions',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
+                                                    'langs'=>'agenda',
+                                                    'position'=>114,
+                                                    'perms'=>'$user->rights->agenda->allactions->read',
+                                                    'enabled'=>'$user->rights->agenda->allactions->read',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
+        // Reports
+        $this->menu[$r]=array('fk_menu'=>'r=1',
+                                                    'type'=>'left',
+                                                    'titre'=>'Reportings',
+                                                    'mainmenu'=>'agenda',
+                                                    'url'=>'/comm/action/rapport/index.php?mainmenu=agenda&leftmenu=agenda',
+                                                    'langs'=>'agenda',
+                                                    'position'=>160,
+                                                    'perms'=>'$user->rights->agenda->allactions->read',
+                                                    'enabled'=>'$conf->agenda->enabled',
+                                                    'target'=>'',
+                                                    'user'=>2);
+        $r++;
 
 
-		// Exports
-		//--------
-		$r=0;
+        // Exports
+        //--------
+        $r=0;
 
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]="ExportDataset_event1";
-		$this->export_permission[$r]=array(array("agenda","export"));
-		$this->export_fields_array[$r]=array('ac.id'=>"IdAgenda",'ac.ref_ext'=>"ExternalRef",'ac.datec'=>"DateCreation",'ac.datep'=>"DateActionBegin",
-			'ac.datep2'=>"DateActionEnd",'ac.label'=>"Title",'ac.note'=>"Note",'ac.percent'=>"Percent",'ac.durationp'=>"Duration",
-			'cac.libelle'=>"ActionType",
-			's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town',
-			'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6',
-			's.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra');
-		$this->export_TypeFields_array[$r]=array('ac.ref_ext'=>"Text",'ac.datec'=>"Date",'ac.datep'=>"Date",
-			'ac.datep2'=>"Date",'ac.label'=>"Text",'ac.note'=>"Text",'ac.percent'=>"Numeric",
-			'ac.durationp'=>"Duree",
-			'cac.libelle'=>"List:c_actioncomm:libelle:id",
-			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text',
-			'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text',
-			's.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text');
-		$this->export_entities_array[$r]=array('ac.id'=>"action",'ac.ref_ext'=>"action",'ac.datec'=>"action",'ac.datep'=>"action",
-			'ac.datep2'=>"action",'ac.label'=>"action",'ac.note'=>"action",'ac.percent'=>"action",'ac.durationp'=>"action",
-			'cac.libelle'=>"action",
-			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company',
-			'co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company',
-			's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company',);
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]="ExportDataset_event1";
+        $this->export_permission[$r]=array(array("agenda","export"));
+        $this->export_fields_array[$r]=array('ac.id'=>"IdAgenda",'ac.ref_ext'=>"ExternalRef",'ac.datec'=>"DateCreation",'ac.datep'=>"DateActionBegin",
+            'ac.datep2'=>"DateActionEnd",'ac.label'=>"Title",'ac.note'=>"Note",'ac.percent'=>"Percent",'ac.durationp'=>"Duration",
+            'cac.libelle'=>"ActionType",
+            's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town',
+            'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6',
+            's.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra');
+        $this->export_TypeFields_array[$r]=array('ac.ref_ext'=>"Text",'ac.datec'=>"Date",'ac.datep'=>"Date",
+            'ac.datep2'=>"Date",'ac.label'=>"Text",'ac.note'=>"Text",'ac.percent'=>"Numeric",
+            'ac.durationp'=>"Duree",
+            'cac.libelle'=>"List:c_actioncomm:libelle:id",
+            's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text',
+            'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text',
+            's.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text');
+        $this->export_entities_array[$r]=array('ac.id'=>"action",'ac.ref_ext'=>"action",'ac.datec'=>"action",'ac.datep'=>"action",
+            'ac.datep2'=>"action",'ac.label'=>"action",'ac.note'=>"action",'ac.percent'=>"action",'ac.durationp'=>"action",
+            'cac.libelle'=>"action",
+            's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company',
+            'co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company',
+            's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company',);
 
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM  '.MAIN_DB_PREFIX.'actioncomm as ac';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id';
-		if (! empty($user) && empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_resources acr on ac.id = acr.fk_actioncomm';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp on ac.fk_contact = sp.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid';
-		if (! empty($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid';
-		$this->export_sql_end[$r] .=' WHERE ac.entity IN ('.getEntity('agenda').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)';
-		if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id);
-		$this->export_sql_end[$r] .=' ORDER BY ac.datep';
-	}
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM  '.MAIN_DB_PREFIX.'actioncomm as ac';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id';
+        if (! empty($user) && empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_resources acr on ac.id = acr.fk_actioncomm';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp on ac.fk_contact = sp.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid';
+        if (! empty($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid';
+        $this->export_sql_end[$r] .=' WHERE ac.entity IN ('.getEntity('agenda').')';
+        if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)';
+        if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id);
+        $this->export_sql_end[$r] .=' ORDER BY ac.datep';
+    }
 }

Spacing +60 added lines, -60 removed lines

@@ -30,7 +30,7 @@ 
  *      \ingroup    agenda
  *      \brief      File of class to describe and enable/disable module Agenda
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe and enable/disable module Agenda
@@ -53,13 +53,13 @@ 
 		$this->family = "projects";
 		$this->module_position = '15';
 		// 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 = "Follow events or rendez-vous. Record manual events into Agendas or let application record automatic events for log tracking.";
 		// 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);
-		$this->picto='action';
+		$this->picto = 'action';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/agenda/temp");
@@ -68,12 +68,12 @@ 
 		$this->config_page_url = array("agenda_other.php");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// 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->hidden = false; // A condition to hide module
+		$this->depends = array(); // 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->langfiles = array("companies");
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 
 		// Module parts
         $this->module_parts = array();
@@ -86,14 +86,14 @@ 
         // );
 		$this->const = array();
 		//$this->const[] = array('AGENDA_DEFAULT_FILTER_TYPE', 'chaine', 'AC_NON_AUTO', 'Default filter for type of event on agenda', 0, 'current');
-		$sqlreadactions="SELECT code, label, description FROM ".MAIN_DB_PREFIX."c_action_trigger ORDER by rang";
+		$sqlreadactions = "SELECT code, label, description FROM ".MAIN_DB_PREFIX."c_action_trigger ORDER by rang";
 		$resql = $this->db->query($sqlreadactions);
 		if ($resql)
 		{
 		    while ($obj = $this->db->fetch_object($resql))
 		    {
 		        //if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
-		        if (preg_match('/^TASK_/',$obj->code)) continue;      // We don't track such events by default.
+		        if (preg_match('/^TASK_/', $obj->code)) continue; // We don't track such events by default.
 		        //if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
 		        $this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
 		    }
@@ -109,11 +109,11 @@ 
 
 		// Boxes
 		//------
-		$this->boxes = array(0=>array('file'=>'box_actions.php','enabledbydefaulton'=>'Home'));
+		$this->boxes = array(0=>array('file'=>'box_actions.php', 'enabledbydefaulton'=>'Home'));
 
 		// Cronjobs
 		//------------
-		$datestart=dol_now();
+		$datestart = dol_now();
 		$this->cronjobs = array(
 			0=>array('label'=>'SendEmailsReminders', 'jobtype'=>'method', 'class'=>'comm/action/class/actioncomm.class.php', 'objectname'=>'ActionComm', 'method'=>'sendEmailsReminder', 'parameters'=>'', 'comment'=>'SendEMailsReminder', 'frequency'=>10, 'unitfrequency'=>60, 'priority'=>10, 'status'=>1, 'test'=>'$conf->agenda->enabled', 'datestart'=>$datestart),
 		);
@@ -122,7 +122,7 @@ 
 		//------------
 		$this->rights = array();
 		$this->rights_class = 'agenda';
-		$r=0;
+		$r = 0;
 
 		// $this->rights[$r][0]     Id permission (unique tous modules confondus)
 		// $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
@@ -187,8 +187,8 @@ 
 		$this->rights[$r][4] = 'export';
 
 		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
+		$this->menu = array(); // List of menus to add
+		$r = 0;
 
 		// Add here entries to declare new menus
 		// Example to declare the Top Menu entry:
@@ -204,7 +204,7 @@ 
 		//							'target'=>'',
 		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		// $r++;
-		$this->menu[$r]=array('fk_menu'=>0,
+		$this->menu[$r] = array('fk_menu'=>0,
 													'type'=>'top',
 													'titre'=>'TMenuAgenda',
 													'mainmenu'=>'agenda',
@@ -217,7 +217,7 @@ 
 													'user'=>2);
 		$r++;
 
-		$this->menu[$r]=array('fk_menu'=>'r=0',
+		$this->menu[$r] = array('fk_menu'=>'r=0',
 													'type'=>'left',
 													'titre'=>'Actions',
 													'mainmenu'=>'agenda',
@@ -229,7 +229,7 @@ 
 													'target'=>'',
 													'user'=>2);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=1',
+		$this->menu[$r] = array('fk_menu'=>'r=1',
 													'type'=>'left',
 													'titre'=>'NewAction',
 													'mainmenu'=>'agenda',
@@ -242,7 +242,7 @@ 
 													'user'=>2);
 		$r++;
 		// Calendar
-		$this->menu[$r]=array('fk_menu'=>'r=1',
+		$this->menu[$r] = array('fk_menu'=>'r=1',
 													'type'=>'left',
 													'titre'=>'Calendar',
 													'mainmenu'=>'agenda',
@@ -254,7 +254,7 @@ 
 													'target'=>'',
 													'user'=>2);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
+		$this->menu[$r] = array('fk_menu'=>'r=3',
 													'type'=>'left',
 													'titre'=>'MenuToDoMyActions',
 													'mainmenu'=>'agenda',
@@ -266,7 +266,7 @@ 
 													'target'=>'',
 													'user'=>2);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
+		$this->menu[$r] = array('fk_menu'=>'r=3',
 													'type'=>'left',
 													'titre'=>'MenuDoneMyActions',
 													'mainmenu'=>'agenda',
@@ -278,7 +278,7 @@ 
 													'target'=>'',
 													'user'=>2);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
+		$this->menu[$r] = array('fk_menu'=>'r=3',
 													'type'=>'left',
 													'titre'=>'MenuToDoActions',
 													'mainmenu'=>'agenda',
@@ -290,7 +290,7 @@ 
 													'target'=>'',
 													'user'=>2);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=3',
+		$this->menu[$r] = array('fk_menu'=>'r=3',
 													'type'=>'left',
 													'titre'=>'MenuDoneActions',
 													'mainmenu'=>'agenda',
@@ -304,7 +304,7 @@ 
 
 		// List
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=1',
+		$this->menu[$r] = array('fk_menu'=>'r=1',
 													'type'=>'left',
 													'titre'=>'List',
 													'mainmenu'=>'agenda',
@@ -316,7 +316,7 @@ 
 													'target'=>'',
 													'user'=>2);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
+		$this->menu[$r] = array('fk_menu'=>'r=8',
 													'type'=>'left',
 													'titre'=>'MenuToDoMyActions',
 													'mainmenu'=>'agenda',
@@ -328,7 +328,7 @@ 
 													'target'=>'',
 													'user'=>2);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
+		$this->menu[$r] = array('fk_menu'=>'r=8',
 													'type'=>'left',
 													'titre'=>'MenuDoneMyActions',
 													'mainmenu'=>'agenda',
@@ -340,7 +340,7 @@ 
 													'target'=>'',
 													'user'=>2);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
+		$this->menu[$r] = array('fk_menu'=>'r=8',
 													'type'=>'left',
 													'titre'=>'MenuToDoActions',
 													'mainmenu'=>'agenda',
@@ -352,7 +352,7 @@ 
 													'target'=>'',
 													'user'=>2);
 		$r++;
-		$this->menu[$r]=array('fk_menu'=>'r=8',
+		$this->menu[$r] = array('fk_menu'=>'r=8',
 													'type'=>'left',
 													'titre'=>'MenuDoneActions',
 													'mainmenu'=>'agenda',
@@ -365,7 +365,7 @@ 
 													'user'=>2);
 		$r++;
 		// Reports
-		$this->menu[$r]=array('fk_menu'=>'r=1',
+		$this->menu[$r] = array('fk_menu'=>'r=1',
 													'type'=>'left',
 													'titre'=>'Reportings',
 													'mainmenu'=>'agenda',
@@ -381,43 +381,43 @@ 
 
 		// Exports
 		//--------
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]="ExportDataset_event1";
-		$this->export_permission[$r]=array(array("agenda","export"));
-		$this->export_fields_array[$r]=array('ac.id'=>"IdAgenda",'ac.ref_ext'=>"ExternalRef",'ac.datec'=>"DateCreation",'ac.datep'=>"DateActionBegin",
-			'ac.datep2'=>"DateActionEnd",'ac.label'=>"Title",'ac.note'=>"Note",'ac.percent'=>"Percent",'ac.durationp'=>"Duration",
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = "ExportDataset_event1";
+		$this->export_permission[$r] = array(array("agenda", "export"));
+		$this->export_fields_array[$r] = array('ac.id'=>"IdAgenda", 'ac.ref_ext'=>"ExternalRef", 'ac.datec'=>"DateCreation", 'ac.datep'=>"DateActionBegin",
+			'ac.datep2'=>"DateActionEnd", 'ac.label'=>"Title", 'ac.note'=>"Note", 'ac.percent'=>"Percent", 'ac.durationp'=>"Duration",
 			'cac.libelle'=>"ActionType",
-			's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town',
-			'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6',
-			's.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra');
-		$this->export_TypeFields_array[$r]=array('ac.ref_ext'=>"Text",'ac.datec'=>"Date",'ac.datep'=>"Date",
-			'ac.datep2'=>"Date",'ac.label'=>"Text",'ac.note'=>"Text",'ac.percent'=>"Numeric",
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town',
+			'co.code'=>'CountryCode', 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5', 's.idprof6'=>'ProfId6',
+			's.code_compta'=>'CustomerAccountancyCode', 's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra');
+		$this->export_TypeFields_array[$r] = array('ac.ref_ext'=>"Text", 'ac.datec'=>"Date", 'ac.datep'=>"Date",
+			'ac.datep2'=>"Date", 'ac.label'=>"Text", 'ac.note'=>"Text", 'ac.percent'=>"Numeric",
 			'ac.durationp'=>"Duree",
 			'cac.libelle'=>"List:c_actioncomm:libelle:id",
-			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text',
-			'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text',
-			's.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text');
-		$this->export_entities_array[$r]=array('ac.id'=>"action",'ac.ref_ext'=>"action",'ac.datec'=>"action",'ac.datep'=>"action",
-			'ac.datep2'=>"action",'ac.label'=>"action",'ac.note'=>"action",'ac.percent'=>"action",'ac.durationp'=>"action",
+			's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text',
+			'co.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.idprof5'=>'Text', 's.idprof6'=>'Text',
+			's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text');
+		$this->export_entities_array[$r] = array('ac.id'=>"action", 'ac.ref_ext'=>"action", 'ac.datec'=>"action", 'ac.datep'=>"action",
+			'ac.datep2'=>"action", 'ac.label'=>"action", 'ac.note'=>"action", 'ac.percent'=>"action", 'ac.durationp'=>"action",
 			'cac.libelle'=>"action",
-			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company',
-			'co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company',
-			's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company',);
+			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company',
+			'co.code'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.idprof5'=>'company', 's.idprof6'=>'company',
+			's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company', 's.tva_intra'=>'company',);
 
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM  '.MAIN_DB_PREFIX.'actioncomm as ac';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id';
-		if (! empty($user) && empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_resources acr on ac.id = acr.fk_actioncomm';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp on ac.fk_contact = sp.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid';
-		if (! empty($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid';
-		$this->export_sql_end[$r] .=' WHERE ac.entity IN ('.getEntity('agenda').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)';
-		if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id);
-		$this->export_sql_end[$r] .=' ORDER BY ac.datep';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM  '.MAIN_DB_PREFIX.'actioncomm as ac';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id';
+		if (!empty($user) && empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_resources acr on ac.id = acr.fk_actioncomm';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp on ac.fk_contact = sp.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid';
+		if (!empty($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid';
+		$this->export_sql_end[$r] .= ' WHERE ac.entity IN ('.getEntity('agenda').')';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND (sc.fk_user = '.(empty($user) ? 0 : $user->id).' OR ac.fk_soc IS NULL)';
+		if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .= ' AND acr.fk_element = '.(empty($user) ? 0 : $user->id);
+		$this->export_sql_end[$r] .= ' ORDER BY ac.datep';
 	}
 }

Braces +17 added lines, -7 removed lines

@@ -93,12 +93,14 @@ 
 		    while ($obj = $this->db->fetch_object($resql))
 		    {
 		        //if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
-		        if (preg_match('/^TASK_/',$obj->code)) continue;      // We don't track such events by default.
+		        if (preg_match('/^TASK_/',$obj->code)) {
+		            continue;
+		        }
+		        // We don't track such events by default.
 		        //if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
 		        $this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
 		    }
-		}
-		else
+		} else
 		{
 		    dol_print_error($this->db->lasterror());
 		}
@@ -410,14 +412,22 @@ 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM  '.MAIN_DB_PREFIX.'actioncomm as ac';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id';
-		if (! empty($user) && empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_resources acr on ac.id = acr.fk_actioncomm';
+		if (! empty($user) && empty($user->rights->agenda->allactions->read)) {
+		    $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_resources acr on ac.id = acr.fk_actioncomm';
+		}
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp on ac.fk_contact = sp.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid';
-		if (! empty($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (! empty($user) && empty($user->rights->societe->client->voir)) {
+		    $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .=' WHERE ac.entity IN ('.getEntity('agenda').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)';
-		if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id);
+		if (empty($user->rights->societe->client->voir)) {
+		    $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)';
+		}
+		if (empty($user->rights->agenda->allactions->read)) {
+		    $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id);
+		}
 		$this->export_sql_end[$r] .=' ORDER BY ac.datep';
 	}
 }

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

Indentation +113 added lines, -113 removed lines

@@ -27,117 +27,117 @@
  */
 class modHRM extends DolibarrModules
 {
-	/**
-	 * Constructor.
-	 * Define names, constants, directories, boxes, permissions
-	 *
-	 * @param 	DoliDB 	$db		Database handler
-	 */
-	public function __construct($db)
-	{
-		global $langs, $conf;
-
-		$this->db = $db;
-
-		$this->numero = 4000;
-		$this->rights_class = 'hrm';
-
-		$this->family = "hr";
-		// 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 = "Management of employees carrier and feelings (department, employment contract)";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'development';
-
-		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
-	    // Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='generic';
-
-		// define triggers
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled
-		$this->dirs = array();
-
-		// Config pages
-		$this->config_page_url = array('admin_hrm.php@hrm');
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array(/*"modSalaries, modExpenseReport, modHoliday"*/);	// 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->need_dolibarr_version = array (3,9); // Minimum version of Dolibarr required by module
-		$this->langfiles = array ("hrm");
-
-		// Dictionaries
-		$this->dictionaries=array();
-
-		// Constantes
-		$this->const = array ();
-		$r = 0;
-
-		// Boxes
-		$this->boxes = array ();
-
-		// Permissions
-		$this->rights = array(); // Permission array used by this module
-		$r = 0;
-
-		$this->rights[$r][0] = 4001;
-		$this->rights[$r][1] = 'See employees';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'employee';
-		$this->rights[$r][5] = 'read';
-		$r ++;
-
-		$this->rights[$r][0] = 4002;
-		$this->rights[$r][1] = 'Create employees';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'employee';
-		$this->rights[$r][5] = 'write';
-		$r ++;
-
-		$this->rights[$r][0] = 4003;
-		$this->rights[$r][1] = 'Delete employees';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'employee';
-		$this->rights[$r][5] = 'delete';
-		$r ++;
-
-		$this->rights[$r][0] = 4004;
-		$this->rights[$r][1] = 'Export employees';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'employee';
-		$this->rights[$r][5] = 'export';
-		$r ++;
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-	}
-
-	/**
-	 * 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 Enabling module ('', 'noboxes')
-	 * @return int if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		// Permissions
-		$this->remove($options);
-
-		$sql = array();
-
-		return $this->_init($sql,$options);
-	}
+    /**
+     * Constructor.
+     * Define names, constants, directories, boxes, permissions
+     *
+     * @param 	DoliDB 	$db		Database handler
+     */
+    public function __construct($db)
+    {
+        global $langs, $conf;
+
+        $this->db = $db;
+
+        $this->numero = 4000;
+        $this->rights_class = 'hrm';
+
+        $this->family = "hr";
+        // 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 = "Management of employees carrier and feelings (department, employment contract)";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'development';
+
+        $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+        // Name of image file used for this module.
+        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+        $this->picto='generic';
+
+        // define triggers
+        $this->module_parts = array();
+
+        // Data directories to create when module is enabled
+        $this->dirs = array();
+
+        // Config pages
+        $this->config_page_url = array('admin_hrm.php@hrm');
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array(/*"modSalaries, modExpenseReport, modHoliday"*/);	// 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->need_dolibarr_version = array (3,9); // Minimum version of Dolibarr required by module
+        $this->langfiles = array ("hrm");
+
+        // Dictionaries
+        $this->dictionaries=array();
+
+        // Constantes
+        $this->const = array ();
+        $r = 0;
+
+        // Boxes
+        $this->boxes = array ();
+
+        // Permissions
+        $this->rights = array(); // Permission array used by this module
+        $r = 0;
+
+        $this->rights[$r][0] = 4001;
+        $this->rights[$r][1] = 'See employees';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'employee';
+        $this->rights[$r][5] = 'read';
+        $r ++;
+
+        $this->rights[$r][0] = 4002;
+        $this->rights[$r][1] = 'Create employees';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'employee';
+        $this->rights[$r][5] = 'write';
+        $r ++;
+
+        $this->rights[$r][0] = 4003;
+        $this->rights[$r][1] = 'Delete employees';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'employee';
+        $this->rights[$r][5] = 'delete';
+        $r ++;
+
+        $this->rights[$r][0] = 4004;
+        $this->rights[$r][1] = 'Export employees';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'employee';
+        $this->rights[$r][5] = 'export';
+        $r ++;
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+    }
+
+    /**
+     * 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 Enabling module ('', 'noboxes')
+     * @return int if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        // Permissions
+        $this->remove($options);
+
+        $sql = array();
+
+        return $this->_init($sql,$options);
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
  * \ingroup HRM
  * \brief   Description and activation file for module HRM
  */
-include_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php";
+include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 
 /**
  * Class to describe and activate the HRM module
@@ -44,17 +44,17 @@ 
 
 		$this->family = "hr";
 		// 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 = "Management of employees carrier and feelings (department, employment contract)";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
 
-		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 	    // Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='generic';
+		$this->picto = 'generic';
 
 		// define triggers
 		$this->module_parts = array();
@@ -66,23 +66,23 @@ 
 		$this->config_page_url = array('admin_hrm.php@hrm');
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array(/*"modSalaries, modExpenseReport, modHoliday"*/);	// 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->need_dolibarr_version = array (3,9); // Minimum version of Dolibarr required by module
-		$this->langfiles = array ("hrm");
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(/*"modSalaries, modExpenseReport, modHoliday"*/); // 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->need_dolibarr_version = array(3, 9); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("hrm");
 
 		// Dictionaries
-		$this->dictionaries=array();
+		$this->dictionaries = array();
 
 		// Constantes
-		$this->const = array ();
+		$this->const = array();
 		$r = 0;
 
 		// Boxes
-		$this->boxes = array ();
+		$this->boxes = array();
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
@@ -93,33 +93,33 @@ 
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'employee';
 		$this->rights[$r][5] = 'read';
-		$r ++;
+		$r++;
 
 		$this->rights[$r][0] = 4002;
 		$this->rights[$r][1] = 'Create employees';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'employee';
 		$this->rights[$r][5] = 'write';
-		$r ++;
+		$r++;
 
 		$this->rights[$r][0] = 4003;
 		$this->rights[$r][1] = 'Delete employees';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'employee';
 		$this->rights[$r][5] = 'delete';
-		$r ++;
+		$r++;
 
 		$this->rights[$r][0] = 4004;
 		$this->rights[$r][1] = 'Export employees';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'employee';
 		$this->rights[$r][5] = 'export';
-		$r ++;
+		$r++;
 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 	}
 
 	/**
@@ -131,13 +131,13 @@ 
 	 * @param string $options Enabling module ('', 'noboxes')
 	 * @return int if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

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

Indentation +27 added lines, -27 removed lines

@@ -32,33 +32,33 @@ 
 {
 
     /**
-	 *   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 = 30000;
 
-		// 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 = "portal";
         $this->module_position = '51';
         // 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 the public collaboration features, like shared pad, shared online sheets, etc...";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'development';
         // 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='globe';
 
-		// Data directories to create when module is enabled
-		$this->dirs = array("/collab/temp");
+        // Data directories to create when module is enabled
+        $this->dirs = array("/collab/temp");
 
         // Config pages
         //-------------
@@ -66,15 +66,15 @@ 
 
         // Dependancies
         //-------------
-		$this->hidden = ! empty($conf->global->MODULE_COLLAB_DISABLED);	// A condition to disable module
-		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
+        $this->hidden = ! empty($conf->global->MODULE_COLLAB_DISABLED);	// A condition to disable module
+        $this->depends = array();		// List of modules id that must be enabled if this module is enabled
         $this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->conflictwith = array();	// List of modules id this module is in conflict with
+        $this->conflictwith = array();	// List of modules id this module is in conflict with
         $this->langfiles = array("collab");
 
         // Constants
         //-----------
-       	$this->const = array();
+            $this->const = array();
 
         // New pages on tabs
         // -----------------
@@ -84,12 +84,12 @@ 
         //------
         $this->boxes = array();
 
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$this->rights_class = 'collab';
-		$r=0;
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $this->rights_class = 'collab';
+        $r=0;
 
-		/*$this->rights[$r][0] = 30001;
+        /*$this->rights[$r][0] = 30001;
 		$this->rights[$r][1] = 'Read website content';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'read';
@@ -110,16 +110,16 @@ 
         // Main menu entries
         $r=0;
         $this->menu[$r]=array(	'fk_menu'=>'0',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-						        'type'=>'top',			                // This is a Left menu entry
-						        'titre'=>'Collab',
+                                'type'=>'top',			                // This is a Left menu entry
+                                'titre'=>'Collab',
                                 'mainmenu'=>'collab',
-						        'url'=>'/collab/index.php',
-						        'langs'=>'collab',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-						        'position'=>100,
-						        'enabled'=>'$conf->collab->enabled',  		// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-						        'perms'=>'1',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-						        'target'=>'',
-						        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+                                'url'=>'/collab/index.php',
+                                'langs'=>'collab',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+                                'position'=>100,
+                                'enabled'=>'$conf->collab->enabled',  		// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+                                'perms'=>'1',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+                                'target'=>'',
+                                'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
         $r++;
     }
 }

Spacing +17 added lines, -17 removed lines

@@ -22,7 +22,7 @@ 
  *  \ingroup    collab
  *  \brief      Description and activation file for module Collab
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -38,7 +38,7 @@ 
      */
     function __construct($db)
     {
-    	global $langs,$conf;
+    	global $langs, $conf;
 
         $this->db = $db;
         $this->numero = 30000;
@@ -48,14 +48,14 @@ 
         $this->family = "portal";
         $this->module_position = '51';
         // 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 the public collaboration features, like shared pad, shared online sheets, etc...";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'development';
         // 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='globe';
+        $this->picto = 'globe';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/collab/temp");
@@ -66,10 +66,10 @@ 
 
         // Dependancies
         //-------------
-		$this->hidden = ! empty($conf->global->MODULE_COLLAB_DISABLED);	// A condition to disable module
-		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->conflictwith = array();	// List of modules id this module is in conflict with
+		$this->hidden = !empty($conf->global->MODULE_COLLAB_DISABLED); // A condition to disable module
+		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->conflictwith = array(); // List of modules id this module is in conflict with
         $this->langfiles = array("collab");
 
         // Constants
@@ -85,9 +85,9 @@ 
         $this->boxes = array();
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
+		$this->rights = array(); // Permission array used by this module
 		$this->rights_class = 'collab';
-		$r=0;
+		$r = 0;
 
 		/*$this->rights[$r][0] = 30001;
 		$this->rights[$r][1] = 'Read website content';
@@ -108,18 +108,18 @@ 
 		$r++;*/
 
         // Main menu entries
-        $r=0;
-        $this->menu[$r]=array(	'fk_menu'=>'0',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-						        'type'=>'top',			                // This is a Left menu entry
+        $r = 0;
+        $this->menu[$r] = array('fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+						        'type'=>'top', // This is a Left menu entry
 						        'titre'=>'Collab',
                                 'mainmenu'=>'collab',
 						        'url'=>'/collab/index.php',
-						        'langs'=>'collab',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+						        'langs'=>'collab', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 						        'position'=>100,
-						        'enabled'=>'$conf->collab->enabled',  		// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-						        'perms'=>'1',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+						        'enabled'=>'$conf->collab->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+						        'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 						        'target'=>'',
-						        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+						        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
         $r++;
     }
 }

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

Indentation +45 added lines, -45 removed lines

@@ -33,59 +33,59 @@
 class modMailmanSpip extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 105;
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 105;
 
-		// 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 = '70';
-		// 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 = "Mailman or Spip interface for member module";
+        // 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 = '70';
+        // 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 = "Mailman or Spip interface for member module";
 
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-		$this->version = 'dolibarr';
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+        $this->version = 'dolibarr';
 
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='technic';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='technic';
 
-		// Data directories to create when module is enabled
-		$this->dirs = array();
+        // Data directories to create when module is enabled
+        $this->dirs = array();
 
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array('modAdherent');		// 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
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array('modAdherent');		// 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
 
-		// Config pages
-		$this->config_page_url = array('mailman.php');
+        // Config pages
+        $this->config_page_url = array('mailman.php');
 
-		// Constants
-		$this->const = array();
-		$this->const[1] = array("ADHERENT_MAILMAN_UNSUB_URL","chaine","http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%","Url de désinscription aux listes mailman");
-		$this->const[2] = array("ADHERENT_MAILMAN_URL","chaine","http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%","Url pour les inscriptions mailman");
-		$this->const[3] = array("ADHERENT_MAILMAN_LISTS","chaine","","Mailing-list to subscribe new members to");
+        // Constants
+        $this->const = array();
+        $this->const[1] = array("ADHERENT_MAILMAN_UNSUB_URL","chaine","http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%","Url de désinscription aux listes mailman");
+        $this->const[2] = array("ADHERENT_MAILMAN_URL","chaine","http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%","Url pour les inscriptions mailman");
+        $this->const[3] = array("ADHERENT_MAILMAN_LISTS","chaine","","Mailing-list to subscribe new members to");
 
-		// Boxes
-		$this->boxes = array();
+        // Boxes
+        $this->boxes = array();
 
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'clicktodial';
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'clicktodial';
 
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-	}
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -24,7 +24,7 @@ 
  *	\brief      Fichier de description et activation du module de click to Dial
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -49,33 +49,33 @@ 
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
 		$this->module_position = '70';
 		// 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 = "Mailman or Spip interface for member module";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='technic';
+		$this->picto = 'technic';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array();
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array('modAdherent');		// 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 = false; // A condition to hide module
+		$this->depends = array('modAdherent'); // 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
 
 		// Config pages
 		$this->config_page_url = array('mailman.php');
 
 		// Constants
 		$this->const = array();
-		$this->const[1] = array("ADHERENT_MAILMAN_UNSUB_URL","chaine","http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%","Url de désinscription aux listes mailman");
-		$this->const[2] = array("ADHERENT_MAILMAN_URL","chaine","http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%","Url pour les inscriptions mailman");
-		$this->const[3] = array("ADHERENT_MAILMAN_LISTS","chaine","","Mailing-list to subscribe new members to");
+		$this->const[1] = array("ADHERENT_MAILMAN_UNSUB_URL", "chaine", "http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%", "Url de désinscription aux listes mailman");
+		$this->const[2] = array("ADHERENT_MAILMAN_URL", "chaine", "http://lists.example.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%", "Url pour les inscriptions mailman");
+		$this->const[3] = array("ADHERENT_MAILMAN_LISTS", "chaine", "", "Mailing-list to subscribe new members to");
 
 		// Boxes
 		$this->boxes = array();
@@ -86,6 +86,6 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 	}
 }

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

Indentation +53 added lines, -53 removed lines

@@ -31,71 +31,71 @@
 class modNotification extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 600;
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 600;
 
-		// 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 = '01';
-		// 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 = "EMail notifications (push) on business Dolibarr events";
+        // 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 = '01';
+        // 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 = "EMail notifications (push) on business Dolibarr events";
         $this->descriptionlong = 'Module600Long';
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='email';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='email';
 
-		// Data directories to create when module is enabled.
-		$this->dirs = array();
+        // Data directories to create when module is enabled.
+        $this->dirs = array();
 
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// 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("mails");
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// 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("mails");
 
-		// Config pages
-		$this->config_page_url = array("notification.php");
+        // Config pages
+        $this->config_page_url = array("notification.php");
 
-		// Constants
-		$this->const = array();
+        // Constants
+        $this->const = array();
 
-		// Boxes
-		$this->boxes = array();
+        // Boxes
+        $this->boxes = array();
 
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'notification';
-	}
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'notification';
+    }
 
 
-	/**
-	 *		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
-	 *
+    /**
+     *		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='')
-	{
-		// Permissions
-		$this->remove($options);
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        // Permissions
+        $this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
-		return $this->_init($sql,$options);
-	}
+        return $this->_init($sql,$options);
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
  *	\ingroup    notification
  *	\brief      Fichier de description et activation du module Notification
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe and enable module Mailing
@@ -47,23 +47,23 @@ 
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
 		$this->module_position = '01';
 		// 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 = "EMail notifications (push) on business Dolibarr events";
         $this->descriptionlong = 'Module600Long';
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='email';
+		$this->picto = 'email';
 
 		// Data directories to create when module is enabled.
 		$this->dirs = array();
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// 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 = false; // A condition to hide module
+		$this->depends = array(); // 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("mails");
 
 		// Config pages
@@ -89,13 +89,13 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

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

Indentation +113 added lines, -113 removed lines

@@ -35,94 +35,94 @@ 
 class modPrelevement extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->numero = 57;
-
-		$this->family = "financial";
-		$this->module_position = '52';
-		// 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 = "Gestion des Prelevements";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of png file (without png) used for this module
-		$this->picto='payment';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/prelevement/temp","/prelevement/receipts");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modFacture","modBanque");		// 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
-
-		// Config pages
-		$this->config_page_url = array("prelevement.php");
-
-		// Constants
-		$this->const = array();
-		$r=0;
-
-		$this->const[$r][0] = "BANK_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "sepamandate";
-		$this->const[$r][3] = 'Name of manager to generate SEPA mandate';
-		$this->const[$r][4] = 0;
-		$r++;
-
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'prelevement';
-		$r=0;
-		$r++;
-		$this->rights[$r][0] = 151;
-		$this->rights[$r][1] = 'Read direct debit payment orders';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'bons';
-		$this->rights[$r][5] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 152;
-		$this->rights[$r][1] = 'Create/modify a direct debit payment order';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'bons';
-		$this->rights[$r][5] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 153;
-		$this->rights[$r][1] = 'Send/Transmit direct debit payment orders';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'bons';
-		$this->rights[$r][5] = 'send';
-
-		$r++;
-		$this->rights[$r][0] = 154;
-		$this->rights[$r][1] = 'Record Credits/Rejects of direct debit payment orders';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'bons';
-		$this->rights[$r][5] = 'credit';
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 57;
+
+        $this->family = "financial";
+        $this->module_position = '52';
+        // 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 = "Gestion des Prelevements";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Name of png file (without png) used for this module
+        $this->picto='payment';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/prelevement/temp","/prelevement/receipts");
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array("modFacture","modBanque");		// 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
+
+        // Config pages
+        $this->config_page_url = array("prelevement.php");
+
+        // Constants
+        $this->const = array();
+        $r=0;
+
+        $this->const[$r][0] = "BANK_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "sepamandate";
+        $this->const[$r][3] = 'Name of manager to generate SEPA mandate';
+        $this->const[$r][4] = 0;
+        $r++;
+
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'prelevement';
+        $r=0;
+        $r++;
+        $this->rights[$r][0] = 151;
+        $this->rights[$r][1] = 'Read direct debit payment orders';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'bons';
+        $this->rights[$r][5] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 152;
+        $this->rights[$r][1] = 'Create/modify a direct debit payment order';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'bons';
+        $this->rights[$r][5] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 153;
+        $this->rights[$r][1] = 'Send/Transmit direct debit payment orders';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'bons';
+        $this->rights[$r][5] = 'send';
+
+        $r++;
+        $this->rights[$r][0] = 154;
+        $this->rights[$r][1] = 'Record Credits/Rejects of direct debit payment orders';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'bons';
+        $this->rights[$r][5] = 'credit';
 
 /*        $this->rights[2][0] = 154;
         $this->rights[2][1] = 'Setup withdraw account';
@@ -132,32 +132,32 @@ 
         $this->rights[2][5] = 'configurer';
 */
 
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-	}
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+    }
 
 
-	/**
-	 *		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
-	 *
+    /**
+     *		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;
-
-		// Permissions
-		$this->remove($options);
-
-		$sql = array(
-		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".$conf->entity,
-		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
-		);
-
-		return $this->_init($sql,$options);
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf;
+
+        // Permissions
+        $this->remove($options);
+
+        $sql = array(
+            "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".$conf->entity,
+            "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
+        );
+
+        return $this->_init($sql,$options);
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
  *	\brief      	Fichier de description et activation du module Prelevement
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -50,7 +50,7 @@ 
 		$this->family = "financial";
 		$this->module_position = '52';
 		// 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 = "Gestion des Prelevements";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -58,24 +58,24 @@ 
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of png file (without png) used for this module
-		$this->picto='payment';
+		$this->picto = 'payment';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array("/prelevement/temp","/prelevement/receipts");
+		$this->dirs = array("/prelevement/temp", "/prelevement/receipts");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modFacture","modBanque");		// 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 = false; // A condition to hide module
+		$this->depends = array("modFacture", "modBanque"); // 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
 
 		// Config pages
 		$this->config_page_url = array("prelevement.php");
 
 		// Constants
 		$this->const = array();
-		$r=0;
+		$r = 0;
 
 		$this->const[$r][0] = "BANK_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -91,7 +91,7 @@ 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'prelevement';
-		$r=0;
+		$r = 0;
 		$r++;
 		$this->rights[$r][0] = 151;
 		$this->rights[$r][1] = 'Read direct debit payment orders';
@@ -134,7 +134,7 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 	}
 
 
@@ -146,7 +146,7 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		global $conf;
 
@@ -158,6 +158,6 @@ 
 		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
 		);
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

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

Indentation +114 added lines, -114 removed lines

@@ -30,119 +30,119 @@
  */
 class modMargin extends DolibarrModules
 {
-	/**
-	 * 	Constructor
-	 *
-	 * 	@param	DoliDB	$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 59000;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'margins';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
-		$this->family = "financial";
-		$this->module_position = '55';
-		// 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));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Margin management";
-		// 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 png file (without png) used for this module.
-		// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
-		$this->picto='margin';
-
-		// Data directories to create when module is enabled.
-		$this->dirs = array('/margin/temp');
-
-		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
-		$this->config_page_url = array("margin.php@margin");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modPropale", "modProduct");		// 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->need_dolibarr_version = array(3,2);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("margins");
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array(0=>array('MARGIN_TYPE','chaine','costprice','Rule for margin calculation by default',0,'current',0));			// List of particular constants to add when module is enabled
-
-		// New pages on tabs
-		$this->tabs = array(
-				'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__',
-				'thirdparty:+margin:Margins:margins:empty($user->societe_id) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__'
-		);
-
-
-		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
-
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r = 0;
-
-		// left menu entry
-		$this->menu[$r]=array(
-				'fk_menu'=>'fk_mainmenu=billing',			// Put 0 if this is a top menu
-    			'type'=>'left',			// This is a Top menu entry
-    			'titre'=>'Margins',
-    			'mainmenu'=>'billing',
-    			'leftmenu'=>'margins',
-    			'url'=>'/margin/index.php',
-    			'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-    			'position'=>100,
-    			'enabled'=>'$conf->margin->enabled',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
-    			'perms'=>'$user->rights->margins->liretous',	// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
-    			'target'=>'',
-    			'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-		$r++;
-
-		// Permissions
-		$this->rights = array();
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 59001; // id de la permission
-		$this->rights[$r][1] = 'Visualiser les marges'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'liretous';
-
-		$r++;
-		$this->rights[$r][0] = 59002; // id de la permission
-		$this->rights[$r][1] = 'Définir les marges'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 59003; // id de la permission
-		$this->rights[$r][1] = 'Read every user margin'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'read';
-		$this->rights[$r][5] = 'all';
-	}
+    /**
+     * 	Constructor
+     *
+     * 	@param	DoliDB	$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+        $this->numero = 59000;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'margins';
+
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
+        $this->family = "financial";
+        $this->module_position = '55';
+        // 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));
+        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Margin management";
+        // 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 png file (without png) used for this module.
+        // Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
+        $this->picto='margin';
+
+        // Data directories to create when module is enabled.
+        $this->dirs = array('/margin/temp');
+
+        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
+        $this->config_page_url = array("margin.php@margin");
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array("modPropale", "modProduct");		// 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->need_dolibarr_version = array(3,2);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("margins");
+
+        // Constants
+        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+        //                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+        // );
+        $this->const = array(0=>array('MARGIN_TYPE','chaine','costprice','Rule for margin calculation by default',0,'current',0));			// List of particular constants to add when module is enabled
+
+        // New pages on tabs
+        $this->tabs = array(
+                'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__',
+                'thirdparty:+margin:Margins:margins:empty($user->societe_id) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__'
+        );
+
+
+        // Boxes
+        $this->boxes = array();			// List of boxes
+        $r=0;
+
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
+
+        // Main menu entries
+        $this->menu = array();			// List of menus to add
+        $r = 0;
+
+        // left menu entry
+        $this->menu[$r]=array(
+                'fk_menu'=>'fk_mainmenu=billing',			// Put 0 if this is a top menu
+                'type'=>'left',			// This is a Top menu entry
+                'titre'=>'Margins',
+                'mainmenu'=>'billing',
+                'leftmenu'=>'margins',
+                'url'=>'/margin/index.php',
+                'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+                'position'=>100,
+                'enabled'=>'$conf->margin->enabled',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
+                'perms'=>'$user->rights->margins->liretous',	// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
+                'target'=>'',
+                'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+        $r++;
+
+        // Permissions
+        $this->rights = array();
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 59001; // id de la permission
+        $this->rights[$r][1] = 'Visualiser les marges'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'liretous';
+
+        $r++;
+        $this->rights[$r][0] = 59002; // id de la permission
+        $this->rights[$r][1] = 'Définir les marges'; // libelle de la permission
+        $this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 59003; // id de la permission
+        $this->rights[$r][1] = 'Read every user margin'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'read';
+        $this->rights[$r][5] = 'all';
+    }
 }
 

Spacing +23 added lines, -23 removed lines

@@ -22,7 +22,7 @@ 
  *      \ingroup    margin
  *      \brief      Description and activation file for module Margin
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -50,7 +50,7 @@ 
 		$this->family = "financial";
 		$this->module_position = '55';
 		// 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));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Margin management";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -59,7 +59,7 @@ 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of png file (without png) used for this module.
 		// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
-		$this->picto='margin';
+		$this->picto = 'margin';
 
 		// Data directories to create when module is enabled.
 		$this->dirs = array('/margin/temp');
@@ -68,12 +68,12 @@ 
 		$this->config_page_url = array("margin.php@margin");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modPropale", "modProduct");		// 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->need_dolibarr_version = array(3,2);	// Minimum version of Dolibarr required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array("modPropale", "modProduct"); // 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->need_dolibarr_version = array(3, 2); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("margins");
 
 		// Constants
@@ -81,7 +81,7 @@ 
 		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
 		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
 		// );
-		$this->const = array(0=>array('MARGIN_TYPE','chaine','costprice','Rule for margin calculation by default',0,'current',0));			// List of particular constants to add when module is enabled
+		$this->const = array(0=>array('MARGIN_TYPE', 'chaine', 'costprice', 'Rule for margin calculation by default', 0, 'current', 0)); // List of particular constants to add when module is enabled
 
 		// New pages on tabs
 		$this->tabs = array(
@@ -91,36 +91,36 @@ 
 
 
 		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 		// Main menu entries
-		$this->menu = array();			// List of menus to add
+		$this->menu = array(); // List of menus to add
 		$r = 0;
 
 		// left menu entry
-		$this->menu[$r]=array(
-				'fk_menu'=>'fk_mainmenu=billing',			// Put 0 if this is a top menu
-    			'type'=>'left',			// This is a Top menu entry
+		$this->menu[$r] = array(
+				'fk_menu'=>'fk_mainmenu=billing', // Put 0 if this is a top menu
+    			'type'=>'left', // This is a Top menu entry
     			'titre'=>'Margins',
     			'mainmenu'=>'billing',
     			'leftmenu'=>'margins',
     			'url'=>'/margin/index.php',
-    			'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+    			'langs'=>'margins', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
     			'position'=>100,
-    			'enabled'=>'$conf->margin->enabled',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
-    			'perms'=>'$user->rights->margins->liretous',	// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
+    			'enabled'=>'$conf->margin->enabled', // Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
+    			'perms'=>'$user->rights->margins->liretous', // Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
     			'target'=>'',
-    			'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+    			'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 
 		// Permissions
 		$this->rights = array();
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 59001; // id de la permission

dolibarr/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php

Indentation +404 added lines, -404 removed lines

@@ -36,409 +36,409 @@ 
  */
 class doc_generic_user_odt extends ModelePDFUser
 {
-	/**
-	 * Issuer
-	 * @var Societe
-	 */
-	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';
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs, $mysoc;
-
-		// Load translation files required by the page
+    /**
+     * Issuer
+     * @var Societe
+     */
+    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';
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs, $mysoc;
+
+        // 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 = 'USER_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 USER_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 = 1;               // 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->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
-	}
-
-
-	/**
-	 *	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
+        $this->db = $db;
+        $this->name = "ODT templates";
+        $this->description = $langs->trans("DocumentModelOdt");
+        $this->scandir = 'USER_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 USER_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 = 1;               // 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->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+    }
+
+
+    /**
+     *	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('companies', 'errors'));
 
-		$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="USER_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-		{
-			$texte.= '<input type="hidden" name="param2" value="USER_ADDON_PDF_ODT_DEFAULT">';
-			$texte.= '<input type="hidden" name="param3" value="USER_ADDON_PDF_ODT_TOBILL">';
-			$texte.= '<input type="hidden" name="param4" value="USER_ADDON_PDF_ODT_CLOSED">';
-		}
-		$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->USER_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->USER_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
-		if (count($listofdir))
-		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
-
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-			{
-				// Model for creation
-				$liste=ModelePDFUser::liste_modeles($this->db);
-				$texte.= '<table width="50%;">';
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value2',$liste,$conf->global->USER_ADDON_PDF_ODT_DEFAULT);
-				$texte.= "</td></tr>";
-
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value3',$liste,$conf->global->USER_ADDON_PDF_ODT_TOBILL);
-				$texte.= "</td></tr>";
-				$texte.= '<tr>';
-
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value4',$liste,$conf->global->USER_ADDON_PDF_ODT_CLOSED);
-				$texte.= "</td></tr>";
-				$texte.= '</table>';
-			}
-		}
-
-		$texte.= '</td>';
-
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
-
-		$texte.= '</table>';
-		$texte.= '</form>';
-
-		return $texte;
-	}
+        $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="USER_ADDON_PDF_ODT_PATH">';
+        if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+        {
+            $texte.= '<input type="hidden" name="param2" value="USER_ADDON_PDF_ODT_DEFAULT">';
+            $texte.= '<input type="hidden" name="param3" value="USER_ADDON_PDF_ODT_TOBILL">';
+            $texte.= '<input type="hidden" name="param4" value="USER_ADDON_PDF_ODT_CLOSED">';
+        }
+        $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->USER_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->USER_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
+        if (count($listofdir))
+        {
+            $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+
+            if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
+            {
+                // Model for creation
+                $liste=ModelePDFUser::liste_modeles($this->db);
+                $texte.= '<table width="50%;">';
+                $texte.= '<tr>';
+                $texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
+                $texte.= '<td colspan="">';
+                $texte.= $form->selectarray('value2',$liste,$conf->global->USER_ADDON_PDF_ODT_DEFAULT);
+                $texte.= "</td></tr>";
+
+                $texte.= '<tr>';
+                $texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
+                $texte.= '<td colspan="">';
+                $texte.= $form->selectarray('value3',$liste,$conf->global->USER_ADDON_PDF_ODT_TOBILL);
+                $texte.= "</td></tr>";
+                $texte.= '<tr>';
+
+                $texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
+                $texte.= '<td colspan="">';
+                $texte.= $form->selectarray('value4',$liste,$conf->global->USER_ADDON_PDF_ODT_CLOSED);
+                $texte.= "</td></tr>";
+                $texte.= '</table>';
+            }
+        }
+
+        $texte.= '</td>';
+
+        $texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+        $texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
+        $texte.= '</td>';
+        $texte.= '</tr>';
+
+        $texte.= '</table>';
+        $texte.= '</form>';
+
+        return $texte;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Function to build a document on disk using the generic odt module.
-	 *
-	 *	@param		User		$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
-	 *  @param		int			$hidedetails		Do not show line details
-	 *  @param		int			$hidedesc			Do not show desc
-	 *  @param		int			$hideref			Do not show ref
-	 *	@return		int         					1 if OK, <=0 if KO
-	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
-	{
+    /**
+     *	Function to build a document on disk using the generic odt module.
+     *
+     *	@param		User		$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
+     *  @param		int			$hidedetails		Do not show line details
+     *  @param		int			$hidedesc			Do not show desc
+     *  @param		int			$hideref			Do not show ref
+     *	@return		int         					1 if OK, <=0 if KO
+     */
+    function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+    {
         // 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;
-		}
-
-		// Add odtgeneration hook
-		if (! is_object($hookmanager))
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
-		}
-		$hookmanager->initHooks(array('odtgeneration'));
-		global $action;
-
-		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", "companies", "bills", "dict"));
-
-		if ($conf->user->dir_output)
-		{
-			// If $object is id instead of object
-			if (! is_object($object))
-			{
-				$id = $object;
-				$object = new User($this->db);
-				$result=$object->fetch($id);
-				if ($result < 0)
-				{
-					dol_print_error($this->db,$object->error);
-					return -1;
-				}
-			}
-
-			$dir = $conf->user->dir_output;
-			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
-
-			if (! file_exists($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('/\.od(t|s)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
-
-				$newfiletmp=$objectref.'_'.$newfiletmp;
-
-				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
-				{
-					$filename=$newfiletmp.'.'.$newfileformat;
-				}
-				$file=$dir.'/'.$filename;
-				//print "newdir=".$dir;
-				//print "newfile=".$newfile;
-				//print "file=".$file;
-				//print "conf->user->dir_temp=".$conf->user->dir_temp;
-
-				dol_mkdir($conf->user->dir_temp);
-
-
-				// If CUSTOMER contact defined on user, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
-				}
-
-				// Recipient name
-				if (! empty($usecontact))
-				{
-					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
-                        			$socobject = $object->thirdparty;
-                        			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
-                        			$contactobject = $object->contact;
-                    			}
-				}
-				else
-				{
-					$socobject=$object->thirdparty;
-				}
-
-				// Open and load template
-				require_once ODTPHP_PATH.'odf.php';
-				try {
-					$odfHandler = new odf(
-						$srctemplatepath,
-						array(
-							'PATH_TO_TMP'	  => $conf->user->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();
-					dol_syslog($e->getMessage(), LOG_WARNING);
-					return -1;
-				}
-
-				// Make substitutions into odt
-				$array_user=$this->get_substitutionarray_user($object,$outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
-				// retrieve contact information for use in object as contact_xxx tags
-				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
-
-				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_other,$array_thirdparty_contact);
-				complete_substitutions_array($tmparray, $outputlangs, $object);
-				$object->fetch_optionals();
-				// 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
-				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_WARNING);
-					}
-				}
-
-				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
-					{
-						dol_syslog($e->getMessage(), LOG_WARNING);
-					}
-				}
-
-				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				$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_WARNING);
-						return -1;
-					}
-				}
-				else {
-					try {
-						$odfHandler->saveToDisk($file);
-					} catch (Exception $e) {
-						$this->error=$e->getMessage();
-						dol_syslog($e->getMessage(), LOG_WARNING);
-						return -1;
-					}
-				}
-
-				$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;
-	}
+        global $user, $langs, $conf, $mysoc, $hookmanager;
+
+        if (empty($srctemplatepath))
+        {
+            dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+            return -1;
+        }
+
+        // Add odtgeneration hook
+        if (! is_object($hookmanager))
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+            $hookmanager=new HookManager($this->db);
+        }
+        $hookmanager->initHooks(array('odtgeneration'));
+        global $action;
+
+        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", "companies", "bills", "dict"));
+
+        if ($conf->user->dir_output)
+        {
+            // If $object is id instead of object
+            if (! is_object($object))
+            {
+                $id = $object;
+                $object = new User($this->db);
+                $result=$object->fetch($id);
+                if ($result < 0)
+                {
+                    dol_print_error($this->db,$object->error);
+                    return -1;
+                }
+            }
+
+            $dir = $conf->user->dir_output;
+            $objectref = dol_sanitizeFileName($object->ref);
+            if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+            $file = $dir . "/" . $objectref . ".odt";
+
+            if (! file_exists($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('/\.od(t|s)/i','',$newfile);
+                $newfiletmp=preg_replace('/template_/i','',$newfiletmp);
+                $newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+
+                $newfiletmp=$objectref.'_'.$newfiletmp;
+
+                // Get extension (ods or odt)
+                $newfileformat=substr($newfile, strrpos($newfile, '.')+1);
+                if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+                {
+                    $format=$conf->global->MAIN_DOC_USE_TIMING;
+                    if ($format == '1') $format='%Y%m%d%H%M%S';
+                    $filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+                }
+                else
+                {
+                    $filename=$newfiletmp.'.'.$newfileformat;
+                }
+                $file=$dir.'/'.$filename;
+                //print "newdir=".$dir;
+                //print "newfile=".$newfile;
+                //print "file=".$file;
+                //print "conf->user->dir_temp=".$conf->user->dir_temp;
+
+                dol_mkdir($conf->user->dir_temp);
+
+
+                // If CUSTOMER contact defined on user, we use it
+                $usecontact=false;
+                $arrayidcontact=$object->getIdContact('external','CUSTOMER');
+                if (count($arrayidcontact) > 0)
+                {
+                    $usecontact=true;
+                    $result=$object->fetch_contact($arrayidcontact[0]);
+                }
+
+                // Recipient name
+                if (! empty($usecontact))
+                {
+                    // On peut utiliser le nom de la societe du contact
+                    if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+                    else {
+                                    $socobject = $object->thirdparty;
+                                    // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+                                    $contactobject = $object->contact;
+                                }
+                }
+                else
+                {
+                    $socobject=$object->thirdparty;
+                }
+
+                // Open and load template
+                require_once ODTPHP_PATH.'odf.php';
+                try {
+                    $odfHandler = new odf(
+                        $srctemplatepath,
+                        array(
+                            'PATH_TO_TMP'	  => $conf->user->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();
+                    dol_syslog($e->getMessage(), LOG_WARNING);
+                    return -1;
+                }
+
+                // Make substitutions into odt
+                $array_user=$this->get_substitutionarray_user($object,$outputlangs);
+                $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+                $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+                $array_other=$this->get_substitutionarray_other($outputlangs);
+                // retrieve contact information for use in object as contact_xxx tags
+                $array_thirdparty_contact = array();
+                if ($usecontact && is_object($contactobject)) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+
+                $tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_other,$array_thirdparty_contact);
+                complete_substitutions_array($tmparray, $outputlangs, $object);
+                $object->fetch_optionals();
+                // 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
+                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_WARNING);
+                    }
+                }
+
+                // Replace labels translated
+                $tmparray=$outputlangs->get_translations_for_substitutions();
+                foreach($tmparray as $key=>$value)
+                {
+                    try {
+                        $odfHandler->setVars($key, $value, true, 'UTF-8');
+                    }
+                    catch (OdfException $e)
+                    {
+                        dol_syslog($e->getMessage(), LOG_WARNING);
+                    }
+                }
+
+                // Call the beforeODTSave hook
+                $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+                $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_WARNING);
+                        return -1;
+                    }
+                }
+                else {
+                    try {
+                        $odfHandler->saveToDisk($file);
+                    } catch (Exception $e) {
+                        $this->error=$e->getMessage();
+                        dol_syslog($e->getMessage(), LOG_WARNING);
+                        return -1;
+                    }
+                }
+
+                $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;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -452,12 +452,12 @@ 
     function get_substitutionarray_object($object,$outputlangs,$array_key='object')
     {
         // phpcs:enable
-		$array_other = array();
-		foreach($object as $key => $value) {
-			if (!is_array($value) && !is_object($value)) {
-				$array_other[$array_key.'_'.$key] = $value;
-			}
-		}
-		return $array_other;
-	}
+        $array_other = array();
+        foreach($object as $key => $value) {
+            if (!is_array($value) && !is_object($value)) {
+                $array_other[$array_key.'_'.$key] = $value;
+            }
+        }
+        return $array_other;
+    }
 }

Spacing +138 added lines, -138 removed lines

@@ -65,37 +65,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 = 'USER_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'USER_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 USER_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 = 1;               // 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 USER_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 = 1; // 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->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 	}
 
 
@@ -115,91 +115,91 @@ 
 		$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="USER_ADDON_PDF_ODT_PATH">';
+		$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="USER_ADDON_PDF_ODT_PATH">';
 		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
 		{
-			$texte.= '<input type="hidden" name="param2" value="USER_ADDON_PDF_ODT_DEFAULT">';
-			$texte.= '<input type="hidden" name="param3" value="USER_ADDON_PDF_ODT_TOBILL">';
-			$texte.= '<input type="hidden" name="param4" value="USER_ADDON_PDF_ODT_CLOSED">';
+			$texte .= '<input type="hidden" name="param2" value="USER_ADDON_PDF_ODT_DEFAULT">';
+			$texte .= '<input type="hidden" name="param3" value="USER_ADDON_PDF_ODT_TOBILL">';
+			$texte .= '<input type="hidden" name="param4" value="USER_ADDON_PDF_ODT_CLOSED">';
 		}
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$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->USER_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->USER_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->USER_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->USER_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
 		if (count($listofdir))
 		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
 			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
 			{
 				// Model for creation
-				$liste=ModelePDFUser::liste_modeles($this->db);
-				$texte.= '<table width="50%;">';
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value2',$liste,$conf->global->USER_ADDON_PDF_ODT_DEFAULT);
-				$texte.= "</td></tr>";
-
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value3',$liste,$conf->global->USER_ADDON_PDF_ODT_TOBILL);
-				$texte.= "</td></tr>";
-				$texte.= '<tr>';
-
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value4',$liste,$conf->global->USER_ADDON_PDF_ODT_CLOSED);
-				$texte.= "</td></tr>";
-				$texte.= '</table>';
+				$liste = ModelePDFUser::liste_modeles($this->db);
+				$texte .= '<table width="50%;">';
+				$texte .= '<tr>';
+				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
+				$texte .= '<td colspan="">';
+				$texte .= $form->selectarray('value2', $liste, $conf->global->USER_ADDON_PDF_ODT_DEFAULT);
+				$texte .= "</td></tr>";
+
+				$texte .= '<tr>';
+				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
+				$texte .= '<td colspan="">';
+				$texte .= $form->selectarray('value3', $liste, $conf->global->USER_ADDON_PDF_ODT_TOBILL);
+				$texte .= "</td></tr>";
+				$texte .= '<tr>';
+
+				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
+				$texte .= '<td colspan="">';
+				$texte .= $form->selectarray('value4', $liste, $conf->global->USER_ADDON_PDF_ODT_CLOSED);
+				$texte .= "</td></tr>";
+				$texte .= '</table>';
 			}
 		}
 
-		$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;
 	}
@@ -216,7 +216,7 @@ 
 	 *  @param		int			$hideref			Do not show ref
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
+	function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
         // phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
@@ -228,17 +228,17 @@ 
 		}
 
 		// Add odtgeneration hook
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		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", "companies", "bills", "dict"));
@@ -246,28 +246,28 @@ 
 		if ($conf->user->dir_output)
 		{
 			// If $object is id instead of object
-			if (! is_object($object))
+			if (!is_object($object))
 			{
 				$id = $object;
 				$object = new User($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;
 				}
 			}
 
 			$dir = $conf->user->dir_output;
 			$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))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -275,26 +275,26 @@ 
 			if (file_exists($dir))
 			{
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.od(t|s)/i','',$newfile);
-				$newfiletmp=preg_replace('/template_/i','',$newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i','',$newfiletmp);
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp=$objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 
 				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
+				    $format = $conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
 				else
 				{
-					$filename=$newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file=$dir.'/'.$filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -304,19 +304,19 @@ 
 
 
 				// If CUSTOMER contact defined on user, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 				if (count($arrayidcontact) > 0)
 				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
+					$usecontact = true;
+					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
-				if (! empty($usecontact))
+				if (!empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
                         			$socobject = $object->thirdparty;
                         			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
@@ -325,7 +325,7 @@ 
 				}
 				else
 				{
-					$socobject=$object->thirdparty;
+					$socobject = $object->thirdparty;
 				}
 
 				// Open and load template
@@ -335,38 +335,38 @@ 
 						$srctemplatepath,
 						array(
 							'PATH_TO_TMP'	  => $conf->user->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();
 					dol_syslog($e->getMessage(), LOG_WARNING);
 					return -1;
 				}
 
 				// Make substitutions into odt
-				$array_user=$this->get_substitutionarray_user($object,$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_user = $this->get_substitutionarray_user($object, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
 
-				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_other,$array_thirdparty_contact);
+				$tmparray = array_merge($array_user, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				$object->fetch_optionals();
 				// 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
-				foreach($tmparray as $key=>$value)
+				$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
+				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');
@@ -376,15 +376,15 @@ 
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}
 
 				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -396,15 +396,15 @@ 
 				}
 
 				// Call the beforeODTSave hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				$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);
+				$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();
+						$this->error = $e->getMessage();
 						dol_syslog($e->getMessage(), LOG_WARNING);
 						return -1;
 					}
@@ -413,26 +413,26 @@ 
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-						$this->error=$e->getMessage();
+						$this->error = $e->getMessage();
 						dol_syslog($e->getMessage(), LOG_WARNING);
 						return -1;
 					}
 				}
 
-				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$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;
 			}
 		}
@@ -449,11 +449,11 @@ 
      * @param string        $array_key      key for array
      * @return array                        array of substitutions
      */
-    function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+    function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
     {
         // phpcs:enable
 		$array_other = array();
-		foreach($object as $key => $value) {
+		foreach ($object as $key => $value) {
 			if (!is_array($value) && !is_object($value)) {
 				$array_other[$array_key.'_'.$key] = $value;
 			}

Braces +41 added lines, -30 removed lines

@@ -95,7 +95,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 	}
 
 
@@ -139,11 +142,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");
@@ -236,7 +242,9 @@ 
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		$sav_charset_output=$outputlangs->charset_output;
 		$outputlangs->charset_output='UTF-8';
 
@@ -260,7 +268,9 @@ 
 
 			$dir = $conf->user->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
+			if (! preg_match('/specimen/i',$objectref)) {
+			    $dir.= "/" . $objectref;
+			}
 			$file = $dir . "/" . $objectref . ".odt";
 
 			if (! file_exists($dir))
@@ -287,10 +297,11 @@ 
 				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
 				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
+				    if ($format == '1') {
+				        $format='%Y%m%d%H%M%S';
+				    }
 					$filename=$newfiletmp.'-'.dol_print_date(dol_now(),$format).'.'.$newfileformat;
-				}
-				else
+				} else
 				{
 					$filename=$newfiletmp.'.'.$newfileformat;
 				}
@@ -316,14 +327,14 @@ 
 				if (! empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
-					else {
+					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+					    $socobject = $object->contact;
+					} else {
                         			$socobject = $object->thirdparty;
                         			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         			$contactobject = $object->contact;
                     			}
-				}
-				else
+				} else
 				{
 					$socobject=$object->thirdparty;
 				}
@@ -340,8 +351,7 @@ 
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error=$e->getMessage();
 					dol_syslog($e->getMessage(), LOG_WARNING);
@@ -355,7 +365,9 @@ 
 				$array_other=$this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				if ($usecontact && is_object($contactobject)) {
+				    $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
+				}
 
 				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_other,$array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -366,17 +378,18 @@ 
 				foreach($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/',$key)) // Image
+						if (preg_match('/logo$/',$key)) {
+						    // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else {
+							    $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else    // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch(OdfException $e)
+					} catch(OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -388,8 +401,7 @@ 
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -408,8 +420,7 @@ 
 						dol_syslog($e->getMessage(), LOG_WARNING);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -421,16 +432,16 @@ 
 
 				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler=null;	// Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Success
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return -1;