alxarafe / alixar

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

Indentation +8 added lines, -8 removed lines

@@ -31,9 +31,9 @@ 
 {
 
     /**
-	 *   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)
     {
@@ -44,7 +44,7 @@ 
         // 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 Dolibarr web services server";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
@@ -59,10 +59,10 @@ 
 
         // 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->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("other");
 
         // Constants

Spacing +9 added lines, -9 removed lines

@@ -22,7 +22,7 @@ 
  *       \ingroup    webservices
  *       \brief      File to describe webservices module
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe a WebServices module
@@ -42,14 +42,14 @@ 
 
         $this->family = "interface";
         // 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 Dolibarr web services server";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Name of image file used for this module.
-        $this->picto='technic';
+        $this->picto = 'technic';
 
         // Data directories to create when module is enabled
         $this->dirs = array();
@@ -58,11 +58,11 @@ 
         $this->config_page_url = array("index.php@webservices");
 
         // 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("other");
 
         // Constants
@@ -77,6 +77,6 @@ 
         // Permissions
         $this->rights = array();
         $this->rights_class = 'webservices';
-        $r=0;
+        $r = 0;
     }
 }

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

Indentation +170 added lines, -170 removed lines

@@ -31,121 +31,121 @@ 
  */
 class modEmailCollector extends DolibarrModules
 {
-	/**
-	 * Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
+    /**
+     * Constructor. Define names, constants, directories, boxes, permissions
+     *
+     * @param DoliDB $db Database handler
+     */
+    public function __construct($db)
+    {
         global $langs,$conf;
 
         $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 = 50320;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'emailcollector';
-
-		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
-		// It is used to group modules by family in module setup page
-		$this->family = "interface";
-		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '12';
-		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
-
-		// Module label (no space allowed), used if translation string 'ModuledavName' not found (MyModue is name of module).
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuledavDesc' not found (MyModue is name of module).
-		$this->description = "EmailCollectorDescription";
-		// Used only if file README.md and README-LL.md not found.
-		$this->descriptionlong = "EmailCollectorDescription";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = 'experimental';
-		// Key used in llx_const table to save module status enabled/disabled (where DAV 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.
-		// 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='email';
-
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /dav/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /dav/core/modules/barcode)
-		// for specific css file (eg: /dav/css/dav.css.php)
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/dav/temp","/dav/subdir");
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page, stored into dav/admin directory, to use to setup module.
-		$this->config_page_url = array("emailcollector_list.php");
-
-		// 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->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("admin");
-		$this->phpmin = array(5,4);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(7,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->automatic_activation = array('FR'=>'davWasAutomaticallyActivatedBecauseOfYourCountryChoice');
-		//$this->always_enabled = true;								// If true, can't be disabled
-
-		// 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('DAV_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('DAV_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array(
-			//1=>array('DAV_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
-		);
-
-
-		if (! isset($conf->dav) || ! isset($conf->dav->enabled))
-		{
-			$conf->dav=new stdClass();
-			$conf->dav->enabled=0;
-		}
-
-
-		// Array to add new pages in new tabs
+        // 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 = 50320;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'emailcollector';
+
+        // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+        // It is used to group modules by family in module setup page
+        $this->family = "interface";
+        // Module position in the family on 2 digits ('01', '10', '20', ...)
+        $this->module_position = '12';
+        // Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+        //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+
+        // Module label (no space allowed), used if translation string 'ModuledavName' not found (MyModue is name of module).
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module description, used if translation string 'ModuledavDesc' not found (MyModue is name of module).
+        $this->description = "EmailCollectorDescription";
+        // Used only if file README.md and README-LL.md not found.
+        $this->descriptionlong = "EmailCollectorDescription";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+        $this->version = 'experimental';
+        // Key used in llx_const table to save module status enabled/disabled (where DAV 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.
+        // 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='email';
+
+        // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+        // for default path (eg: /dav/core/xxxxx) (0=disable, 1=enable)
+        // for specific path of parts (eg: /dav/core/modules/barcode)
+        // for specific css file (eg: /dav/css/dav.css.php)
+        $this->module_parts = array();
+
+        // Data directories to create when module is enabled.
+        // Example: this->dirs = array("/dav/temp","/dav/subdir");
+        $this->dirs = array();
+
+        // Config pages. Put here list of php page, stored into dav/admin directory, to use to setup module.
+        $this->config_page_url = array("emailcollector_list.php");
+
+        // 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->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("admin");
+        $this->phpmin = array(5,4);					// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(7,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->automatic_activation = array('FR'=>'davWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+        //$this->always_enabled = true;								// If true, can't be disabled
+
+        // 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('DAV_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+        //                             1=>array('DAV_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+        // );
+        $this->const = array(
+            //1=>array('DAV_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+        );
+
+
+        if (! isset($conf->dav) || ! isset($conf->dav->enabled))
+        {
+            $conf->dav=new stdClass();
+            $conf->dav->enabled=0;
+        }
+
+
+        // Array to add new pages in new tabs
         $this->tabs = array();
-		// Example:
-		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@dav:$user->rights->dav->read:/dav/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+        // Example:
+        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@dav:$user->rights->dav->read:/dav/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
         // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@dav:$user->rights->othermodule->read:/dav/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
         // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
         //
         // Where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
+        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+        // 'contact'          to add a tab in contact view
+        // 'contract'         to add a tab in contract view
+        // 'group'            to add a tab in group view
+        // 'intervention'     to add a tab in intervention view
+        // 'invoice'          to add a tab in customer invoice view
+        // 'invoice_supplier' to add a tab in supplier invoice view
+        // 'member'           to add a tab in fundation member view
+        // 'opensurveypoll'	  to add a tab in opensurvey poll view
+        // 'order'            to add a tab in customer order view
+        // 'order_supplier'   to add a tab in supplier order view
+        // 'payment'		  to add a tab in payment view
+        // 'payment_supplier' to add a tab in supplier payment view
+        // 'product'          to add a tab in product view
+        // 'propal'           to add a tab in propal view
+        // 'project'          to add a tab in project view
+        // 'stock'            to add a tab in stock view
+        // 'thirdparty'       to add a tab in third party view
+        // 'user'             to add a tab in user view
 
 
         // Dictionaries
-		$this->dictionaries=array();
+        $this->dictionaries=array();
         /* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@dav',
@@ -163,25 +163,25 @@ 
 
 
         // Boxes/Widgets
-		// Add here list of php file(s) stored in dav/core/boxes that contains class to show a widget.
+        // Add here list of php file(s) stored in dav/core/boxes that contains class to show a widget.
         $this->boxes = array(
-        	//0=>array('file'=>'davwidget1.php@dav','note'=>'Widget provided by dav','enabledbydefaulton'=>'Home'),
-        	//1=>array('file'=>'davwidget2.php@dav','note'=>'Widget provided by dav'),
-        	//2=>array('file'=>'davwidget3.php@dav','note'=>'Widget provided by dav')
+            //0=>array('file'=>'davwidget1.php@dav','note'=>'Widget provided by dav','enabledbydefaulton'=>'Home'),
+            //1=>array('file'=>'davwidget2.php@dav','note'=>'Widget provided by dav'),
+            //2=>array('file'=>'davwidget3.php@dav','note'=>'Widget provided by dav')
         );
 
 
-		// Cronjobs (List of cron jobs entries to add when module is enabled)
-		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
-		$this->cronjobs = array(
-			0=>array('label'=>'Email collector', 'priority'=>50, 'jobtype'=>'method', 'class'=>'/emailcollector/class/emailcollector.class.php', 'objectname'=>'EmailCollector', 'method'=>'doCollect', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>5, 'unitfrequency'=>60, 'status'=>1, 'test'=>'$conf->emailcollector->enabled')
-		);
+        // Cronjobs (List of cron jobs entries to add when module is enabled)
+        // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+        $this->cronjobs = array(
+            0=>array('label'=>'Email collector', 'priority'=>50, 'jobtype'=>'method', 'class'=>'/emailcollector/class/emailcollector.class.php', 'objectname'=>'EmailCollector', 'method'=>'doCollect', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>5, 'unitfrequency'=>60, 'status'=>1, 'test'=>'$conf->emailcollector->enabled')
+        );
 
 
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
 
-		/*
+        /*
 		$r=0;
 		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read myobject of dav';	// Permission label
@@ -204,14 +204,14 @@ 
 		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->dav->level1->level2)
 		*/
 
-		// 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
+        // Add here entries to declare new menus
 
-		/* BEGIN MODULEBUILDER TOPMENU */
-		/*$this->menu[$r++]=array('fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+        /* BEGIN MODULEBUILDER TOPMENU */
+        /*$this->menu[$r++]=array('fk_menu'=>'',			                // '' if this is a top menu. For left menu, 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 Top menu entry
 								'titre'=>'dav',
 								'mainmenu'=>'dav',
@@ -224,9 +224,9 @@ 
 								'target'=>'',
 								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
 		*/
-		/* END MODULEBUILDER TOPMENU */
+        /* END MODULEBUILDER TOPMENU */
 
-		/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT
+        /* BEGIN MODULEBUILDER LEFTMENU MYOBJECT
 		$this->menu[$r++]=array(	'fk_menu'=>'fk_mainmenu=dav',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'left',			                // This is a Left menu entry
 								'titre'=>'List MyObject',
@@ -254,11 +254,11 @@ 
 		END MODULEBUILDER LEFTMENU MYOBJECT */
 
 
-		// Exports
-		$r=1;
+        // Exports
+        $r=1;
 
-		/* BEGIN MODULEBUILDER EXPORT MYOBJECT */
-		/*
+        /* BEGIN MODULEBUILDER EXPORT MYOBJECT */
+        /*
 		$langs->load("dav@dav");
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='MyObjectLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
@@ -273,48 +273,48 @@ 
 		$this->export_sql_end[$r] .=' WHERE 1 = 1';
 		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('myobject').')';
 		$r++; */
-		/* END MODULEBUILDER EXPORT MYOBJECT */
-	}
-
-	/**
-	 *	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
-	 *
+        /* END MODULEBUILDER EXPORT MYOBJECT */
+    }
+
+    /**
+     *	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
+     */
+    public function init($options='')
+    {
+        //$this->_load_tables('/dav/sql/');
+
+        // Create extrafields
+        include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+        $extrafields = new ExtraFields($this->db);
+
+        //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1 '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+
+        $sql = array();
+
+        return $this->_init($sql, $options);
+    }
+
+    /**
+     *	Function called when module is disabled.
+     *	Remove from database constants, boxes and permissions from Dolibarr database.
+     *	Data directories are not deleted
+     *
      *	@param      string	$options    Options when enabling module ('', 'noboxes')
-	 *	@return     int             	1 if OK, 0 if KO
-	 */
-	public function init($options='')
-	{
-		//$this->_load_tables('/dav/sql/');
-
-		// Create extrafields
-		include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-
-		//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1 '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-
-		$sql = array();
-
-		return $this->_init($sql, $options);
-	}
-
-	/**
-	 *	Function called when module is disabled.
-	 *	Remove from database constants, boxes and permissions from Dolibarr database.
-	 *	Data directories are not deleted
-	 *
-	 *	@param      string	$options    Options when enabling module ('', 'noboxes')
-	 *	@return     int             	1 if OK, 0 if KO
-	 */
-	public function remove($options = '')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
+     *	@return     int             	1 if OK, 0 if KO
+     */
+    public function remove($options = '')
+    {
+        $sql = array();
+
+        return $this->_remove($sql, $options);
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -23,7 +23,7 @@ 
  *  \ingroup    dav
  *  \brief      Description and activation file for module dav
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -38,7 +38,7 @@ 
 	 */
 	public function __construct($db)
 	{
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->db = $db;
 
@@ -57,7 +57,7 @@ 
 		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
 
 		// Module label (no space allowed), used if translation string 'ModuledavName' not found (MyModue is name 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 'ModuledavDesc' not found (MyModue is name of module).
 		$this->description = "EmailCollectorDescription";
 		// Used only if file README.md and README-LL.md not found.
@@ -70,7 +70,7 @@ 
 		// 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='email';
+		$this->picto = 'email';
 
 		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
 		// for default path (eg: /dav/core/xxxxx) (0=disable, 1=enable)
@@ -86,15 +86,15 @@ 
 		$this->config_page_url = array("emailcollector_list.php");
 
 		// 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->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('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("admin");
-		$this->phpmin = array(5,4);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(7,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->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(7, 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->automatic_activation = array('FR'=>'davWasAutomaticallyActivatedBecauseOfYourCountryChoice');
 		//$this->always_enabled = true;								// If true, can't be disabled
 
@@ -108,10 +108,10 @@ 
 		);
 
 
-		if (! isset($conf->dav) || ! isset($conf->dav->enabled))
+		if (!isset($conf->dav) || !isset($conf->dav->enabled))
 		{
-			$conf->dav=new stdClass();
-			$conf->dav->enabled=0;
+			$conf->dav = new stdClass();
+			$conf->dav->enabled = 0;
 		}
 
 
@@ -145,7 +145,7 @@ 
 
 
         // Dictionaries
-		$this->dictionaries=array();
+		$this->dictionaries = array();
         /* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@dav',
@@ -179,7 +179,7 @@ 
 
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
+		$this->rights = array(); // Permission array used by this module
 
 		/*
 		$r=0;
@@ -205,8 +205,8 @@ 
 		*/
 
 		// 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
 
@@ -255,7 +255,7 @@ 
 
 
 		// Exports
-		$r=1;
+		$r = 1;
 
 		/* BEGIN MODULEBUILDER EXPORT MYOBJECT */
 		/*
@@ -284,7 +284,7 @@ 
      *	@param      string	$options    Options when enabling module ('', 'noboxes')
 	 *	@return     int             	1 if OK, 0 if KO
 	 */
-	public function init($options='')
+	public function init($options = '')
 	{
 		//$this->_load_tables('/dav/sql/');
 

dolibarr/htdocs/core/modules/action/modules_action.php

Indentation +77 added lines, -77 removed lines

@@ -29,9 +29,9 @@ 
 abstract class ModeleAction extends CommonDocGenerator
 {
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -72,86 +72,86 @@ 
 function action_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
     // phpcs:enable
-	global $conf,$langs,$user;
-	$langs->load("action");
-
-	$error=0;
-
-	$srctemplatepath='';
-
-	// Positionne modele sur le nom du modele de fichinter a utiliser
-	if (! dol_strlen($modele))
-	{
-		if (! empty($conf->global->ACTION_EVENT_ADDON_PDF))
-		{
-			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
-		}
-		else
-		{
-			$modele = 'soleil';
-		}
-	}
-
-	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
+    global $conf,$langs,$user;
+    $langs->load("action");
+
+    $error=0;
+
+    $srctemplatepath='';
+
+    // Positionne modele sur le nom du modele de fichinter a utiliser
+    if (! dol_strlen($modele))
+    {
+        if (! empty($conf->global->ACTION_EVENT_ADDON_PDF))
+        {
+            $modele = $conf->global->ACTION_EVENT_ADDON_PDF;
+        }
+        else
+        {
+            $modele = 'soleil';
+        }
+    }
+
+    // If selected modele is a filename template (then $modele="modelname:filename")
+    $tmp=explode(':',$modele,2);
     if (! empty($tmp[1]))
     {
         $modele=$tmp[0];
         $srctemplatepath=$tmp[1];
     }
 
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-    	foreach(array('doc','pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
-
-    		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/action/doc/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
+    // Search template files
+    $file=''; $classname=''; $filefound=0;
+    $dirmodels=array('/');
+    if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+    foreach($dirmodels as $reldir)
+    {
+        foreach(array('doc','pdf') as $prefix)
+        {
+            $file = $prefix."_".$modele.".modules.php";
+
+            // On verifie l'emplacement du modele
+            $file=dol_buildpath($reldir."core/modules/action/doc/".$file,0);
+            if (file_exists($file))
+            {
+                $filefound=1;
+                $classname=$prefix.'_'.$modele;
+                break;
+            }
+        }
+        if ($filefound) break;
     }
 
-	// Charge le modele
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db);
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// We delete old preview
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"action_pdf_create Error: ".$obj->error);
-			return 0;
-		}
-	}
-	else
-	{
-		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-		return 0;
-	}
+    // Charge le modele
+    if ($filefound)
+    {
+        require_once $file;
+
+        $obj = new $classname($db);
+
+        // We save charset_output to restore it because write_file can change it if needed for
+        // output format that does not support UTF8.
+        $sav_charset_output=$outputlangs->charset_output;
+        if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
+        {
+            $outputlangs->charset_output=$sav_charset_output;
+
+            // We delete old preview
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            dol_delete_preview($object);
+
+            return 1;
+        }
+        else
+        {
+            $outputlangs->charset_output=$sav_charset_output;
+            dol_print_error($db,"action_pdf_create Error: ".$obj->error);
+            return 0;
+        }
+    }
+    else
+    {
+        print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
+        return 0;
+    }
 }

Spacing +28 added lines, -28 removed lines

@@ -31,7 +31,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -41,16 +41,16 @@ 
      *  @param	integer		$maxfilenamelength  Max length of value to show
      * 	@return	array							List of templates
      */
-    static function liste_modeles($db,$maxfilenamelength=0)
+    static function liste_modeles($db, $maxfilenamelength = 0)
     {
         // phpcs:enable
         global $conf;
 
-        $type='action';
-        $liste=array();
+        $type = 'action';
+        $liste = array();
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $liste=getListOfModels($db,$type,$maxfilenamelength);
+        $liste = getListOfModels($db, $type, $maxfilenamelength);
 
         return $liste;
     }
@@ -69,20 +69,20 @@ 
  *  @param  int			$hideref        Hide ref
  *  @return int         				0 if KO, 1 if OK
  */
-function action_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 {
     // phpcs:enable
-	global $conf,$langs,$user;
+	global $conf, $langs, $user;
 	$langs->load("action");
 
-	$error=0;
+	$error = 0;
 
-	$srctemplatepath='';
+	$srctemplatepath = '';
 
 	// Positionne modele sur le nom du modele de fichinter a utiliser
-	if (! dol_strlen($modele))
+	if (!dol_strlen($modele))
 	{
-		if (! empty($conf->global->ACTION_EVENT_ADDON_PDF))
+		if (!empty($conf->global->ACTION_EVENT_ADDON_PDF))
 		{
 			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
 		}
@@ -93,29 +93,29 @@ 
 	}
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
+	$tmp = explode(':', $modele, 2);
+    if (!empty($tmp[1]))
     {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
+        $modele = $tmp[0];
+        $srctemplatepath = $tmp[1];
     }
 
 	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array('/');
+	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
 	{
-    	foreach(array('doc','pdf') as $prefix)
+    	foreach (array('doc', 'pdf') as $prefix)
     	{
     	    $file = $prefix."_".$modele.".modules.php";
 
     		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/action/doc/".$file,0);
+	        $file = dol_buildpath($reldir."core/modules/action/doc/".$file, 0);
     		if (file_exists($file))
     		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
+    			$filefound = 1;
+    			$classname = $prefix.'_'.$modele;
     			break;
     		}
     	}
@@ -131,10 +131,10 @@ 
 
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
+		$sav_charset_output = $outputlangs->charset_output;
 		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
 		{
-			$outputlangs->charset_output=$sav_charset_output;
+			$outputlangs->charset_output = $sav_charset_output;
 
 			// We delete old preview
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -144,14 +144,14 @@ 
 		}
 		else
 		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"action_pdf_create Error: ".$obj->error);
+			$outputlangs->charset_output = $sav_charset_output;
+			dol_print_error($db, "action_pdf_create Error: ".$obj->error);
 			return 0;
 		}
 	}
 	else
 	{
-		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
+		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 		return 0;
 	}
 }

