alxarafe / alixar

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

Indentation +261 added lines, -261 removed lines

@@ -33,284 +33,284 @@
 class modUser extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->numero = 0;
-
-		$this->family = "hr";		// Family for module (or "base" if core module)
-		$this->module_position = '10';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion des utilisateurs (requis)";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='group';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/users/temp");
-
-		// Config pages
-		$this->config_page_url = array("user.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->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->langfiles = array("main","users","companies","members",'salaries');
-		$this->always_enabled = true;	// Can't be disabled
-
-		// Constants
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array(
-		    0=>array('file'=>'box_lastlogin.php','enabledbydefaulton'=>'Home'),
-		);
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'user';
-		$this->rights_admin_allowed = 1;	// Admin is always granted of permission (even when module is disabled)
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 251;
-		$this->rights[$r][1] = 'Consulter les autres utilisateurs';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'user';
-		$this->rights[$r][5] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 252;
-		$this->rights[$r][1] = 'Consulter les permissions des autres utilisateurs';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'user_advance';
-		$this->rights[$r][5] = 'readperms';
-
-		$r++;
-		$this->rights[$r][0] = 253;
-		$this->rights[$r][1] = 'Creer/modifier utilisateurs internes et externes';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'user';
-		$this->rights[$r][5] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 254;
-		$this->rights[$r][1] = 'Creer/modifier utilisateurs externes seulement';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'user_advance';
-		$this->rights[$r][5] = 'write';
-
-		$r++;
-		$this->rights[$r][0] = 255;
-		$this->rights[$r][1] = 'Modifier le mot de passe des autres utilisateurs';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'user';
-		$this->rights[$r][5] = 'password';
-
-		$r++;
-		$this->rights[$r][0] = 256;
-		$this->rights[$r][1] = 'Supprimer ou desactiver les autres utilisateurs';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'user';
-		$this->rights[$r][5] = 'supprimer';
-
-		$r++;
-		$this->rights[$r][0] = 341;
-		$this->rights[$r][1] = 'Consulter ses propres permissions';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'self_advance';        // Visible if option MAIN_USE_ADVANCED_PERMS is on
-		$this->rights[$r][5] = 'readperms';
-
-		$r++;
-		$this->rights[$r][0] = 342;
-		$this->rights[$r][1] = 'Creer/modifier ses propres infos utilisateur';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'self';
-		$this->rights[$r][5] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 343;
-		$this->rights[$r][1] = 'Modifier son propre mot de passe';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'self';
-		$this->rights[$r][5] = 'password';
-
-		$r++;
-		$this->rights[$r][0] = 344;
-		$this->rights[$r][1] = 'Modifier ses propres permissions';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'self_advance';          // Visible if option MAIN_USE_ADVANCED_PERMS is on
-		$this->rights[$r][5] = 'writeperms';
-
-		$r++;
-		$this->rights[$r][0] = 351;
-		$this->rights[$r][1] = 'Consulter les groupes';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'group_advance';        // Visible if option MAIN_USE_ADVANCED_PERMS is on
-		$this->rights[$r][5] = 'read';
-
-		$r++;
-		$this->rights[$r][0] = 352;
-		$this->rights[$r][1] = 'Consulter les permissions des groupes';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'group_advance';       // Visible if option MAIN_USE_ADVANCED_PERMS is on
-		$this->rights[$r][5] = 'readperms';
-
-		$r++;
-		$this->rights[$r][0] = 353;
-		$this->rights[$r][1] = 'Creer/modifier les groupes et leurs permissions';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'group_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
-		$this->rights[$r][5] = 'write';
-
-		$r++;
-		$this->rights[$r][0] = 354;
-		$this->rights[$r][1] = 'Supprimer ou desactiver les groupes';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'group_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
-		$this->rights[$r][5] = 'delete';
-
-		$r++;
-		$this->rights[$r][0] = 358;
-		$this->rights[$r][1] = 'Exporter les utilisateurs';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'user';
-		$this->rights[$r][5] = 'export';
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 0;
+
+        $this->family = "hr";		// Family for module (or "base" if core module)
+        $this->module_position = '10';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Gestion des utilisateurs (requis)";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='group';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/users/temp");
+
+        // Config pages
+        $this->config_page_url = array("user.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->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->langfiles = array("main","users","companies","members",'salaries');
+        $this->always_enabled = true;	// Can't be disabled
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array(
+            0=>array('file'=>'box_lastlogin.php','enabledbydefaulton'=>'Home'),
+        );
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'user';
+        $this->rights_admin_allowed = 1;	// Admin is always granted of permission (even when module is disabled)
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 251;
+        $this->rights[$r][1] = 'Consulter les autres utilisateurs';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'user';
+        $this->rights[$r][5] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 252;
+        $this->rights[$r][1] = 'Consulter les permissions des autres utilisateurs';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'user_advance';
+        $this->rights[$r][5] = 'readperms';
+
+        $r++;
+        $this->rights[$r][0] = 253;
+        $this->rights[$r][1] = 'Creer/modifier utilisateurs internes et externes';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'user';
+        $this->rights[$r][5] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 254;
+        $this->rights[$r][1] = 'Creer/modifier utilisateurs externes seulement';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'user_advance';
+        $this->rights[$r][5] = 'write';
+
+        $r++;
+        $this->rights[$r][0] = 255;
+        $this->rights[$r][1] = 'Modifier le mot de passe des autres utilisateurs';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'user';
+        $this->rights[$r][5] = 'password';
+
+        $r++;
+        $this->rights[$r][0] = 256;
+        $this->rights[$r][1] = 'Supprimer ou desactiver les autres utilisateurs';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'user';
+        $this->rights[$r][5] = 'supprimer';
+
+        $r++;
+        $this->rights[$r][0] = 341;
+        $this->rights[$r][1] = 'Consulter ses propres permissions';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'self_advance';        // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][5] = 'readperms';
+
+        $r++;
+        $this->rights[$r][0] = 342;
+        $this->rights[$r][1] = 'Creer/modifier ses propres infos utilisateur';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'self';
+        $this->rights[$r][5] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 343;
+        $this->rights[$r][1] = 'Modifier son propre mot de passe';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'self';
+        $this->rights[$r][5] = 'password';
+
+        $r++;
+        $this->rights[$r][0] = 344;
+        $this->rights[$r][1] = 'Modifier ses propres permissions';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'self_advance';          // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][5] = 'writeperms';
+
+        $r++;
+        $this->rights[$r][0] = 351;
+        $this->rights[$r][1] = 'Consulter les groupes';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'group_advance';        // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][5] = 'read';
+
+        $r++;
+        $this->rights[$r][0] = 352;
+        $this->rights[$r][1] = 'Consulter les permissions des groupes';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'group_advance';       // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][5] = 'readperms';
+
+        $r++;
+        $this->rights[$r][0] = 353;
+        $this->rights[$r][1] = 'Creer/modifier les groupes et leurs permissions';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'group_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][5] = 'write';
+
+        $r++;
+        $this->rights[$r][0] = 354;
+        $this->rights[$r][1] = 'Supprimer ou desactiver les groupes';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'group_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][5] = 'delete';
+
+        $r++;
+        $this->rights[$r][0] = 358;
+        $this->rights[$r][1] = 'Exporter les utilisateurs';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'user';
+        $this->rights[$r][5] = 'export';
 
 
         // Menus
         $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
 
-		// Exports
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='Liste des utilisateurs Dolibarr et attributs';
-		$this->export_permission[$r]=array(array("user","user","export"));
-		$this->export_fields_array[$r]=array(
-			'u.rowid'=>"Id",'u.login'=>"Login",'u.lastname'=>"Lastname",'u.firstname'=>"Firstname",'u.accountancy_code'=>"UserAccountancyCode",
-			'u.office_phone'=>'Phone','u.office_fax'=>'Fax','u.email'=>'EMail','u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",
-			'u.admin'=>"Administrator",'u.statut'=>'Status','u.note'=>"Note",'u.datelastlogin'=>'LastConnexion','u.datepreviouslogin'=>'PreviousConnexion',
-			'u.fk_socpeople'=>"IdContact",'u.fk_soc'=>"IdCompany",'u.fk_member'=>"MemberId"
-		);
-		$this->export_TypeFields_array[$r]=array(
-			'u.login'=>"Text",'u.lastname'=>"Text",'u.firstname'=>"Text",'u.accountancy_code'=>'Text','u.office_phone'=>'Text','u.office_fax'=>'Text',
-			'u.email'=>'Text','u.datec'=>"Date",'u.tms'=>"Date",'u.admin'=>"Boolean",'u.statut'=>'Status','u.note'=>"Text",'u.datelastlogin'=>'Date',
-			'u.datepreviouslogin'=>'Date','u.fk_soc'=>"List:societe:nom:rowid",'u.fk_member'=>"List:adherent:firstname"
-		);
-		$this->export_entities_array[$r]=array(
-			'u.rowid'=>"user",'u.login'=>"user",'u.lastname'=>"user",'u.firstname'=>"user",'u.accountancy_code'=>'user','u.office_phone'=>'user',
-			'u.office_fax'=>'user','u.email'=>'user','u.datec'=>"user",'u.tms'=>"user",'u.admin'=>"user",'u.statut'=>'user','u.note'=>"user",
-			'u.datelastlogin'=>'user','u.datepreviouslogin'=>'user','u.fk_socpeople'=>"contact",'u.fk_soc'=>"company",'u.fk_member'=>"member"
-		);
+        // Exports
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]='Liste des utilisateurs Dolibarr et attributs';
+        $this->export_permission[$r]=array(array("user","user","export"));
+        $this->export_fields_array[$r]=array(
+            'u.rowid'=>"Id",'u.login'=>"Login",'u.lastname'=>"Lastname",'u.firstname'=>"Firstname",'u.accountancy_code'=>"UserAccountancyCode",
+            'u.office_phone'=>'Phone','u.office_fax'=>'Fax','u.email'=>'EMail','u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",
+            'u.admin'=>"Administrator",'u.statut'=>'Status','u.note'=>"Note",'u.datelastlogin'=>'LastConnexion','u.datepreviouslogin'=>'PreviousConnexion',
+            'u.fk_socpeople'=>"IdContact",'u.fk_soc'=>"IdCompany",'u.fk_member'=>"MemberId"
+        );
+        $this->export_TypeFields_array[$r]=array(
+            'u.login'=>"Text",'u.lastname'=>"Text",'u.firstname'=>"Text",'u.accountancy_code'=>'Text','u.office_phone'=>'Text','u.office_fax'=>'Text',
+            'u.email'=>'Text','u.datec'=>"Date",'u.tms'=>"Date",'u.admin'=>"Boolean",'u.statut'=>'Status','u.note'=>"Text",'u.datelastlogin'=>'Date',
+            'u.datepreviouslogin'=>'Date','u.fk_soc'=>"List:societe:nom:rowid",'u.fk_member'=>"List:adherent:firstname"
+        );
+        $this->export_entities_array[$r]=array(
+            'u.rowid'=>"user",'u.login'=>"user",'u.lastname'=>"user",'u.firstname'=>"user",'u.accountancy_code'=>'user','u.office_phone'=>'user',
+            'u.office_fax'=>'user','u.email'=>'user','u.datec'=>"user",'u.tms'=>"user",'u.admin'=>"user",'u.statut'=>'user','u.note'=>"user",
+            'u.datelastlogin'=>'user','u.datepreviouslogin'=>'user','u.fk_socpeople'=>"contact",'u.fk_soc'=>"company",'u.fk_member'=>"member"
+        );
         if (empty($conf->adherent->enabled))
         {
             unset($this->export_fields_array[$r]['u.fk_member']);
             unset($this->export_entities_array[$r]['u.fk_member']);
         }
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
-		$this->export_sql_end[$r] .=' WHERE u.entity IN ('.getEntity('user').')';
-
-		// Imports
-		$r=0;
-
-		// Import list of users attributes
-		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]='ImportDataset_user_1';
-		$this->import_icon[$r]='user';
-		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('u'=>MAIN_DB_PREFIX.'user','extra'=>MAIN_DB_PREFIX.'user_extrafields');	// List of tables to insert into (insert done in same order)
-		$this->import_fields_array[$r]=array(
-			'u.lastname'=>"Name*",'u.firstname'=>"Firstname",'u.employee'=>"Employee*",'u.job'=>"Job",'u.gender'=>"Gender",'u.login'=>"Login*",
-			'u.pass_crypted'=>"Password",'u.admin'=>"Administrator",'u.fk_soc'=>"Company*",'u.address'=>"Address",'u.zip'=>"Zip",'u.town'=>"Town",
-			'u.fk_state'=>"StateId",'u.fk_country'=>"CountryCode",'u.office_phone'=>"Phone",'u.user_mobile'=>"Mobile",'u.office_fax'=>"Fax",
-			'u.email'=>"Email",'u.note'=>"Note",'u.signature'=>'Signature','u.fk_user'=>'Supervisor','u.thm'=>'THM','u.tjm'=>'TJM',
-			'u.dateemployment'=>'DateEmployment','u.salary'=>'Salary','u.color'=>'Color','u.api_key'=>'ApiKey','u.datec'=>"DateCreation"
-		);
-		// Add extra fields
-		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'user' AND entity IN (0,".$conf->entity.")";
-		$resql=$this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-		    while ($obj=$this->db->fetch_object($resql))
-		    {
-		        $fieldname='extra.'.$obj->name;
-		        $fieldlabel=ucfirst($obj->label);
-		        $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
-		    }
-		}
-		// End add extra fields
-		$this->import_fieldshidden_array[$r]=array('u.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'user');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_convertvalue_array[$r]=array(
-			'u.fk_state'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cstate.class.php','class'=>'Cstate','method'=>'fetch','dict'=>'DictionaryState'),
-		    'u.fk_country'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
-		    'u.salary'=>array('rule'=>'numeric')
-		);
-		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-		$this->import_regex_array[$r]=array(
-			'u.employee'=>'^[0|1]',
-			'u.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$'
-		);
-		$this->import_examplevalues_array[$r]=array(
-			'u.lastname'=>"Doe",'u.firstname'=>'John','u.login'=>'jdoe','u.employee'=>'0 or 1','u.status'=>"0 (closed) or 1 (active)",
-			'u.fk_soc'=>'0 (internal user) or company name (external user)','u.datec'=>dol_print_date(dol_now(),'%Y-%m-%d'),'u.address'=>"61 jump street",
-			'u.zip'=>"123456",'u.town'=>"Big town",'u.fk_country'=>'US, FR, DE...','u.office_phone'=>"0101010101",'u.office_fax'=>"0101010102",
-			'u.email'=>"test@mycompany.com",'u.salary'=>"10000",'u.note'=>"This is an example of note for record",'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00"
-		);
-		$this->import_updatekeys_array[$r]=array('u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>'Login');
-	}
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
+        $this->export_sql_end[$r] .=' WHERE u.entity IN ('.getEntity('user').')';
+
+        // Imports
+        $r=0;
+
+        // Import list of users attributes
+        $r++;
+        $this->import_code[$r]=$this->rights_class.'_'.$r;
+        $this->import_label[$r]='ImportDataset_user_1';
+        $this->import_icon[$r]='user';
+        $this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+        $this->import_tables_array[$r]=array('u'=>MAIN_DB_PREFIX.'user','extra'=>MAIN_DB_PREFIX.'user_extrafields');	// List of tables to insert into (insert done in same order)
+        $this->import_fields_array[$r]=array(
+            'u.lastname'=>"Name*",'u.firstname'=>"Firstname",'u.employee'=>"Employee*",'u.job'=>"Job",'u.gender'=>"Gender",'u.login'=>"Login*",
+            'u.pass_crypted'=>"Password",'u.admin'=>"Administrator",'u.fk_soc'=>"Company*",'u.address'=>"Address",'u.zip'=>"Zip",'u.town'=>"Town",
+            'u.fk_state'=>"StateId",'u.fk_country'=>"CountryCode",'u.office_phone'=>"Phone",'u.user_mobile'=>"Mobile",'u.office_fax'=>"Fax",
+            'u.email'=>"Email",'u.note'=>"Note",'u.signature'=>'Signature','u.fk_user'=>'Supervisor','u.thm'=>'THM','u.tjm'=>'TJM',
+            'u.dateemployment'=>'DateEmployment','u.salary'=>'Salary','u.color'=>'Color','u.api_key'=>'ApiKey','u.datec'=>"DateCreation"
+        );
+        // Add extra fields
+        $sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'user' AND entity IN (0,".$conf->entity.")";
+        $resql=$this->db->query($sql);
+        if ($resql)    // This can fail when class is used on old database (during migration for example)
+        {
+            while ($obj=$this->db->fetch_object($resql))
+            {
+                $fieldname='extra.'.$obj->name;
+                $fieldlabel=ucfirst($obj->label);
+                $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
+            }
+        }
+        // End add extra fields
+        $this->import_fieldshidden_array[$r]=array('u.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'user');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+        $this->import_convertvalue_array[$r]=array(
+            'u.fk_state'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cstate.class.php','class'=>'Cstate','method'=>'fetch','dict'=>'DictionaryState'),
+            'u.fk_country'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
+            'u.salary'=>array('rule'=>'numeric')
+        );
+        //$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
+        $this->import_regex_array[$r]=array(
+            'u.employee'=>'^[0|1]',
+            'u.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$'
+        );
+        $this->import_examplevalues_array[$r]=array(
+            'u.lastname'=>"Doe",'u.firstname'=>'John','u.login'=>'jdoe','u.employee'=>'0 or 1','u.status'=>"0 (closed) or 1 (active)",
+            'u.fk_soc'=>'0 (internal user) or company name (external user)','u.datec'=>dol_print_date(dol_now(),'%Y-%m-%d'),'u.address'=>"61 jump street",
+            'u.zip'=>"123456",'u.town'=>"Big town",'u.fk_country'=>'US, FR, DE...','u.office_phone'=>"0101010101",'u.office_fax'=>"0101010102",
+            'u.email'=>"test@mycompany.com",'u.salary'=>"10000",'u.note'=>"This is an example of note for record",'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00"
+        );
+        $this->import_updatekeys_array[$r]=array('u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>'Login');
+    }
 
 
     /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
