Standardize and Update code

This commit is contained in:
Philippe GRAND 2018-09-01 23:12:20 +02:00
parent ae2df6be11
commit 5cd9557318
11 changed files with 95 additions and 92 deletions

View File

@ -40,15 +40,15 @@ class ExportCsv extends ModeleExports
*/
public $label;
var $extension;
var $version;
public $extension;
public $version;
var $label_lib;
var $version_lib;
public $label_lib;
public $version_lib;
var $separator;
public $separator;
var $handle; // Handle fichier
public $handle; // Handle fichier
/**

View File

@ -42,17 +42,17 @@ class ExportExcel extends ModeleExports
*/
public $label;
var $extension;
var $version;
public $extension;
public $version;
var $label_lib;
var $version_lib;
public $label_lib;
public $version_lib;
var $workbook; // Handle fichier
var $worksheet; // Handle onglet
var $row;
var $col;
var $file; // To save filename
public $workbook; // Handle fichier
public $worksheet; // Handle onglet
public $row;
public $col;
public $file; // To save filename
/**

View File

@ -43,17 +43,17 @@ class ExportExcel2007 extends ExportExcel
*/
public $label;
var $extension;
var $version;
public $extension;
public $version;
var $label_lib;
var $version_lib;
public $label_lib;
public $version_lib;
var $workbook; // Handle fichier
var $worksheet; // Handle onglet
var $row;
var $col;
var $file; // To save filename
public $workbook; // Handle fichier
public $worksheet; // Handle onglet
public $row;
public $col;
public $file; // To save filename
/**
* Constructor

View File

@ -41,15 +41,15 @@ class ExportTsv extends ModeleExports
*/
public $label;
var $extension;
var $version;
public $extension;
public $version;
var $label_lib;
var $version_lib;
public $label_lib;
public $version_lib;
var $separator="\t";
public $separator="\t";
var $handle; // Handle fichier
public $handle; // Handle fichier
/**

View File

@ -60,22 +60,22 @@ class ImportCsv extends ModeleImports
*/
public $label;
var $extension; // Extension of files imported by driver
var $version; // Version of driver
public $extension; // Extension of files imported by driver
public $version; // Version of driver
var $label_lib; // Label of external lib used by driver
var $version_lib; // Version of external lib used by driver
public $label_lib; // Label of external lib used by driver
public $version_lib; // Version of external lib used by driver
var $separator;
public $separator;
var $file; // Path of file
var $handle; // Handle fichier
public $file; // Path of file
public $handle; // Handle fichier
var $cacheconvert=array(); // Array to cache list of value found after a convertion
var $cachefieldtable=array(); // Array to cache list of value found into fields@tables
public $cacheconvert=array(); // Array to cache list of value found after a convertion
public $cachefieldtable=array(); // Array to cache list of value found into fields@tables
var $nbinsert = 0; // # of insert done during the import
var $nbupdate = 0; // # of update done during the import
public $nbinsert = 0; // # of insert done during the import
public $nbupdate = 0; // # of update done during the import
/**

View File

@ -60,23 +60,23 @@ class ImportXlsx extends ModeleImports
*/
public $label;
var $extension; // Extension of files imported by driver
var $version; // Version of driver
public $extension; // Extension of files imported by driver
public $version; // Version of driver
var $label_lib; // Label of external lib used by driver
var $version_lib; // Version of external lib used by driver
public $label_lib; // Label of external lib used by driver
public $version_lib; // Version of external lib used by driver
var $separator;
public $separator;
var $file; // Path of file
var $handle; // Handle fichier
public $file; // Path of file
public $handle; // Handle fichier
var $cacheconvert=array(); // Array to cache list of value found after a convertion
var $cachefieldtable=array(); // Array to cache list of value found into fields@tables
public $cacheconvert=array(); // Array to cache list of value found after a convertion
public $cachefieldtable=array(); // Array to cache list of value found into fields@tables
var $workbook; // temporary import file
var $record; // current record
var $headers;
public $workbook; // temporary import file
public $record; // current record
public $headers;
/**

View File

@ -35,17 +35,17 @@ class modGeneratePassNone extends ModeleGenPassword
* @var int ID
*/
public $id;
var $length;
public $length;
/**
* @var DoliDB Database handler.
*/
public $db;
var $conf;
var $lang;
var $user;
public $conf;
public $lang;
public $user;
/**

View File

@ -37,30 +37,30 @@ class modGeneratePassPerso extends ModeleGenPassword
* @var int ID
*/
public $id;
var $length;
var $length2; // didn't overright display
var $NbMaj;
var $NbNum;
var $NbSpe;
var $NbRepeat;
var $WithoutAmbi;
public $length;
public $length2; // didn't overright display
public $NbMaj;
public $NbNum;
public $NbSpe;
public $NbRepeat;
public $WithoutAmbi;
/**
* @var DoliDB Database handler.
*/
public $db;
var $conf;
var $lang;
var $user;
var $Maj;
var $Min;
var $Nb;
var $Spe;
var $Ambi;
var $All;
public $conf;
public $lang;
public $user;
public $Maj;
public $Min;
public $Nb;
public $Spe;
public $Ambi;
public $All;
/**
* Constructor

View File

@ -35,17 +35,17 @@ class modGeneratePassStandard extends ModeleGenPassword
* @var int ID
*/
public $id;
var $length;
public $length;
/**
* @var DoliDB Database handler.
*/
public $db;
var $conf;
var $lang;
var $user;
public $conf;
public $lang;
public $user;
/**

View File

@ -1337,6 +1337,9 @@ class Cronjob extends CommonObject
class Cronjobline
{
/**
* @var int ID
*/
public $id;
/**

View File

@ -37,7 +37,7 @@ class EcmDirectory // extends CommonObject
*/
//public $table_element='ecm_directories';
var $picto = 'dir';
public $picto = 'dir';
/**
* @var int ID
@ -49,16 +49,16 @@ class EcmDirectory // extends CommonObject
*/
public $label;
var $fk_parent;
public $fk_parent;
/**
* @var string description
*/
public $description;
var $cachenbofdoc=-1; // By default cache initialized with value 'not calculated'
var $date_c;
var $date_m;
public $cachenbofdoc=-1; // By default cache initialized with value 'not calculated'
public $date_c;
public $date_m;
public $fk_user_m;
public $fk_user_c;
@ -67,11 +67,11 @@ class EcmDirectory // extends CommonObject
*/
public $ref;
var $cats=array();
var $motherof=array();
public $cats=array();
public $motherof=array();
var $forbiddenchars = array('<','>',':','/','\\','?','*','|','"');
var $forbiddencharsdir = array('<','>',':','?','*','|','"');
public $forbiddenchars = array('<','>',':','/','\\','?','*','|','"');
public $forbiddencharsdir = array('<','>',':','?','*','|','"');
public $full_arbo_loaded;