Braces +9 added lines, -8 removed lines

@@ -85,8 +85,7 @@ 
 		if (! empty($conf->global->ACTION_EVENT_ADDON_PDF))
 		{
 			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
-		}
-		else
+		} else
 		{
 			$modele = 'soleil';
 		}
@@ -103,7 +102,9 @@ 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
 	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+	if (is_array($conf->modules_parts['models'])) {
+	    $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+	}
 	foreach($dirmodels as $reldir)
 	{
     	foreach(array('doc','pdf') as $prefix)
@@ -119,7 +120,9 @@ 
     			break;
     		}
     	}
-    	if ($filefound) break;
+    	if ($filefound) {
+    	    break;
+    	}
     }
 
 	// Charge le modele
@@ -141,15 +144,13 @@ 
 			dol_delete_preview($object);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			dol_print_error($db,"action_pdf_create Error: ".$obj->error);
 			return 0;
 		}
-	}
-	else
+	} else
 	{
 		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
 		return 0;

dolibarr/htdocs/core/modules/action/rapport.pdf.php

Indentation +255 added lines, -255 removed lines

@@ -35,115 +35,115 @@ 
  */
 class CommActionRapport
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string description
-	 */
-	public $description;
+    /**
+     * @var string description
+     */
+    public $description;
 
-	public $date_edition;
+    public $date_edition;
 
-	public $year;
+    public $year;
 
-	public $month;
+    public $month;
 
-	public $title;
+    public $title;
 
-	public $subject;
+    public $subject;
 
-	public $marge_gauche;
+    public $marge_gauche;
 
-	public	$marge_droite;
+    public	$marge_droite;
 
-	public	$marge_haute;
+    public	$marge_haute;
 
-	public	$marge_basse;
+    public	$marge_basse;
 
 
-	/**
-	 * Constructor
-	 *
-	 * @param 	DoliDB	$db		Database handler
-	 * @param	int		$month	Month
-	 * @param	int		$year	Year
-	 */
-	function __construct($db, $month, $year)
-	{
-		global $conf, $langs;
+    /**
+     * Constructor
+     *
+     * @param 	DoliDB	$db		Database handler
+     * @param	int		$month	Month
+     * @param	int		$year	Year
+     */
+    function __construct($db, $month, $year)
+    {
+        global $conf, $langs;
 
-		// Load translation files required by the page
+        // Load translation files required by the page
         $langs->loadLangs(array("commercial","projects"));
 
-		$this->db = $db;
-		$this->description = "";
-		$this->date_edition = time();
-		$this->month = $month;
-		$this->year = $year;
-
-		// Dimension page pour format A4
-		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
-		$this->page_largeur = $formatarray['width'];
-		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+        $this->db = $db;
+        $this->description = "";
+        $this->date_edition = time();
+        $this->month = $month;
+        $this->year = $year;
+
+        // Dimension page pour format A4
+        $this->type = 'pdf';
+        $formatarray=pdf_getFormat();
+        $this->page_largeur = $formatarray['width'];
+        $this->page_hauteur = $formatarray['height'];
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+        $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+        $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+        $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
 
         $this->title=$langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
         $this->subject=$langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
-	}
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *      Write the object to document file to disk
      *
      *      @param	int			$socid			Thirdparty id
      *      @param  int			$catid			Cat id
      *      @param  Translate	$outputlangs    Lang object for output language
      *      @return int             			1=OK, 0=KO
-	 */
-	function write_file($socid = 0, $catid = 0, $outputlangs='')
-	{
+     */
+    function write_file($socid = 0, $catid = 0, $outputlangs='')
+    {
         // phpcs:enable
-		global $user,$conf,$langs,$hookmanager;
+        global $user,$conf,$langs,$hookmanager;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
 
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
 
         $dir = $conf->agenda->dir_temp."/";
-		$file = $dir . "actions-".$this->month."-".$this->year.".pdf";
-
-		if (! file_exists($dir))
-		{
-			if (dol_mkdir($dir) < 0)
-			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-
-		if (file_exists($dir))
-		{
-			// Add pdfgeneration hook
-			if (! is_object($hookmanager))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-				$hookmanager=new HookManager($this->db);
-			}
-			$hookmanager->initHooks(array('pdfgeneration'));
-			$parameters=array('file'=>$file, 'outputlangs'=>$outputlangs);
-			global $action;
-			$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        $file = $dir . "actions-".$this->month."-".$this->year.".pdf";
+
+        if (! file_exists($dir))
+        {
+            if (dol_mkdir($dir) < 0)
+            {
+                $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+
+        if (file_exists($dir))
+        {
+            // Add pdfgeneration hook
+            if (! is_object($hookmanager))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+                $hookmanager=new HookManager($this->db);
+            }
+            $hookmanager->initHooks(array('pdfgeneration'));
+            $parameters=array('file'=>$file, 'outputlangs'=>$outputlangs);
+            global $action;
+            $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
             $pdf=pdf_getInstance($this->format);
             $heightforinfotot = 50;	// Height reserved to output the info and total part
@@ -158,204 +158,204 @@ 
             }
             $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-			$pdf->Open();
-			$pagenb=0;
-			$pdf->SetDrawColor(128,128,128);
-			$pdf->SetFillColor(220,220,220);
+            $pdf->Open();
+            $pagenb=0;
+            $pdf->SetDrawColor(128,128,128);
+            $pdf->SetFillColor(220,220,220);
 
-			$pdf->SetTitle($outputlangs->convToOutputCharset($this->title));
-			$pdf->SetSubject($outputlangs->convToOutputCharset($this->subject));
-			$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-			$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-			$pdf->SetKeywords($outputlangs->convToOutputCharset($this->title." ".$this->subject));
+            $pdf->SetTitle($outputlangs->convToOutputCharset($this->title));
+            $pdf->SetSubject($outputlangs->convToOutputCharset($this->subject));
+            $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+            $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+            $pdf->SetKeywords($outputlangs->convToOutputCharset($this->title." ".$this->subject));
 
-			$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+            $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
-			$nbpage = $this->_pages($pdf, $outputlangs);
+            $nbpage = $this->_pages($pdf, $outputlangs);
 
-			if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
-			$pdf->Close();
+            if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+            $pdf->Close();
 
-			$pdf->Output($file,'F');
+            $pdf->Output($file,'F');
 
-			// Add pdfgeneration hook
-			if (! is_object($hookmanager))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-				$hookmanager=new HookManager($this->db);
-			}
-			$hookmanager->initHooks(array('pdfgeneration'));
-			$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-			global $action;
-			$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+            // Add pdfgeneration hook
+            if (! is_object($hookmanager))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+                $hookmanager=new HookManager($this->db);
+            }
+            $hookmanager->initHooks(array('pdfgeneration'));
+            $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+            global $action;
+            $reshook=$hookmanager->executeHooks('afterPDFCreation',$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));
 
-			$this->result = array('fullpath'=>$file);
+            $this->result = array('fullpath'=>$file);
 
-			return 1;
-		}
-	}
+            return 1;
+        }
+    }
 