+     *      @return     int             	1 if OK, 0 if KO
      */
-	function init($options='')
-	{
-		global $conf;
+    function init($options='')
+    {
+        global $conf;
 
-		// Permissions
-		$this->remove($options);
+        // Permissions
+        $this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
-		return $this->_init($sql,$options);
-	}
+        return $this->_init($sql,$options);
+    }
 }

dolibarr/htdocs/core/modules/modWebServicesClient.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 web service client to call external supplier web services";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'experimental';
         // 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

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

Indentation +103 added lines, -103 removed lines

@@ -30,115 +30,115 @@
  */
 class modCashDesk extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used module id).
-		$this->numero = 50100;
-		// Key text used to identify module (for permission, menus, etc...)
-		$this->rights_class = 'cashdesk';
-
-		$this->family = "portal";
-		$this->module_position = '55';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "CashDesk module";
-
-		$this->revision = '1.27';
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = 'list';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
-		$this->config_page_url = array("cashdesk.php@cashdesk");
-
-		// Dependencies
-		$this->hidden = false;			            // A condition to hide module
-		$this->depends = array('always'=>"modBanque", 'always'=>"modFacture", 'always'=>"modProduct", 'FR'=>'modBlockedLog');	// 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->phpmin = array(5,4);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(2,4);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("cashdesk");
-		$this->warnings_activation = array('FR'=>'WarningNoteModulePOSForFrenchLaw');                     // Warning to show when we activate module. array('always'='text') or array('FR'='text')
-		//$this->warnings_activation_ext = array('FR'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
-
-		// Constants
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 50101;
-		$this->rights[$r][1] = 'Use point of sale';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'use';
-
-		// Main menu entries
-		$this->menus = array();			// List of menus to add
-		$r=0;
-
-		// This is 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'=>'PointOfSaleShort',
-									'mainmenu'=>'cashdesk',
-									'url'=>'/cashdesk/index.php?user=__LOGIN__',
-									'langs'=>'cashdesk',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-									'position'=>900,
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used module id).
+        $this->numero = 50100;
+        // Key text used to identify module (for permission, menus, etc...)
+        $this->rights_class = 'cashdesk';
+
+        $this->family = "portal";
+        $this->module_position = '55';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "CashDesk module";
+
+        $this->revision = '1.27';
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto = 'list';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array();
+
+        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
+        $this->config_page_url = array("cashdesk.php@cashdesk");
+
+        // Dependencies
+        $this->hidden = false;			            // A condition to hide module
+        $this->depends = array('always'=>"modBanque", 'always'=>"modFacture", 'always'=>"modProduct", 'FR'=>'modBlockedLog');	// 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->phpmin = array(5,4);					// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(2,4);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("cashdesk");
+        $this->warnings_activation = array('FR'=>'WarningNoteModulePOSForFrenchLaw');                     // Warning to show when we activate module. array('always'='text') or array('FR'='text')
+        //$this->warnings_activation_ext = array('FR'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 50101;
+        $this->rights[$r][1] = 'Use point of sale';
+        $this->rights[$r][2] = 'a';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'use';
+
+        // Main menu entries
+        $this->menus = array();			// List of menus to add
+        $r=0;
+
+        // This is 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'=>'PointOfSaleShort',
+                                    'mainmenu'=>'cashdesk',
+                                    'url'=>'/cashdesk/index.php?user=__LOGIN__',
+                                    'langs'=>'cashdesk',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+                                    'position'=>900,
                                     'enabled'=>'$conf->cashdesk->enabled',
