Browse Source

Fix regression in php style

Laurent Destailleur 6 years ago
parent
commit
ee204e2e64
27 changed files with 109 additions and 110 deletions
  1. 6 6
      htdocs/accountancy/class/accountancycategory.class.php
  2. 9 9
      htdocs/accountancy/class/accountingaccount.class.php
  3. 5 5
      htdocs/adherents/class/adherent.class.php
  4. 5 5
      htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
  5. 5 5
      htdocs/compta/localtax/class/localtax.class.php
  6. 3 3
      htdocs/compta/salaries/class/paymentsalary.class.php
  7. 3 3
      htdocs/compta/sociales/class/paymentsocialcontribution.class.php
  8. 2 2
      htdocs/core/class/comment.class.php
  9. 3 3
      htdocs/core/class/events.class.php
  10. 3 3
      htdocs/core/class/menubase.class.php
  11. 3 3
      htdocs/cron/class/cronjob.class.php
  12. 3 3
      htdocs/don/class/paymentdonation.class.php
  13. 2 2
      htdocs/expedition/class/expeditionbatch.class.php
  14. 3 3
      htdocs/expensereport/class/expensereport.class.php
  15. 6 6
      htdocs/fourn/class/fournisseur.commande.class.php
  16. 5 5
      htdocs/fourn/class/fournisseur.commande.dispatch.class.php
  17. 2 2
      htdocs/loan/class/loan.class.php
  18. 3 3
      htdocs/loan/class/loanschedule.class.php
  19. 2 2
      htdocs/loan/class/paymentloan.class.php
  20. 3 3
      htdocs/opensurvey/class/opensurveysondage.class.php
  21. 2 2
      htdocs/product/class/productbatch.class.php
  22. 5 5
      htdocs/product/class/productcustomerprice.class.php
  23. 3 3
      htdocs/product/class/propalmergepdfproduct.class.php
  24. 7 7
      htdocs/projet/class/project.class.php
  25. 6 6
      htdocs/projet/class/task.class.php
  26. 4 5
      htdocs/resource/class/dolresource.class.php
  27. 6 6
      htdocs/ticket/class/ticketlogs.class.php

+ 6 - 6
htdocs/accountancy/class/accountancycategory.class.php

@@ -34,27 +34,27 @@ class AccountancyCategory 	// extends CommonObject
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
 	/**
 	 * @var string 		Error string
 	 * @see             errors
 	 */
 	public $error;
-	
+
 	/**
 	 * @var string[] Error codes (or messages)
 	 */
 	public $errors = array();
-	
+
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='c_accounting_category';			
-	
+	public $element='c_accounting_category';
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='c_accounting_category';	
+	public $table_element='c_accounting_category';
 
 	public $id;
 	public $code;

+ 9 - 9
htdocs/accountancy/class/accountingaccount.class.php