-	/**
-	 * Write content of pages
-	 *
-	 * @param   PDF			$pdf			Object pdf
+    /**
+     * Write content of pages
+     *
+     * @param   PDF			$pdf			Object pdf
      * @param	Translate   $outputlangs	Object langs
-	 * @return  int							1
-	 */
-	function _pages(&$pdf, $outputlangs)
-	{
-		global $conf;
-
-		$height=3;		// height for text separation
-		$pagenb=1;
-
-		$y=$this->_pagehead($pdf, $outputlangs, $pagenb);
-		$y++;
-		$pdf->SetFont('','',8);
-
-		$sql = "SELECT s.nom as thirdparty, s.rowid as socid, s.client,";
-		$sql.= " a.id, a.datep as dp, a.datep2 as dp2,";
-		$sql.= " a.fk_contact, a.note, a.percent as percent, a.label, a.fk_project,";
-		$sql.= " c.code, c.libelle,";
-		$sql.= " u.login";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
+     * @return  int							1
+     */
+    function _pages(&$pdf, $outputlangs)
+    {
+        global $conf;
+
+        $height=3;		// height for text separation
+        $pagenb=1;
+
+        $y=$this->_pagehead($pdf, $outputlangs, $pagenb);
+        $y++;
+        $pdf->SetFont('','',8);
+
+        $sql = "SELECT s.nom as thirdparty, s.rowid as socid, s.client,";
+        $sql.= " a.id, a.datep as dp, a.datep2 as dp2,";
+        $sql.= " a.fk_contact, a.note, a.percent as percent, a.label, a.fk_project,";
+        $sql.= " c.code, c.libelle,";
+        $sql.= " u.login";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-		$sql.= " WHERE c.id=a.fk_action AND a.fk_user_author = u.rowid";
-		$sql.= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($this->year,$this->month,false))."'";
-		$sql.= " AND '".$this->db->idate(dol_get_last_day($this->year,$this->month,false))."'";
-		$sql.= " AND a.entity = ".$conf->entity;
-		$sql.= " ORDER BY a.datep DESC";
-
-		$eventstatic=new ActionComm($this->db);
-		$projectstatic=new Project($this->db);
-
-		dol_syslog(get_class($this)."::_page", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			$y0=$y1=$y2=$y3=0;
-
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$eventstatic->id=$obj->id;
-				$eventstatic->percentage=$obj->percent;
-				$eventstatic->fulldayevent=$obj->fulldayevent;
-				$eventstatic->punctual=$obj->punctual;
-
-				$y = max($y, $pdf->GetY(), $y0, $y1, $y2, $y3);
-
-				// Calculate height of text
-				$text='';
-				if (! preg_match('/^'.preg_quote($obj->label).'/',$obj->note)) $text=$obj->label."\n";
-				$text.=$obj->note;
-				$text=dol_trunc(dol_htmlentitiesbr_decode($text),150);
-				// Add status to text
-				$text.="\n";
-				$status=dol_htmlentitiesbr_decode($eventstatic->getLibStatut(1,1));
-				$text.=$status;
-				if ($obj->fk_project > 0)
-				{
-					$projectstatic->fetch($obj->fk_project);
-					$text.=($status?' - ':'').$outputlangs->transnoentitiesnoconv("Project").": ".dol_htmlentitiesbr_decode($projectstatic->getNomUrl(0, 'nolink'));
-				}
-
-				//print 'd'.$text; exit;
-				$nboflines=dol_nboflines($text);
-				$heightlinemax=max(2*$height,$nboflines*$height);
-				// Check if there is enough space to print record
-				if ((1+$y+$heightlinemax) >= ($this->page_hauteur - $this->marge_haute))
-				{
-					// We need to break page
-					$pagenb++;
-					$y=$this->_pagehead($pdf, $outputlangs, $pagenb);
-					$y++;
-					$pdf->SetFont('','',8);
-				}
-				$y++;
-
-				// Date
-				$pdf->SetXY($this->marge_gauche, $y);
-				$textdate = dol_print_date($this->db->jdate($obj->dp),"day")."\n".dol_print_date($this->db->jdate($obj->dp),"hour");
-				if ($obj->dp2) {
-					if (dol_print_date($this->db->jdate($obj->dp),"day") != dol_print_date($this->db->jdate($obj->dp2),"day"))
-						$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
-					else
-						$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
-				}
-				$pdf->MultiCell(22, $height, $textdate, 0, 'L', 0);
-				$y0 = $pdf->GetY();
-
-				// Third party
-				$pdf->SetXY(26, $y);
-				$pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($obj->thirdparty),32), 0, 'L', 0);
-				$y1 = $pdf->GetY();
-
-				// Action code
-				$code=$obj->code;
-				if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-				{
-					if ($code == 'AC_OTH')      $code='AC_MANUAL';
-					if ($code == 'AC_OTH_AUTO') $code='AC_AUTO';
-				}
-				$pdf->SetXY(60,$y);
-				$labelactiontype = $outputlangs->transnoentitiesnoconv("Action".$code);
-				$labelactiontypeshort = $outputlangs->transnoentitiesnoconv("Action".$code.'Short');
-				$pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($labelactiontypeshort == "Action".$code.'Short' ? $labelactiontype : $labelactiontypeshort),32), 0, 'L', 0);
-				$y2 = $pdf->GetY();
-
-				// Description of event
-				$pdf->SetXY(106,$y);
-				$pdf->MultiCell(94, $height, $outputlangs->convToOutputCharset($text), 0, 'L', 0);
-				$y3 = $pdf->GetY();
-
-				$i++;
-			}
-		}
-
-		return 1;
-	}
-
-	/**
-	 *  Show top header of page.
-	 *
-	 * 	@param	PDF			$pdf     		Object PDF
-	 *  @param  Translate	$outputlangs	Object lang for output
-	 * 	@param	int			$pagenb			Page nb
-	 *  @return	integer
-	 */
-	function _pagehead(&$pdf, $outputlangs, $pagenb)
-	{
-		global $conf,$langs;
-
-		// Do not add the BACKGROUND as this is a report
-		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
-
-		// New page
-		$pdf->AddPage();
-
-		// Show title
-		$pdf->SetFont('','B',10);
-		$pdf->SetXY($this->marge_gauche, $this->marge_haute);
-		$pdf->MultiCell(120, 1, $outputlangs->convToOutputCharset($this->title), 0, 'L', 0);
+        $sql.= " WHERE c.id=a.fk_action AND a.fk_user_author = u.rowid";
+        $sql.= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($this->year,$this->month,false))."'";
+        $sql.= " AND '".$this->db->idate(dol_get_last_day($this->year,$this->month,false))."'";
+        $sql.= " AND a.entity = ".$conf->entity;
+        $sql.= " ORDER BY a.datep DESC";
+
+        $eventstatic=new ActionComm($this->db);
+        $projectstatic=new Project($this->db);
+
+        dol_syslog(get_class($this)."::_page", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            $y0=$y1=$y2=$y3=0;
+
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $eventstatic->id=$obj->id;
+                $eventstatic->percentage=$obj->percent;
+                $eventstatic->fulldayevent=$obj->fulldayevent;
+                $eventstatic->punctual=$obj->punctual;
+
+                $y = max($y, $pdf->GetY(), $y0, $y1, $y2, $y3);
+
+                // Calculate height of text
+                $text='';
+                if (! preg_match('/^'.preg_quote($obj->label).'/',$obj->note)) $text=$obj->label."\n";
+                $text.=$obj->note;
+                $text=dol_trunc(dol_htmlentitiesbr_decode($text),150);
+                // Add status to text
+                $text.="\n";
+                $status=dol_htmlentitiesbr_decode($eventstatic->getLibStatut(1,1));
+                $text.=$status;
+                if ($obj->fk_project > 0)
+                {
+                    $projectstatic->fetch($obj->fk_project);
+                    $text.=($status?' - ':'').$outputlangs->transnoentitiesnoconv("Project").": ".dol_htmlentitiesbr_decode($projectstatic->getNomUrl(0, 'nolink'));
+                }
+
+                //print 'd'.$text; exit;
+                $nboflines=dol_nboflines($text);
+                $heightlinemax=max(2*$height,$nboflines*$height);
+                // Check if there is enough space to print record
+                if ((1+$y+$heightlinemax) >= ($this->page_hauteur - $this->marge_haute))
+                {
+                    // We need to break page
+                    $pagenb++;
+                    $y=$this->_pagehead($pdf, $outputlangs, $pagenb);
+                    $y++;
+                    $pdf->SetFont('','',8);
+                }
+                $y++;
+
+                // Date
+                $pdf->SetXY($this->marge_gauche, $y);
+                $textdate = dol_print_date($this->db->jdate($obj->dp),"day")."\n".dol_print_date($this->db->jdate($obj->dp),"hour");
+                if ($obj->dp2) {
+                    if (dol_print_date($this->db->jdate($obj->dp),"day") != dol_print_date($this->db->jdate($obj->dp2),"day"))
+                        $textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+                    else
+                        $textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+                }
+                $pdf->MultiCell(22, $height, $textdate, 0, 'L', 0);
+                $y0 = $pdf->GetY();
+
+                // Third party
+                $pdf->SetXY(26, $y);
+                $pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($obj->thirdparty),32), 0, 'L', 0);
+                $y1 = $pdf->GetY();
+
+                // Action code
+                $code=$obj->code;
+                if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
+                {
+                    if ($code == 'AC_OTH')      $code='AC_MANUAL';
+                    if ($code == 'AC_OTH_AUTO') $code='AC_AUTO';
+                }
+                $pdf->SetXY(60,$y);
+                $labelactiontype = $outputlangs->transnoentitiesnoconv("Action".$code);
+                $labelactiontypeshort = $outputlangs->transnoentitiesnoconv("Action".$code.'Short');
+                $pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($labelactiontypeshort == "Action".$code.'Short' ? $labelactiontype : $labelactiontypeshort),32), 0, 'L', 0);
+                $y2 = $pdf->GetY();
+
+                // Description of event
+                $pdf->SetXY(106,$y);
+                $pdf->MultiCell(94, $height, $outputlangs->convToOutputCharset($text), 0, 'L', 0);
+                $y3 = $pdf->GetY();
+
+                $i++;
+            }
+        }
+
+        return 1;
+    }
+
+    /**
+     *  Show top header of page.
+     *
+     * 	@param	PDF			$pdf     		Object PDF
+     *  @param  Translate	$outputlangs	Object lang for output
+     * 	@param	int			$pagenb			Page nb
+     *  @return	integer
+     */
+    function _pagehead(&$pdf, $outputlangs, $pagenb)
+    {
+        global $conf,$langs;
+
+        // Do not add the BACKGROUND as this is a report
+        //pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+        // New page
+        $pdf->AddPage();
+
+        // Show title
+        $pdf->SetFont('','B',10);
+        $pdf->SetXY($this->marge_gauche, $this->marge_haute);
+        $pdf->MultiCell(120, 1, $outputlangs->convToOutputCharset($this->title), 0, 'L', 0);
         // Show page nb only on iso languages (so default Helvetica font)
         if (pdf_getPDFFont($outputlangs) == 'Helvetica')
         {
-		    $pdf->SetXY($this->page_largeur-$this->marge_droite-40, $this->marge_haute);
+            $pdf->SetXY($this->page_largeur-$this->marge_droite-40, $this->marge_haute);
             $pdf->MultiCell(40, 1, $pagenb.'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
         }
 
-		$y=$pdf->GetY()+2;
+        $y=$pdf->GetY()+2;
 
-		$pdf->Rect($this->marge_gauche, $y, ($this->page_largeur - $this->marge_gauche - $this->marge_droite), ($this->page_hauteur - $this->marge_haute - $this->marge_basse));
-		$y=$pdf->GetY()+1;
+        $pdf->Rect($this->marge_gauche, $y, ($this->page_largeur - $this->marge_gauche - $this->marge_droite), ($this->page_hauteur - $this->marge_haute - $this->marge_basse));
+        $y=$pdf->GetY()+1;
 
-		return $y;
-	}
+        return $y;
+    }
 }

