alxarafe / alixar

dolibarr/htdocs/core/modules/societe/mod_codecompta_panicum.php

Indentation +57 added lines, -57 removed lines

@@ -30,76 +30,76 @@
  */
 class mod_codecompta_panicum extends ModeleAccountancyCode
 {
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Panicum';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Panicum';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Panicum';
+    /**
+     * @var string model name
+     */
+    public $name='Panicum';
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';        // 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';        // 'development', 'experimental', 'dolibarr'
 
 
-	/**
-	 * 	Constructor
-	 */
-	function __construct()
-	{
-	}
+    /**
+     * 	Constructor
+     */
+    function __construct()
+    {
+    }
 
 
-	/**
-	 * Return description of module
-	 *
-	 * @param	Translate	$langs	Object langs
-	 * @return 	string      		Description of module
-	 */
-	function info($langs)
-	{
-		return $langs->trans("ModuleCompanyCode".$this->name);
-	}
+    /**
+     * Return description of module
+     *
+     * @param	Translate	$langs	Object langs
+     * @return 	string      		Description of module
+     */
+    function info($langs)
+    {
+        return $langs->trans("ModuleCompanyCode".$this->name);
+    }
 
-	/**
-	 *  Return an example of result returned by getNextValue
-	 *
-	 *  @param	Translate	$langs		Object langs
-	 *  @param	Societe		$objsoc		Object thirdparty
-	 *  @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 *  @return	string					Example
-	 */
-	function getExample($langs,$objsoc=0,$type=-1)
-	{
-		return '';
-	}
+    /**
+     *  Return an example of result returned by getNextValue
+     *
+     *  @param	Translate	$langs		Object langs
+     *  @param	Societe		$objsoc		Object thirdparty
+     *  @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+     *  @return	string					Example
+     */
+    function getExample($langs,$objsoc=0,$type=-1)
+    {
+        return '';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Set accountancy account code for a third party into this->code
-	 *
-	 *  @param	DoliDB	$db              Database handler
-	 *  @param  Societe	$societe         Third party object
-	 *  @param  int		$type			'customer' or 'supplier'
-	 *  @return	int						>=0 if OK, <0 if KO
-	 */
-	function get_code($db, $societe, $type='')
-	{
+    /**
+     *  Set accountancy account code for a third party into this->code
+     *
+     *  @param	DoliDB	$db              Database handler
+     *  @param  Societe	$societe         Third party object
+     *  @param  int		$type			'customer' or 'supplier'
+     *  @return	int						>=0 if OK, <0 if KO
+     */
+    function get_code($db, $societe, $type='')
+    {
         // phpcs:enable
-		$this->code='';
+        $this->code='';
 
-		if (is_object($societe)) {
-			if ($type == 'supplier') $this->code = (! empty($societe->code_compta_fournisseur)?$societe->code_compta_fournisseur:'');
-			else $this->code = (! empty($societe->code_compta)?$societe->code_compta:'');
-		}
+        if (is_object($societe)) {
+            if ($type == 'supplier') $this->code = (! empty($societe->code_compta_fournisseur)?$societe->code_compta_fournisseur:'');
+            else $this->code = (! empty($societe->code_compta)?$societe->code_compta:'');
+        }
 
-		return 0; // return ok
-	}
+        return 0; // return ok
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -35,18 +35,18 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Panicum';
+	public $nom = 'Panicum';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Panicum';
+	public $name = 'Panicum';
 
 	/**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';        // 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 
 	/**
@@ -76,7 +76,7 @@ 
 	 *  @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 *  @return	string					Example
 	 */
-	function getExample($langs,$objsoc=0,$type=-1)
+	function getExample($langs, $objsoc = 0, $type = -1)
 	{
 		return '';
 	}
@@ -90,14 +90,14 @@ 
 	 *  @param  int		$type			'customer' or 'supplier'
 	 *  @return	int						>=0 if OK, <0 if KO
 	 */
-	function get_code($db, $societe, $type='')
+	function get_code($db, $societe, $type = '')
 	{
         // phpcs:enable
-		$this->code='';
+		$this->code = '';
 
 		if (is_object($societe)) {
-			if ($type == 'supplier') $this->code = (! empty($societe->code_compta_fournisseur)?$societe->code_compta_fournisseur:'');
-			else $this->code = (! empty($societe->code_compta)?$societe->code_compta:'');
+			if ($type == 'supplier') $this->code = (!empty($societe->code_compta_fournisseur) ? $societe->code_compta_fournisseur : '');
+			else $this->code = (!empty($societe->code_compta) ? $societe->code_compta : '');
 		}
 
 		return 0; // return ok

Braces +5 added lines, -2 removed lines

@@ -96,8 +96,11 @@
 		$this->code='';
 
 		if (is_object($societe)) {
-			if ($type == 'supplier') $this->code = (! empty($societe->code_compta_fournisseur)?$societe->code_compta_fournisseur:'');
-			else $this->code = (! empty($societe->code_compta)?$societe->code_compta:'');
+			if ($type == 'supplier') {
+			    $this->code = (! empty($societe->code_compta_fournisseur)?$societe->code_compta_fournisseur:'');
+			} else {
+			    $this->code = (! empty($societe->code_compta)?$societe->code_compta:'');
+			}
 		}
 
 		return 0; // return ok

dolibarr/htdocs/core/modules/societe/mod_codeclient_leopard.php

Indentation +89 added lines, -89 removed lines

@@ -31,112 +31,112 @@
  */
 class mod_codeclient_leopard extends ModeleThirdPartyCode
 {
-	/*
+    /*
 	 * Attention ce module est utilise par defaut si aucun module n'a
 	 * ete definit dans la configuration
 	 *
 	 * Le fonctionnement de celui-ci doit donc rester le plus ouvert possible
 	 */
 
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Leopard';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Leopard';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Leopard';
+    /**
+     * @var string model name
+     */
+    public $name='Leopard';
 
-	public $code_modifiable;				// Code modifiable
+    public $code_modifiable;				// Code modifiable
 
-	public $code_modifiable_invalide;		// Code modifiable si il est invalide
+    public $code_modifiable_invalide;		// Code modifiable si il est invalide
 
-	public $code_modifiable_null;			// Code modifiables si il est null
+    public $code_modifiable_null;			// Code modifiables si il est null
 
-	public $code_null;						// Code facultatif
+    public $code_null;						// Code facultatif
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';    		// 'development', 'experimental', 'dolibarr'
-
-	public $code_auto; 	                // Numerotation automatique
-
+    public $version = 'dolibarr';    		// 'development', 'experimental', 'dolibarr'
 
-	/**
-	 *	Constructor
-	 */
-	function __construct()
-	{
-		$this->code_null = 1;
-		$this->code_modifiable = 1;
-		$this->code_modifiable_invalide = 1;
-		$this->code_modifiable_null = 1;
-		$this->code_auto = 0;
-	}
-
-
-	/**		Return description of module
-	 *
-	 * 		@param	Translate	$langs	Object langs
-	 * 		@return string      		Description of module
-	 */
-	function info($langs)
-	{
-		$langs->load("companies");
-		return $langs->trans("LeopardNumRefModelDesc");
-	}
+    public $code_auto; 	                // Numerotation automatique
 
 
-	/**
-	 * Return an example of result returned by getNextValue
-	 *
-	 * @param	societe		$objsoc		Object thirdparty
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 * @return	string					Return next value
-	 */
-	function getNextValue($objsoc=0,$type=-1)
-	{
-		global $langs;
-		return '';
-	}
-
-
-	/**
-	 * 	Check validity of code according to its rules
-	 *
-	 *	@param	DoliDB		$db		Database handler
-	 *	@param	string		$code	Code to check/correct
-	 *	@param	Societe		$soc	Object third party
-	 *  @param  int		  	$type   0 = customer/prospect , 1 = supplier
-	 *  @return int					0 if OK
-	 * 								-1 ErrorBadCustomerCodeSyntax
-	 * 								-2 ErrorCustomerCodeRequired
-	 * 								-3 ErrorCustomerCodeAlreadyUsed
-	 * 								-4 ErrorPrefixRequired
-	 */
-	function verif($db, &$code, $soc, $type)
-	{
-		global $conf;
-
-		$result=0;
-		$code = trim($code);
-
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
-		{
-			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
-		{
-			$result=-2;
-		}
-
-		dol_syslog(get_class($this)."::verif type=".$type." result=".$result);
-		return $result;
-	}
+    /**
+     *	Constructor
+     */
+    function __construct()
+    {
+        $this->code_null = 1;
+        $this->code_modifiable = 1;
+        $this->code_modifiable_invalide = 1;
+        $this->code_modifiable_null = 1;
+        $this->code_auto = 0;
+    }
+
+
+    /**		Return description of module
+     *
+     * 		@param	Translate	$langs	Object langs
+     * 		@return string      		Description of module
+     */
+    function info($langs)
+    {
+        $langs->load("companies");
+        return $langs->trans("LeopardNumRefModelDesc");
+    }
+
+
+    /**
+     * Return an example of result returned by getNextValue
+     *
+     * @param	societe		$objsoc		Object thirdparty
+     * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+     * @return	string					Return next value
+     */
+    function getNextValue($objsoc=0,$type=-1)
+    {
+        global $langs;
+        return '';
+    }
+
+
+    /**
+     * 	Check validity of code according to its rules
+     *
+     *	@param	DoliDB		$db		Database handler
+     *	@param	string		$code	Code to check/correct
+     *	@param	Societe		$soc	Object third party
+     *  @param  int		  	$type   0 = customer/prospect , 1 = supplier
+     *  @return int					0 if OK
+     * 								-1 ErrorBadCustomerCodeSyntax
+     * 								-2 ErrorCustomerCodeRequired
+     * 								-3 ErrorCustomerCodeAlreadyUsed
+     * 								-4 ErrorPrefixRequired
+     */
+    function verif($db, &$code, $soc, $type)
+    {
+        global $conf;
+
+        $result=0;
+        $code = trim($code);
+
+        if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
+        {
+            $result=0;
+        }
+        else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+        {
+            $result=-2;
+        }
+
+        dol_syslog(get_class($this)."::verif type=".$type." result=".$result);
+        return $result;
+    }
 }
 

Spacing +13 added lines, -13 removed lines

@@ -43,28 +43,28 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Leopard';
+	public $nom = 'Leopard';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Leopard';
+	public $name = 'Leopard';
 
-	public $code_modifiable;				// Code modifiable
+	public $code_modifiable; // Code modifiable
 
-	public $code_modifiable_invalide;		// Code modifiable si il est invalide
+	public $code_modifiable_invalide; // Code modifiable si il est invalide
 
-	public $code_modifiable_null;			// Code modifiables si il est null
+	public $code_modifiable_null; // Code modifiables si il est null
 
-	public $code_null;						// Code facultatif
+	public $code_null; // Code facultatif
 
 	/**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';    		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $code_auto; 	                // Numerotation automatique
+	public $code_auto; // Numerotation automatique
 
 
 	/**
@@ -99,7 +99,7 @@ 
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return next value
 	 */
-	function getNextValue($objsoc=0,$type=-1)
+	function getNextValue($objsoc = 0, $type = -1)
 	{
 		global $langs;
 		return '';
@@ -123,16 +123,16 @@ 
 	{
 		global $conf;
 
-		$result=0;
+		$result = 0;
 		$code = trim($code);
 
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
-			$result=0;
+			$result = 0;
 		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		else if (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
-			$result=-2;
+			$result = -2;
 		}
 
 		dol_syslog(get_class($this)."::verif type=".$type." result=".$result);

Braces +1 added lines, -2 removed lines

@@ -129,8 +129,7 @@
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result=0;
-		}
-		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
+		} else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) )
 		{
 			$result=-2;
 		}

dolibarr/htdocs/core/modules/societe/mod_codecompta_aquarium.php

Indentation +177 added lines, -177 removed lines

@@ -31,201 +31,201 @@
  */
 class mod_codecompta_aquarium extends ModeleAccountancyCode
 {
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='Aquarium';
-
-	/**
-	 * @var string model name
-	 */
-	public $name='Aquarium';
-
-	/**
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see name
+     */
+    public $nom='Aquarium';
+
+    /**
+     * @var string model name
+     */
+    public $name='Aquarium';
+
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';        // 'development', 'experimental', 'dolibarr'
+    public $version = 'dolibarr';        // 'development', 'experimental', 'dolibarr'
 
-	public	$prefixcustomeraccountancycode;
+    public	$prefixcustomeraccountancycode;
 
-	public	$prefixsupplieraccountancycode;
+    public	$prefixsupplieraccountancycode;
 
 
-	/**
-	 * 	Constructor
-	 */
-	function __construct()
-	{
-	    global $conf;
-		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
+    /**
+     * 	Constructor
+     */
+    function __construct()
+    {
+        global $conf;
+        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
         if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
-		$this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
-	    $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
-	}
+        $this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
+        $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
+    }
 
 
-	/**
-	 * Return description of module
-	 *
-	 * @param	Translate	$langs		Object langs
-	 * @return	string   		   		Description of module
-	 */
-	function info($langs)
-	{
-	    global $conf;
-	    global $form;
+    /**
+     * Return description of module
+     *
+     * @param	Translate	$langs		Object langs
+     * @return	string   		   		Description of module
+     */
+    function info($langs)
+    {
+        global $conf;
+        global $form;
 
-		$langs->load("companies");
+        $langs->load("companies");
 
         $tooltip='';
-		$texte = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="COMPANY_AQUARIUM_MASK_SUPPLIER">';
-		$texte.= '<input type="hidden" name="param2" value="COMPANY_AQUARIUM_MASK_CUSTOMER">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-		$s1= $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">',$tooltip,1,1);
-		$s2= $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">',$tooltip,1,1);
-		$texte.= '<tr><td>';
-		$texte.=$langs->trans("ModuleCompanyCodeCustomer".$this->name,$s2)."<br>\n";
-		$texte.=$langs->trans("ModuleCompanyCodeSupplier".$this->name,$s1)."<br>\n";
-		$texte.="<br>\n";
-		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_SPECIAL').' = '.yn(1)."<br>\n";
-		//if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
-		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))  $texte.=$langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
-		$texte.= '</td>';
-		$texte.= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+        $texte = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="setModuleOptions">';
+        $texte.= '<input type="hidden" name="param1" value="COMPANY_AQUARIUM_MASK_SUPPLIER">';
+        $texte.= '<input type="hidden" name="param2" value="COMPANY_AQUARIUM_MASK_CUSTOMER">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
+        $s1= $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">',$tooltip,1,1);
+        $s2= $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">',$tooltip,1,1);
+        $texte.= '<tr><td>';
+        $texte.=$langs->trans("ModuleCompanyCodeCustomer".$this->name,$s2)."<br>\n";
+        $texte.=$langs->trans("ModuleCompanyCodeSupplier".$this->name,$s1)."<br>\n";
+        $texte.="<br>\n";
+        if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_SPECIAL').' = '.yn(1)."<br>\n";
+        //if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
+        if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))  $texte.=$langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
+        $texte.= '</td>';
+        $texte.= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
         $texte.= '</tr></table>';
         $texte.= '</form>';
 
-		return $texte;
-	}
-
-	/**
-	 * Return an example of result returned by getNextValue
-	 *
-	 * @param	Translate	$langs		Object langs
-	 * @param	societe		$objsoc		Object thirdparty
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
-	 * @return	string					Return string example
-	 */
-	function getExample($langs,$objsoc=0,$type=-1)
-	{
-		$s='';
-		$s.=$this->prefixcustomeraccountancycode.'CUSTCODE';
-	    $s.="<br>\n";
-	    $s.=$this->prefixsupplieraccountancycode.'SUPPCODE';
-	    return $s;
-	}
+        return $texte;
+    }
+
+    /**
+     * Return an example of result returned by getNextValue
+     *
+     * @param	Translate	$langs		Object langs
+     * @param	societe		$objsoc		Object thirdparty
+     * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+     * @return	string					Return string example
+     */
+    function getExample($langs,$objsoc=0,$type=-1)
+    {
+        $s='';
+        $s.=$this->prefixcustomeraccountancycode.'CUSTCODE';
+        $s.="<br>\n";
+        $s.=$this->prefixsupplieraccountancycode.'SUPPCODE';
+        return $s;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Set accountancy account code for a third party into this->code
-	 *
-	 *  @param	DoliDB		$db             Database handler
-	 *  @param  Societe		$societe        Third party object
-	 *  @param  string		$type			'customer' or 'supplier'
-	 *  @return	int							>=0 if OK, <0 if KO
-	 */
-	function get_code($db, $societe, $type='')
-	{
+    /**
+     *  Set accountancy account code for a third party into this->code
+     *
+     *  @param	DoliDB		$db             Database handler
+     *  @param  Societe		$societe        Third party object
+     *  @param  string		$type			'customer' or 'supplier'
+     *  @return	int							>=0 if OK, <0 if KO
+     */
+    function get_code($db, $societe, $type='')
+    {
         // phpcs:enable
-		global $conf;
-
-		$i = 0;
-		$this->db = $db;
-
-		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:''));
-
-		// Regle gestion compte compta
-		if ($type == 'customer')
-		{
-			$codetouse=(! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
-			$prefix = $this->prefixcustomeraccountancycode;
-		}
-		else if ($type == 'supplier')
-		{
-			$codetouse=(! empty($societe->code_fournisseur)?$societe->code_fournisseur:'SUPPCODE');
-			$prefix = $this->prefixsupplieraccountancycode;
-		}
-		else
-		{
-			$this->error = 'Bad value for parameter type';
-			return -1;
-		}
-
-		//$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
-
-		// Remove special char if COMPANY_AQUARIUM_REMOVE_SPECIAL is set to 1 or not set (default)
-		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $codetouse=preg_replace('/([^a-z0-9])/i','',$codetouse);
-		// Remove special alpha if COMPANY_AQUARIUM_REMOVE_ALPHA is set to 1
-		if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA))   $codetouse=preg_replace('/([a-z])/i','',$codetouse);
-		// Apply a regex replacement pattern on code if COMPANY_AQUARIUM_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
-		{
-			$codetouse=preg_replace('/'.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX.'/','\1\2\3',$codetouse);
-		}
-
-		$codetouse=$prefix.strtoupper($codetouse);
-
-		$is_dispo = $this->verif($db, $codetouse, $societe, $type);
-		if (! $is_dispo)
-		{
-			$this->code=$codetouse;
-		}
-		else
-		{
-			// Pour retour
-			$this->code=$codetouse;
-		}
-		dol_syslog("mod_codecompta_aquarium::get_code found code=".$this->code);
-		return $is_dispo;
-	}
-
-
-	/**
-	 *  Return if a code is available
-	 *
-	 *	@param	DoliDB		$db			Database handler
-	 * 	@param	string		$code		Code of third party
-	 * 	@param	Societe		$societe	Object third party
-	 * 	@param	string		$type		'supplier' or 'customer'
-	 *	@return	int						0 if OK but not available, >0 if OK and available, <0 if KO
-	 */
-	function verif($db, $code, $societe, $type)
-	{
-		$sql = "SELECT ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
-		$sql.= " = '".$db->escape($code)."'";
-		if (! empty($societe->id)) $sql.= " AND rowid <> ".$societe->id;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			if ($db->num_rows($resql) == 0)
-			{
-				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
-				return 1;	// Dispo
-			}
-			else
-			{
-				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
-				return 0;	// Non dispo
-			}
-		}
-		else
-		{
-			$this->error=$db->error()." sql=".$sql;
-			return -1;		// Erreur
-		}
-	}
+        global $conf;
+
+        $i = 0;
+        $this->db = $db;
+
+        dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:''));
+
+        // Regle gestion compte compta
+        if ($type == 'customer')
+        {
+            $codetouse=(! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
+            $prefix = $this->prefixcustomeraccountancycode;
+        }
+        else if ($type == 'supplier')
+        {
+            $codetouse=(! empty($societe->code_fournisseur)?$societe->code_fournisseur:'SUPPCODE');
+            $prefix = $this->prefixsupplieraccountancycode;
+        }
+        else
+        {
+            $this->error = 'Bad value for parameter type';
+            return -1;
+        }
+
+        //$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
+
+        // Remove special char if COMPANY_AQUARIUM_REMOVE_SPECIAL is set to 1 or not set (default)
+        if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $codetouse=preg_replace('/([^a-z0-9])/i','',$codetouse);
+        // Remove special alpha if COMPANY_AQUARIUM_REMOVE_ALPHA is set to 1
+        if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA))   $codetouse=preg_replace('/([a-z])/i','',$codetouse);
+        // Apply a regex replacement pattern on code if COMPANY_AQUARIUM_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
+        if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
+        {
+            $codetouse=preg_replace('/'.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX.'/','\1\2\3',$codetouse);
+        }
+
+        $codetouse=$prefix.strtoupper($codetouse);
+
+        $is_dispo = $this->verif($db, $codetouse, $societe, $type);
+        if (! $is_dispo)
+        {
+            $this->code=$codetouse;
+        }
+        else
+        {
+            // Pour retour
+            $this->code=$codetouse;
+        }
+        dol_syslog("mod_codecompta_aquarium::get_code found code=".$this->code);
+        return $is_dispo;
+    }
+
+
+    /**
+     *  Return if a code is available
+     *
+     *	@param	DoliDB		$db			Database handler
+     * 	@param	string		$code		Code of third party
+     * 	@param	Societe		$societe	Object third party
+     * 	@param	string		$type		'supplier' or 'customer'
+     *	@return	int						0 if OK but not available, >0 if OK and available, <0 if KO
+     */
+    function verif($db, $code, $societe, $type)
+    {
+        $sql = "SELECT ";
+        if ($type == 'customer') $sql.= "code_compta";
+        else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe";
+        $sql.= " WHERE ";
+        if ($type == 'customer') $sql.= "code_compta";
+        else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
+        $sql.= " = '".$db->escape($code)."'";
+        if (! empty($societe->id)) $sql.= " AND rowid <> ".$societe->id;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            if ($db->num_rows($resql) == 0)
+            {
+                dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
+                return 1;	// Dispo
+            }
+            else
+            {
+                dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
+                return 0;	// Non dispo
+            }
+        }
+        else
+        {
+            $this->error=$db->error()." sql=".$sql;
+            return -1;		// Erreur
+        }
+    }
 }