-		                            'perms'=>'$user->rights->cashdesk->use',		// Use 'perms'=>'1' if you want your menu with no permission rules
-									'target'=>'pointofsale',
-									'user'=>0);				// 0=Menu for internal users, 1=external users, 2=both
-
-		$r++;
-
-		// This is to declare a Left Menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'r=0',		// Use r=value where r is index key used for the top menu entry
-		//							'type'=>'left',			// This is a Left menu entry
-		//							'titre'=>'Title left menu',
-		//							'mainmenu'=>'mymodule',
-		//							'url'=>'/comm/action/index2.php',
-		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'perms'=>'$user->rights->mymodule->level1->level2',		// Use 'perms'=>'1' if you want your menu with no permission rules
-		//							'target'=>'',
-		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-	}
+                                    'perms'=>'$user->rights->cashdesk->use',		// Use 'perms'=>'1' if you want your menu with no permission rules
+                                    'target'=>'pointofsale',
+                                    'user'=>0);				// 0=Menu for internal users, 1=external users, 2=both
+
+        $r++;
+
+        // This is to declare a Left Menu entry:
+        // $this->menu[$r]=array(	'fk_menu'=>'r=0',		// Use r=value where r is index key used for the top menu entry
+        //							'type'=>'left',			// This is a Left menu entry
+        //							'titre'=>'Title left menu',
+        //							'mainmenu'=>'mymodule',
+        //							'url'=>'/comm/action/index2.php',
+        //							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+        //							'position'=>100,
+        //							'perms'=>'$user->rights->mymodule->level1->level2',		// Use 'perms'=>'1' if you want your menu with no permission rules
+        //							'target'=>'',
+        //							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+        // $r++;
+    }
 
 
     /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
+     *      @return     int             	1 if OK, 0 if KO
      */
-	function init($options='')
-  	{
-    	$sql = array();
+    function init($options='')
+        {
+        $sql = array();
 
-		// Remove permissions and default values
-		$this->remove($options);
+        // Remove permissions and default values
+        $this->remove($options);
 
-    	return $this->_init($sql,$options);
-  	}
+        return $this->_init($sql,$options);
+        }
 }

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

Indentation +61 added lines, -61 removed lines

@@ -33,66 +33,66 @@
 class modExport extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 240;
-
-		$this->family = "technic";
-		$this->module_position = '72';
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 240;
+
+        $this->family = "technic";
+        $this->module_position = '72';
         // 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 = "Outils d'exports de donnees Dolibarr (via un assistant)";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = 'technic';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/export/temp");
-
-		// Config pages
-		$this->config_page_url = array("export.php");
-
-		// Dependencies
-		$this->depends = array();
-		$this->requiredby = array();
-		$this->phpmin = array(4,2,0);
-		$this->phpmax = array();
-
-		// Constants
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'export';
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 1201;
-		$this->rights[$r][1] = 'Lire les exports';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 1202;
-		$this->rights[$r][1] = 'Creer/modifier un export';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'creer';
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-	}
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Outils d'exports de donnees Dolibarr (via un assistant)";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto = 'technic';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/export/temp");
+
+        // Config pages
+        $this->config_page_url = array("export.php");
+
+        // Dependencies
+        $this->depends = array();
+        $this->requiredby = array();
+        $this->phpmin = array(4,2,0);
+        $this->phpmax = array();
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'export';
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 1201;
+        $this->rights[$r][1] = 'Lire les exports';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 1202;
+        $this->rights[$r][1] = 'Creer/modifier un export';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'creer';
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+    }
 }

dolibarr/htdocs/core/modules/export/export_excel2007.modules.php

Indentation +60 added lines, -60 removed lines

@@ -33,104 +33,104 @@
  */
 class ExportExcel2007 extends ExportExcel
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	/**
+    /**
      * @var string label
      */
     public $label;
 
-	public $extension;
+    public $extension;
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	public $label_lib;
+    public $label_lib;
 
-	public $version_lib;
+    public $version_lib;
 
-	public $workbook;      // Handle fichier
+    public $workbook;      // Handle fichier
 
-	public $worksheet;     // Handle onglet
+    public $worksheet;     // Handle onglet
 
-	public $row;
+    public $row;
 
-	public $col;
+    public $col;
 
     public $file;          // To save filename
 
-	/**
-	 *	Constructor
-	 *
-	 *	@param	    DoliDB	$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs;
-		$this->db = $db;
-
-		$this->id='excel2007';                  // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Excel 2007';               // Label of driver
-		$this->desc = $langs->trans('Excel2007FormatDesc');
-		$this->extension='xlsx';             // Extension for generated file by this driver
+    /**
+     *	Constructor
+     *
+     *	@param	    DoliDB	$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs;
+        $this->db = $db;
+
+        $this->id='excel2007';                  // Same value then xxx in file name export_xxx.modules.php
+        $this->label='Excel 2007';               // Label of driver
+        $this->desc = $langs->trans('Excel2007FormatDesc');
+        $this->extension='xlsx';             // Extension for generated file by this driver
         $this->picto='mime/xls';			// Picto
-		$this->version='1.30';             // Driver version
+        $this->version='1.30';             // Driver version
 
-		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+        $this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
 
-		if (empty($this->disabled))
-		{
-    		// If driver use an external library, put its name here
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		{
-    			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
+        if (empty($this->disabled))
+        {
+            // If driver use an external library, put its name here
+            if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+            {
+                require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-    			$this->label_lib='PhpWriteExcel';
+                $this->label_lib='PhpWriteExcel';
                 $this->version_lib='unknown';
-    		}
-    		else
-    		{
+            }
+            else
+            {
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    			$this->label_lib='PhpExcel';
+                $this->label_lib='PhpExcel';
                 $this->version_lib='1.8.0';		// No way to get info from library
-    		}
-		}
+            }
+        }
 
-		$this->row=0;
-	}
+        $this->row=0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
      *  Close Excel file
      *
-	 *  @return		int							<0 if KO, >0 if OK
+     *  @return		int							<0 if KO, >0 if OK
      */