Spacing +90 added lines, -90 removed lines

@@ -76,7 +76,7 @@ 
 		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("commercial","projects"));
+        $langs->loadLangs(array("commercial", "projects"));
 
 		$this->db = $db;
 		$this->description = "";
@@ -86,17 +86,17 @@ 
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
-        $this->title=$langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
-        $this->subject=$langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
+
+        $this->title = $langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
+        $this->subject = $langs->transnoentitiesnoconv("ActionsReport").' '.$this->year."-".$this->month;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -108,26 +108,26 @@ 
      *      @param  Translate	$outputlangs    Lang object for output language
      *      @return int             			1=OK, 0=KO
 	 */
-	function write_file($socid = 0, $catid = 0, $outputlangs='')
+	function write_file($socid = 0, $catid = 0, $outputlangs = '')
 	{
         // phpcs:enable
-		global $user,$conf,$langs,$hookmanager;
+		global $user, $conf, $langs, $hookmanager;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
 
         $dir = $conf->agenda->dir_temp."/";
-		$file = $dir . "actions-".$this->month."-".$this->year.".pdf";
+		$file = $dir."actions-".$this->month."-".$this->year.".pdf";
 
-		if (! file_exists($dir))
+		if (!file_exists($dir))
 		{
 			if (dol_mkdir($dir) < 0)
 			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
@@ -135,21 +135,21 @@ 
 		if (file_exists($dir))
 		{
 			// Add pdfgeneration 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('pdfgeneration'));
-			$parameters=array('file'=>$file, 'outputlangs'=>$outputlangs);
+			$parameters = array('file'=>$file, 'outputlangs'=>$outputlangs);
 			global $action;
-			$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-            $pdf=pdf_getInstance($this->format);
-            $heightforinfotot = 50;	// Height reserved to output the info and total part
-            $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-            $pdf->SetAutoPageBreak(1,0);
+            $pdf = pdf_getInstance($this->format);
+            $heightforinfotot = 50; // Height reserved to output the info and total part
+            $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+            $pdf->SetAutoPageBreak(1, 0);
 
             if (class_exists('TCPDF'))
             {
@@ -159,9 +159,9 @@ 
             $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 			$pdf->Open();
-			$pagenb=0;
-			$pdf->SetDrawColor(128,128,128);
-			$pdf->SetFillColor(220,220,220);
+			$pagenb = 0;
+			$pdf->SetDrawColor(128, 128, 128);
+			$pdf->SetFillColor(220, 220, 220);
 
 			$pdf->SetTitle($outputlangs->convToOutputCharset($this->title));
 			$pdf->SetSubject($outputlangs->convToOutputCharset($this->subject));
@@ -169,27 +169,27 @@ 
 			$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 			$pdf->SetKeywords($outputlangs->convToOutputCharset($this->title." ".$this->subject));
 
-			$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+			$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 			$nbpage = $this->_pages($pdf, $outputlangs);
 
-			if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+			if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 			$pdf->Close();
 
-			$pdf->Output($file,'F');
+			$pdf->Output($file, 'F');
 
 			// Add pdfgeneration 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('pdfgeneration'));
-			$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+			$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 			global $action;
-			$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('afterPDFCreation', $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));
 
 			$this->result = array('fullpath'=>$file);
@@ -209,109 +209,109 @@ 
 	{
 		global $conf;
 
-		$height=3;		// height for text separation
-		$pagenb=1;
+		$height = 3; // height for text separation
+		$pagenb = 1;
 
-		$y=$this->_pagehead($pdf, $outputlangs, $pagenb);
+		$y = $this->_pagehead($pdf, $outputlangs, $pagenb);
 		$y++;
-		$pdf->SetFont('','',8);
+		$pdf->SetFont('', '', 8);
 
 		$sql = "SELECT s.nom as thirdparty, s.rowid as socid, s.client,";
-		$sql.= " a.id, a.datep as dp, a.datep2 as dp2,";
-		$sql.= " a.fk_contact, a.note, a.percent as percent, a.label, a.fk_project,";
-		$sql.= " c.code, c.libelle,";
-		$sql.= " u.login";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-		$sql.= " WHERE c.id=a.fk_action AND a.fk_user_author = u.rowid";
-		$sql.= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($this->year,$this->month,false))."'";
-		$sql.= " AND '".$this->db->idate(dol_get_last_day($this->year,$this->month,false))."'";
-		$sql.= " AND a.entity = ".$conf->entity;
-		$sql.= " ORDER BY a.datep DESC";
-
-		$eventstatic=new ActionComm($this->db);
-		$projectstatic=new Project($this->db);
+		$sql .= " a.id, a.datep as dp, a.datep2 as dp2,";
+		$sql .= " a.fk_contact, a.note, a.percent as percent, a.label, a.fk_project,";
+		$sql .= " c.code, c.libelle,";
+		$sql .= " u.login";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+		$sql .= " WHERE c.id=a.fk_action AND a.fk_user_author = u.rowid";
+		$sql .= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($this->year, $this->month, false))."'";
+		$sql .= " AND '".$this->db->idate(dol_get_last_day($this->year, $this->month, false))."'";
+		$sql .= " AND a.entity = ".$conf->entity;
+		$sql .= " ORDER BY a.datep DESC";
+
+		$eventstatic = new ActionComm($this->db);
+		$projectstatic = new Project($this->db);
 
 		dol_syslog(get_class($this)."::_page", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			$y0=$y1=$y2=$y3=0;
+			$y0 = $y1 = $y2 = $y3 = 0;
 
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$eventstatic->id=$obj->id;
-				$eventstatic->percentage=$obj->percent;
-				$eventstatic->fulldayevent=$obj->fulldayevent;
-				$eventstatic->punctual=$obj->punctual;
+				$eventstatic->id = $obj->id;
+				$eventstatic->percentage = $obj->percent;
+				$eventstatic->fulldayevent = $obj->fulldayevent;
+				$eventstatic->punctual = $obj->punctual;
 
 				$y = max($y, $pdf->GetY(), $y0, $y1, $y2, $y3);
 
 				// Calculate height of text
-				$text='';
-				if (! preg_match('/^'.preg_quote($obj->label).'/',$obj->note)) $text=$obj->label."\n";
-				$text.=$obj->note;
-				$text=dol_trunc(dol_htmlentitiesbr_decode($text),150);
+				$text = '';
+				if (!preg_match('/^'.preg_quote($obj->label).'/', $obj->note)) $text = $obj->label."\n";
+				$text .= $obj->note;
+				$text = dol_trunc(dol_htmlentitiesbr_decode($text), 150);
 				// Add status to text
-				$text.="\n";
-				$status=dol_htmlentitiesbr_decode($eventstatic->getLibStatut(1,1));
-				$text.=$status;
+				$text .= "\n";
+				$status = dol_htmlentitiesbr_decode($eventstatic->getLibStatut(1, 1));
+				$text .= $status;
 				if ($obj->fk_project > 0)
 				{
 					$projectstatic->fetch($obj->fk_project);
-					$text.=($status?' - ':'').$outputlangs->transnoentitiesnoconv("Project").": ".dol_htmlentitiesbr_decode($projectstatic->getNomUrl(0, 'nolink'));
+					$text .= ($status ? ' - ' : '').$outputlangs->transnoentitiesnoconv("Project").": ".dol_htmlentitiesbr_decode($projectstatic->getNomUrl(0, 'nolink'));
 				}
 
 				//print 'd'.$text; exit;
-				$nboflines=dol_nboflines($text);
-				$heightlinemax=max(2*$height,$nboflines*$height);
+				$nboflines = dol_nboflines($text);
+				$heightlinemax = max(2 * $height, $nboflines * $height);
 				// Check if there is enough space to print record
-				if ((1+$y+$heightlinemax) >= ($this->page_hauteur - $this->marge_haute))
+				if ((1 + $y + $heightlinemax) >= ($this->page_hauteur - $this->marge_haute))
 				{
 					// We need to break page
 					$pagenb++;
-					$y=$this->_pagehead($pdf, $outputlangs, $pagenb);
+					$y = $this->_pagehead($pdf, $outputlangs, $pagenb);
 					$y++;
-					$pdf->SetFont('','',8);
+					$pdf->SetFont('', '', 8);
 				}
 				$y++;
 
 				// Date
 				$pdf->SetXY($this->marge_gauche, $y);
-				$textdate = dol_print_date($this->db->jdate($obj->dp),"day")."\n".dol_print_date($this->db->jdate($obj->dp),"hour");
+				$textdate = dol_print_date($this->db->jdate($obj->dp), "day")."\n".dol_print_date($this->db->jdate($obj->dp), "hour");
 				if ($obj->dp2) {
-					if (dol_print_date($this->db->jdate($obj->dp),"day") != dol_print_date($this->db->jdate($obj->dp2),"day"))
-						$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+					if (dol_print_date($this->db->jdate($obj->dp), "day") != dol_print_date($this->db->jdate($obj->dp2), "day"))
+						$textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
 					else
-						$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+						$textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
 				}
 				$pdf->MultiCell(22, $height, $textdate, 0, 'L', 0);
 				$y0 = $pdf->GetY();
 
 				// Third party
 				$pdf->SetXY(26, $y);
-				$pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($obj->thirdparty),32), 0, 'L', 0);
+				$pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($obj->thirdparty), 32), 0, 'L', 0);
 				$y1 = $pdf->GetY();
 
 				// Action code