Spacing +56 added lines, -56 removed lines

@@ -36,18 +36,18 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='Aquarium';
+	public $nom = 'Aquarium';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Aquarium';
+	public $name = 'Aquarium';
 
 	/**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';        // 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	public	$prefixcustomeraccountancycode;
 
@@ -60,10 +60,10 @@ 
 	function __construct()
 	{
 	    global $conf;
-		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
-        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
-		$this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
-	    $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
+		if (!isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER = '411';
+        if (!isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER = '401';
+		$this->prefixcustomeraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
+	    $this->prefixsupplieraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}
 
 
@@ -80,26 +80,26 @@ 
 
 		$langs->load("companies");
 
-        $tooltip='';
+        $tooltip = '';
 		$texte = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="COMPANY_AQUARIUM_MASK_SUPPLIER">';
-		$texte.= '<input type="hidden" name="param2" value="COMPANY_AQUARIUM_MASK_CUSTOMER">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-		$s1= $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">',$tooltip,1,1);
-		$s2= $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">',$tooltip,1,1);
-		$texte.= '<tr><td>';
-		$texte.=$langs->trans("ModuleCompanyCodeCustomer".$this->name,$s2)."<br>\n";
-		$texte.=$langs->trans("ModuleCompanyCodeSupplier".$this->name,$s1)."<br>\n";
-		$texte.="<br>\n";
-		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_SPECIAL').' = '.yn(1)."<br>\n";
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="COMPANY_AQUARIUM_MASK_SUPPLIER">';
+		$texte .= '<input type="hidden" name="param2" value="COMPANY_AQUARIUM_MASK_CUSTOMER">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+		$s1 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">', $tooltip, 1, 1);
+		$s2 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">', $tooltip, 1, 1);
+		$texte .= '<tr><td>';
+		$texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, $s2)."<br>\n";
+		$texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, $s1)."<br>\n";
+		$texte .= "<br>\n";
+		if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte .= $langs->trans('COMPANY_AQUARIUM_REMOVE_SPECIAL').' = '.yn(1)."<br>\n";
 		//if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
-		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))  $texte.=$langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
-		$texte.= '</td>';
-		$texte.= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
-        $texte.= '</tr></table>';
-        $texte.= '</form>';
+		if (!empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))  $texte .= $langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
+		$texte .= '</td>';
+		$texte .= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+        $texte .= '</tr></table>';
+        $texte .= '</form>';
 
 		return $texte;
 	}
@@ -112,12 +112,12 @@ 
 	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string					Return string example
 	 */