@@ -31,12 +31,12 @@
 class AccountingAccount extends CommonObject
 {
 	public $element='accounting_account';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='accounting_account';
-	
+
 	public $picto = 'billr';
 
 	/**
@@ -44,7 +44,7 @@ class AccountingAccount extends CommonObject
 	 * @var int
 	 */
 	public $ismultientitymanaged = 1;
-	
+
 	/**
 	 * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
 	 * @var integer
@@ -55,22 +55,22 @@ class AccountingAccount extends CommonObject
 	 * @var DoliDB Database handler.
 	 */
 	public $db;
-	
+
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';	
+	public $error='';
 
 	/**
 	 * @var string[] Error codes (or messages)
 	 */
 	public $errors = array();
-	
+
 	/**
 	 * @var int ID
 	 */
 	public $id;
-	
+
 	var $rowid;
 	var $datec; // Creation date
 	var $fk_pcg_version;
@@ -79,12 +79,12 @@ class AccountingAccount extends CommonObject
 	var $account_number;
 	var $account_parent;
 	var $account_category;
-	
+
 	/**
          * @var string proper name for given parameter
          */
         public $label;
-    
+
 	var $fk_user_author;
 	var $fk_user_modif;
 	var $active;       // duplicate with status

+ 5 - 5
htdocs/adherents/class/adherent.class.php

@@ -45,12 +45,12 @@ class Adherent extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='member';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='adherent';
-	
+
 	public $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
 	var $mesgs;
@@ -542,10 +542,10 @@ class Adherent extends CommonObject
 						$luser->birth=$this->birth;
                                                 $luser->address=$this->address;
                                                 $luser->zip=$this->zip;
-                                                $luser->town=$this->town; 
-                                                $luser->country_id=$this->country_id; 
+                                                $luser->town=$this->town;
+                                                $luser->country_id=$this->country_id;
                                                 $luser->state_id=$this->state_id;
-						
+
 						$luser->email=$this->email;
 						$luser->skype=$this->skype;
 						$luser->office_phone=$this->phone;

+ 5 - 5
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php

@@ -30,7 +30,7 @@ class FormAdvTargetEmailing extends Form
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
 	/**
 	 * @var string Error code (or message)
 	 */
@@ -378,10 +378,10 @@ class FormAdvTargetEmailing extends Form
 	/**
 	 *  Return combo list of categories
 	 *
-	 *  @param  string	$htmlname   Name of categorie
-	 * 	@param	array	$selected_array	value selected
-	 * 	@param	int	$type	type
-	 *  @return	string HTML combo
+	 *  @param  string	$htmlname  		Name of categorie
+	 * 	@param	array	$selected_array	Value selected
+	 * 	@param	int		$type			Type
+	 *  @return	string 					HTML combo
 	 */
 	public function multiselectCategories($htmlname='',$selected_array = array(), $type=0)
 	{

+ 5 - 5
htdocs/compta/localtax/class/localtax.class.php

@@ -32,13 +32,13 @@ class Localtax extends CommonObject
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='localtax';	
-	
+	public $element='localtax';
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='localtax';
-	
+
 	public $picto='payment';
 
 	var $ltt;
@@ -46,12 +46,12 @@ class Localtax extends CommonObject
 	var $datep;
 	var $datev;
 	var $amount;
-	
+
 	/**
      * @var string proper name for given parameter
      */
     public $label;
-    
+
 	var $fk_bank;
 	var $fk_user_creat;
 	var $fk_user_modif;

+ 3 - 3
htdocs/compta/salaries/class/paymentsalary.class.php

@@ -35,12 +35,12 @@ class PaymentSalary extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='payment_salary';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='payment_salary';	
-	
+	public $table_element='payment_salary';
+
 	public $picto='payment';
 
 	public $tms;

+ 3 - 3
htdocs/compta/sociales/class/paymentsocialcontribution.class.php

@@ -35,12 +35,12 @@ class PaymentSocialContribution extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='paiementcharge';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='paiementcharge';	
-	
+	public $table_element='paiementcharge';
+
 	public $picto = 'payment';
 
 	var $fk_charge;

+ 2 - 2
htdocs/core/class/comment.class.php

@@ -8,11 +8,11 @@ class Comment extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='comment';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='comment';	
+	public $table_element='comment';
 
 	public $fk_element;
 	public $element_type;

+ 3 - 3
htdocs/core/class/events.class.php

@@ -38,17 +38,17 @@ class Events // extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='events';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='events';	
+	public $table_element='events';
 
 	/**
 	 * @var int ID
 	 */
 	public $id;
-	
+
 	/**
      * @var DoliDB Database handler.
      */

+ 3 - 3
htdocs/core/class/menubase.class.php

@@ -31,13 +31,13 @@ class Menubase
     /**
      * @var DoliDB Database handler.
      */
-    public $db;	
-    
+    public $db;
+
     /**
 	 * @var string Error code (or message)
 	 */
 	public $error;
-	
+
     /**
 	 * @var string[] Error codes (or messages)
 	 */

+ 3 - 3
htdocs/cron/class/cronjob.class.php

@@ -34,12 +34,12 @@ class Cronjob extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='cronjob';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='cronjob';	
-	
+	public $table_element='cronjob';
+
     public $picto = 'cron';
 
     public $entity;

+ 3 - 3
htdocs/don/class/paymentdonation.class.php

@@ -32,13 +32,13 @@ class PaymentDonation extends CommonObject
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='payment_donation';	
-	
+	public $element='payment_donation';
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='payment_donation';
-	
+
     public $picto = 'payment';
 
 	public $rowid;

+ 2 - 2
htdocs/expedition/class/expeditionbatch.class.php

@@ -31,8 +31,8 @@ class ExpeditionLineBatch extends CommonObject
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='expeditionlignebatch';			
-	
+	public $element='expeditionlignebatch';
+
 	private static $_table_element='expeditiondet_batch';		//!< Name of table without prefix where object is stored
 
 	var $sellby;

+ 3 - 3
htdocs/expensereport/class/expensereport.class.php

@@ -37,12 +37,12 @@ class ExpenseReport extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='expensereport';
-	
+
     /**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='expensereport';
-	
+
     var $table_element_line = 'expensereport_det';
     var $fk_element = 'fk_expensereport';
     var $picto = 'trip';
@@ -2390,7 +2390,7 @@ class ExpenseReportLine
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
     /**
 	 * @var string Error code (or message)
 	 */

+ 6 - 6
htdocs/fourn/class/fournisseur.commande.class.php

@@ -44,22 +44,22 @@ class CommandeFournisseur extends CommonOrder
 	 * @var string ID to identify managed object
 	 */
 	public $element='order_supplier';
-    
+
     /**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='commande_fournisseur';
-	
+
     public $table_element_line = 'commande_fournisseurdet';
     public $fk_element = 'fk_commande';
     public $picto='order';
-    
+
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
      * @var int
      */
     public $ismultientitymanaged = 1;
-    
+
     /**
      * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
      * @var integer
@@ -78,7 +78,7 @@ class CommandeFournisseur extends CommonOrder
 	 * @var string
 	 */
     public $ref;
-    
+
     public $ref_supplier;
     public $brouillon;
     public $statut;			// 0=Draft -> 1=Validated -> 2=Approved -> 3=Ordered/Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
@@ -3099,7 +3099,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 * @var string ID to identify managed object
 	 */
 	public $element='commande_fournisseurdet';
-    
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */

+ 5 - 5
htdocs/fourn/class/fournisseur.commande.dispatch.class.php

@@ -37,23 +37,23 @@ class CommandeFournisseurDispatch extends CommonObject
 	/**
      * @var DoliDB Database handler.
      */
-    public $db;	
-    
+    public $db;
+
 	/**
 	 * @var string Error code (or message)
 	 */
 	public $error;
-	
+
 	/**
 	 * @var string[] Error codes (or messages)
 	 */
 	public $errors = array();
-	
+
 	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element='commandefournisseurdispatch';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */

+ 2 - 2
htdocs/loan/class/loan.class.php

@@ -33,9 +33,9 @@ class Loan extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='loan';
-	
+
 	public $table='loan';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */

+ 3 - 3
htdocs/loan/class/loanschedule.class.php

@@ -17,7 +17,7 @@
 
 /**
  *      \file       htdocs/loan/class/loanschedule.class.php
- *		\ingroup    facture
+ *		\ingroup    loan
  *		\brief      File of class to manage schedule of loans
  */
 
@@ -33,11 +33,11 @@ class LoanSchedule extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='loan_schedule';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='loan_schedule';	
+	public $table_element='loan_schedule';
 
 	var $fk_loan;
 	var $datec='';

+ 2 - 2
htdocs/loan/class/paymentloan.class.php

@@ -34,11 +34,11 @@ class PaymentLoan extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='payment_loan';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='payment_loan';	
+	public $table_element='payment_loan';
 
 	var $fk_loan;
 	var $datec='';

+ 3 - 3
htdocs/opensurvey/class/opensurveysondage.class.php

@@ -38,12 +38,12 @@ class Opensurveysondage extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='opensurvey_sondage';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='opensurvey_sondage';	
-	
+	public $table_element='opensurvey_sondage';
+
     public $picto = 'opensurvey';
 
 	public $id_sondage;

+ 2 - 2
htdocs/product/class/productbatch.class.php

@@ -33,8 +33,8 @@ class Productbatch extends CommonObject
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='productbatch';		
-	
+	public $element='productbatch';
+
 	private static $_table_element='product_batch';		//!< Name of table without prefix where object is stored
 
 	var $tms='';

+ 5 - 5
htdocs/product/class/productcustomerprice.class.php

@@ -31,13 +31,13 @@ class Productcustomerprice extends CommonObject
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element = 'product_customer_price'; 
-	
+	public $element = 'product_customer_price';
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'product_customer_price'; 
-	
+	public $table_element = 'product_customer_price';
+
 	var $entity;
 	var $datec = '';
 	var $tms = '';
@@ -962,7 +962,7 @@ class PriceByCustomerLine
 	 * @var int ID
 	 */
 	public $id;
-	
+
 	var $entity;
 	var $datec = '';
 	var $tms = '';

+ 3 - 3
htdocs/product/class/propalmergepdfproduct.class.php

@@ -34,12 +34,12 @@ class Propalmergepdfproduct extends CommonObject
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='propal_merge_pdf_product';			
-	
+	public $element='propal_merge_pdf_product';
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='propal_merge_pdf_product';	
+	public $table_element='propal_merge_pdf_product';
 
 	var $fk_product;
 	var $file_name;

+ 7 - 7
htdocs/projet/class/project.class.php

@@ -36,13 +36,13 @@ class Project extends CommonObject
     /**
 	 * @var string ID to identify managed object
 	 */
-	public $element = 'project'; 
-    
+	public $element = 'project';
+
     /**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'projet';  
-	
+	public $table_element = 'projet';
+
     public $table_element_line = 'projet_task';
     public $fk_element = 'fk_projet';
     public $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -732,10 +732,10 @@ class Project extends CommonObject
             return -1;
         }
     }
-    
+
     /**
      * 		Delete tasks with no children first, then task with children recursively
-     *  
+     *
      *  	@param     	User		$user		User
      *		@return		int				<0 if KO, 1 if OK
      */
@@ -763,7 +763,7 @@ class Project extends CommonObject
         {
             if (count($this->lines)) $this->deleteTasks($this->lines);
         }
-        
+
         return 1;
     }
 

+ 6 - 6
htdocs/projet/class/task.class.php

@@ -34,24 +34,24 @@ class Task extends CommonObject
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='project_task';	
-	
+	public $element='project_task';
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='projet_task';	
-	
+	public $table_element='projet_task';
+
 	public $fk_element='fk_task';
 	public $picto = 'task';
 	protected $childtables=array('projet_task_time');    // To test if we can delete object
 
 	var $fk_task_parent;
-	
+
 	/**
      * @var string proper name for given parameter
      */
     public $label;
-    
+
 	var $description;
 	var $duration_effective;		// total of time spent on this task
 	var $planned_workload;

+ 4 - 5
htdocs/resource/class/dolresource.class.php

@@ -19,7 +19,6 @@
  *  \file      	resource/class/resource.class.php
  *  \ingroup    resource
  *  \brief      Class file for resource object
-
  */
 
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
@@ -33,13 +32,13 @@ class Dolresource extends CommonObject
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='dolresource';	
-	
+	public $element='dolresource';
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='resource';	
-	
+	public $table_element='resource';
+
     public $picto = 'resource';
 
 	public $resource_id;

+ 6 - 6
htdocs/ticket/class/ticketlogs.class.php

@@ -36,22 +36,22 @@ class Ticketlogs// extends CommonObject
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error; 
-	
+	public $error;
+
     /**
 	 * @var string[] Error codes (or messages)
 	 */
 	public $errors = array();
-    
+
     /**
 	 * @var string ID to identify managed object
 	 */
-	public $element = 'ticketlogs'; 
-	
+	public $element = 'ticketlogs';
+
     /**
 	 * @var string Name of table without prefix where object is stored
 	 */