-				$code=$obj->code;
+				$code = $obj->code;
 				if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 				{
-					if ($code == 'AC_OTH')      $code='AC_MANUAL';
-					if ($code == 'AC_OTH_AUTO') $code='AC_AUTO';
+					if ($code == 'AC_OTH')      $code = 'AC_MANUAL';
+					if ($code == 'AC_OTH_AUTO') $code = 'AC_AUTO';
 				}
-				$pdf->SetXY(60,$y);
+				$pdf->SetXY(60, $y);
 				$labelactiontype = $outputlangs->transnoentitiesnoconv("Action".$code);
 				$labelactiontypeshort = $outputlangs->transnoentitiesnoconv("Action".$code.'Short');
-				$pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($labelactiontypeshort == "Action".$code.'Short' ? $labelactiontype : $labelactiontypeshort),32), 0, 'L', 0);
+				$pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($labelactiontypeshort == "Action".$code.'Short' ? $labelactiontype : $labelactiontypeshort), 32), 0, 'L', 0);
 				$y2 = $pdf->GetY();
 
 				// Description of event
-				$pdf->SetXY(106,$y);
+				$pdf->SetXY(106, $y);
 				$pdf->MultiCell(94, $height, $outputlangs->convToOutputCharset($text), 0, 'L', 0);
 				$y3 = $pdf->GetY();
 