-	function getExample($langs,$objsoc=0,$type=-1)
+	function getExample($langs, $objsoc = 0, $type = -1)
 	{
-		$s='';
-		$s.=$this->prefixcustomeraccountancycode.'CUSTCODE';
-	    $s.="<br>\n";
-	    $s.=$this->prefixsupplieraccountancycode.'SUPPCODE';
+		$s = '';
+		$s .= $this->prefixcustomeraccountancycode.'CUSTCODE';
+	    $s .= "<br>\n";
+	    $s .= $this->prefixsupplieraccountancycode.'SUPPCODE';
 	    return $s;
 	}
 
@@ -131,7 +131,7 @@ 
 	 *  @param  string		$type			'customer' or 'supplier'
 	 *  @return	int							>=0 if OK, <0 if KO
 	 */
-	function get_code($db, $societe, $type='')
+	function get_code($db, $societe, $type = '')
 	{
         // phpcs:enable
 		global $conf;
@@ -139,17 +139,17 @@ 
 		$i = 0;
 		$this->db = $db;
 
-		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:''));
+		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(!empty($societe->name) ? $societe->name : ''));
 
 		// Regle gestion compte compta
 		if ($type == 'customer')
 		{
-			$codetouse=(! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
+			$codetouse = (!empty($societe->code_client) ? $societe->code_client : 'CUSTCODE');
 			$prefix = $this->prefixcustomeraccountancycode;
 		}
 		else if ($type == 'supplier')
 		{
-			$codetouse=(! empty($societe->code_fournisseur)?$societe->code_fournisseur:'SUPPCODE');
+			$codetouse = (!empty($societe->code_fournisseur) ? $societe->code_fournisseur : 'SUPPCODE');
 			$prefix = $this->prefixsupplieraccountancycode;
 		}
 		else
@@ -161,26 +161,26 @@ 
 		//$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
 
 		// Remove special char if COMPANY_AQUARIUM_REMOVE_SPECIAL is set to 1 or not set (default)
-		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $codetouse=preg_replace('/([^a-z0-9])/i','',$codetouse);
+		if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
 		// Remove special alpha if COMPANY_AQUARIUM_REMOVE_ALPHA is set to 1
-		if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA))   $codetouse=preg_replace('/([a-z])/i','',$codetouse);
+		if (!empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA))   $codetouse = preg_replace('/([a-z])/i', '', $codetouse);
 		// Apply a regex replacement pattern on code if COMPANY_AQUARIUM_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
+		if (!empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
 		{
-			$codetouse=preg_replace('/'.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX.'/','\1\2\3',$codetouse);
+			$codetouse = preg_replace('/'.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX.'/', '\1\2\3', $codetouse);
 		}
 
-		$codetouse=$prefix.strtoupper($codetouse);
+		$codetouse = $prefix.strtoupper($codetouse);
 
 		$is_dispo = $this->verif($db, $codetouse, $societe, $type);
-		if (! $is_dispo)
+		if (!$is_dispo)
 		{
-			$this->code=$codetouse;
+			$this->code = $codetouse;
 		}
 		else
 		{
 			// Pour retour
-			$this->code=$codetouse;
+			$this->code = $codetouse;
 		}
 		dol_syslog("mod_codecompta_aquarium::get_code found code=".$this->code);
 		return $is_dispo;
@@ -199,33 +199,33 @@ 
 	function verif($db, $code, $societe, $type)
 	{
 		$sql = "SELECT ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
-		$sql.= " = '".$db->escape($code)."'";
-		if (! empty($societe->id)) $sql.= " AND rowid <> ".$societe->id;
-
-		$resql=$db->query($sql);
+		if ($type == 'customer') $sql .= "code_compta";
+		else if ($type == 'supplier') $sql .= "code_compta_fournisseur";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+		$sql .= " WHERE ";
+		if ($type == 'customer') $sql .= "code_compta";
+		else if ($type == 'supplier') $sql .= "code_compta_fournisseur";
+		$sql .= " = '".$db->escape($code)."'";
+		if (!empty($societe->id)) $sql .= " AND rowid <> ".$societe->id;
+
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			if ($db->num_rows($resql) == 0)
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
-				return 1;	// Dispo
+				return 1; // Dispo
 			}
 			else
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
-				return 0;	// Non dispo
+				return 0; // Non dispo
 			}
 		}
 		else
 		{
-			$this->error=$db->error()." sql=".$sql;
-			return -1;		// Erreur
+			$this->error = $db->error()." sql=".$sql;
+			return -1; // Erreur
 		}
 	}
 }

Braces +39 added lines, -22 removed lines

@@ -60,8 +60,12 @@ 
 	function __construct()
 	{
 	    global $conf;
-		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
-        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
+		if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') {
+		    $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
+		}
+        if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') {
+            $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401';
+        }
 		$this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
 	    $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}
@@ -93,9 +97,13 @@ 
 		$texte.=$langs->trans("ModuleCompanyCodeCustomer".$this->name,$s2)."<br>\n";
 		$texte.=$langs->trans("ModuleCompanyCodeSupplier".$this->name,$s1)."<br>\n";
 		$texte.="<br>\n";
-		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_SPECIAL').' = '.yn(1)."<br>\n";
+		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) {
+		    $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_SPECIAL').' = '.yn(1)."<br>\n";
+		}
 		//if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
-		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))  $texte.=$langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
+		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX)) {
+		    $texte.=$langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
+		}
 		$texte.= '</td>';
 		$texte.= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
         $texte.= '</tr></table>';
@@ -146,13 +154,11 @@ 
 		{
 			$codetouse=(! empty($societe->code_client)?$societe->code_client:'CUSTCODE');
 			$prefix = $this->prefixcustomeraccountancycode;
-		}
-		else if ($type == 'supplier')
+		} else if ($type == 'supplier')
 		{
 			$codetouse=(! empty($societe->code_fournisseur)?$societe->code_fournisseur:'SUPPCODE');
 			$prefix = $this->prefixsupplieraccountancycode;
-		}
-		else
+		} else
 		{
 			$this->error = 'Bad value for parameter type';
 			return -1;
@@ -161,14 +167,20 @@ 
 		//$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
 
 		// Remove special char if COMPANY_AQUARIUM_REMOVE_SPECIAL is set to 1 or not set (default)
-		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $codetouse=preg_replace('/([^a-z0-9])/i','',$codetouse);
+		if (! isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || ! empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) {
+		    $codetouse=preg_replace('/([^a-z0-9])/i','',$codetouse);
+		}
 		// Remove special alpha if COMPANY_AQUARIUM_REMOVE_ALPHA is set to 1
-		if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA))   $codetouse=preg_replace('/([a-z])/i','',$codetouse);
+		if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) {
+		    $codetouse=preg_replace('/([a-z])/i','',$codetouse);
+		}
 		// Apply a regex replacement pattern on code if COMPANY_AQUARIUM_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
+		if (! empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX)) {
+		    // Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
 		{
 			$codetouse=preg_replace('/'.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX.'/','\1\2\3',$codetouse);
 		}
+		}
 
 		$codetouse=$prefix.strtoupper($codetouse);
 
