From d91b1fd895797d4729ee9eaa71e266350297e721 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 22 Aug 2018 11:06:34 +0200 Subject: [PATCH] Update and standardize code --- htdocs/core/class/antivir.class.php | 6 +++++- htdocs/core/class/canvas.class.php | 5 ++++- htdocs/core/class/ccountry.class.php | 5 ++++- htdocs/core/class/conf.class.php | 8 ++++++-- htdocs/core/class/cstate.class.php | 5 ++++- htdocs/core/class/ctypent.class.php | 5 ++++- htdocs/core/class/dolreceiptprinter.class.php | 7 ++++++- htdocs/core/class/events.class.php | 6 +++++- htdocs/core/class/extrafields.class.php | 5 ++++- htdocs/core/class/google.class.php | 5 ++++- htdocs/core/class/hookmanager.class.php | 5 ++++- htdocs/core/class/html.form.class.php | 5 ++++- htdocs/core/class/html.formaccounting.class.php | 7 +++++-- htdocs/core/class/html.formactions.class.php | 5 ++++- htdocs/core/class/html.formadmin.class.php | 5 ++++- htdocs/core/class/html.formbank.class.php | 5 ++++- htdocs/core/class/html.formbarcode.class.php | 5 ++++- htdocs/core/class/html.formcompany.class.php | 6 ++++-- htdocs/core/class/html.formcontract.class.php | 5 ++++- htdocs/core/class/html.formcron.class.php | 5 ++++- htdocs/core/class/html.formintervention.class.php | 5 ++++- htdocs/core/class/html.formmail.class.php | 5 ++++- htdocs/core/class/html.formmargin.class.php | 5 ++++- htdocs/core/class/html.formprojet.class.php | 5 ++++- htdocs/core/class/html.formpropal.class.php | 5 ++++- htdocs/core/class/html.formsms.class.php | 5 ++++- htdocs/core/class/html.formsocialcontrib.class.php | 5 ++++- htdocs/core/class/interfaces.class.php | 12 ++++++++---- htdocs/core/class/notify.class.php | 6 +++++- htdocs/core/class/rssparser.class.php | 5 ++++- htdocs/core/class/utils.class.php | 5 ++++- htdocs/core/menus/standard/auguria_menu.php | 6 +++++- htdocs/core/menus/standard/eldy_menu.php | 6 +++++- htdocs/core/menus/standard/empty.php | 6 +++++- htdocs/core/modules/action/rapport.pdf.php | 6 +++++- htdocs/core/modules/import/import_csv.modules.php | 6 +++++- htdocs/core/modules/import/import_xlsx.modules.php | 9 ++++++--- .../modules/mailings/advthirdparties.modules.php | 6 +++++- htdocs/core/modules/mailings/contacts1.modules.php | 5 ++++- htdocs/core/modules/mailings/example.modules.php | 6 +++++- htdocs/core/modules/mailings/fraise.modules.php | 5 ++++- htdocs/core/modules/mailings/modules_mailings.php | 5 ++++- htdocs/core/modules/mailings/pomme.modules.php | 5 ++++- .../core/modules/mailings/thirdparties.modules.php | 6 +++++- .../thirdparties_services_expired.modules.php | 7 ++++++- htdocs/core/modules/printing/modules_printing.php | 5 ++++- htdocs/core/modules/printing/printgcp.modules.php | 5 ++++- htdocs/core/modules/printing/printipp.modules.php | 5 ++++- .../security/generate/modGeneratePassNone.class.php | 6 +++++- .../security/generate/modGeneratePassPerso.class.php | 6 +++++- .../generate/modGeneratePassStandard.class.php | 6 +++++- 51 files changed, 231 insertions(+), 59 deletions(-) diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php index e82b97c73ba..950d857000d 100644 --- a/htdocs/core/class/antivir.class.php +++ b/htdocs/core/class/antivir.class.php @@ -41,7 +41,11 @@ class AntiVir public $errors = array(); var $output; - var $db; + + /** + * @var DoliDB Database handler. + */ + public $db; /** * Constructor diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index 1a5573a7279..8a9b9d2f005 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -28,7 +28,10 @@ */ class Canvas { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php index be5a7f2e490..01b176da165 100644 --- a/htdocs/core/class/ccountry.class.php +++ b/htdocs/core/class/ccountry.class.php @@ -32,7 +32,10 @@ */ class Ccountry // extends CommonObject { - var $db; //!< To store db handler + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 3b33b1f16f1..c86051d7088 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -35,8 +35,12 @@ class Conf /** \public */ //! To store properties found in conf file var $file; - //! Object with database handler - var $db; + + /** + * @var DoliDB Database handler. + */ + public $db; + //! To store properties found into database var $global; //! To store browser info diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php index e94d00bcb07..e841fc581d8 100644 --- a/htdocs/core/class/cstate.class.php +++ b/htdocs/core/class/cstate.class.php @@ -32,7 +32,10 @@ */ class Cstate // extends CommonObject { - var $db; //!< To store db handler + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php index 35643a0733b..546b182a336 100644 --- a/htdocs/core/class/ctypent.class.php +++ b/htdocs/core/class/ctypent.class.php @@ -27,7 +27,10 @@ */ class Ctypent // extends CommonObject { - var $db; //!< To store db handler + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php index 8aacdba4a6b..78a9b2479eb 100644 --- a/htdocs/core/class/dolreceiptprinter.class.php +++ b/htdocs/core/class/dolreceiptprinter.class.php @@ -105,7 +105,12 @@ class dolReceiptPrinter extends Escpos const CONNECTOR_NETWORK_PRINT = 3; const CONNECTOR_WINDOWS_PRINT = 4; //const CONNECTOR_JAVA = 5; - var $db; + + /** + * @var DoliDB Database handler. + */ + public $db; + var $tags; var $printer; var $template; diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php index e11830aca12..f300d5c49e7 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.class.php @@ -38,7 +38,11 @@ class Events // extends CommonObject public $table_element='events'; //!< Name of table without prefix where object is stored var $id; - var $db; + + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 44b38afc351..2d0398dae16 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -37,7 +37,10 @@ */ class ExtraFields { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; // type of element (for what object is the extrafield) // @deprecated diff --git a/htdocs/core/class/google.class.php b/htdocs/core/class/google.class.php index 1e2e2438114..5756acd90e0 100644 --- a/htdocs/core/class/google.class.php +++ b/htdocs/core/class/google.class.php @@ -26,7 +26,10 @@ */ class GoogleAPI { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 8d37d7b5c9b..9e2bd344171 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -29,7 +29,10 @@ */ class HookManager { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 77d55794a3c..52abde0c14e 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -47,7 +47,10 @@ */ class Form { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php index a2e1dcc9ad9..8a0073e0351 100644 --- a/htdocs/core/class/html.formaccounting.class.php +++ b/htdocs/core/class/html.formaccounting.class.php @@ -35,14 +35,17 @@ class FormAccounting extends Form private $options_cache = array(); - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) */ public $error=''; - /** + /** * Constructor * * @param DoliDB $db Database handler diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 01316d9b452..a0468da2726 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -29,7 +29,10 @@ */ class FormActions { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index 1b6266fb6e3..b52da95f967 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.class.php @@ -29,7 +29,10 @@ */ class FormAdmin { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.formbank.class.php b/htdocs/core/class/html.formbank.class.php index 36eeaaacdf0..9cf60cc45b1 100644 --- a/htdocs/core/class/html.formbank.class.php +++ b/htdocs/core/class/html.formbank.class.php @@ -29,7 +29,10 @@ */ class FormBank { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php index 3d8f40bb2e8..34d56cee853 100644 --- a/htdocs/core/class/html.formbarcode.class.php +++ b/htdocs/core/class/html.formbarcode.class.php @@ -28,7 +28,10 @@ */ class FormBarCode { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index c03764c2f34..d422fa379c4 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -31,7 +31,10 @@ */ class FormCompany { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) @@ -39,7 +42,6 @@ class FormCompany public $error=''; - /** * Constructor * diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php index b011d7e1b14..2c45ef0266c 100644 --- a/htdocs/core/class/html.formcontract.class.php +++ b/htdocs/core/class/html.formcontract.class.php @@ -27,7 +27,10 @@ */ class FormContract { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php index 99ca3924c3c..92cbcc52334 100644 --- a/htdocs/core/class/html.formcron.class.php +++ b/htdocs/core/class/html.formcron.class.php @@ -28,7 +28,10 @@ */ class FormCron extends Form { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php index 4a65fc7eac1..62950626e2d 100644 --- a/htdocs/core/class/html.formintervention.class.php +++ b/htdocs/core/class/html.formintervention.class.php @@ -27,7 +27,10 @@ */ class FormIntervention { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index fd8940674e2..73c4b036711 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -35,7 +35,10 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php'; */ class FormMail extends Form { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; var $withform; // 1=Include HTML form tag and show submit button, 0=Do not include form tag and submit button, -1=Do not include form tag but include submit button diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php index ee88110038b..e891e3dacbe 100644 --- a/htdocs/core/class/html.formmargin.class.php +++ b/htdocs/core/class/html.formmargin.class.php @@ -28,7 +28,10 @@ */ class FormMargin { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index e7b91e8c82d..7a022c4cf52 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -29,7 +29,10 @@ */ class FormProjets { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php index 1f4d94f649a..712460f530f 100644 --- a/htdocs/core/class/html.formpropal.class.php +++ b/htdocs/core/class/html.formpropal.class.php @@ -27,7 +27,10 @@ */ class FormPropal { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php index 850704fe42e..9db197d41b2 100644 --- a/htdocs/core/class/html.formsms.class.php +++ b/htdocs/core/class/html.formsms.class.php @@ -32,7 +32,10 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php'; */ class FormSms { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; var $fromname; var $fromsms; diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php index 636cf489d7d..8c940c3898b 100644 --- a/htdocs/core/class/html.formsocialcontrib.class.php +++ b/htdocs/core/class/html.formsocialcontrib.class.php @@ -27,7 +27,10 @@ */ class FormSocialContrib { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index e6325df8836..ceb4d0c657c 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -31,13 +31,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php'; */ class Interfaces { - var $db; - var $dir; // Directory with all core and external triggers files /** - * + * @var DoliDB Database handler. + */ + public $db; + + var $dir; // Directory with all core and external triggers files + + /** * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); /** * Constructor diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index 22a22008d74..e77978fd62e 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -31,7 +31,11 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/CMailFile.class.php'; class Notify { var $id; - var $db; + + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php index d2ce6d6d5c2..34738c09bf7 100644 --- a/htdocs/core/class/rssparser.class.php +++ b/htdocs/core/class/rssparser.class.php @@ -26,7 +26,10 @@ */ class RssParser { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php index b9a9ad6f4bf..b7ae66da36c 100644 --- a/htdocs/core/class/utils.class.php +++ b/htdocs/core/class/utils.class.php @@ -27,7 +27,10 @@ */ class Utils { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; var $output; // Used by Cron method to return message var $result; // Used by Cron method to return data diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php index df31b9c9d8f..33c02ce5f1c 100644 --- a/htdocs/core/menus/standard/auguria_menu.php +++ b/htdocs/core/menus/standard/auguria_menu.php @@ -28,7 +28,11 @@ */ class MenuManager { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; + var $type_user; // Put 0 for internal users, 1 for external users var $atarget=""; // To store default target to use onto links var $name="auguria"; diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php index 11f1de43a1f..dd919fd20a3 100644 --- a/htdocs/core/menus/standard/eldy_menu.php +++ b/htdocs/core/menus/standard/eldy_menu.php @@ -27,7 +27,11 @@ */ class MenuManager { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; + var $type_user; // Put 0 for internal users, 1 for external users var $atarget=""; // To store default target to use onto links var $name="eldy"; diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index f761b593fb7..a9d8e2f9a41 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -25,7 +25,11 @@ */ class MenuManager { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; + var $type_user=0; // Put 0 for internal users, 1 for external users var $atarget=""; // To store default target to use onto links diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php index 7dec29e5189..fe7be7f3052 100644 --- a/htdocs/core/modules/action/rapport.pdf.php +++ b/htdocs/core/modules/action/rapport.pdf.php @@ -35,7 +35,11 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; */ class CommActionRapport { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; + var $description; var $date_edition; var $year; diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php index aeaa6e58db2..9ea8ee25438 100644 --- a/htdocs/core/modules/import/import_csv.modules.php +++ b/htdocs/core/modules/import/import_csv.modules.php @@ -33,7 +33,11 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/import/modules_import.php'; */ class ImportCsv extends ModeleImports { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; + var $datatoimport; /** diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php index 0c610f469b0..d9400f2738d 100644 --- a/htdocs/core/modules/import/import_xlsx.modules.php +++ b/htdocs/core/modules/import/import_xlsx.modules.php @@ -33,7 +33,11 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/import/modules_import.php'; */ class ImportXlsx extends ModeleImports { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; + var $datatoimport; /** @@ -42,10 +46,9 @@ class ImportXlsx extends ModeleImports public $error=''; /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); var $id; // Id of driver var $label; // Label of driver diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php index 78aab1a5bd7..08249104909 100644 --- a/htdocs/core/modules/mailings/advthirdparties.modules.php +++ b/htdocs/core/modules/mailings/advthirdparties.modules.php @@ -32,7 +32,11 @@ class mailing_advthirdparties extends MailingTargets var $require_module=array("none"); // This module should not be displayed as Selector in mailling var $picto='company'; - var $db; + + /** + * @var DoliDB Database handler. + */ + public $db; /** diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php index 90d81dca4a5..af0d1103e4e 100644 --- a/htdocs/core/modules/mailings/contacts1.modules.php +++ b/htdocs/core/modules/mailings/contacts1.modules.php @@ -39,7 +39,10 @@ class mailing_contacts1 extends MailingTargets var $require_admin=0; // Module mailing actif pour user admin ou non var $picto='contact'; - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php index 548510f81a0..fb7b6c94519 100644 --- a/htdocs/core/modules/mailings/example.modules.php +++ b/htdocs/core/modules/mailings/example.modules.php @@ -37,7 +37,11 @@ class mailing_example extends MailingTargets var $require_module=array(); var $picto=''; - var $db; + + /** + * @var DoliDB Database handler. + */ + public $db; // CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php index f71b6b925f0..9d6e2505f92 100644 --- a/htdocs/core/modules/mailings/fraise.modules.php +++ b/htdocs/core/modules/mailings/fraise.modules.php @@ -41,7 +41,10 @@ class mailing_fraise extends MailingTargets var $require_module=array('adherent'); var $picto='user'; - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * Constructor diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php index d3ea299a86e..1035d3bf765 100644 --- a/htdocs/core/modules/mailings/modules_mailings.php +++ b/htdocs/core/modules/mailings/modules_mailings.php @@ -31,7 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; */ class MailingTargets // This can't be abstract as it is used for some method { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php index 5824f456365..b3265ac35f7 100644 --- a/htdocs/core/modules/mailings/pomme.modules.php +++ b/htdocs/core/modules/mailings/pomme.modules.php @@ -37,7 +37,10 @@ class mailing_pomme extends MailingTargets var $require_admin=1; // Module mailing actif pour user admin ou non var $picto='user'; - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php index 57a69475000..f7a2ed5bc3c 100644 --- a/htdocs/core/modules/mailings/thirdparties.modules.php +++ b/htdocs/core/modules/mailings/thirdparties.modules.php @@ -31,7 +31,11 @@ class mailing_thirdparties extends MailingTargets var $require_module=array("societe"); // This module allows to select by categories must be also enabled if category module is not activated var $picto='company'; - var $db; + + /** + * @var DoliDB Database handler. + */ + public $db; /** diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php index 08473f3cb6d..0135227b461 100644 --- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php +++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php @@ -29,7 +29,12 @@ class mailing_thirdparties_services_expired extends MailingTargets var $require_module=array('contrat'); var $picto='company'; - var $db; + + /** + * @var DoliDB Database handler. + */ + public $db; + var $arrayofproducts=array(); diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php index f0d96c8aea7..8205dc5a705 100644 --- a/htdocs/core/modules/printing/modules_printing.php +++ b/htdocs/core/modules/printing/modules_printing.php @@ -31,7 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; */ class PrintingDriver { - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php index 8e868c19a1c..b85e4823bba 100644 --- a/htdocs/core/modules/printing/printgcp.modules.php +++ b/htdocs/core/modules/printing/printgcp.modules.php @@ -53,7 +53,10 @@ class printing_printgcp extends PrintingDriver */ public $errors = array(); - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; private $OAUTH_SERVICENAME_GOOGLE = 'Google'; diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php index e2354870cf9..e51aa4e5c63 100644 --- a/htdocs/core/modules/printing/printipp.modules.php +++ b/htdocs/core/modules/printing/printipp.modules.php @@ -51,7 +51,10 @@ class printing_printipp extends PrintingDriver */ public $errors = array(); - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; /** diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php index 79cbd1ff629..e0c7714f8bb 100644 --- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php @@ -34,7 +34,11 @@ class modGeneratePassNone extends ModeleGenPassword var $id; var $length; - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; + var $conf; var $lang; var $user; diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php index 39b3d54ea30..f4734cd5a54 100644 --- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php @@ -42,7 +42,11 @@ class modGeneratePassPerso extends ModeleGenPassword var $NbRepeat; var $WithoutAmbi; - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; + var $conf; var $lang; var $user; diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php index acb44256537..4103a9cced8 100644 --- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php @@ -34,7 +34,11 @@ class modGeneratePassStandard extends ModeleGenPassword var $id; var $length; - var $db; + /** + * @var DoliDB Database handler. + */ + public $db; + var $conf; var $lang; var $user;