@@ -332,7 +332,7 @@ 
 	 */
 	function _pagehead(&$pdf, $outputlangs, $pagenb)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Do not add the BACKGROUND as this is a report
 		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
@@ -341,20 +341,20 @@ 
 		$pdf->AddPage();
 
 		// Show title
-		$pdf->SetFont('','B',10);
+		$pdf->SetFont('', 'B', 10);
 		$pdf->SetXY($this->marge_gauche, $this->marge_haute);
 		$pdf->MultiCell(120, 1, $outputlangs->convToOutputCharset($this->title), 0, 'L', 0);
         // Show page nb only on iso languages (so default Helvetica font)
         if (pdf_getPDFFont($outputlangs) == 'Helvetica')
         {
-		    $pdf->SetXY($this->page_largeur-$this->marge_droite-40, $this->marge_haute);
+		    $pdf->SetXY($this->page_largeur - $this->marge_droite - 40, $this->marge_haute);
             $pdf->MultiCell(40, 1, $pagenb.'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
         }
 
-		$y=$pdf->GetY()+2;
+		$y = $pdf->GetY() + 2;
 
 		$pdf->Rect($this->marge_gauche, $y, ($this->page_largeur - $this->marge_gauche - $this->marge_droite), ($this->page_hauteur - $this->marge_haute - $this->marge_basse));
-		$y=$pdf->GetY()+1;
+		$y = $pdf->GetY() + 1;
 
 		return $y;
 	}