@@ -176,8 +188,7 @@ 
 		if (! $is_dispo)
 		{
 			$this->code=$codetouse;
-		}
-		else
+		} else
 		{
 			// Pour retour
 			$this->code=$codetouse;
@@ -199,14 +210,22 @@ 
 	function verif($db, $code, $societe, $type)
 	{
 		$sql = "SELECT ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
+		if ($type == 'customer') {
+		    $sql.= "code_compta";
+		} else if ($type == 'supplier') {
+		    $sql.= "code_compta_fournisseur";
+		}
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe";
 		$sql.= " WHERE ";
-		if ($type == 'customer') $sql.= "code_compta";
-		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
+		if ($type == 'customer') {
+		    $sql.= "code_compta";
+		} else if ($type == 'supplier') {
+		    $sql.= "code_compta_fournisseur";
+		}
 		$sql.= " = '".$db->escape($code)."'";
-		if (! empty($societe->id)) $sql.= " AND rowid <> ".$societe->id;
+		if (! empty($societe->id)) {
+		    $sql.= " AND rowid <> ".$societe->id;
+		}
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -215,14 +234,12 @@ 
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
 				return 1;	// Dispo
-			}
-			else
+			} else
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
 				return 0;	// Non dispo
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$db->error()." sql=".$sql;
 			return -1;		// Erreur

dolibarr/htdocs/core/modules/modSupplierProposal.class.php

Indentation +210 added lines, -210 removed lines

@@ -37,224 +37,224 @@
 class modSupplierProposal extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->numero = 1120;
-
-		$this->family = "srm";
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "supplier_proposalDESC";
-
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='supplier_proposal';
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 1120;
+
+        $this->family = "srm";
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "supplier_proposalDESC";
+
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='supplier_proposal';
         
-		// Data directories to create when module is enabled.
-		$this->dirs = array();
+        // Data directories to create when module is enabled.
+        $this->dirs = array();
 		
-		 // Config pages. Put here list of php page names stored in admin directory used to setup module.
+            // Config pages. Put here list of php page names stored in admin directory used to setup module.
         $this->config_page_url = array("supplier_proposal.php");
 
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array('modFournisseur');		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->langfiles = array("supplier_proposal");
-
-		// Constants
-		$this->const = array();
-		$r=0;
-
-		$this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "aurore";
-		$this->const[$r][3] = 'Name of submodule to generate PDF for supplier quotation request';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_supplier_proposal_marbre";
-		$this->const[$r][3] = 'Name of submodule to number supplier quotation request';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/supplier_proposal";
-		$this->const[$r][3] = "";
-		$this->const[$r][4] = 0;
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'supplier_proposal';
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Read supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Create/modify supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Validate supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'validate_advance';
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Envoyer les demandes fournisseurs'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array('modFournisseur');		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->langfiles = array("supplier_proposal");
+
+        // Constants
+        $this->const = array();
+        $r=0;
+
+        $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "aurore";
+        $this->const[$r][3] = 'Name of submodule to generate PDF for supplier quotation request';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_supplier_proposal_marbre";
+        $this->const[$r][3] = 'Name of submodule to number supplier quotation request';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/supplier_proposal";
+        $this->const[$r][3] = "";
+        $this->const[$r][4] = 0;
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'supplier_proposal';
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Read supplier proposals'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Create/modify supplier proposals'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Validate supplier proposals'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'validate_advance';
+
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Envoyer les demandes fournisseurs'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
         $this->rights[$r][4] = 'send_advance';
 
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Delete supplier proposals'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'supprimer';
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r; // id de la permission
-		$this->rights[$r][1] = 'Close supplier price requests'; // libelle de la permission
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'cloturer';
-
- 		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-		$this->menu[$r]=array(
-			'fk_menu'=>'fk_mainmenu=commercial',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'SupplierProposalsShort',
-			'leftmenu'=>'supplier_proposalsubmenu',
-			'url'=>'/supplier_proposal/index.php',
-			'langs'=>'supplier_proposal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'enabled'=>'$conf->supplier_proposal->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->supplier_proposal->lire',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Delete supplier proposals'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'supprimer';
+
+        $r++;
+        $this->rights[$r][0] = $this->numero + $r; // id de la permission
+        $this->rights[$r][1] = 'Close supplier price requests'; // libelle de la permission
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'cloturer';
+
+            // Main menu entries
+        $this->menu = array();			// List of menus to add
+        $r=0;
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=commercial',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'type'=>'left',			                // This is a Left menu entry
+            'titre'=>'SupplierProposalsShort',
+            'leftmenu'=>'supplier_proposalsubmenu',
+            'url'=>'/supplier_proposal/index.php',
+            'langs'=>'supplier_proposal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'enabled'=>'$conf->supplier_proposal->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'perms'=>'$user->rights->supplier_proposal->lire',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+            'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
             'position'=>300
-		);
-		$r++;
-
-		$this->menu[$r]=array(
-			'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
-			'type'=>'left',
-			'titre'=>'SupplierProposalNew',
-			'url'=>'/supplier_proposal/card.php?action=create&leftmenu=supplier_proposals',
-			'langs'=>'supplier_proposal',
-			'enabled'=>'$conf->supplier_proposal->enabled',
-			'perms'=>'$user->rights->supplier_proposal->creer',
-			'user'=>2,
+        );
+        $r++;
+
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
+            'type'=>'left',
+            'titre'=>'SupplierProposalNew',
+            'url'=>'/supplier_proposal/card.php?action=create&leftmenu=supplier_proposals',
+            'langs'=>'supplier_proposal',
+            'enabled'=>'$conf->supplier_proposal->enabled',
+            'perms'=>'$user->rights->supplier_proposal->creer',
+            'user'=>2,
             'position'=>301
-		);
-		$r++;
-
-		$this->menu[$r]=array(
-			'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
-			'type'=>'left',
-			'titre'=>'List',
-			'url'=>'/supplier_proposal/list.php?leftmenu=supplier_proposals',
-			'langs'=>'supplier_proposal',
-			'enabled'=>'$conf->supplier_proposal->enabled',
-			'perms'=>'$user->rights->supplier_proposal->lire',
-			'user'=>2,
+        );
+        $r++;
+
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
+            'type'=>'left',
+            'titre'=>'List',
+            'url'=>'/supplier_proposal/list.php?leftmenu=supplier_proposals',
+            'langs'=>'supplier_proposal',
+            'enabled'=>'$conf->supplier_proposal->enabled',
+            'perms'=>'$user->rights->supplier_proposal->lire',
+            'user'=>2,
             'position'=>302
-		);
-		$r++;
-
-		$this->menu[$r]=array(
-		    'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
-		    'type'=>'left',
-		    'titre'=>'Statistics',
-		    'url'=>'/comm/propal/stats/index.php?leftmenu=supplier_proposals&mode=supplier',
-		    'langs'=>'supplier_proposal',
-		    'enabled'=>'$conf->supplier_proposal->enabled',
-		    'perms'=>'$user->rights->supplier_proposal->lire',
-		    'user'=>2,
-		    'position'=>303
-		);
-		$r++;
-	}
-
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+        );
+        $r++;
+
+        $this->menu[$r]=array(
+            'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
+            'type'=>'left',
+            'titre'=>'Statistics',
+            'url'=>'/comm/propal/stats/index.php?leftmenu=supplier_proposals&mode=supplier',
+            'langs'=>'supplier_proposal',
+            'enabled'=>'$conf->supplier_proposal->enabled',
+            'perms'=>'$user->rights->supplier_proposal->lire',
+            'user'=>2,
+            'position'=>303
+        );
+        $r++;
+    }
+
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $conf,$langs;
-
-		// Remove permissions and default values
-		$this->remove($options);
-
-		//ODT template
-		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposal/template_supplier_proposal.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/supplier_proposal';
-		$dest=$dirodt.'/template_supplier_proposal.odt';
-
-		if (file_exists($src) && ! file_exists($dest))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_mkdir($dirodt);
-			$result=dol_copy($src,$dest,0,0);
-			if ($result < 0)
-			{
-				$langs->load("errors");
-				$this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
-				return 0;
-			}
-		}
-
-		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'supplier_proposal' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','supplier_proposal',".$conf->entity.")",
-		);
-
-		return $this->_init($sql, $options);
-	}
-
-
-
-	/**
-	 * Function called when module is disabled.
-	 * Remove from database constants, boxes and permissions from Dolibarr database.
-	 * Data directories are not deleted
-	 *
-	 * @param      string	$options    Options when enabling module ('', 'noboxes')
-	 * @return     int             	1 if OK, 0 if KO
-	 */
-	public function remove($options = '')
-	{
-	    $sql = array(
-	        "DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = 'askpricesupplier'"		// To delete/clean deprecated entries
-	    );
-
-	    return $this->_remove($sql, $options);
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf,$langs;
+
+        // Remove permissions and default values
+        $this->remove($options);
+
+        //ODT template
+        $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposal/template_supplier_proposal.odt';
+        $dirodt=DOL_DATA_ROOT.'/doctemplates/supplier_proposal';
+        $dest=$dirodt.'/template_supplier_proposal.odt';
+
+        if (file_exists($src) && ! file_exists($dest))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            dol_mkdir($dirodt);
+            $result=dol_copy($src,$dest,0,0);
+            if ($result < 0)
+            {
+                $langs->load("errors");
+                $this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+                return 0;
+            }
+        }
+
+        $sql = array(
+                "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'supplier_proposal' AND entity = ".$conf->entity,
+                "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','supplier_proposal',".$conf->entity.")",
+        );
+
+        return $this->_init($sql, $options);
+    }
+
+
+
+    /**
+     * Function called when module is disabled.
+     * Remove from database constants, boxes and permissions from Dolibarr database.
+     * Data directories are not deleted
+     *
+     * @param      string	$options    Options when enabling module ('', 'noboxes')
+     * @return     int             	1 if OK, 0 if KO
+     */
+    public function remove($options = '')
+    {
+        $sql = array(
+            "DELETE FROM ".MAIN_DB_PREFIX."rights_def WHERE module = 'askpricesupplier'"		// To delete/clean deprecated entries
+        );
+
+        return $this->_remove($sql, $options);
+    }
 }
\ No newline at end of file

Spacing +29 added lines, -29 removed lines

@@ -28,7 +28,7 @@ 
  *	\ingroup    supplier_proposal
  *	\brief      File to describe and activate module SupplierProposal
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -50,13 +50,13 @@ 
 		$this->numero = 1120;
 
 		$this->family = "srm";
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "supplier_proposalDESC";
 
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='supplier_proposal';
+		$this->picto = 'supplier_proposal';
         
 		// Data directories to create when module is enabled.
 		$this->dirs = array();
@@ -65,16 +65,16 @@ 
         $this->config_page_url = array("supplier_proposal.php");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array('modFournisseur');		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array('modFournisseur'); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 		$this->langfiles = array("supplier_proposal");
 
 		// Constants
 		$this->const = array();
-		$r=0;
+		$r = 0;
 
 		$this->const[$r][0] = "SUPPLIER_PROPOSAL_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -102,7 +102,7 @@ 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'supplier_proposal';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
@@ -141,23 +141,23 @@ 
 		$this->rights[$r][4] = 'cloturer';
 
  		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
