Browse Source

Update and standardize code

Philippe GRAND 6 năm trước cách đây
mục cha
commit
d91b1fd895
51 tập tin đã thay đổi với 230 bổ sung58 xóa
  1. 5 1
      htdocs/core/class/antivir.class.php
  2. 4 1
      htdocs/core/class/canvas.class.php
  3. 4 1
      htdocs/core/class/ccountry.class.php
  4. 6 2
      htdocs/core/class/conf.class.php
  5. 4 1
      htdocs/core/class/cstate.class.php
  6. 4 1
      htdocs/core/class/ctypent.class.php
  7. 6 1
      htdocs/core/class/dolreceiptprinter.class.php
  8. 5 1
      htdocs/core/class/events.class.php
  9. 4 1
      htdocs/core/class/extrafields.class.php
  10. 4 1
      htdocs/core/class/google.class.php
  11. 4 1
      htdocs/core/class/hookmanager.class.php
  12. 4 1
      htdocs/core/class/html.form.class.php
  13. 5 2
      htdocs/core/class/html.formaccounting.class.php
  14. 4 1
      htdocs/core/class/html.formactions.class.php
  15. 4 1
      htdocs/core/class/html.formadmin.class.php
  16. 4 1
      htdocs/core/class/html.formbank.class.php
  17. 4 1
      htdocs/core/class/html.formbarcode.class.php
  18. 4 2
      htdocs/core/class/html.formcompany.class.php
  19. 4 1
      htdocs/core/class/html.formcontract.class.php
  20. 4 1
      htdocs/core/class/html.formcron.class.php
  21. 4 1
      htdocs/core/class/html.formintervention.class.php
  22. 4 1
      htdocs/core/class/html.formmail.class.php
  23. 4 1
      htdocs/core/class/html.formmargin.class.php
  24. 4 1
      htdocs/core/class/html.formprojet.class.php
  25. 4 1
      htdocs/core/class/html.formpropal.class.php
  26. 4 1
      htdocs/core/class/html.formsms.class.php
  27. 4 1
      htdocs/core/class/html.formsocialcontrib.class.php
  28. 7 3
      htdocs/core/class/interfaces.class.php
  29. 5 1
      htdocs/core/class/notify.class.php
  30. 4 1
      htdocs/core/class/rssparser.class.php
  31. 4 1
      htdocs/core/class/utils.class.php
  32. 5 1
      htdocs/core/menus/standard/auguria_menu.php
  33. 5 1
      htdocs/core/menus/standard/eldy_menu.php
  34. 5 1
      htdocs/core/menus/standard/empty.php
  35. 5 1
      htdocs/core/modules/action/rapport.pdf.php
  36. 5 1
      htdocs/core/modules/import/import_csv.modules.php
  37. 6 3
      htdocs/core/modules/import/import_xlsx.modules.php
  38. 5 1
      htdocs/core/modules/mailings/advthirdparties.modules.php
  39. 4 1
      htdocs/core/modules/mailings/contacts1.modules.php
  40. 5 1
      htdocs/core/modules/mailings/example.modules.php
  41. 4 1
      htdocs/core/modules/mailings/fraise.modules.php
  42. 4 1
      htdocs/core/modules/mailings/modules_mailings.php
  43. 4 1
      htdocs/core/modules/mailings/pomme.modules.php
  44. 5 1
      htdocs/core/modules/mailings/thirdparties.modules.php
  45. 6 1
      htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
  46. 4 1
      htdocs/core/modules/printing/modules_printing.php
  47. 4 1
      htdocs/core/modules/printing/printgcp.modules.php
  48. 4 1
      htdocs/core/modules/printing/printipp.modules.php
  49. 5 1
      htdocs/core/modules/security/generate/modGeneratePassNone.class.php
  50. 5 1
      htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
  51. 5 1
      htdocs/core/modules/security/generate/modGeneratePassStandard.class.php

+ 5 - 1
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

+ 4 - 1
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)

+ 4 - 1
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)

+ 6 - 2
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

+ 4 - 1
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)

+ 4 - 1
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)

+ 6 - 1
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;

+ 5 - 1
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)

+ 4 - 1
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

+ 4 - 1
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)

+ 4 - 1
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)

+ 4 - 1
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)

+ 5 - 2
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

+ 4 - 1
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)

+ 4 - 1
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)

+ 4 - 1
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)

+ 4 - 1
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)

+ 4 - 2
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
 	 *

+ 4 - 1
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)

+ 4 - 1
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)

+ 4 - 1
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)

+ 4 - 1
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
 

+ 4 - 1
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)

+ 4 - 1
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)

+ 4 - 1
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)

+ 4 - 1
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;

+ 4 - 1
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)

+ 7 - 3
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 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

+ 5 - 1
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)

+ 4 - 1
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)

+ 4 - 1
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

+ 5 - 1
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";

+ 5 - 1
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";

+ 5 - 1
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
 

+ 5 - 1
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;

+ 5 - 1
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;
 
 	/**

+ 6 - 3
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

+ 5 - 1
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;
 
 
 	/**

+ 4 - 1
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;
 
 
 	/**

+ 5 - 1
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

+ 4 - 1
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

+ 4 - 1
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)

+ 4 - 1
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;
 
 
 	/**

+ 5 - 1
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;
 
 
 	/**

+ 6 - 1
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();
 
 

+ 4 - 1
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)

+ 4 - 1
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';
 

+ 4 - 1
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;
 
 
     /**

+ 5 - 1
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;

+ 5 - 1
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;

+ 5 - 1
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;