Braces +26 added lines, -12 removed lines

@@ -113,9 +113,13 @@ 
         // phpcs:enable
 		global $user,$conf,$langs,$hookmanager;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
@@ -173,7 +177,9 @@ 
 
 			$nbpage = $this->_pages($pdf, $outputlangs);
 
-			if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+			if (method_exists($pdf,'AliasNbPages')) {
+			    $pdf->AliasNbPages();
+			}
 			$pdf->Close();
 
 			$pdf->Output($file,'F');
@@ -189,8 +195,9 @@ 
 			global $action;
 			$reshook=$hookmanager->executeHooks('afterPDFCreation',$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));
+			}
 
 			$this->result = array('fullpath'=>$file);
 
@@ -253,7 +260,9 @@ 
 
 				// Calculate height of text
 				$text='';
-				if (! preg_match('/^'.preg_quote($obj->label).'/',$obj->note)) $text=$obj->label."\n";
+				if (! preg_match('/^'.preg_quote($obj->label).'/',$obj->note)) {
+				    $text=$obj->label."\n";
+				}
 				$text.=$obj->note;
 				$text=dol_trunc(dol_htmlentitiesbr_decode($text),150);
 				// Add status to text
@@ -284,10 +293,11 @@ 
 				$pdf->SetXY($this->marge_gauche, $y);
 				$textdate = dol_print_date($this->db->jdate($obj->dp),"day")."\n".dol_print_date($this->db->jdate($obj->dp),"hour");
 				if ($obj->dp2) {
-					if (dol_print_date($this->db->jdate($obj->dp),"day") != dol_print_date($this->db->jdate($obj->dp2),"day"))
-						$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
-					else
-						$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+					if (dol_print_date($this->db->jdate($obj->dp),"day") != dol_print_date($this->db->jdate($obj->dp2),"day")) {
+											$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+					} else {
+											$textdate.= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+					}
 				}
 				$pdf->MultiCell(22, $height, $textdate, 0, 'L', 0);
 				$y0 = $pdf->GetY();
@@ -301,8 +311,12 @@ 
 				$code=$obj->code;
 				if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 				{
-					if ($code == 'AC_OTH')      $code='AC_MANUAL';
-					if ($code == 'AC_OTH_AUTO') $code='AC_AUTO';
+					if ($code == 'AC_OTH') {
+					    $code='AC_MANUAL';
+					}
+					if ($code == 'AC_OTH_AUTO') {
+					    $code='AC_AUTO';
+					}
 				}
 				$pdf->SetXY(60,$y);
 				$labelactiontype = $outputlangs->transnoentitiesnoconv("Action".$code);

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.
 	}
 }