From bb0a830b78b846343d02ceb70b5b84102f48fd65 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 20 Sep 2018 13:56:18 +0200 Subject: [PATCH] Standardize and update code --- .../doc/doc_generic_project_odt.modules.php | 6 +++++- .../core/modules/project/mod_project_simple.php | 16 ++++++++++++---- .../modules/project/mod_project_universal.php | 17 ++++++++++++----- .../modules/project/task/mod_task_simple.php | 16 ++++++++++++---- .../modules/project/task/mod_task_universal.php | 15 +++++++++++---- 5 files changed, 52 insertions(+), 18 deletions(-) diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 370a322346b..a350f643e9e 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -65,7 +65,11 @@ class doc_generic_project_odt extends ModelePDFProjects */ public $phpmin = array(5, 4); - var $version = 'dolibarr'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; /** diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php index 33fce830397..8fef9abd7bd 100644 --- a/htdocs/core/modules/project/mod_project_simple.php +++ b/htdocs/core/modules/project/mod_project_simple.php @@ -31,14 +31,22 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/project/modules_project.php'; */ class mod_project_simple extends ModeleNumRefProjects { - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $prefix='PJ'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + + public $prefix='PJ'; + /** * @var string Error code (or message) */ public $error=''; - var $nom = "Simple"; - var $name = "Simple"; + + public $nom = "Simple"; + + public $name = "Simple"; /** diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php index a5526d9f033..2426da13e87 100644 --- a/htdocs/core/modules/project/mod_project_universal.php +++ b/htdocs/core/modules/project/mod_project_universal.php @@ -30,10 +30,17 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/project/modules_project.php'; */ class mod_project_universal extends ModeleNumRefProjects { - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $error = ''; - var $nom = 'Universal'; - var $name = 'Universal'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + + public $error = ''; + + public $nom = 'Universal'; + + public $name = 'Universal'; /** @@ -43,7 +50,7 @@ class mod_project_universal extends ModeleNumRefProjects */ function info() { - global $conf,$langs; + global $conf, $langs; // Load translation files required by the page $langs->loadLangs(array("projects","admin")); diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php index 76cade72785..009449e36c4 100644 --- a/htdocs/core/modules/project/task/mod_task_simple.php +++ b/htdocs/core/modules/project/task/mod_task_simple.php @@ -31,14 +31,22 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/project/task/modules_task.php'; */ class mod_task_simple extends ModeleNumRefTask { - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $prefix='TK'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + + public $prefix='TK'; + /** * @var string Error code (or message) */ public $error=''; - var $nom = "Simple"; - var $name = "Simple"; + + public $nom = "Simple"; + + public $name = "Simple"; /** diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php index 5fcb39c9b83..e0d82164585 100644 --- a/htdocs/core/modules/project/task/mod_task_universal.php +++ b/htdocs/core/modules/project/task/mod_task_universal.php @@ -30,10 +30,17 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/project/task/modules_task.php'; */ class mod_task_universal extends ModeleNumRefTask { - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $error = ''; - var $nom = 'Universal'; - var $name = 'Universal'; + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + + public $error = ''; + + public $nom = 'Universal'; + + public $name = 'Universal'; /**