-		$this->menu[$r]=array(
-			'fk_menu'=>'fk_mainmenu=commercial',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
+		$this->menu = array(); // List of menus to add
+		$r = 0;
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=commercial', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left', // This is a Left menu entry
 			'titre'=>'SupplierProposalsShort',
 			'leftmenu'=>'supplier_proposalsubmenu',
 			'url'=>'/supplier_proposal/index.php',
-			'langs'=>'supplier_proposal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'enabled'=>'$conf->supplier_proposal->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->supplier_proposal->lire',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'langs'=>'supplier_proposal', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'enabled'=>'$conf->supplier_proposal->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->supplier_proposal->lire', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
             'position'=>300
 		);
 		$r++;
 
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
 			'type'=>'left',
 			'titre'=>'SupplierProposalNew',
@@ -170,7 +170,7 @@ 
 		);
 		$r++;
 
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
 			'type'=>'left',
 			'titre'=>'List',
@@ -183,7 +183,7 @@ 
 		);
 		$r++;
 
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 		    'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
 		    'type'=>'left',
 		    'titre'=>'Statistics',
@@ -206,27 +206,27 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Remove permissions and default values
 		$this->remove($options);
 
 		//ODT template
-		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposal/template_supplier_proposal.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/supplier_proposal';
-		$dest=$dirodt.'/template_supplier_proposal.odt';
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/supplier_proposal/template_supplier_proposal.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/supplier_proposal';
+		$dest = $dirodt.'/template_supplier_proposal.odt';
 
-		if (file_exists($src) && ! file_exists($dest))
+		if (file_exists($src) && !file_exists($dest))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
-			$result=dol_copy($src,$dest,0,0);
+			$result = dol_copy($src, $dest, 0, 0);
 			if ($result < 0)
 			{
 				$langs->load("errors");
-				$this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
 			}
 		}

dolibarr/htdocs/core/modules/modExpenseReport.class.php

Indentation +191 added lines, -191 removed lines

@@ -31,197 +31,197 @@
  */
 class modExpenseReport extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param		Database	$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf;
-
-		$this->db = $db;
-		$this->numero = 770;
-
-		$this->family = "hr";
-		$this->module_position = '40';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Manage and claim expense reports (transportation, meal, ...)";
-		$this->version = 'dolibarr';
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='trip';
-
-		// Data directories to create when module is enabled.
-		$this->dirs = array("/expensereport/temp");
-		$r=0;
-
-		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
-		$this->config_page_url = array('expensereport.php');
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		// $this->conflictwith = array("modDeplacement"); // Deactivate for access on old information
-		$this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->phpmin = array(5,4);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,7);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("companies","trips");
-
-		// Constants
-		$this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
-		$r=0;
-
-		$this->const[$r][0] = "EXPENSEREPORT_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "standard";
-		$this->const[$r][3] = 'Name of manager to build PDF expense reports documents';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "EXPENSEREPORT_ADDON";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_expensereport_jade";
-		$this->const[$r][3] = 'Name of manager to generate expense report ref number';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "MAIN_DELAY_EXPENSEREPORTS";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "15";
-		$this->const[$r][3] = 'Tolerance delay (in days) before alert for expense reports to approve';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "MAIN_DELAY_EXPENSEREPORTS_TO_PAY";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "15";
-		$this->const[$r][3] = 'Tolerance delay (in days) before alert for expense reports to pay';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		// Array to add new pages in new tabs
-		$this->tabs[] = array('data'=>'user:+expensereport:ExpenseReport:expensereport:$user->rights->expensereport->lire:/expensereport/list.php?mainmenu=hrm&id=__ID__');
-
-		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
-
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$this->rights_class = 'expensereport';
-
-		$this->rights[$r][0] = 771;
-		$this->rights[$r][1] = 'Read expense reports (yours and your subordinates)';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'lire';
-		$r++;
-
-		$this->rights[$r][0] = 772;
-		$this->rights[$r][1] = 'Create/modify expense reports';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'creer';
-		$r++;
-
-		$this->rights[$r][0] = 773;
-		$this->rights[$r][1] = 'Delete expense reports';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'supprimer';
-		$r++;
-
-		$this->rights[$r][0] = 775;
-		$this->rights[$r][1] = 'Approve expense reports';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'approve';
-		$r++;
-
-		$this->rights[$r][0] = 776;
-		$this->rights[$r][1] = 'Pay expense reports';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'to_paid';
-		$r++;
-
-		$this->rights[$r][0] = 777;
-		$this->rights[$r][1] = 'Read expense reports of everybody';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 1;
-		$this->rights[$r][4] = 'readall';
-		$r++;
-
-		$this->rights[$r][0] = 778;
-		$this->rights[$r][1] = 'Create expense reports for everybody';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'writeall_advance';
-		$r++;
-
-		$this->rights[$r][0] = 779;
-		$this->rights[$r][1] = 'Export expense reports';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'export';
-		$r++;
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-		// Exports
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]='expensereport_'.$r;
-		$this->export_label[$r]='ListTripsAndExpenses';
-		$this->export_icon[$r]='trip';
-		$this->export_permission[$r]=array(array("expensereport","export"));
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param		Database	$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 770;
+
+        $this->family = "hr";
+        $this->module_position = '40';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Manage and claim expense reports (transportation, meal, ...)";
+        $this->version = 'dolibarr';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='trip';
+
+        // Data directories to create when module is enabled.
+        $this->dirs = array("/expensereport/temp");
+        $r=0;
+
+        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
+        $this->config_page_url = array('expensereport.php');
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        // $this->conflictwith = array("modDeplacement"); // Deactivate for access on old information
+        $this->requiredby = array();	// List of modules id to disable if this one is disabled
+        $this->phpmin = array(5,4);					// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3,7);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("companies","trips");
+
+        // Constants
+        $this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
+        $r=0;
+
+        $this->const[$r][0] = "EXPENSEREPORT_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "standard";
+        $this->const[$r][3] = 'Name of manager to build PDF expense reports documents';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "EXPENSEREPORT_ADDON";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_expensereport_jade";
+        $this->const[$r][3] = 'Name of manager to generate expense report ref number';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "MAIN_DELAY_EXPENSEREPORTS";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "15";
+        $this->const[$r][3] = 'Tolerance delay (in days) before alert for expense reports to approve';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "MAIN_DELAY_EXPENSEREPORTS_TO_PAY";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "15";
+        $this->const[$r][3] = 'Tolerance delay (in days) before alert for expense reports to pay';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        // Array to add new pages in new tabs
+        $this->tabs[] = array('data'=>'user:+expensereport:ExpenseReport:expensereport:$user->rights->expensereport->lire:/expensereport/list.php?mainmenu=hrm&id=__ID__');
+
+        // Boxes
+        $this->boxes = array();			// List of boxes
+        $r=0;
+
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $this->rights_class = 'expensereport';
+
+        $this->rights[$r][0] = 771;
+        $this->rights[$r][1] = 'Read expense reports (yours and your subordinates)';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'lire';
+        $r++;
+
+        $this->rights[$r][0] = 772;
+        $this->rights[$r][1] = 'Create/modify expense reports';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'creer';
+        $r++;
+
+        $this->rights[$r][0] = 773;
+        $this->rights[$r][1] = 'Delete expense reports';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'supprimer';
+        $r++;
+
+        $this->rights[$r][0] = 775;
+        $this->rights[$r][1] = 'Approve expense reports';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'approve';
+        $r++;
+
+        $this->rights[$r][0] = 776;
+        $this->rights[$r][1] = 'Pay expense reports';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'to_paid';
+        $r++;
+
+        $this->rights[$r][0] = 777;
+        $this->rights[$r][1] = 'Read expense reports of everybody';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 1;
+        $this->rights[$r][4] = 'readall';
+        $r++;
+
+        $this->rights[$r][0] = 778;
+        $this->rights[$r][1] = 'Create expense reports for everybody';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'writeall_advance';
+        $r++;
+
+        $this->rights[$r][0] = 779;
+        $this->rights[$r][1] = 'Export expense reports';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'export';
+        $r++;
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+        // Exports
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]='expensereport_'.$r;
+        $this->export_label[$r]='ListTripsAndExpenses';
+        $this->export_icon[$r]='trip';
+        $this->export_permission[$r]=array(array("expensereport","export"));
         $this->export_fields_array[$r]=array(
-			'd.rowid'=>"TripId",'d.ref'=>'Ref','d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.date_create'=>'DateCreation','d.date_approve'=>'DateApprove',
-			'd.total_ht'=>"TotalHT",'d.total_tva'=>'TotalVAT','d.total_ttc'=>'TotalTTC','d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic',
-			'u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'ed.rowid'=>'LineId','tf.code'=>'Type','ed.date'=>'Date','ed.tva_tx'=>'VATRate',
-			'ed.total_ht'=>'TotalHT','ed.total_tva'=>'TotalVAT','ed.total_ttc'=>'TotalTTC','ed.comments'=>'Comment','p.rowid'=>'ProjectId','p.ref'=>'Ref'
-		);
-		$this->export_entities_array[$r]=array(
-			'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ed.rowid'=>'expensereport_line','ed.date'=>'expensereport_line',
-			'ed.tva_tx'=>'expensereport_line','ed.total_ht'=>'expensereport_line','ed.total_tva'=>'expensereport_line','ed.total_ttc'=>'expensereport_line',
-			'ed.comments'=>'expensereport_line','tf.code'=>'expensereport_line','p.project_ref'=>'expensereport_line','p.rowid'=>'project','p.ref'=>'project'
-		);
+            'd.rowid'=>"TripId",'d.ref'=>'Ref','d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.date_create'=>'DateCreation','d.date_approve'=>'DateApprove',
+            'd.total_ht'=>"TotalHT",'d.total_tva'=>'TotalVAT','d.total_ttc'=>'TotalTTC','d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic',
+            'u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'ed.rowid'=>'LineId','tf.code'=>'Type','ed.date'=>'Date','ed.tva_tx'=>'VATRate',
+            'ed.total_ht'=>'TotalHT','ed.total_tva'=>'TotalVAT','ed.total_ttc'=>'TotalTTC','ed.comments'=>'Comment','p.rowid'=>'ProjectId','p.ref'=>'Ref'
+        );
+        $this->export_entities_array[$r]=array(
+            'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ed.rowid'=>'expensereport_line','ed.date'=>'expensereport_line',
+            'ed.tva_tx'=>'expensereport_line','ed.total_ht'=>'expensereport_line','ed.total_tva'=>'expensereport_line','ed.total_ttc'=>'expensereport_line',
+            'ed.comments'=>'expensereport_line','tf.code'=>'expensereport_line','p.project_ref'=>'expensereport_line','p.rowid'=>'project','p.ref'=>'project'
+        );
         $this->export_alias_array[$r]=array('d.rowid'=>"idtrip",'d.type'=>"type",'d.note_private'=>'note_private','d.note_public'=>'note_public','u.lastname'=>'name','u.firstname'=>'firstname','u.login'=>'login');