-	function close_file()
-	{
+    function close_file()
+    {
         // phpcs:enable
-		global $conf;
-
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    	{
-	        $this->workbook->close();
-    	}
-    	else
-    	{
+        global $conf;
+
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
+            $this->workbook->close();
+        }
+        else
+        {
             require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
-    	    $objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
+            $objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
             $objWriter->save($this->file);
             $this->workbook->disconnectWorksheets();
             unset($this->workbook);
-    	}
-		return 1;
-	}
+        }
+        return 1;
+    }
 }

dolibarr/htdocs/core/modules/export/export_excel.modules.php

Indentation +346 added lines, -346 removed lines

@@ -32,208 +32,208 @@ 
  */
 class ExportExcel extends ModeleExports
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
     /**
      * @var string Export Excel label
      */
     public $label;
 
-	public $extension;
+    public $extension;
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	public $label_lib;
+    public $label_lib;
 
-	public $version_lib;
+    public $version_lib;
 
-	public $workbook;      // Handle file
+    public $workbook;      // Handle file
 
-	public $worksheet;     // Handle sheet
+    public $worksheet;     // Handle sheet
 
-	public $row;
+    public $row;
 
-	public $col;
+    public $col;
 
     public $file;          // To save filename
 
 
-	/**
-	 *	Constructor
-	 *
-	 *	@param	    DoliDB	$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs;
-		$this->db = $db;
-
-		$this->id='excel';                  // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Excel 95';             // Label of driver
-		$this->desc = $langs->trans('Excel95FormatDesc');
-		$this->extension='xls';             // Extension for generated file by this driver
+    /**
+     *	Constructor
+     *
+     *	@param	    DoliDB	$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs;
+        $this->db = $db;
+
+        $this->id='excel';                  // Same value then xxx in file name export_xxx.modules.php
+        $this->label='Excel 95';             // Label of driver
+        $this->desc = $langs->trans('Excel95FormatDesc');
+        $this->extension='xls';             // Extension for generated file by this driver
         $this->picto='mime/xls';					// Picto
-		$this->version='1.30';             // Driver version
+        $this->version='1.30';             // Driver version
 
-		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+        $this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
 
-		if (empty($this->disabled))
-		{
-    		// If driver use an external library, put its name here
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		{
-    			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
+        if (empty($this->disabled))
+        {
+            // If driver use an external library, put its name here
+            if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+            {
+                require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-    			$this->label_lib='PhpWriteExcel';
+                $this->label_lib='PhpWriteExcel';
                 $this->version_lib='unknown';
-    		}
-    		else
-    		{
+            }
+            else
+            {
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    			$this->label_lib='PhpExcel';
+                $this->label_lib='PhpExcel';
                 $this->version_lib='1.8.0';		// No way to get info from library
-    		}
-		}
-
-		$this->row=0;
-	}
-
-	/**
-	 * getDriverId
-	 *
-	 * @return string
-	 */
-	function getDriverId()
-	{
-		return $this->id;
-	}
-
-	/**
-	 * getDriverLabel
-	 *
-	 * @return 	string			Return driver label
-	 */
-	function getDriverLabel()
-	{
-		return $this->label;
-	}
-
-	/**
-	 * getDriverDesc
-	 *
-	 * @return string
-	 */
-	function getDriverDesc()
+            }
+        }
+
+        $this->row=0;
+    }
+
+    /**
+     * getDriverId
+     *
+     * @return string
+     */
+    function getDriverId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * getDriverLabel
+     *
+     * @return 	string			Return driver label
+     */
+    function getDriverLabel()
+    {
+        return $this->label;
+    }
+
+    /**
+     * getDriverDesc
+     *
+     * @return string
+     */
+    function getDriverDesc()
     {
         return $this->desc;
     }
 
-	/**
-	 * getDriverExtension
-	 *
-	 * @return string
-	 */
+    /**
+     * getDriverExtension
+     *
+     * @return string
+     */
     function getDriverExtension()
-	{
-		return $this->extension;
-	}
-
-	/**
-	 * getDriverVersion
-	 *
-	 * @return string
-	 */
-	function getDriverVersion()
-	{
-		return $this->version;
-	}
-
-	/**
-	 * getLibLabel
-	 *
-	 * @return string
-	 */
-	function getLibLabel()
-	{
-		return $this->label_lib;
-	}
-
-	/**
-	 * getLibVersion
-	 *
-	 * @return string
-	 */
-	function getLibVersion()
-	{
-		return $this->version_lib;
-	}
+    {
+        return $this->extension;
+    }
+
+    /**
+     * getDriverVersion
+     *
+     * @return string
+     */
+    function getDriverVersion()
+    {
+        return $this->version;
+    }
+
+    /**
+     * getLibLabel
+     *
+     * @return string
+     */
+    function getLibLabel()
+    {
+        return $this->label_lib;
+    }
+
+    /**
+     * getLibVersion
+     *
+     * @return string
+     */
+    function getLibVersion()
+    {
+        return $this->version_lib;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Open output file
-	 *
-	 * 	@param		string		$file			File name to generate
-	 *  @param		Translate	$outputlangs	Output language object
-	 *	@return		int							<0 if KO, >=0 if OK
-	 */
-	function open_file($file,$outputlangs)
-	{
+    /**
+     *	Open output file
+     *
+     * 	@param		string		$file			File name to generate
+     *  @param		Translate	$outputlangs	Output language object
+     *	@return		int							<0 if KO, >=0 if OK
+     */
+    function open_file($file,$outputlangs)
+    {
         // phpcs:enable
-		global $user,$conf,$langs;
+        global $user,$conf,$langs;
 
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
-		}
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
+            $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+        }
 
-		dol_syslog(get_class($this)."::open_file file=".$file);
+        dol_syslog(get_class($this)."::open_file file=".$file);
         $this->file=$file;
 
-		$ret=1;
+        $ret=1;
 
-    	$outputlangs->load("exports");
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-		{
+        $outputlangs->load("exports");
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
             require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
             require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
             require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-		    $this->workbook = new writeexcel_workbookbig($file);
-    		$this->workbook->set_tempdir($conf->export->dir_temp);			// Set temporary directory
-    		$this->workbook->set_sheetname($outputlangs->trans("Sheet"));
-    		$this->worksheet = &$this->workbook->addworksheet();
-		}
-		else
-		{
+            $this->workbook = new writeexcel_workbookbig($file);
+            $this->workbook->set_tempdir($conf->export->dir_temp);			// Set temporary directory
+            $this->workbook->set_sheetname($outputlangs->trans("Sheet"));
+            $this->worksheet = &$this->workbook->addworksheet();
+        }
+        else
+        {
             require_once PHPEXCEL_PATH.'PHPExcel.php';
             require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
 
-		    if ($this->id == 'excel2007')
-		    {
-	            if (! class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
-	            {
-	            	$langs->load("errors");
-	            	$this->error=$langs->trans('ErrorPHPNeedModule','zip');
-	            	return -1;
-	            }
-		    }
-
-		    if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
-			    $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
-			    $cacheSettings = array (
-			    		'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
-			    );
-			    PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
-		    }
+            if ($this->id == 'excel2007')
+            {
+                if (! class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
+                {
+                    $langs->load("errors");
+                    $this->error=$langs->trans('ErrorPHPNeedModule','zip');
+                    return -1;
+                }
+            }
+
+            if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
+                $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
+                $cacheSettings = array (
+                        'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
+                );
+                PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
+            }
 
             $this->workbook = new PHPExcel();
             $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
@@ -245,242 +245,242 @@ 
             $this->workbook->setActiveSheetIndex(0);
             $this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
             $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
-		}
-		return $ret;
-	}
+        }
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Write header
-	 *
+    /**
+     *  Write header
+     *
      *  @param      Translate	$outputlangs        Object lang to translate values
-	 * 	@return		int								<0 if KO, >0 if OK
-	 */
-	function write_header($outputlangs)
-	{
+     * 	@return		int								<0 if KO, >0 if OK
+     */
+    function write_header($outputlangs)
+    {
         // phpcs:enable
-		//$outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+        //$outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
 
-		return 0;
-	}
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *  Output title line into file
      *
      *  @param      array		$array_export_fields_label   	Array with list of label of fields
      *  @param      array		$array_selected_sorted       	Array with list of field to export
      *  @param      Translate	$outputlangs    				Object lang to translate values
      *  @param		array		$array_types					Array with types of fields
-	 * 	@return		int											<0 if KO, >0 if OK
-	 */
-	function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
-	{
+     * 	@return		int											<0 if KO, >0 if OK
+     */
+    function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
+    {
         // phpcs:enable
-		global $conf;
-
-		// Create a format for the column headings
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
-
-		    $formatheader =$this->workbook->addformat();
-    		$formatheader->set_bold();
-    		$formatheader->set_color('blue');
-    		//$formatheader->set_size(12);
-    		//$formatheader->set_font("Courier New");
-    		//$formatheader->set_align('center');
-		}
-		else
-		{
+        global $conf;
+
+        // Create a format for the column headings
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
+            $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+
+            $formatheader =$this->workbook->addformat();
+            $formatheader->set_bold();
+            $formatheader->set_color('blue');
+            //$formatheader->set_size(12);
+            //$formatheader->set_font("Courier New");
+            //$formatheader->set_align('center');
+        }
+        else
+        {
             $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
-		    $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-		}
+            $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+        }
 
-		$this->col=0;
-		foreach($array_selected_sorted as $code => $value)
-		{
+        $this->col=0;
+        foreach($array_selected_sorted as $code => $value)
+        {
             $alias=$array_export_fields_label[$code];
-			//print "dd".$alias;
-			if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		{
-    			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-    		}
-    		else
-    		{
+            //print "dd".$alias;
+            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+            if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+            {
+                $this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
+            }
+            else
+            {
                 $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $outputlangs->transnoentities($alias));
-    		    if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto')))		// Set autowidth for some types
+                if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto')))		// Set autowidth for some types
                 {
-                	$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
+                    $this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
                 }
-    		}
-			$this->col++;
-		}
-		$this->row++;
-		return 0;
-	}
+            }
+            $this->col++;
+        }
+        $this->row++;
+        return 0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *  Output record line into file
      *
      *  @param      array		$array_selected_sorted      Array with list of field to export
      *  @param      resource	$objp                       A record from a fetch with all fields from select
      *  @param      Translate	$outputlangs                Object lang to translate values
      *  @param		array		$array_types				Array with types of fields
