From 7b50935e499b7fbd56368f841a0f2c3205f56bce Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 20 Sep 2018 13:44:45 +0200 Subject: [PATCH] Standardize and update code --- htdocs/core/modules/fichinter/mod_arctic.php | 14 ++++++++++---- htdocs/core/modules/fichinter/mod_pacific.php | 13 ++++++++++--- .../modules/holiday/mod_holiday_immaculate.php | 17 ++++++++++++----- .../modules/holiday/mod_holiday_madonna.php | 16 ++++++++++++---- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php index 3e6193e0740..e11b6cc739c 100644 --- a/htdocs/core/modules/fichinter/mod_arctic.php +++ b/htdocs/core/modules/fichinter/mod_arctic.php @@ -32,9 +32,15 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/fichinter/modules_fichinter.php'; */ class mod_arctic extends ModeleNumRefFicheinter { - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $error = ''; - var $nom = 'arctic'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + + public $error = ''; + + public $nom = 'arctic'; /** @@ -44,7 +50,7 @@ class mod_arctic extends ModeleNumRefFicheinter */ function info() { - global $conf,$langs; + global $conf, $langs; $langs->load("bills"); diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php index c412c1d340c..67539837362 100644 --- a/htdocs/core/modules/fichinter/mod_pacific.php +++ b/htdocs/core/modules/fichinter/mod_pacific.php @@ -30,13 +30,20 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/fichinter/modules_fichinter.php'; */ class mod_pacific extends ModeleNumRefFicheinter { - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $prefix='FI'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + + public $prefix='FI'; + /** * @var string Error code (or message) */ public $error=''; - var $nom = 'pacific'; + + public $nom = 'pacific'; /** diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php index 16b7adce4ac..8d712253a8d 100644 --- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php +++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php @@ -30,10 +30,17 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/holiday/modules_holiday.php'; */ class mod_holiday_immaculate extends ModelNumRefHolidays { - var $version='dolibarr'; - var $error = ''; - var $nom = 'Immaculate'; - var $code_auto=1; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; + + public $error = ''; + + public $nom = 'Immaculate'; + + public $code_auto=1; /** * Return default description of numbering model @@ -42,7 +49,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays */ function info() { - global $conf,$langs; + global $conf, $langs; $langs->load("bills"); diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php index ba951bb557c..eaafade561f 100644 --- a/htdocs/core/modules/holiday/mod_holiday_madonna.php +++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php @@ -29,14 +29,22 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/holiday/modules_holiday.php'; */ class mod_holiday_madonna extends ModelNumRefHolidays { - var $version='dolibarr'; - var $prefix='HL'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; + + public $prefix='HL'; + /** * @var string Error code (or message) */ public $error=''; - var $nom='Madonna'; - var $code_auto=1; + + public $nom='Madonna'; + + public $code_auto=1; /**