-		$this->export_dependencies_array[$r]=array('expensereport_line'=>'ed.rowid','type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expensereport as d, '.MAIN_DB_PREFIX.'user as u,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
-		$this->export_sql_end[$r] .=' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('expensereport').')';
-	}
-
-	/**
-	 *	Function called when module is enabled.
-	 *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *	It also creates data directories.
-	 *
-	 *	@param		string	$options	Options
-	 *	@return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $conf;
-
-		// Remove permissions and default values
-		$this->remove($options);
-
-		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard' AND type='expensereport' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard','expensereport',".$conf->entity.")"
-		);
-
-		return $this->_init($sql,$options);
-	}
+        $this->export_dependencies_array[$r]=array('expensereport_line'=>'ed.rowid','type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expensereport as d, '.MAIN_DB_PREFIX.'user as u,';
+        $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
+        $this->export_sql_end[$r] .=' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
+        $this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('expensereport').')';
+    }
+
+    /**
+     *	Function called when module is enabled.
+     *	The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *	It also creates data directories.
+     *
+     *	@param		string	$options	Options
+     *	@return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf;
+
+        // Remove permissions and default values
+        $this->remove($options);
+
+        $sql = array(
+                "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard' AND type='expensereport' AND entity = ".$conf->entity,
+                "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard','expensereport',".$conf->entity.")"
+        );
+
+        return $this->_init($sql,$options);
+    }
 }

Spacing +41 added lines, -41 removed lines

@@ -23,7 +23,7 @@ 
  *      \ingroup    expensereport
  *      \brief      Description and activation file for module ExpenseReport
  */
-include_once DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php";
+include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 
 
 /**
@@ -46,32 +46,32 @@ 
 		$this->family = "hr";
 		$this->module_position = '40';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Manage and claim expense reports (transportation, meal, ...)";
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='trip';
+		$this->picto = 'trip';
 
 		// Data directories to create when module is enabled.
 		$this->dirs = array("/expensereport/temp");
-		$r=0;
+		$r = 0;
 
 		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
 		$this->config_page_url = array('expensereport.php');
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		// $this->conflictwith = array("modDeplacement"); // Deactivate for access on old information
-		$this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->phpmin = array(5,4);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,7);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("companies","trips");
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3, 7); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("companies", "trips");
 
 		// Constants
-		$this->const = array();			// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
-		$r=0;
+		$this->const = array(); // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
+		$r = 0;
 
 		$this->const[$r][0] = "EXPENSEREPORT_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -105,11 +105,11 @@ 
 		$this->tabs[] = array('data'=>'user:+expensereport:ExpenseReport:expensereport:$user->rights->expensereport->lire:/expensereport/list.php?mainmenu=hrm&id=__ID__');
 
 		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
+		$this->rights = array(); // Permission array used by this module
 		$this->rights_class = 'expensereport';
 
 		$this->rights[$r][0] = 771;
@@ -170,36 +170,36 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 		// Exports
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->export_code[$r]='expensereport_'.$r;
-		$this->export_label[$r]='ListTripsAndExpenses';
-		$this->export_icon[$r]='trip';
-		$this->export_permission[$r]=array(array("expensereport","export"));
-        $this->export_fields_array[$r]=array(
-			'd.rowid'=>"TripId",'d.ref'=>'Ref','d.date_debut'=>'DateStart','d.date_fin'=>'DateEnd','d.date_create'=>'DateCreation','d.date_approve'=>'DateApprove',
-			'd.total_ht'=>"TotalHT",'d.total_tva'=>'TotalVAT','d.total_ttc'=>'TotalTTC','d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic',
-			'u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>"Login",'ed.rowid'=>'LineId','tf.code'=>'Type','ed.date'=>'Date','ed.tva_tx'=>'VATRate',
-			'ed.total_ht'=>'TotalHT','ed.total_tva'=>'TotalVAT','ed.total_ttc'=>'TotalTTC','ed.comments'=>'Comment','p.rowid'=>'ProjectId','p.ref'=>'Ref'
+		$this->export_code[$r] = 'expensereport_'.$r;
+		$this->export_label[$r] = 'ListTripsAndExpenses';
+		$this->export_icon[$r] = 'trip';
+		$this->export_permission[$r] = array(array("expensereport", "export"));
+        $this->export_fields_array[$r] = array(
+			'd.rowid'=>"TripId", 'd.ref'=>'Ref', 'd.date_debut'=>'DateStart', 'd.date_fin'=>'DateEnd', 'd.date_create'=>'DateCreation', 'd.date_approve'=>'DateApprove',
+			'd.total_ht'=>"TotalHT", 'd.total_tva'=>'TotalVAT', 'd.total_ttc'=>'TotalTTC', 'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic',
+			'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>"Login", 'ed.rowid'=>'LineId', 'tf.code'=>'Type', 'ed.date'=>'Date', 'ed.tva_tx'=>'VATRate',
+			'ed.total_ht'=>'TotalHT', 'ed.total_tva'=>'TotalVAT', 'ed.total_ttc'=>'TotalTTC', 'ed.comments'=>'Comment', 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref'
 		);
-		$this->export_entities_array[$r]=array(
-			'u.lastname'=>'user','u.firstname'=>'user','u.login'=>'user','ed.rowid'=>'expensereport_line','ed.date'=>'expensereport_line',
-			'ed.tva_tx'=>'expensereport_line','ed.total_ht'=>'expensereport_line','ed.total_tva'=>'expensereport_line','ed.total_ttc'=>'expensereport_line',
-			'ed.comments'=>'expensereport_line','tf.code'=>'expensereport_line','p.project_ref'=>'expensereport_line','p.rowid'=>'project','p.ref'=>'project'
+		$this->export_entities_array[$r] = array(
+			'u.lastname'=>'user', 'u.firstname'=>'user', 'u.login'=>'user', 'ed.rowid'=>'expensereport_line', 'ed.date'=>'expensereport_line',
+			'ed.tva_tx'=>'expensereport_line', 'ed.total_ht'=>'expensereport_line', 'ed.total_tva'=>'expensereport_line', 'ed.total_ttc'=>'expensereport_line',
+			'ed.comments'=>'expensereport_line', 'tf.code'=>'expensereport_line', 'p.project_ref'=>'expensereport_line', 'p.rowid'=>'project', 'p.ref'=>'project'
 		);
-        $this->export_alias_array[$r]=array('d.rowid'=>"idtrip",'d.type'=>"type",'d.note_private'=>'note_private','d.note_public'=>'note_public','u.lastname'=>'name','u.firstname'=>'firstname','u.login'=>'login');
-		$this->export_dependencies_array[$r]=array('expensereport_line'=>'ed.rowid','type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expensereport as d, '.MAIN_DB_PREFIX.'user as u,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
-		$this->export_sql_end[$r] .=' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('expensereport').')';
+        $this->export_alias_array[$r] = array('d.rowid'=>"idtrip", 'd.type'=>"type", 'd.note_private'=>'note_private', 'd.note_public'=>'note_public', 'u.lastname'=>'name', 'u.firstname'=>'firstname', 'u.login'=>'login');
+		$this->export_dependencies_array[$r] = array('expensereport_line'=>'ed.rowid', 'type_fees'=>'tf.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'expensereport as d, '.MAIN_DB_PREFIX.'user as u,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'expensereport_det as ed LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as tf ON ed.fk_c_type_fees = tf.id';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON ed.fk_projet = p.rowid';
+		$this->export_sql_end[$r] .= ' WHERE ed.fk_expensereport = d.rowid AND d.fk_user_author = u.rowid';
+		$this->export_sql_end[$r] .= ' AND d.entity IN ('.getEntity('expensereport').')';
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 	 *	@param		string	$options	Options
 	 *	@return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		global $conf;
 
@@ -222,6 +222,6 @@ 
 				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard','expensereport',".$conf->entity.")"
 		);
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

dolibarr/htdocs/core/modules/modPaypal.class.php

Indentation +4 added lines, -4 removed lines

@@ -71,10 +71,10 @@
 
         // Dependencies
         $this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array('modPaypalPlus');	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array('modPaypalPlus');	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
         $this->need_dolibarr_version = array(3,0);		// Minimum version of Dolibarr required by module
         $this->langfiles = array("paypal");
 

Spacing +17 added lines, -17 removed lines

@@ -24,7 +24,7 @@ 
  *  \ingroup    paypal
  *  \brief      Description and activation file for module Paypal
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -51,7 +51,7 @@ 
         // It is used to group modules in module setup page
         $this->family = "interface";
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
         // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
         $this->description = "Module to offer an online payment page with PayPal";
         // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -61,7 +61,7 @@ 
         // Name of image file used for this module.
         // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
         // If file is in module/img directory, use this->picto=DOL_URL_ROOT.'/module/img/file.png'
-        $this->picto='paypal@paypal';
+        $this->picto = 'paypal@paypal';
 
         // Data directories to create when module is enabled.
         $this->dirs = array('/paypal/temp');
@@ -70,16 +70,16 @@ 
         $this->config_page_url = array("paypal.php@paypal");
 
         // Dependencies
-        $this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array('modPaypalPlus');	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3,0);		// Minimum version of Dolibarr required by module
+        $this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array('modPaypalPlus'); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
         $this->langfiles = array("paypal");
 
         // Constants
-        $this->const = array();			// List of particular constants to add when module is enabled
+        $this->const = array(); // List of particular constants to add when module is enabled
         //Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
         //                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
 
@@ -88,8 +88,8 @@ 
 
 
         // Boxes
-        $this->boxes = array();			// List of boxes
-        $r=0;
+        $this->boxes = array(); // List of boxes
+        $r = 0;
 
         // Add here list of php file(s) stored in core/boxes that contains class to show a box.
         // Example:
@@ -100,13 +100,13 @@ 
 
 
         // Permissions
-        $this->rights = array();		// Permission array used by this module
-        $r=0;
+        $this->rights = array(); // Permission array used by this module
+        $r = 0;
 
 
         // Main menu entries
-        $this->menus = array();			// List of menus to add
-        $r=0;
+        $this->menus = array(); // List of menus to add
+        $r = 0;
         /*$this->menu[$r]=array(
 	        'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 	        'mainmenu'=>'billing',
@@ -165,7 +165,7 @@ 
 
 
         // Exports
-        $r=1;
+        $r = 1;
 
         // Example:
         // $this->export_code[$r]=$this->rights_class.'_'.$r;

dolibarr/htdocs/core/modules/security/generate/modules_genpassword.php

Indentation +14 added lines, -14 removed lines

@@ -31,9 +31,9 @@ 
 abstract class ModeleGenPassword
 {
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     /**
      * 		Return if a module can be used or not
@@ -68,23 +68,23 @@ 
         return $langs->trans("NoExample");
     }
 
-	/**
-	 * 		Build new password
-	 *
- 	 *      @return     string      Return a new generated password
-	 */
+    /**
+     * 		Build new password
+     *
+     *      @return     string      Return a new generated password
+     */
     function getNewGeneratedPassword()
     {
         global $langs;
         return $langs->trans("NotAvailable");
     }
 