-	 * 	@return		int										<0 if KO, >0 if OK
-	 */
-	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
-	{
+     * 	@return		int										<0 if KO, >0 if OK
+     */
+    function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		// Create a format for the column headings
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
-		}
+        // Create a format for the column headings
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
+            $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+        }
 
-		// Define first row
-		$this->col=0;
+        // Define first row
+        $this->col=0;
 
-		foreach($array_selected_sorted as $code => $value)
-		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
+        foreach($array_selected_sorted as $code => $value)
+        {
+            if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
+            else $alias=substr($code, strpos($code, ' as ') + 4);
             if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
             $newvalue=$objp->$alias;
 
-			$newvalue=$this->excel_clean($newvalue);
-			$typefield=isset($array_types[$code])?$array_types[$code]:'';
-
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
-			{
-				$array = unserialize($typefield);
-				$array = $array['options'];
-				$newvalue = $array[$newvalue];
-			}
-
-			// Traduction newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
-			{
-				$newvalue=$outputlangs->transnoentities($reg[1]);
-			}
-			else
-			{
-				$newvalue=$outputlangs->convToOutputCharset($newvalue);
-			}
-
-			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i',$newvalue))
-			{
-        		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-        		{
-            		$formatdate=$this->workbook->addformat();
-            		$formatdate->set_num_format('yyyy-mm-dd');
-            		//$formatdate->set_num_format(0x0f);
-        		    $arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
-    				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
-    				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
-        		    $this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
-        		}
-        		else
-        		{
-        		    $newvalue=dol_stringtotime($newvalue);
-        		    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
-        		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
-        		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
-        		}
-			}
-			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
-			{
-				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		    {
-            		$formatdatehour=$this->workbook->addformat();
-            		$formatdatehour->set_num_format('yyyy-mm-dd hh:mm:ss');
-            		//$formatdatehour->set_num_format(0x0f);
-            		$arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
-    				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
-    				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
-    		        $this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
-    		    }
-    		    else
-    		    {
-        		    $newvalue=dol_stringtotime($newvalue);
-    		        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
-        		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
-        		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
-    		    }
-			}
-			else
-			{
-				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		    {
-			        $this->worksheet->write($this->row, $this->col, $newvalue);
-    		    }
-    		    else
-				{
-    		    	if ($typefield == 'Text' || $typefield == 'TextAuto')
-    		    	{
-    		    		//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
-						$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, (string) $newvalue);
-    		    		$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
-    		    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
-    		    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-    		    	}
-    		    	else
-    		    	{
-    		    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
-    		    	}
-    		    }
-			}
-			$this->col++;
-		}
-		$this->row++;
-		return 0;
-	}
+            $newvalue=$this->excel_clean($newvalue);
+            $typefield=isset($array_types[$code])?$array_types[$code]:'';
+
+            if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
+            {
+                $array = unserialize($typefield);
+                $array = $array['options'];
+                $newvalue = $array[$newvalue];
+            }
+
+            // Traduction newvalue
+            if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
+            {
+                $newvalue=$outputlangs->transnoentities($reg[1]);
+            }
+            else
+            {
+                $newvalue=$outputlangs->convToOutputCharset($newvalue);
+            }
+
+            if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i',$newvalue))
+            {
+                if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+                {
+                    $formatdate=$this->workbook->addformat();
+                    $formatdate->set_num_format('yyyy-mm-dd');
+                    //$formatdate->set_num_format(0x0f);
+                    $arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
+                    //print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
+                    $newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
+                    $this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
+                }
+                else
+                {
+                    $newvalue=dol_stringtotime($newvalue);
+                    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
+                    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+                    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
+                }
+            }
+            elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
+            {
+                if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+                {
+                    $formatdatehour=$this->workbook->addformat();
+                    $formatdatehour->set_num_format('yyyy-mm-dd hh:mm:ss');
+                    //$formatdatehour->set_num_format(0x0f);
+                    $arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
+                    //print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
+                    $newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
+                    $this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
+                }
+                else
+                {
+                    $newvalue=dol_stringtotime($newvalue);
+                    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
+                    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+                    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
+                }
+            }
+            else
+            {
+                if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+                {
+                    $this->worksheet->write($this->row, $this->col, $newvalue);
+                }
+                else
+                {
+                    if ($typefield == 'Text' || $typefield == 'TextAuto')
+                    {
+                        //$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
+                        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, (string) $newvalue);
+                        $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+                        $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
+                        $this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+                    }
+                    else
+                    {
+                        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
+                    }
+                }
+            }
+            $this->col++;
+        }
+        $this->row++;
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *	Write footer
      *
-	 * 	@param		Translate	$outputlangs	Output language object
-	 * 	@return		int							<0 if KO, >0 if OK
+     * 	@param		Translate	$outputlangs	Output language object
+     * 	@return		int							<0 if KO, >0 if OK
      */
-	function write_footer($outputlangs)
-	{
+    function write_footer($outputlangs)
+    {
         // phpcs:enable
-		return 0;
-	}
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
      *	Close Excel file
      *
-	 * 	@return		int							<0 if KO, >0 if OK
+     * 	@return		int							<0 if KO, >0 if OK
      */
-	function close_file()
-	{
+    function close_file()
+    {
         // phpcs:enable
-		global $conf;
-
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    	{
-	        $this->workbook->close();
-    	}
-    	else
-    	{
+        global $conf;
+
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
+            $this->workbook->close();
+        }
+        else
+        {
             require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
-    	    $objWriter = new PHPExcel_Writer_Excel5($this->workbook);
+            $objWriter = new PHPExcel_Writer_Excel5($this->workbook);
             $objWriter->save($this->file);
             $this->workbook->disconnectWorksheets();
             unset($this->workbook);
-    	}
-		return 1;
-	}
+        }
+        return 1;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -493,10 +493,10 @@ 
     function excel_clean($newvalue)
     {
         // phpcs:enable
-		// Rule Dolibarr: No HTML
-    	$newvalue=dol_string_nohtmltag($newvalue);
+        // Rule Dolibarr: No HTML
+        $newvalue=dol_string_nohtmltag($newvalue);
 
-    	return $newvalue;
+        return $newvalue;
     }
 
 
@@ -509,16 +509,16 @@ 
     function column2Letter($c)
     {
 
-    	$c = intval($c);
-    	if ($c <= 0) return '';
+        $c = intval($c);
+        if ($c <= 0) return '';
 
-    	while ($c != 0)
-    	{
-    		$p = ($c - 1) % 26;
-    		$c = intval(($c - $p) / 26);
-    		$letter = chr(65 + $p) . $letter;
-    	}
+        while ($c != 0)
+        {
+            $p = ($c - 1) % 26;
+            $c = intval(($c - $p) / 26);
+            $letter = chr(65 + $p) . $letter;
+        }
 
-    	return $letter;
+        return $letter;
     }
 }

dolibarr/htdocs/core/modules/export/export_csv.modules.php

Indentation +284 added lines, -284 removed lines

@@ -30,208 +30,208 @@ 
  */
 class ExportCsv extends ModeleExports
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	/**
+    /**
      * @var string export files label
      */
     public $label;
 