-	/**
-	 * 		Validate a password
-	 *
-	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
-	 */
+    /**
+     * 		Validate a password
+     *
+     *		@param		string	$password	Password to check
+     *      @return     int					0 if KO, >0 if OK
+     */
     function validatePassword($password)
     {
         return 1;

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     /**
      * 		Return if a module can be used or not

dolibarr/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php

Indentation +97 added lines, -97 removed lines

@@ -31,108 +31,108 @@
  */
 class modGeneratePassStandard extends ModeleGenPassword
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	public $length;
+    public $length;
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	public $conf;
-	public $lang;
-	public $user;
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db			Database handler
-	 *	@param		Conf		$conf		Handler de conf
-	 *	@param		Translate	$langs		Handler de langue
-	 *	@param		User		$user		Handler du user connecte
-	 */
-	function __construct($db, $conf, $langs, $user)
-	{
-		$this->id = "standard";
-		$this->length = 8;
-
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
-	}
-
-	/**
-	 *		Return description of module
-	 *
- 	 *      @return     string      Description of module
-	 */
-	function getDescription()
-	{
-		global $langs;
-		return $langs->trans("PasswordGenerationStandard");
-	}
-
-	/**
-	 * 		Return an example of password generated by this module
-	 *
- 	 *      @return     string      Example of password
-	 */
-	function getExample()
-	{
-		return $this->getNewGeneratedPassword();
-	}
-
-	/**
-	 * 		Build new password
-	 *
- 	 *      @return     string      Return a new generated password
-	 */
-	function getNewGeneratedPassword()
-	{
-		// start with a blank password
-		$password = "";
-
-		// define possible characters
-		$possible = "0123456789bcdfghjkmnpqrstvwxyz";
-
-		// set up a counter
-		$i = 0;
-
-		// add random characters to $password until $length is reached
-		while ($i < $this->length)
-		{
-
-			// pick a random character from the possible ones
-			$char = substr($possible, mt_rand(0, dol_strlen($possible)-1), 1);
-
-			// we don't want this character if it's already in the password
-			if (!strstr($password, $char))
-			{
-				$password .= $char;
-				$i++;
-			}
-		}
-
-		// done!
-		return $password;
-	}
-
-	/**
-	 * 		Validate a password
-	 *
-	 *		@param		string	$password	Password to check
- 	 *      @return     int					0 if KO, >0 if OK
-	 */
-	function validatePassword($password)
-	{
-		if (dol_strlen($password) < $this->length) return 0;
-		return 1;
-	}
+    public $conf;
+    public $lang;
+    public $user;
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db			Database handler
+     *	@param		Conf		$conf		Handler de conf
+     *	@param		Translate	$langs		Handler de langue
+     *	@param		User		$user		Handler du user connecte
+     */
+    function __construct($db, $conf, $langs, $user)
+    {
+        $this->id = "standard";
+        $this->length = 8;
+
+        $this->db=$db;
+        $this->conf=$conf;
+        $this->langs=$langs;
+        $this->user=$user;
+    }
+
+    /**
+     *		Return description of module
+     *
+     *      @return     string      Description of module
+     */
+    function getDescription()
+    {
+        global $langs;
+        return $langs->trans("PasswordGenerationStandard");
+    }
+
+    /**
+     * 		Return an example of password generated by this module
+     *
+     *      @return     string      Example of password
+     */
+    function getExample()
+    {
+        return $this->getNewGeneratedPassword();
+    }
+
+    /**
+     * 		Build new password
+     *
+     *      @return     string      Return a new generated password
+     */
+    function getNewGeneratedPassword()
+    {
+        // start with a blank password
+        $password = "";
+
+        // define possible characters
+        $possible = "0123456789bcdfghjkmnpqrstvwxyz";
+
+        // set up a counter
+        $i = 0;
+
+        // add random characters to $password until $length is reached
+        while ($i < $this->length)
+        {
+
+            // pick a random character from the possible ones
+            $char = substr($possible, mt_rand(0, dol_strlen($possible)-1), 1);
+
+            // we don't want this character if it's already in the password
+            if (!strstr($password, $char))
+            {
+                $password .= $char;
+                $i++;
+            }
+        }
+
+        // done!
+        return $password;
+    }
+
+    /**
+     * 		Validate a password
+     *
+     *		@param		string	$password	Password to check
+     *      @return     int					0 if KO, >0 if OK
+     */
+    function validatePassword($password)
+    {
+        if (dol_strlen($password) < $this->length) return 0;
+        return 1;
+    }
 }
 

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
  *		\brief      File to manage password generation according to standard rule
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassword.php';
 
 
 /**
@@ -61,10 +61,10 @@ 
 		$this->id = "standard";
 		$this->length = 8;
 
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
+		$this->db = $db;
+		$this->conf = $conf;
+		$this->langs = $langs;
+		$this->user = $user;
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 		{
 
 			// pick a random character from the possible ones
-			$char = substr($possible, mt_rand(0, dol_strlen($possible)-1), 1);
+			$char = substr($possible, mt_rand(0, dol_strlen($possible) - 1), 1);
 
 			// we don't want this character if it's already in the password
 			if (!strstr($password, $char))

Braces +3 added lines, -1 removed lines

@@ -131,7 +131,9 @@
 	 */
 	function validatePassword($password)
 	{
-		if (dol_strlen($password) < $this->length) return 0;
+		if (dol_strlen($password) < $this->length) {
+		    return 0;
+		}
 		return 1;
 	}
 }

dolibarr/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php

Indentation +188 added lines, -188 removed lines

@@ -33,198 +33,198 @@
  */
 class modGeneratePassPerso extends ModeleGenPassword
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
-
-	public $length;
-	public $length2; // didn't overright display
-	public $NbMaj;
-	public $NbNum;
-	public $NbSpe;
-	public $NbRepeat;
-	public $WithoutAmbi;
-
-	/**
+    /**
+     * @var int ID
+     */
+    public $id;
+
+    public $length;
+    public $length2; // didn't overright display
+    public $NbMaj;
+    public $NbNum;
+    public $NbSpe;
+    public $NbRepeat;
+    public $WithoutAmbi;
+
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	public $conf;
-	public $lang;
-	public $user;
-
-	public $Maj;
-	public $Min;
-	public $Nb;
-	public $Spe;
-	public $Ambi;
-	public $All;
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db			Database handler
-	 *	@param		Conf		$conf		Handler de conf
-	 *	@param		Translate	$langs		Handler de langue
-	 *	@param		User		$user		Handler du user connecte
-	 */
-	function __construct($db, $conf, $langs, $user)
-	{
-		$this->id = "Perso";
-		$this->length = $langs->trans("SetupPerso");
-
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
-
-		if (empty($conf->global->USER_PASSWORD_PATTERN)) {
-			// default value (8carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
-			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1','chaine',0,'',$conf->entity);
-		}
-
-		$this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-		$this->Min = strtolower($this->Maj);
-		$this->Nb = "0123456789";
-		$this->Spe = "!@#$%&*()_-+={}[]\\|:;'/";
-		$this->Ambi = array("1","I","l","|","O","0");
-
-		$tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN);
-		$this->length2 = $tabConf[0];
-		$this->NbMaj = $tabConf[1];
-		$this->NbNum = $tabConf[2];
-		$this->NbSpe = $tabConf[3];
-		$this->NbRepeat = $tabConf[4];
-		$this->WithoutAmbi = $tabConf[5];
-
-		if ($this->WithoutAmbi)
-		{
-			$this->Maj = str_replace($this->Ambi,"",$this->Maj);
-			$this->Min = str_replace($this->Ambi,"",$this->Min);
-			$this->Nb  = str_replace($this->Ambi,"",$this->Nb);
-			$this->Spe = str_replace($this->Ambi,"",$this->Spe);
-		}
-
-		$pattern = $this->Min . (! empty($this->NbMaj)?$this->Maj:'') . (! empty($this->NbNum)?$this->Nb:'') . (! empty($this->NbSpe)?$this->Spe:'');
-		$this->All = str_shuffle($pattern);
-
-		//$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
-		//$this->All = $this->Maj. $this->Min. $this->Nb. $this->Spe;
-		//$this->All =  $this->Spe;
-	}
-
-	/**
-	 *		Return description of module
-	 *
-	 *      @return     string      Description of text
-	 */
-	function getDescription()
-	{
-		global $langs;
-		return $langs->trans("PasswordGenerationPerso");
-	}
-
-	/**
-	 * 		Return an example of password generated by this module
-	 *
-	 *      @return     string      Example of password
-	 */
-	function getExample()
-	{
-		return $this->getNewGeneratedPassword();
-	}
-
-	/**
-	 * 		Build new password
-	 *
-	 *      @return     string      Return a new generated password
-	 */
-	function getNewGeneratedPassword()
-	{
-		$pass = "";
-		for($i=0; $i<$this->NbMaj; $i++){ // Y
-			$pass .= $this->Maj[mt_rand(0,strlen($this->Maj) - 1)];
-		}
-
-		for($i=0; $i<$this->NbNum; $i++){ // X
-			$pass .= $this->Nb[mt_rand(0,strlen($this->Nb) - 1)];
-		}
-
-		for($i=0; $i<$this->NbSpe; $i++){ // @
-			$pass .= $this->Spe[mt_rand(0,strlen($this->Spe) - 1)];
-		}
-
-		for($i=strlen($pass);$i<$this->length2; $i++){ // y
-			$pass .= $this->All[mt_rand(0,strlen($this->All) -1)];
-		}
-
-		$pass = str_shuffle($pass);
-
-		if ($this->validatePassword($pass))
-		{
-			return $pass;
-		}
-
-		return $this->getNewGeneratedPassword();
-	}
-
-	/**
-	 * 		Validate a password
-	 *
-	 *		@param		string	$password	Password to check
-	 *      @return     int					0 if KO, >0 if OK
-	 */
-	function validatePassword($password)
-	{
-		$password_a = str_split($password);
-		$maj = str_split($this->Maj);
-		$num = str_split($this->Nb);
-		$spe = str_split($this->Spe);
-
-		if(count(array_intersect($password_a, $maj)) < $this->NbMaj){
-			return 0;
-		}
-
-		if(count(array_intersect($password_a, $num)) < $this->NbNum){
-			return 0;
-		}
-
-		if(count(array_intersect($password_a, $spe)) < $this->NbSpe){
-			return 0;
-		}
-
-		if(!$this->consecutiveInterationSameCharacter($password)){
-			return 0;
-		}
-
-		return 1;
-	}
-
-	/**
-	 * 		consecutive iterations of the same character
-	 *
-	 *		@param		string	$password	Password to check
-	 *      @return     int					0 if KO, >0 if OK
-	 */
+    public $conf;
+    public $lang;
+    public $user;
+
+    public $Maj;
+    public $Min;
+    public $Nb;
+    public $Spe;
+    public $Ambi;
+    public $All;
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db			Database handler
+     *	@param		Conf		$conf		Handler de conf
+     *	@param		Translate	$langs		Handler de langue
+     *	@param		User		$user		Handler du user connecte
+     */
+    function __construct($db, $conf, $langs, $user)
+    {
+        $this->id = "Perso";
+        $this->length = $langs->trans("SetupPerso");
+
+        $this->db=$db;
+        $this->conf=$conf;
+        $this->langs=$langs;
+        $this->user=$user;
+
+        if (empty($conf->global->USER_PASSWORD_PATTERN)) {
+            // default value (8carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
+            dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1','chaine',0,'',$conf->entity);
+        }
+
+        $this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        $this->Min = strtolower($this->Maj);
+        $this->Nb = "0123456789";
+        $this->Spe = "!@#$%&*()_-+={}[]\\|:;'/";
+        $this->Ambi = array("1","I","l","|","O","0");
+
+        $tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN);
+        $this->length2 = $tabConf[0];
+        $this->NbMaj = $tabConf[1];
+        $this->NbNum = $tabConf[2];
+        $this->NbSpe = $tabConf[3];
+        $this->NbRepeat = $tabConf[4];
+        $this->WithoutAmbi = $tabConf[5];
+
+        if ($this->WithoutAmbi)
+        {
+            $this->Maj = str_replace($this->Ambi,"",$this->Maj);
+            $this->Min = str_replace($this->Ambi,"",$this->Min);
+            $this->Nb  = str_replace($this->Ambi,"",$this->Nb);
+            $this->Spe = str_replace($this->Ambi,"",$this->Spe);
+        }
+
+        $pattern = $this->Min . (! empty($this->NbMaj)?$this->Maj:'') . (! empty($this->NbNum)?$this->Nb:'') . (! empty($this->NbSpe)?$this->Spe:'');
+        $this->All = str_shuffle($pattern);
+
+        //$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
+        //$this->All = $this->Maj. $this->Min. $this->Nb. $this->Spe;
+        //$this->All =  $this->Spe;
+    }
+
+    /**
+     *		Return description of module
+     *
+     *      @return     string      Description of text
+     */
+    function getDescription()
+    {
+        global $langs;
+        return $langs->trans("PasswordGenerationPerso");
+    }
+
+    /**
+     * 		Return an example of password generated by this module
+     *
+     *      @return     string      Example of password
+     */
+    function getExample()
+    {
+        return $this->getNewGeneratedPassword();
+    }
+
+    /**
+     * 		Build new password
+     *
+     *      @return     string      Return a new generated password
+     */
+    function getNewGeneratedPassword()
+    {
+        $pass = "";
+        for($i=0; $i<$this->NbMaj; $i++){ // Y
+            $pass .= $this->Maj[mt_rand(0,strlen($this->Maj) - 1)];
+        }
+
+        for($i=0; $i<$this->NbNum; $i++){ // X
+            $pass .= $this->Nb[mt_rand(0,strlen($this->Nb) - 1)];
+        }
+
+        for($i=0; $i<$this->NbSpe; $i++){ // @
+            $pass .= $this->Spe[mt_rand(0,strlen($this->Spe) - 1)];
+        }
+
+        for($i=strlen($pass);$i<$this->length2; $i++){ // y
+            $pass .= $this->All[mt_rand(0,strlen($this->All) -1)];
+        }
+
+        $pass = str_shuffle($pass);
+
+        if ($this->validatePassword($pass))
+        {
+            return $pass;
+        }
+
+        return $this->getNewGeneratedPassword();
+    }
+
+    /**
+     * 		Validate a password
+     *
+     *		@param		string	$password	Password to check
+     *      @return     int					0 if KO, >0 if OK
+     */
+    function validatePassword($password)
+    {
+        $password_a = str_split($password);
+        $maj = str_split($this->Maj);
+        $num = str_split($this->Nb);
+        $spe = str_split($this->Spe);
+
+        if(count(array_intersect($password_a, $maj)) < $this->NbMaj){
+            return 0;
+        }
+
+        if(count(array_intersect($password_a, $num)) < $this->NbNum){
+            return 0;
+        }
+
+        if(count(array_intersect($password_a, $spe)) < $this->NbSpe){
+            return 0;
+        }
+
+        if(!$this->consecutiveInterationSameCharacter($password)){
+            return 0;
+        }
+
+        return 1;
+    }
+
+    /**
+     * 		consecutive iterations of the same character
+     *
+     *		@param		string	$password	Password to check
+     *      @return     int					0 if KO, >0 if OK
+     */
     function consecutiveInterationSameCharacter($password)
     {
-		$last = "";
-		$count = 0;
-		$char = str_split($password);
-		foreach($char as $c){
-			if($c != $last){
-				$last = $c;
-				$count = 0;
-			}else{
-				$count++;
-			}
-
-			if($count >= $this->NbRepeat) {
-				return 0;
-			}
-		}
-		return 1;
-	}
+        $last = "";
+        $count = 0;
+        $char = str_split($password);
+        foreach($char as $c){
+            if($c != $last){
+                $last = $c;
+                $count = 0;
+            }else{
+                $count++;
+            }
+
+            if($count >= $this->NbRepeat) {
+                return 0;
+            }
+        }
+        return 1;
+    }
 }

Spacing +29 added lines, -29 removed lines

@@ -24,7 +24,7 @@ 
  *      \brief      File to manage no password generation.
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassword.php';
 
 
 /**
@@ -75,23 +75,23 @@ 
 		$this->id = "Perso";
 		$this->length = $langs->trans("SetupPerso");
 
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
+		$this->db = $db;
+		$this->conf = $conf;
+		$this->langs = $langs;
+		$this->user = $user;
 
 		if (empty($conf->global->USER_PASSWORD_PATTERN)) {
 			// default value (8carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
-			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1','chaine',0,'',$conf->entity);
+			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1', 'chaine', 0, '', $conf->entity);
 		}
 
 		$this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 		$this->Min = strtolower($this->Maj);
 		$this->Nb = "0123456789";
 		$this->Spe = "!@#$%&*()_-+={}[]\\|:;'/";
-		$this->Ambi = array("1","I","l","|","O","0");
+		$this->Ambi = array("1", "I", "l", "|", "O", "0");
 
-		$tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN);
+		$tabConf = explode(";", $conf->global->USER_PASSWORD_PATTERN);
 		$this->length2 = $tabConf[0];
 		$this->NbMaj = $tabConf[1];
 		$this->NbNum = $tabConf[2];
@@ -101,13 +101,13 @@ 
 
 		if ($this->WithoutAmbi)
 		{
-			$this->Maj = str_replace($this->Ambi,"",$this->Maj);
-			$this->Min = str_replace($this->Ambi,"",$this->Min);
-			$this->Nb  = str_replace($this->Ambi,"",$this->Nb);
-			$this->Spe = str_replace($this->Ambi,"",$this->Spe);
+			$this->Maj = str_replace($this->Ambi, "", $this->Maj);
+			$this->Min = str_replace($this->Ambi, "", $this->Min);
+			$this->Nb  = str_replace($this->Ambi, "", $this->Nb);
+			$this->Spe = str_replace($this->Ambi, "", $this->Spe);
 		}
 
-		$pattern = $this->Min . (! empty($this->NbMaj)?$this->Maj:'') . (! empty($this->NbNum)?$this->Nb:'') . (! empty($this->NbSpe)?$this->Spe:'');
+		$pattern = $this->Min.(!empty($this->NbMaj) ? $this->Maj : '').(!empty($this->NbNum) ? $this->Nb : '').(!empty($this->NbSpe) ? $this->Spe : '');
 		$this->All = str_shuffle($pattern);
 
 		//$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
@@ -144,20 +144,20 @@ 
 	function getNewGeneratedPassword()
 	{
 		$pass = "";
-		for($i=0; $i<$this->NbMaj; $i++){ // Y
-			$pass .= $this->Maj[mt_rand(0,strlen($this->Maj) - 1)];
+		for ($i = 0; $i < $this->NbMaj; $i++) { // Y
+			$pass .= $this->Maj[mt_rand(0, strlen($this->Maj) - 1)];
 		}
 
-		for($i=0; $i<$this->NbNum; $i++){ // X
-			$pass .= $this->Nb[mt_rand(0,strlen($this->Nb) - 1)];
+		for ($i = 0; $i < $this->NbNum; $i++) { // X
+			$pass .= $this->Nb[mt_rand(0, strlen($this->Nb) - 1)];
 		}
 
-		for($i=0; $i<$this->NbSpe; $i++){ // @
-			$pass .= $this->Spe[mt_rand(0,strlen($this->Spe) - 1)];
+		for ($i = 0; $i < $this->NbSpe; $i++) { // @
+			$pass .= $this->Spe[mt_rand(0, strlen($this->Spe) - 1)];
 		}
 
-		for($i=strlen($pass);$i<$this->length2; $i++){ // y
-			$pass .= $this->All[mt_rand(0,strlen($this->All) -1)];
+		for ($i = strlen($pass); $i < $this->length2; $i++) { // y
+			$pass .= $this->All[mt_rand(0, strlen($this->All) - 1)];
 		}
 
 		$pass = str_shuffle($pass);
@@ -183,19 +183,19 @@ 
 		$num = str_split($this->Nb);
 		$spe = str_split($this->Spe);
 
-		if(count(array_intersect($password_a, $maj)) < $this->NbMaj){
+		if (count(array_intersect($password_a, $maj)) < $this->NbMaj) {
 			return 0;
 		}
 
-		if(count(array_intersect($password_a, $num)) < $this->NbNum){
+		if (count(array_intersect($password_a, $num)) < $this->NbNum) {
 			return 0;
 		}
 
-		if(count(array_intersect($password_a, $spe)) < $this->NbSpe){
+		if (count(array_intersect($password_a, $spe)) < $this->NbSpe) {
 			return 0;
 		}
 
-		if(!$this->consecutiveInterationSameCharacter($password)){
+		if (!$this->consecutiveInterationSameCharacter($password)) {
 			return 0;
 		}
 
@@ -213,15 +213,15 @@ 
 		$last = "";
 		$count = 0;
 		$char = str_split($password);
-		foreach($char as $c){
-			if($c != $last){
+		foreach ($char as $c) {
+			if ($c != $last) {
 				$last = $c;
 				$count = 0;
-			}else{
+			} else {
 				$count++;
 			}
 
-			if($count >= $this->NbRepeat) {
+			if ($count >= $this->NbRepeat) {
 				return 0;
 			}
 		}

Braces +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
 			if($c != $last){
 				$last = $c;
 				$count = 0;
-			}else{
+			} else{
 				$count++;
 			}