-	public $extension;
+    public $extension;
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
-
-	public $label_lib;
-
-	public $version_lib;
-
-	public $separator;
-
-	public $handle;    // Handle fichier
-
-
-	/**
-	 *	Constructor
-	 *
-	 *	@param	    DoliDB	$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs;
-		$this->db = $db;
-
-		$this->separator=',';
-		if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
-		$this->escape='"';
-		$this->enclosure='"';
-
-		$this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
-		$this->label = 'CSV';             // Label of driver
-		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
-		$this->extension='csv';         // Extension for generated file by this driver
-		$this->picto='mime/other';		// Picto
-		$this->version='1.32';         // Driver version
-
-		// If driver use an external library, put its name here
-		$this->label_lib='Dolibarr';
-		$this->version_lib=DOL_VERSION;
-	}
-
-	/**
-	 * getDriverId
-	 *
-	 * @return string
-	 */
-	function getDriverId()
-	{
-		return $this->id;
-	}
-
-	/**
-	 * getDriverLabel
-	 *
-	 * @return 	string			Return driver label
-	 */
-	function getDriverLabel()
-	{
-		return $this->label;
-	}
-
-	/**
-	 * getDriverDesc
-	 *
-	 * @return string
-	 */
-	function getDriverDesc()
-	{
-		return $this->desc;
-	}
-
-	/**
-	 * getDriverExtension
-	 *
-	 * @return string
-	 */
-	function getDriverExtension()
-	{
-		return $this->extension;
-	}
-
-	/**
-	 * getDriverVersion
-	 *
-	 * @return string
-	 */
-	function getDriverVersion()
-	{
-		return $this->version;
-	}
-
-	/**
-	 * getLabelLabel
-	 *
-	 * @return string
-	 */
-	function getLibLabel()
-	{
-		return $this->label_lib;
-	}
-
-	/**
-	 * getLibVersion
-	 *
-	 * @return string
-	 */
-	function getLibVersion()
-	{
-		return $this->version_lib;
-	}
+    public $version = 'dolibarr';
+
+    public $label_lib;
+
+    public $version_lib;
+
+    public $separator;
+
+    public $handle;    // Handle fichier
+
+
+    /**
+     *	Constructor
+     *
+     *	@param	    DoliDB	$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs;
+        $this->db = $db;
+
+        $this->separator=',';
+        if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+        $this->escape='"';
+        $this->enclosure='"';
+
+        $this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
+        $this->label = 'CSV';             // Label of driver
+        $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
+        $this->extension='csv';         // Extension for generated file by this driver
+        $this->picto='mime/other';		// Picto
+        $this->version='1.32';         // Driver version
+
+        // If driver use an external library, put its name here
+        $this->label_lib='Dolibarr';
+        $this->version_lib=DOL_VERSION;
+    }
+
+    /**
+     * getDriverId
+     *
+     * @return string
+     */
+    function getDriverId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * getDriverLabel
+     *
+     * @return 	string			Return driver label
+     */
+    function getDriverLabel()
+    {
+        return $this->label;
+    }
+
+    /**
+     * getDriverDesc
+     *
+     * @return string
+     */
+    function getDriverDesc()
+    {
+        return $this->desc;
+    }
+
+    /**
+     * getDriverExtension
+     *
+     * @return string
+     */
+    function getDriverExtension()
+    {
+        return $this->extension;
+    }
+
+    /**
+     * getDriverVersion
+     *
+     * @return string
+     */
+    function getDriverVersion()
+    {
+        return $this->version;
+    }
+
+    /**
+     * getLabelLabel
+     *
+     * @return string
+     */
+    function getLibLabel()
+    {
+        return $this->label_lib;
+    }
+
+    /**
+     * getLibVersion
+     *
+     * @return string
+     */
+    function getLibVersion()
+    {
+        return $this->version_lib;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Open output file
-	 *
-	 *	@param		string		$file			Path of filename to generate
-	 * 	@param		Translate	$outputlangs	Output language object
-	 *	@return		int							<0 if KO, >=0 if OK
-	 */
-	function open_file($file,$outputlangs)
-	{
+    /**
+     *	Open output file
+     *
+     *	@param		string		$file			Path of filename to generate
+     * 	@param		Translate	$outputlangs	Output language object
+     *	@return		int							<0 if KO, >=0 if OK
+     */
+    function open_file($file,$outputlangs)
+    {
         // phpcs:enable
-		global $langs;
+        global $langs;
 
-		dol_syslog("ExportCsv::open_file file=".$file);
+        dol_syslog("ExportCsv::open_file file=".$file);
 
-		$ret=1;
+        $ret=1;
 
-		$outputlangs->load("exports");
-		$this->handle = fopen($file, "wt");
-		if (! $this->handle)
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToCreateFile",$file);
-			$ret=-1;
-		}
+        $outputlangs->load("exports");
+        $this->handle = fopen($file, "wt");
+        if (! $this->handle)
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans("ErrorFailToCreateFile",$file);
+            $ret=-1;
+        }
 
-		return $ret;
-	}
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output header into file
-	 *
-	 * 	@param		Translate	$outputlangs	Output language object
-	 * 	@return		int							<0 if KO, >0 if OK
-	 */
-	function write_header($outputlangs)
-	{
+    /**
+     * 	Output header into file
+     *
+     * 	@param		Translate	$outputlangs	Output language object
+     * 	@return		int							<0 if KO, >0 if OK
+     */
+    function write_header($outputlangs)
+    {
         // phpcs:enable
-		return 0;
-	}
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output title line into file
-	 *
+    /**
+     * 	Output title line into file
+     *
      *  @param      array		$array_export_fields_label   	Array with list of label of fields
      *  @param      array		$array_selected_sorted       	Array with list of field to export
      *  @param      Translate	$outputlangs    				Object lang to translate values
      *  @param		array		$array_types					Array with types of fields
-	 * 	@return		int											<0 if KO, >0 if OK
-	 */
-	function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
-	{
+     * 	@return		int											<0 if KO, >0 if OK
+     */
+    function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
-		{
-			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
-		{
-			$outputlangs->charset_output = 'ISO-8859-1';
-		}
+        if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
+        {
+            $outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
+        }
+        else
+        {
+            $outputlangs->charset_output = 'ISO-8859-1';
+        }
 
-		foreach($array_selected_sorted as $code => $value)
-		{
-			$newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
-			$newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
+        foreach($array_selected_sorted as $code => $value)
+        {
+            $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
+            $newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
 
-			fwrite($this->handle,$newvalue.$this->separator);
-		}
-		fwrite($this->handle,"\n");
-		return 0;
-	}
+            fwrite($this->handle,$newvalue.$this->separator);
+        }
+        fwrite($this->handle,"\n");
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -242,124 +242,124 @@ 
      *  @param     	resource	$objp                       A record from a fetch with all fields from select
      *  @param     	Translate	$outputlangs    			Object lang to translate values
      *  @param		array		$array_types				Array with types of fields
-	 * 	@return		int										<0 if KO, >0 if OK
-	 */
-	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
-	{
+     * 	@return		int										<0 if KO, >0 if OK
+     */
+    function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
+    {
         // phpcs:enable
-		global $conf;
-
-		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
-		{
-			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
-		{
-			$outputlangs->charset_output = 'ISO-8859-1';
-		}
-
-		$this->col=0;
-		foreach($array_selected_sorted as $code => $value)
-		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-			if (empty($alias)) dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
-
-			$newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
-			$typefield=isset($array_types[$code])?$array_types[$code]:'';
-
-			// Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
-
-			$newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
-
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
-			{
-				$array = unserialize($typefield);
-				$array = $array['options'];
-				$newvalue = $array[$newvalue];
-			}
-
-			fwrite($this->handle,$newvalue.$this->separator);
-			$this->col++;
-		}
-
-		fwrite($this->handle,"\n");
-		return 0;
-	}
+        global $conf;
+
+        if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
+        {
+            $outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
+        }
+        else
+        {
+            $outputlangs->charset_output = 'ISO-8859-1';
+        }
+
+        $this->col=0;
+        foreach($array_selected_sorted as $code => $value)
+        {
+            if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
+            else $alias=substr($code, strpos($code, ' as ') + 4);
+            if (empty($alias)) dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
+
+            $newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
+            $typefield=isset($array_types[$code])?$array_types[$code]:'';
+
+            // Translation newvalue
+            if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+
+            $newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
+
+            if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
+            {
+                $array = unserialize($typefield);
+                $array = $array['options'];
+                $newvalue = $array[$newvalue];
+            }
+
+            fwrite($this->handle,$newvalue.$this->separator);
+            $this->col++;
+        }
+
+        fwrite($this->handle,"\n");
+        return 0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output footer into file
-	 *
-	 * 	@param		Translate	$outputlangs	Output language object
-	 * 	@return		int							<0 if KO, >0 if OK
-	 */
-	function write_footer($outputlangs)
-	{
+    /**
+     * 	Output footer into file
+     *
+     * 	@param		Translate	$outputlangs	Output language object
+     * 	@return		int							<0 if KO, >0 if OK
+     */
+    function write_footer($outputlangs)
+    {
         // phpcs:enable
-		return 0;
-	}
+        return 0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Close file handle
-	 *
-	 * 	@return		int							<0 if KO, >0 if OK
-	 */
-	function close_file()
-	{
+    /**
+     * 	Close file handle
+     *
+     * 	@return		int							<0 if KO, >0 if OK
+     */
+    function close_file()
+    {
         // phpcs:enable
-		fclose($this->handle);
-		return 0;
-	}
-
-
-	/**
-	 * Clean a cell to respect rules of CSV file cells
-	 * Note: It uses $this->separator
-	 * Note: We keep this function public to be able to test
-	 *
-	 * @param 	string	$newvalue	String to clean
-	 * @param	string	$charset	Input AND Output character set
-	 * @return 	string				Value cleaned
-	 */
-	public function csvClean($newvalue, $charset)
-	{
-		global $conf;
-		$addquote=0;
-
-
-		// Rule Dolibarr: No HTML
-   		//print $charset.' '.$newvalue."\n";
-   		//$newvalue=dol_string_nohtmltag($newvalue,0,$charset);
-   		$newvalue=dol_htmlcleanlastbr($newvalue);
-   		//print $charset.' '.$newvalue."\n";
-
-		// Rule 1 CSV: No CR, LF in cells (except if USE_STRICT_CSV_RULES is on, we can keep record as it is but we must add quotes)
-		$oldvalue=$newvalue;
-		$newvalue=str_replace("\r",'',$newvalue);
-		$newvalue=str_replace("\n",'\n',$newvalue);
-		if (! empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue)
-		{
-			// If strict use of CSV rules, we just add quote
-			$newvalue=$oldvalue;
-			$addquote=1;
-		}
-
-		// Rule 2 CSV: If value contains ", we must escape with ", and add "
-		if (preg_match('/"/',$newvalue))
-		{
-			$addquote=1;
-			$newvalue=str_replace('"','""',$newvalue);
-		}
-
-		// Rule 3 CSV: If value contains separator, we must add "
-		if (preg_match('/'.$this->separator.'/',$newvalue))
-		{
-			$addquote=1;
-		}
-
-		return ($addquote?'"':'').$newvalue.($addquote?'"':'');
-	}
+        fclose($this->handle);
+        return 0;
+    }
+
+
+    /**
+     * Clean a cell to respect rules of CSV file cells
+     * Note: It uses $this->separator
+     * Note: We keep this function public to be able to test
+     *
+     * @param 	string	$newvalue	String to clean
+     * @param	string	$charset	Input AND Output character set
+     * @return 	string				Value cleaned
+     */
+    public function csvClean($newvalue, $charset)
+    {
+        global $conf;
+        $addquote=0;
+
+
+        // Rule Dolibarr: No HTML
+            //print $charset.' '.$newvalue."\n";
+            //$newvalue=dol_string_nohtmltag($newvalue,0,$charset);
+            $newvalue=dol_htmlcleanlastbr($newvalue);
+            //print $charset.' '.$newvalue."\n";
+
+        // Rule 1 CSV: No CR, LF in cells (except if USE_STRICT_CSV_RULES is on, we can keep record as it is but we must add quotes)
+        $oldvalue=$newvalue;
+        $newvalue=str_replace("\r",'',$newvalue);
+        $newvalue=str_replace("\n",'\n',$newvalue);
+        if (! empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue)
+        {
+            // If strict use of CSV rules, we just add quote
+            $newvalue=$oldvalue;
+            $addquote=1;
+        }
+
+        // Rule 2 CSV: If value contains ", we must escape with ", and add "
+        if (preg_match('/"/',$newvalue))
+        {
+            $addquote=1;
+            $newvalue=str_replace('"','""',$newvalue);
+        }
+
+        // Rule 3 CSV: If value contains separator, we must add "
+        if (preg_match('/'.$this->separator.'/',$newvalue))
+        {
+            $addquote=1;
+        }
+
+        return ($addquote?'"':'').$newvalue.($addquote?'"':'');
+    }
 }

dolibarr/htdocs/core/modules/export/export_tsv.modules.php

Indentation +108 added lines, -108 removed lines

@@ -32,9 +32,9 @@ 
 class ExportTsv extends ModeleExports
 {
     /**
-	 * @var int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
     /**
      * @var string label
@@ -47,7 +47,7 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
     public $label_lib;
 
@@ -59,9 +59,9 @@ 
 
 
     /**
-	 *	Constructor
-	 *
-	 *	@param	    DoliDB	$db      Database handler
+     *	Constructor
+     *
+     *	@param	    DoliDB	$db      Database handler
      */
     function __construct($db)
     {
@@ -80,71 +80,71 @@ 
         $this->version_lib=DOL_VERSION;
     }
 
-	/**
-	 * getDriverId
-	 *
-	 * @return string
-	 */
+    /**
+     * getDriverId
+     *
+     * @return string
+     */
     function getDriverId()
     {
         return $this->id;
     }
 
-	/**
-	 * getDriverLabel
-	 *
-	 * @return 	string			Return driver label
-	 */
+    /**
+     * getDriverLabel
+     *
+     * @return 	string			Return driver label
+     */
     function getDriverLabel()
     {
         return $this->label;
     }
 
-	/**
-	 * getDriverDesc
-	 *
-	 * @return string
-	 */
+    /**
+     * getDriverDesc
+     *
+     * @return string
+     */
     function getDriverDesc()
     {
         return $this->desc;
     }
 
-	/**
-	 * getDriverExtension
-	 *
-	 * @return string
-	 */
+    /**
+     * getDriverExtension
+     *
+     * @return string
+     */
     function getDriverExtension()
     {
         return $this->extension;
     }
 
-	/**
-	 * getDriverVersion
-	 *
-	 * @return string
-	 */
+    /**
+     * getDriverVersion
+     *
+     * @return string
+     */
     function getDriverVersion()
     {
         return $this->version;
     }
 
-	/**
-	 * getLibLabel
-	 *
-	 * @return string
-	 */
+    /**
+     * getLibLabel
+     *
+     * @return string
+     */
     function getLibLabel()
     {
         return $this->label_lib;
     }
 
-	/**
-	 * getLibVersion
-	 *
-	 * @return string
-	 */
+    /**
+     * getLibVersion
+     *
+     * @return string
+     */
     function getLibVersion()
     {
         return $this->version_lib;
@@ -153,12 +153,12 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	*	Open output file
-	*
-	 *	@param		string		$file			Path of filename to generate
-	*	@param		Translate	$outputlangs	Output language object
-	*	@return		int							<0 if KO, >=0 if OK
-    */
+     *	Open output file
+     *
+     *	@param		string		$file			Path of filename to generate
+     *	@param		Translate	$outputlangs	Output language object
+     *	@return		int							<0 if KO, >=0 if OK
+     */
     function open_file($file,$outputlangs)
     {
         // phpcs:enable
@@ -169,24 +169,24 @@ 
         $ret=1;
 
         $outputlangs->load("exports");
-		$this->handle = fopen($file, "wt");
+        $this->handle = fopen($file, "wt");
         if (! $this->handle)
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToCreateFile",$file);
-			$ret=-1;
-		}
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans("ErrorFailToCreateFile",$file);
+            $ret=-1;
+        }
 
-		return $ret;
+        return $ret;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output header into file
-	 *
-	 * 	@param		Translate	$outputlangs		Output language object
-	 * 	@return		int								<0 if KO, >0 if OK
-	 */
+    /**
+     * 	Output header into file
+     *
+     * 	@param		Translate	$outputlangs		Output language object
+     * 	@return		int								<0 if KO, >0 if OK
+     */
     function write_header($outputlangs)
     {
         // phpcs:enable
@@ -202,17 +202,17 @@ 
      *  @param      array		$array_selected_sorted       	Array with list of field to export
      *  @param      Translate	$outputlangs    				Object lang to translate values
      *  @param		array		$array_types					Array with types of fields
-	 * 	@return		int											<0 if KO, >0 if OK
-	 */
+     * 	@return		int											<0 if KO, >0 if OK
+     */
     function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
     {
         // phpcs:enable
         foreach($array_selected_sorted as $code => $value)
         {
             $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
-			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
+            $newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
 
-			fwrite($this->handle,$newvalue.$this->separator);
+            fwrite($this->handle,$newvalue.$this->separator);
         }
         fwrite($this->handle,"\n");
         return 0;
@@ -220,68 +220,68 @@ 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output record line into file
-	 *
-	 *  @param      array		$array_selected_sorted      Array with list of field to export
-	 *  @param      resource	$objp                       A record from a fetch with all fields from select
-	 *  @param      Translate	$outputlangs                Object lang to translate values
+    /**
+     * 	Output record line into file
+     *
+     *  @param      array		$array_selected_sorted      Array with list of field to export
+     *  @param      resource	$objp                       A record from a fetch with all fields from select
+     *  @param      Translate	$outputlangs                Object lang to translate values
      *  @param		array		$array_types				Array with types of fields
-	 * 	@return		int										<0 if KO, >0 if OK
-	 */
+     * 	@return		int										<0 if KO, >0 if OK
+     */
     function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
     {
         // phpcs:enable
-    	global $conf;
+        global $conf;
 
-		$this->col=0;
- 		foreach($array_selected_sorted as $code => $value)
+        $this->col=0;
+            foreach($array_selected_sorted as $code => $value)
         {
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
+            if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
+            else $alias=substr($code, strpos($code, ' as ') + 4);
             if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
 
             $newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
             $typefield=isset($array_types[$code])?$array_types[$code]:'';
 
             // Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+            if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
 
-			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
+            $newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
 
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
-			{
-				$array = unserialize($typefield);
-				$array = $array['options'];
-				$newvalue = $array[$newvalue];
-			}
+            if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
+            {
+                $array = unserialize($typefield);
+                $array = $array['options'];
+                $newvalue = $array[$newvalue];
+            }
 
-			fwrite($this->handle,$newvalue.$this->separator);
+            fwrite($this->handle,$newvalue.$this->separator);
             $this->col++;
-		}
+        }
         fwrite($this->handle,"\n");
         return 0;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output footer into file
-	 *
-	 * 	@param		Translate	$outputlangs		Output language object
-	 * 	@return		int								<0 if KO, >0 if OK
-	 */
+    /**
+     * 	Output footer into file
+     *
+     * 	@param		Translate	$outputlangs		Output language object
+     * 	@return		int								<0 if KO, >0 if OK
+     */
     function write_footer($outputlangs)
     {
         // phpcs:enable
-		return 0;
+        return 0;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Close file handle
-	 *
-	 * 	@return		int							<0 if KO, >0 if OK
-	 */
+    /**
+     * 	Close file handle
+     *
+     * 	@return		int							<0 if KO, >0 if OK
+     */
     function close_file()
     {
         // phpcs:enable
@@ -300,18 +300,18 @@ 
     function tsv_clean($newvalue, $charset)
     {
         // phpcs:enable
-		// Rule Dolibarr: No HTML
-		$newvalue=dol_string_nohtmltag($newvalue, 1, $charset);
+        // Rule Dolibarr: No HTML
+        $newvalue=dol_string_nohtmltag($newvalue, 1, $charset);
 
-		// Rule 1 TSV: No CR, LF in cells
-    	$newvalue=str_replace("\r",'',$newvalue);
+        // Rule 1 TSV: No CR, LF in cells
+        $newvalue=str_replace("\r",'',$newvalue);
         $newvalue=str_replace("\n",'\n',$newvalue);
 
         // Rule 2 TSV: If value contains tab, we must replace by space
-		if (preg_match('/'.$this->separator.'/',$newvalue))
-		{
-			$newvalue=str_replace("\t"," ",$newvalue);
-		}
+        if (preg_match('/'.$this->separator.'/',$newvalue))
+        {
+            $newvalue=str_replace("\t"," ",$newvalue);
+        }
 
         return $newvalue;
     }

dolibarr/htdocs/core/modules/export/modules_export.php

Indentation +117 added lines, -117 removed lines

@@ -30,140 +30,140 @@
  */
 class ModeleExports extends CommonDocGenerator    // This class can't be abstract as there is instance propreties loaded by liste_modeles
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	public $driverlabel=array();
+    public $driverlabel=array();
 
-	public $driverversion=array();
+    public $driverversion=array();
 
-	public $liblabel=array();
+    public $liblabel=array();
 
-	public $libversion=array();
+    public $libversion=array();
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Load into memory list of available export format
-	 *
+    /**
+     *  Load into memory list of available export format
+     *
      *  @param	DoliDB	$db     			Database handler
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates (same content than array this->driverlabel)
-	 */
-	function liste_modeles($db,$maxfilenamelength=0)
-	{
+     */
+    function liste_modeles($db,$maxfilenamelength=0)
+    {
         // phpcs:enable
-		dol_syslog(get_class($this)."::liste_modeles");
+        dol_syslog(get_class($this)."::liste_modeles");
 
-		$dir=DOL_DOCUMENT_ROOT."/core/modules/export/";
-		$handle=opendir($dir);
+        $dir=DOL_DOCUMENT_ROOT."/core/modules/export/";
+        $handle=opendir($dir);
 
-		// Recherche des fichiers drivers exports disponibles
-		$i=0;
+        // Recherche des fichiers drivers exports disponibles
+        $i=0;
         if (is_resource($handle))
         {
-    		while (($file = readdir($handle))!==false)
-    		{
-    			if (preg_match("/^export_(.*)\.modules\.php$/i",$file,$reg))
-    			{
-    				$moduleid=$reg[1];
-
-    				// Loading Class
-    				$file = $dir."export_".$moduleid.".modules.php";
-    				$classname = "Export".ucfirst($moduleid);
-
-    				require_once $file;
-    				if (class_exists($classname))
-    				{
-        				$module = new $classname($db);
-
-        				// Picto
-        				$this->picto[$module->id]=$module->picto;
-        				// Driver properties
-        				$this->driverlabel[$module->id]=$module->getDriverLabel().(empty($module->disabled)?'':' __(Disabled)__');	// '__(Disabled)__' is a key
-        				$this->driverdesc[$module->id]=$module->getDriverDesc();
-        				$this->driverversion[$module->id]=$module->getDriverVersion();
-        				// If use an external lib
-        				$this->liblabel[$module->id]=$module->getLibLabel();
-        				$this->libversion[$module->id]=$module->getLibVersion();
-    				}
-    				$i++;
-    			}
-    		}
-    		closedir($handle);
+            while (($file = readdir($handle))!==false)
+            {
+                if (preg_match("/^export_(.*)\.modules\.php$/i",$file,$reg))
+                {
+                    $moduleid=$reg[1];
+
+                    // Loading Class
+                    $file = $dir."export_".$moduleid.".modules.php";
+                    $classname = "Export".ucfirst($moduleid);
+
+                    require_once $file;
+                    if (class_exists($classname))
+                    {
+                        $module = new $classname($db);
+
+                        // Picto
+                        $this->picto[$module->id]=$module->picto;
+                        // Driver properties
+                        $this->driverlabel[$module->id]=$module->getDriverLabel().(empty($module->disabled)?'':' __(Disabled)__');	// '__(Disabled)__' is a key
+                        $this->driverdesc[$module->id]=$module->getDriverDesc();
+                        $this->driverversion[$module->id]=$module->getDriverVersion();
+                        // If use an external lib
+                        $this->liblabel[$module->id]=$module->getLibLabel();
+                        $this->libversion[$module->id]=$module->getLibVersion();
+                    }
+                    $i++;
+                }
+            }
+            closedir($handle);
         }
 
         asort($this->driverlabel);
 
-		return $this->driverlabel;
-	}
-
-
-	/**
-	 *  Return picto of export driver
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Picto string
-	 */
-	function getPictoForKey($key)
-	{
-		return $this->picto[$key];
-	}
-
-	/**
-	 *  Renvoi libelle d'un driver export
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Label
-	 */
-	function getDriverLabelForKey($key)
-	{
-		return $this->driverlabel[$key];
-	}
-
-	/**
-	 *  Renvoi le descriptif d'un driver export
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Description
-	 */
-	function getDriverDescForKey($key)
-	{
-		return $this->driverdesc[$key];
-	}
-
-	/**
-	 *  Renvoi version d'un driver export
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Driver version
-	 */
-	function getDriverVersionForKey($key)
-	{
-		return $this->driverversion[$key];
-	}
-
-	/**
-	 *  Renvoi libelle de librairie externe du driver
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Label of library
-	 */
-	function getLibLabelForKey($key)
-	{
-		return $this->liblabel[$key];
-	}
-
-	/**
-	 *  Renvoi version de librairie externe du driver
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Version of library
-	 */
-	function getLibVersionForKey($key)
-	{
-		return $this->libversion[$key];
-	}
+        return $this->driverlabel;
+    }
+
+
+    /**
+     *  Return picto of export driver
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Picto string
+     */
+    function getPictoForKey($key)
+    {
+        return $this->picto[$key];
+    }
+
+    /**
+     *  Renvoi libelle d'un driver export
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Label
+     */
+    function getDriverLabelForKey($key)
+    {
+        return $this->driverlabel[$key];
+    }
+
+    /**
+     *  Renvoi le descriptif d'un driver export
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Description
+     */
+    function getDriverDescForKey($key)
+    {
+        return $this->driverdesc[$key];
+    }
+
+    /**
+     *  Renvoi version d'un driver export
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Driver version
+     */
+    function getDriverVersionForKey($key)
+    {
+        return $this->driverversion[$key];
+    }
+
+    /**
+     *  Renvoi libelle de librairie externe du driver
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Label of library
+     */
+    function getLibLabelForKey($key)
+    {
+        return $this->liblabel[$key];
+    }
+
+    /**
+     *  Renvoi version de librairie externe du driver
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Version of library
+     */
+    function getLibVersionForKey($key)
+    {
+        return $this->libversion[$key];
+    }
 }