alxarafe / alixar

dolibarr/htdocs/core/modules/bank/modules_bank.php

Indentation +16 added lines, -16 removed lines

@@ -31,31 +31,31 @@
  */
 abstract class ModeleBankAccountDoc extends CommonDocGenerator
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return list of active generation modules
-	 *
+    /**
+     *  Return list of active generation modules
+     *
      *  @param	DoliDB	$db     			Database handler
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
-	static function liste_modeles($db, $maxfilenamelength=0)
-	{
+    static function liste_modeles($db, $maxfilenamelength=0)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$type = 'bankaccount';
-		$list = array();
+        $type = 'bankaccount';
+        $list = array();
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$list = getListOfModels($db, $type, $maxfilenamelength);
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $list;
-	}
+        return $list;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -45,7 +45,7 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
-	static function liste_modeles($db, $maxfilenamelength=0)
+	static function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		global $conf;

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

Indentation +245 added lines, -245 removed lines

@@ -36,257 +36,257 @@
 class modPropale extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $user;
-
-		$this->db = $db;
-		$this->numero = 20;
-
-		$this->family = "crm";
-		$this->module_position = '20';
-		// 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->description = "Gestion des propositions commerciales";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='propal';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/propale/temp");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modSociete");		// 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->config_page_url = array("propal.php");
-		$this->langfiles = array("propal","bills","companies","deliveries","products");
-
-		// Constants
-		$this->const = array();
-		$r=0;
-
-		$this->const[$r][0] = "PROPALE_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "azur";
-		$this->const[$r][3] = 'Name of the proposal generation manager in PDF format';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "PROPALE_ADDON";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_propale_marbre";
-		$this->const[$r][3] = 'Name of proposal numbering manager';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "PROPALE_VALIDITY_DURATION";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "15";
-		$this->const[$r][3] = 'Duration of validity of business proposals';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "PROPALE_ADDON_PDF_ODT_PATH";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/proposals";
-		$this->const[$r][3] = "";
-		$this->const[$r][4] = 0;
-		$r++;
-
-		/*$this->const[$r][0] = "PROPALE_DRAFT_WATERMARK";
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $user;
+
+        $this->db = $db;
+        $this->numero = 20;
+
+        $this->family = "crm";
+        $this->module_position = '20';
+        // 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->description = "Gestion des propositions commerciales";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='propal';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/propale/temp");
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array("modSociete");		// 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->config_page_url = array("propal.php");
+        $this->langfiles = array("propal","bills","companies","deliveries","products");
+
+        // Constants
+        $this->const = array();
+        $r=0;
+
+        $this->const[$r][0] = "PROPALE_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "azur";
+        $this->const[$r][3] = 'Name of the proposal generation manager in PDF format';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "PROPALE_ADDON";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_propale_marbre";
+        $this->const[$r][3] = 'Name of proposal numbering manager';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "PROPALE_VALIDITY_DURATION";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "15";
+        $this->const[$r][3] = 'Duration of validity of business proposals';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "PROPALE_ADDON_PDF_ODT_PATH";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/proposals";
+        $this->const[$r][3] = "";
+        $this->const[$r][4] = 0;
+        $r++;
+
+        /*$this->const[$r][0] = "PROPALE_DRAFT_WATERMARK";
 		$this->const[$r][2] = "__(Draft)__";
 		$this->const[$r][3] = 'Watermark to show on draft proposals';
 		$this->const[$r][4] = 0;
 		$r++;*/
 
-		// Boxes
-		$this->boxes = array(
-           	0=>array('file'=>'box_graph_propales_permonth.php','enabledbydefaulton'=>'Home'),
-           	1=>array('file'=>'box_propales.php','enabledbydefaulton'=>'Home'),
-		);
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'propale';
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 21; // id de la permission
-		$this->rights[$r][1] = 'Read commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 22; // id de la permission
-		$this->rights[$r][1] = 'Create and update commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 24; // id de la permission
-		$this->rights[$r][1] = 'Validate commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'propal_advance';
-		$this->rights[$r][5] = 'validate';
-
-		$r++;
-		$this->rights[$r][0] = 25; // id de la permission
-		$this->rights[$r][1] = 'Send commercial proposals to customers'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'propal_advance';
+        // Boxes
+        $this->boxes = array(
+                0=>array('file'=>'box_graph_propales_permonth.php','enabledbydefaulton'=>'Home'),
+                1=>array('file'=>'box_propales.php','enabledbydefaulton'=>'Home'),
+        );
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'propale';
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 21; // id de la permission
+        $this->rights[$r][1] = 'Read commercial proposals'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 22; // id de la permission
+        $this->rights[$r][1] = 'Create and update commercial proposals'; // libelle de la permission
+        $this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 24; // id de la permission
+        $this->rights[$r][1] = 'Validate commercial proposals'; // libelle de la permission
+        $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'propal_advance';
+        $this->rights[$r][5] = 'validate';
+
+        $r++;
+        $this->rights[$r][0] = 25; // id de la permission
+        $this->rights[$r][1] = 'Send commercial proposals to customers'; // libelle de la permission
+        $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'propal_advance';
         $this->rights[$r][5] = 'send';
 
-		$r++;
-		$this->rights[$r][0] = 26; // id de la permission
-		$this->rights[$r][1] = 'Close commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'cloturer';
-
-		$r++;
-		$this->rights[$r][0] = 27; // id de la permission
-		$this->rights[$r][1] = 'Delete commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'supprimer';
-
-		$r++;
-		$this->rights[$r][0] = 28; // id de la permission
-		$this->rights[$r][1] = 'Exporting commercial proposals and attributes'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'export';
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		//--------
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='ProposalsAndProposalsLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_permission[$r]=array(array("propale","export"));
-		$this->export_fields_array[$r]=array(
-			's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.code'=>'CountryCode','s.phone'=>'Phone',
-			's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",
-			'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",
-			'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate',
-			'c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin',
-			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct',
-			'cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",
-			'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'
-		);
-		//$this->export_TypeFields_array[$r]=array(
-		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text',
-		//	's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",
-		//	'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",
-		//	'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
-		//	'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
-		//);
-		$this->export_TypeFields_array[$r]=array(
-			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text',
-			's.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",
-			'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date',
-			'pj.ref'=>'Text', 'cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
-			'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text'
-		);
-		$this->export_entities_array[$r]=array(
-			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.code'=>'company','s.phone'=>'company',
-			's.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",
-			'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",
-			'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal", 'pj.ref'=>'project', 'cd.rowid'=>'propal_line',
-			'cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",
-			'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'
-		);
-		$this->export_dependencies_array[$r]=array('propal_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		$keyforselect='propal'; $keyforelement='propal'; $keyforaliasextra='extra';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='propaldet'; $keyforelement='propal_line'; $keyforaliasextra='extra2';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='product'; $keyforelement='product'; $keyforaliasextra='extra3';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='societe'; $keyforelement='societe'; $keyforaliasextra='extra4';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s ';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
-
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uv.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propal_extrafields as extra ON c.rowid = extra.fk_object';
-		$this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'propaldet as cd';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet_extrafields as extra2 on cd.rowid = extra2.fk_object';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
-		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal').')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
-	}
-
-
-	/**
-	 *		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->rights[$r][0] = 26; // id de la permission
+        $this->rights[$r][1] = 'Close commercial proposals'; // libelle de la permission
+        $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'cloturer';
+
+        $r++;
+        $this->rights[$r][0] = 27; // id de la permission
+        $this->rights[$r][1] = 'Delete commercial proposals'; // libelle de la permission
+        $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'supprimer';
+
+        $r++;
+        $this->rights[$r][0] = 28; // id de la permission
+        $this->rights[$r][1] = 'Exporting commercial proposals and attributes'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'export';
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        //--------
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]='ProposalsAndProposalsLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        $this->export_permission[$r]=array(array("propale","export"));
+        $this->export_fields_array[$r]=array(
+            's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.code'=>'CountryCode','s.phone'=>'Phone',
+            's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",
+            'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",
+            'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate',
+            'c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin',
+            'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct',
+            'cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",
+            'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'
+        );
+        //$this->export_TypeFields_array[$r]=array(
+        //	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text',
+        //	's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",
+        //	'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",
+        //	'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
+        //	'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
+        //);
+        $this->export_TypeFields_array[$r]=array(
+            's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text',
+            's.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",
+            'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date',
+            'pj.ref'=>'Text', 'cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
+            'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text'
+        );
+        $this->export_entities_array[$r]=array(
+            's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.code'=>'company','s.phone'=>'company',
+            's.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",
+            'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",
+            'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal", 'pj.ref'=>'project', 'cd.rowid'=>'propal_line',
+            'cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",
+            'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'
+        );
+        $this->export_dependencies_array[$r]=array('propal_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+        $keyforselect='propal'; $keyforelement='propal'; $keyforaliasextra='extra';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $keyforselect='propaldet'; $keyforelement='propal_line'; $keyforaliasextra='extra2';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $keyforselect='product'; $keyforelement='product'; $keyforaliasextra='extra3';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $keyforselect='societe'; $keyforelement='societe'; $keyforaliasextra='extra4';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s ';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
+
+        if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
+        $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uv.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propal_extrafields as extra ON c.rowid = extra.fk_object';
+        $this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'propaldet as cd';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet_extrafields as extra2 on cd.rowid = extra2.fk_object';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
+        $this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
+        $this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal').')';
+        if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+    }
+
+
+    /**
+     *		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/proposals/template_proposal.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/proposals';
-		$dest=$dirodt.'/template_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 = 'propal' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','propal',".$conf->entity.")",
-		);
-
-		return $this->_init($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/proposals/template_proposal.odt';
+        $dirodt=DOL_DATA_ROOT.'/doctemplates/proposals';
+        $dest=$dirodt.'/template_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 = 'propal' AND entity = ".$conf->entity,
+                "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','propal',".$conf->entity.")",
+        );
+
+        return $this->_init($sql,$options);
+    }
 }

Spacing +72 added lines, -72 removed lines

@@ -27,7 +27,7 @@ 
  *	\ingroup    propale
  *	\brief      Fichier de description et activation du module Propale
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -51,30 +51,30 @@ 
 		$this->family = "crm";
 		$this->module_position = '20';
 		// 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));
 		$this->description = "Gestion des propositions commerciales";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='propal';
+		$this->picto = 'propal';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/propale/temp");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modSociete");		// 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("modSociete"); // 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->config_page_url = array("propal.php");
-		$this->langfiles = array("propal","bills","companies","deliveries","products");
+		$this->langfiles = array("propal", "bills", "companies", "deliveries", "products");
 
 		// Constants
 		$this->const = array();
-		$r=0;
+		$r = 0;
 
 		$this->const[$r][0] = "PROPALE_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -112,14 +112,14 @@ 
 
 		// Boxes
 		$this->boxes = array(
-           	0=>array('file'=>'box_graph_propales_permonth.php','enabledbydefaulton'=>'Home'),
-           	1=>array('file'=>'box_propales.php','enabledbydefaulton'=>'Home'),
+           	0=>array('file'=>'box_graph_propales_permonth.php', 'enabledbydefaulton'=>'Home'),
+           	1=>array('file'=>'box_propales.php', 'enabledbydefaulton'=>'Home'),
 		);
 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'propale';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 21; // id de la permission
@@ -175,26 +175,26 @@ 
 
 		// 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]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='ProposalsAndProposalsLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_permission[$r]=array(array("propale","export"));
-		$this->export_fields_array[$r]=array(
-			's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.code'=>'CountryCode','s.phone'=>'Phone',
-			's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",
-			'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",
-			'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate',
-			'c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin',
-			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct',
-			'cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",
-			'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'ProposalsAndProposalsLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r] = array(array("propale", "export"));
+		$this->export_fields_array[$r] = array(
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'co.code'=>'CountryCode', 's.phone'=>'Phone',
+			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_client'=>"RefCustomer",
+			'c.fk_soc'=>"IdCompany", 'c.datec'=>"DateCreation", 'c.datep'=>"DatePropal", 'c.fin_validite'=>"DateEndPropal", 'c.remise_percent'=>"GlobalDiscount",
+			'c.total_ht'=>"TotalHT", 'c.total'=>"TotalTTC", 'c.fk_statut'=>'Status', 'c.note_public'=>"Note", 'c.date_livraison'=>'DeliveryDate',
+			'c.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin', 'c.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin',
+			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId', 'cd.label'=>"Label", 'cd.description'=>"LineDescription", 'cd.product_type'=>'TypeOfLineServiceOrProduct',
+			'cd.tva_tx'=>"LineVATRate", 'cd.qty'=>"LineQty", 'cd.total_ht'=>"LineTotalHT", 'cd.total_tva'=>"LineTotalVAT", 'cd.total_ttc'=>"LineTotalTTC",
+			'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel'
 		);
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text',
@@ -203,49 +203,49 @@ 
 		//	'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
 		//	'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
 		//);
-		$this->export_TypeFields_array[$r]=array(
-			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text',
-			's.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",
-			'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date',
-			'pj.ref'=>'Text', 'cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
-			'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text'
+		$this->export_TypeFields_array[$r] = array(
+			's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text',
+			's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_client'=>"Text", 'c.datec'=>"Date", 'c.datep'=>"Date", 'c.fin_validite'=>"Date",
+			'c.remise_percent'=>"Numeric", 'c.total_ht'=>"Numeric", 'c.total'=>"Numeric", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.date_livraison'=>'Date',
+			'pj.ref'=>'Text', 'cd.description'=>"Text", 'cd.product_type'=>'Boolean', 'cd.tva_tx'=>"Numeric", 'cd.qty'=>"Numeric", 'cd.total_ht'=>"Numeric",
+			'cd.total_tva'=>"Numeric", 'cd.total_ttc'=>"Numeric", 'p.ref'=>'Text', 'p.label'=>'Text'
 		);
-		$this->export_entities_array[$r]=array(
-			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.code'=>'company','s.phone'=>'company',
-			's.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",
-			'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",
-			'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal", 'pj.ref'=>'project', 'cd.rowid'=>'propal_line',
-			'cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",
-			'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'
+		$this->export_entities_array[$r] = array(
+			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'co.code'=>'company', 's.phone'=>'company',
+			's.siren'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.siret'=>'company', 'c.rowid'=>"propal", 'c.ref'=>"propal", 'c.ref_client'=>"propal",
+			'c.fk_soc'=>"propal", 'c.datec'=>"propal", 'c.datep'=>"propal", 'c.fin_validite'=>"propal", 'c.remise_percent'=>"propal", 'c.total_ht'=>"propal",
+			'c.total'=>"propal", 'c.fk_statut'=>"propal", 'c.note_public'=>"propal", 'c.date_livraison'=>"propal", 'pj.ref'=>'project', 'cd.rowid'=>'propal_line',
+			'cd.label'=>"propal_line", 'cd.description'=>"propal_line", 'cd.product_type'=>'propal_line', 'cd.tva_tx'=>"propal_line", 'cd.qty'=>"propal_line",
+			'cd.total_ht'=>"propal_line", 'cd.total_tva'=>"propal_line", 'cd.total_ttc'=>"propal_line", 'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product'
 		);
-		$this->export_dependencies_array[$r]=array('propal_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		$keyforselect='propal'; $keyforelement='propal'; $keyforaliasextra='extra';
+		$this->export_dependencies_array[$r] = array('propal_line'=>'cd.rowid', 'product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$keyforselect = 'propal'; $keyforelement = 'propal'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='propaldet'; $keyforelement='propal_line'; $keyforaliasextra='extra2';
+		$keyforselect = 'propaldet'; $keyforelement = 'propal_line'; $keyforaliasextra = 'extra2';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='product'; $keyforelement='product'; $keyforaliasextra='extra3';
+		$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra3';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='societe'; $keyforelement='societe'; $keyforaliasextra='extra4';
+		$keyforselect = 'societe'; $keyforelement = 'societe'; $keyforaliasextra = 'extra4';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s ';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
-
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uv.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propal_extrafields as extra ON c.rowid = extra.fk_object';
-		$this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'propaldet as cd';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet_extrafields as extra2 on cd.rowid = extra2.fk_object';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
-		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal').')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s ';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
+
+		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'propal as c';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uv.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propal_extrafields as extra ON c.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ', '.MAIN_DB_PREFIX.'propaldet as cd';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet_extrafields as extra2 on cd.rowid = extra2.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
+		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
+		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('propal').')';
+		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 	}
 
 
@@ -257,27 +257,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/proposals/template_proposal.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/proposals';
-		$dest=$dirodt.'/template_proposal.odt';
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/proposals/template_proposal.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/proposals';
+		$dest = $dirodt.'/template_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;
 			}
 		}
@@ -287,6 +287,6 @@ 
 				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','propal',".$conf->entity.")",
 		);
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

Braces +6 added lines, -2 removed lines

@@ -232,7 +232,9 @@ 
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s ';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
 
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if(!$user->rights->societe->client->voir) {
+		    $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
@@ -245,7 +247,9 @@ 
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
 		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal').')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		if(!$user->rights->societe->client->voir) {
+		    $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		}
 	}
 
 

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

Indentation +68 added lines, -68 removed lines

@@ -33,101 +33,101 @@
  */
 class modProductBatch extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
         global $langs,$conf;
 
         $this->db = $db;
-		$this->numero = 39000;
+        $this->numero = 39000;
 
-		$this->family = "products";
-		$this->module_position = '45';
+        $this->family = "products";
+        $this->module_position = '45';
 
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Batch number, eat-by and sell-by date management module";
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Batch number, eat-by and sell-by date management module";
 
-		$this->rights_class = 'productbatch';
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->rights_class = 'productbatch';
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 
-		$this->picto='stock';
+        $this->picto='stock';
 
-		$this->module_parts = array();
+        $this->module_parts = array();
 
-		// 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, stored into productdluo/admin directory, to use to setup module.
-		$this->config_page_url = array("product_lot_extrafields.php@product");
+        // Config pages. Put here list of php page, stored into productdluo/admin directory, to use to setup module.
+        $this->config_page_url = array("product_lot_extrafields.php@product");
 
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modProduct","modStock","modExpedition","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->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("productbatch");
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array("modProduct","modStock","modExpedition","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->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("productbatch");
 
-		// Constants
-		$this->const = array();
+        // Constants
+        $this->const = array();
 
         $this->tabs = array();
 
         // Dictionaries
-	    if (! isset($conf->productbatch->enabled))
+        if (! isset($conf->productbatch->enabled))
         {
-        	$conf->productbatch=new stdClass();
-        	$conf->productbatch->enabled=0;
+            $conf->productbatch=new stdClass();
+            $conf->productbatch->enabled=0;
         }
-		$this->dictionaries=array();
+        $this->dictionaries=array();
 
         // Boxes
         $this->boxes = array();			// List of boxes
 
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
 
 
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
 
-		// Exports
-		$r=0;
-	}
+        // Exports
+        $r=0;
+    }
 
-	/**
-	 *		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
-	 *
+    /**
+     *		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 $db,$conf;
-
-		$sql = array();
-
-		if (! empty($conf->cashdesk->enabled)) {
-    		if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
-    		    include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-    		    $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
-    		}
-		}
-
-		return $this->_init($sql, $options);
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $db,$conf;
+
+        $sql = array();
+
+        if (! empty($conf->cashdesk->enabled)) {
+            if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+                $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
+            }
+        }
+
+        return $this->_init($sql, $options);
+    }
 }
 

Spacing +23 added lines, -23 removed lines

@@ -25,7 +25,7 @@ 
  *  \ingroup    productbatch
  *  \brief      Description and activation file for module productbatch
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -40,7 +40,7 @@ 
 	 */
 	function __construct($db)
 	{
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->db = $db;
 		$this->numero = 39000;
@@ -48,7 +48,7 @@ 
 		$this->family = "products";
 		$this->module_position = '45';
 
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Batch number, eat-by and sell-by date management module";
 
 		$this->rights_class = 'productbatch';
@@ -57,7 +57,7 @@ 
 		// Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 
-		$this->picto='stock';
+		$this->picto = 'stock';
 
 		$this->module_parts = array();
 
@@ -68,12 +68,12 @@ 
 		$this->config_page_url = array("product_lot_extrafields.php@product");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modProduct","modStock","modExpedition","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->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array("modProduct", "modStock", "modExpedition", "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->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("productbatch");
 
 		// Constants
@@ -82,28 +82,28 @@ 
         $this->tabs = array();
 
         // Dictionaries
-	    if (! isset($conf->productbatch->enabled))
+	    if (!isset($conf->productbatch->enabled))
         {
-        	$conf->productbatch=new stdClass();
-        	$conf->productbatch->enabled=0;
+        	$conf->productbatch = new stdClass();
+        	$conf->productbatch->enabled = 0;
         }
-		$this->dictionaries=array();
+		$this->dictionaries = array();
 
         // Boxes
-        $this->boxes = array();			// List of boxes
+        $this->boxes = array(); // List of boxes
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 
 		// 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;
 	}
 
 	/**
@@ -114,16 +114,16 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
-	    global $db,$conf;
+	    global $db, $conf;
 
 		$sql = array();
 
-		if (! empty($conf->cashdesk->enabled)) {
+		if (!empty($conf->cashdesk->enabled)) {
     		if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
     		    include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-    		    $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
+    		    $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
     		}
 		}
 

dolibarr/htdocs/core/modules/holiday/mod_holiday_immaculate.php

Indentation +91 added lines, -91 removed lines

@@ -30,122 +30,122 @@
  */
 class mod_holiday_immaculate extends ModelNumRefHolidays
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
-
-	/**
-	 * @var string Error message
-	 */
-	public $error = '';
-
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see $name
-	 */
-	public $nom='Immaculate';
-
-	/**
-	 * @var string model name
-	 */
-	public $name='Immaculate';
-
-	public $code_auto=1;
-
-	/**
-	 *	Return default description of numbering model
-	 *
-	 *	@return     string      text description
-	 */
-	function info()
+    public $version = 'dolibarr';
+
+    /**
+     * @var string Error message
+     */
+    public $error = '';
+
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see $name
+     */
+    public $nom='Immaculate';
+
+    /**
+     * @var string model name
+     */
+    public $name='Immaculate';
+
+    public $code_auto=1;
+
+    /**
+     *	Return default description of numbering model
+     *
+     *	@return     string      text description
+     */
+    function info()
     {
-    	global $conf, $langs;
+        global $conf, $langs;
 
-		$langs->load("bills");
+        $langs->load("bills");
 
-		$form = new Form($this->db);
+        $form = new Form($this->db);
 
-		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstcontract" value="HOLIDAY_IMMACULATE_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+        $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="updateMask">';
+        $texte.= '<input type="hidden" name="maskconstcontract" value="HOLIDAY_IMMACULATE_MASK">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+        $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
+        $tooltip.=$langs->trans("GenericMaskCodes2");
+        $tooltip.=$langs->trans("GenericMaskCodes3");
+        $tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
+        $tooltip.=$langs->trans("GenericMaskCodes5");
 
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskholiday" value="'.$conf->global->HOLIDAY_IMMACULATE_MASK.'">',$tooltip,1,1).'</td>';
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
-		$texte.= '</tr>';
-		$texte.= '</table>';
-		$texte.= '</form>';
+        $texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
+        $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskholiday" value="'.$conf->global->HOLIDAY_IMMACULATE_MASK.'">',$tooltip,1,1).'</td>';
+        $texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+        $texte.= '</tr>';
+        $texte.= '</table>';
+        $texte.= '</form>';
 
-		return $texte;
+        return $texte;
     }
 
-	/**
-	 *	Return numbering example
-	 *
-	 *	@return     string      Example
-	 */
+    /**
+     *	Return numbering example
+     *
+     *	@return     string      Example
+     */
     function getExample()
     {
-     	global $conf,$langs,$user;
-
-    	$old_login=$user->login;
-    	$user->login='UUUUUUU';
-     	$numExample = $this->getNextValue($user, '');
-		$user->login=$old_login;
-
-		if (! $numExample)
-		{
-			$numExample = $langs->trans('NotConfigured');
-		}
-		return $numExample;
+            global $conf,$langs,$user;
+
+        $old_login=$user->login;
+        $user->login='UUUUUUU';
+            $numExample = $this->getNextValue($user, '');
+        $user->login=$old_login;
+
+        if (! $numExample)
+        {
+            $numExample = $langs->trans('NotConfigured');
+        }
+        return $numExample;
     }
 
-	/**
-	 *	Return next value
-	 *
-	 *	@param	Societe		$user     	user object
-	 *	@param	Object		$holiday	holiday object
-	 *	@return string      			Value if OK, 0 if KO
-	 */
+    /**
+     *	Return next value
+     *
+     *	@param	Societe		$user     	user object
+     *	@param	Object		$holiday	holiday object
+     *	@return string      			Value if OK, 0 if KO
+     */
     function getNextValue($user, $holiday)
     {
-		global $db,$conf;
+        global $db,$conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
 
-		$mask=$conf->global->HOLIDAY_IMMACULATE_MASK;
+        $mask=$conf->global->HOLIDAY_IMMACULATE_MASK;
 
-		if (! $mask)
-		{
-			$this->error='NotConfigured';
-			return 0;
-		}
+        if (! $mask)
+        {
+            $this->error='NotConfigured';
+            return 0;
+        }
 
-		$numFinal=get_next_value($db,$mask,'holiday','ref','', $user, $holiday->date_create);
+        $numFinal=get_next_value($db,$mask,'holiday','ref','', $user, $holiday->date_create);
 
-		return  $numFinal;
-	}
+        return  $numFinal;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return next value
-	 *
-	 *  @param  User		$fuser     	User object
-	 *  @param  Object		$objforref	Holiday object
-	 *  @return string      			Value if OK, 0 if KO
-	 */
+    /**
+     *  Return next value
+     *
+     *  @param  User		$fuser     	User object
+     *  @param  Object		$objforref	Holiday object
+     *  @return string      			Value if OK, 0 if KO
+     */
     function holiday_get_num($fuser, $objforref)
     {
         // phpcs:enable

Spacing +33 added lines, -33 removed lines

@@ -23,7 +23,7 @@ 
  *  \brief      File of class to manage contract numbering rules Magre
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/holiday/modules_holiday.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/holiday/modules_holiday.php';
 
 /**
  *	Class to manage contract numbering rules Magre
@@ -46,14 +46,14 @@ 
 	 * @deprecated
 	 * @see $name
 	 */
-	public $nom='Immaculate';
+	public $nom = 'Immaculate';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Immaculate';
+	public $name = 'Immaculate';
 
-	public $code_auto=1;
+	public $code_auto = 1;
 
 	/**
 	 *	Return default description of numbering model
@@ -69,24 +69,24 @@ 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstcontract" value="HOLIDAY_IMMACULATE_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
-
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskholiday" value="'.$conf->global->HOLIDAY_IMMACULATE_MASK.'">',$tooltip,1,1).'</td>';
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
-		$texte.= '</tr>';
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstcontract" value="HOLIDAY_IMMACULATE_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Holiday"), $langs->transnoentities("Holiday"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Holiday"), $langs->transnoentities("Holiday"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
+
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskholiday" value="'.$conf->global->HOLIDAY_IMMACULATE_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '</tr>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -98,14 +98,14 @@ 
 	 */
     function getExample()
     {
-     	global $conf,$langs,$user;
+     	global $conf, $langs, $user;
 
-    	$old_login=$user->login;
-    	$user->login='UUUUUUU';
+    	$old_login = $user->login;
+    	$user->login = 'UUUUUUU';
      	$numExample = $this->getNextValue($user, '');
-		$user->login=$old_login;
+		$user->login = $old_login;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -121,19 +121,19 @@ 
 	 */
     function getNextValue($user, $holiday)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		$mask=$conf->global->HOLIDAY_IMMACULATE_MASK;
+		$mask = $conf->global->HOLIDAY_IMMACULATE_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal=get_next_value($db,$mask,'holiday','ref','', $user, $holiday->date_create);
+		$numFinal = get_next_value($db, $mask, 'holiday', 'ref', '', $user, $holiday->date_create);
 
 		return  $numFinal;
 	}

dolibarr/htdocs/core/modules/holiday/mod_holiday_madonna.php

Indentation +119 added lines, -119 removed lines

@@ -29,142 +29,142 @@
  */
 class mod_holiday_madonna extends ModelNumRefHolidays
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	public $prefix='HL';
+    public $prefix='HL';
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see $name
-	 */
-	public $nom='Madonna';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see $name
+     */
+    public $nom='Madonna';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Madonna';
+    /**
+     * @var string model name
+     */
+    public $name='Madonna';
 
-	public $code_auto=1;
+    public $code_auto=1;
 
 
-	/**
-	 *	Return default description of numbering model
-	 *
-	 *	@return     string      text description
-	 */
+    /**
+     *	Return default description of numbering model
+     *
+     *	@return     string      text description
+     */
     function info()
     {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+        global $langs;
+            return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
     }
 
 
-	/**
-	 *	Return numbering example
-	 *
-	 *	@return     string      Example
-	 */
-	function getExample()
-	{
-		return $this->prefix."0501-0001";
-	}
-
-
-	/**
-	 *	Test if existing numbers make problems with numbering
-	 *
-	 *	@return     boolean     false if conflit, true if ok
-	 */
-	function canBeActivated()
-	{
-		global $conf,$langs,$db;
-
-		$coyymm=''; $max='';
-
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."holiday";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
-		}
-		if ($coyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 *	Return next value
-	 *
-	 *	@param	Societe		$objsoc     third party object
-	 *	@param	Object		$holiday	Holiday object
-	 *	@return string      			Value if OK, 0 if KO
-	 */
-	function getNextValue($objsoc, $holiday)
-	{
-		global $db,$conf;
-
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."holiday";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
-		{
-			dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG);
-			return -1;
-		}
-
-		$date=$holiday->date_debut;
-		$yymm = strftime("%y%m",$date);
-
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
-
-		dol_syslog("mod_holiday_madonna::getNextValue return ".$this->prefix.$yymm."-".$num);
-		return $this->prefix.$yymm."-".$num;
-	}
+    /**
+     *	Return numbering example
+     *
+     *	@return     string      Example
+     */
+    function getExample()
+    {
+        return $this->prefix."0501-0001";
+    }
+
+
+    /**
+     *	Test if existing numbers make problems with numbering
+     *
+     *	@return     boolean     false if conflit, true if ok
+     */
+    function canBeActivated()
+    {
+        global $conf,$langs,$db;
+
+        $coyymm=''; $max='';
+
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."holiday";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $row = $db->fetch_row($resql);
+            if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+        }
+        if ($coyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans('ErrorNumRefModel', $max);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     *	Return next value
+     *
+     *	@param	Societe		$objsoc     third party object
+     *	@param	Object		$holiday	Holiday object
+     *	@return string      			Value if OK, 0 if KO
+     */
+    function getNextValue($objsoc, $holiday)
+    {
+        global $db,$conf;
+
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."holiday";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $max = intval($obj->max);
+            else $max=0;
+        }
+        else
+        {
+            dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG);
+            return -1;
+        }
+
+        $date=$holiday->date_debut;
+        $yymm = strftime("%y%m",$date);
+
+        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+        else $num = sprintf("%04s",$max+1);
+
+        dol_syslog("mod_holiday_madonna::getNextValue return ".$this->prefix.$yymm."-".$num);
+        return $this->prefix.$yymm."-".$num;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return next value
-	 *
-	 *	@param	User		$fuser     	User object
-	 *	@param	Object		$objforref	Holiday object
-	 *	@return string      			Value if OK, 0 if KO
-	 */
-	function holiday_get_num($fuser,$objforref)
-	{
+    /**
+     *	Return next value
+     *
+     *	@param	User		$fuser     	User object
+     *	@param	Object		$objforref	Holiday object
+     *	@return string      			Value if OK, 0 if KO
+     */
+    function holiday_get_num($fuser,$objforref)
+    {
         // phpcs:enable
-		return $this->getNextValue($fuser,$objforref);
-	}
+        return $this->getNextValue($fuser,$objforref);
+    }
 }

Spacing +30 added lines, -30 removed lines

@@ -22,7 +22,7 @@ 
  *  \ingroup    contract
  *  \brief      File of class to manage contract numbering rules Serpis
  */
-require_once DOL_DOCUMENT_ROOT .'/core/modules/holiday/modules_holiday.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/holiday/modules_holiday.php';
 
 /**
  * 	Class to manage contract numbering rules madonna
@@ -35,26 +35,26 @@ 
      */
 	public $version = 'dolibarr';
 
-	public $prefix='HL';
+	public $prefix = 'HL';
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
 	 * @deprecated
 	 * @see $name
 	 */
-	public $nom='Madonna';
+	public $nom = 'Madonna';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Madonna';
+	public $name = 'Madonna';
 
-	public $code_auto=1;
+	public $code_auto = 1;
 
 
 	/**
@@ -65,7 +65,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -87,26 +87,26 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 
-		$coyymm=''; $max='';
+		$coyymm = ''; $max = '';
 
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."holiday";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."holiday";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($coyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
@@ -122,20 +122,20 @@ 
 	 */
 	function getNextValue($objsoc, $holiday)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."holiday";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."holiday";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -143,11 +143,11 @@ 
 			return -1;
 		}
 
-		$date=$holiday->date_debut;
-		$yymm = strftime("%y%m",$date);
+		$date = $holiday->date_debut;
+		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog("mod_holiday_madonna::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -162,9 +162,9 @@ 
 	 *	@param	Object		$objforref	Holiday object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-	function holiday_get_num($fuser,$objforref)
+	function holiday_get_num($fuser, $objforref)
 	{
         // phpcs:enable
-		return $this->getNextValue($fuser,$objforref);
+		return $this->getNextValue($fuser, $objforref);
 	}
 }

Braces +13 added lines, -6 removed lines

@@ -134,10 +134,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+			    $max = intval($obj->max);
+			} else {
+			    $max=0;
+			}
+		} else
 		{
 			dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG);
 			return -1;
@@ -146,8 +148,13 @@ 
 		$date=$holiday->date_debut;
 		$yymm = strftime("%y%m",$date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) {
+		    $num=$max+1;
+		}
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else {
+		    $num = sprintf("%04s",$max+1);
+		}
 
 		dol_syslog("mod_holiday_madonna::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

dolibarr/htdocs/core/modules/holiday/modules_holiday.php

Indentation +94 added lines, -94 removed lines

@@ -30,7 +30,7 @@ 
  *  \brief      File with parent class for generating holiday to PDF and File of class to manage contract numbering
  */
 
- require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 
 
 /**
@@ -38,33 +38,33 @@ 
  */
 abstract class ModelePDFHoliday extends CommonDocGenerator
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	Return list of active generation modules
-	 *
+     *	Return list of active generation modules
+     *
      *  @param  DoliDB  $db     			Database handler
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
-	static function liste_modeles($db, $maxfilenamelength=0)
-	{
+    static function liste_modeles($db, $maxfilenamelength=0)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$type = 'holiday';
-		$list = array();
+        $type = 'holiday';
+        $list = array();
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$list = getListOfModels($db, $type, $maxfilenamelength);
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $list;
-	}
+        return $list;
+    }
 }
 
 
@@ -73,82 +73,82 @@ 
  */
 class ModelNumRefHolidays
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	/**
-	 *	Return if a module can be used or not
-	 *
-	 * 	@return		boolean     true if module can be used
-	 */
-	function isEnabled()
-	{
-		return true;
-	}
-
-	/**
-	 *	Return default description of numbering model
-	 *
-	 *	@return     string      text description
-	 */
-	function info()
-	{
-		global $langs;
-		$langs->load("holidays");
-		return $langs->trans("NoDescription");
-	}
-
-	/**
-	 *	Return numbering example
-	 *
-	 *	@return     string      Example
-	 */
-	function getExample()
-	{
-		global $langs;
-		$langs->load("holidays");
-		return $langs->trans("NoExample");
-	}
-
-	/**
-	 *	Test if existing numbers make problems with numbering
-	 *
-	 *	@return		boolean		false if conflict, true if ok
-	 */
-	function canBeActivated()
-	{
-		return true;
-	}
-
-	/**
-	 *	Return next value
-	 *
-	 *	@param	Societe		$objsoc     third party object
-	 *	@param	Object		$contract	contract object
-	 *	@return	string					Value
-	 */
-	function getNextValue($objsoc, $contract)
-	{
-		global $langs;
-		return $langs->trans("NotAvailable");
-	}
-
-	/**
-	 *	Return numbering version module
-	 *
-	 *	@return     string      Value
-	 */
-	function getVersion()
-	{
-		global $langs;
-		$langs->load("admin");
-
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
-		return $langs->trans("NotAvailable");
-	}
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    /**
+     *	Return if a module can be used or not
+     *
+     * 	@return		boolean     true if module can be used
+     */
+    function isEnabled()
+    {
+        return true;
+    }
+
+    /**
+     *	Return default description of numbering model
+     *
+     *	@return     string      text description
+     */
+    function info()
+    {
+        global $langs;
+        $langs->load("holidays");
+        return $langs->trans("NoDescription");
+    }
+
+    /**
+     *	Return numbering example
+     *
+     *	@return     string      Example
+     */
+    function getExample()
+    {
+        global $langs;
+        $langs->load("holidays");
+        return $langs->trans("NoExample");
+    }
+
+    /**
+     *	Test if existing numbers make problems with numbering
+     *
+     *	@return		boolean		false if conflict, true if ok
+     */
+    function canBeActivated()
+    {
+        return true;
+    }
+
+    /**
+     *	Return next value
+     *
+     *	@param	Societe		$objsoc     third party object
+     *	@param	Object		$contract	contract object
+     *	@return	string					Value
+     */
+    function getNextValue($objsoc, $contract)
+    {
+        global $langs;
+        return $langs->trans("NotAvailable");
+    }
+
+    /**
+     *	Return numbering version module
+     *
+     *	@return     string      Value
+     */
+    function getVersion()
+    {
+        global $langs;
+        $langs->load("admin");
+
+        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+        if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
+        return $langs->trans("NotAvailable");
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -52,7 +52,7 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
-	static function liste_modeles($db, $maxfilenamelength=0)
+	static function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		global $conf;
@@ -76,7 +76,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 *	Return if a module can be used or not

Braces +12 added lines, -4 removed lines

@@ -142,10 +142,18 @@
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+		    return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+		    return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+		    return DOL_VERSION;
+		}
+		if ($this->version) {
+		    return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

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

Indentation +8 added lines, -8 removed lines

@@ -31,9 +31,9 @@ 
 {
 
     /**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
@@ -44,7 +44,7 @@ 
         // 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->description = "Enable the Dolibarr web services server";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
@@ -59,10 +59,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();	// 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();	// 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("other");
 
         // Constants

Spacing +9 added lines, -9 removed lines

@@ -22,7 +22,7 @@ 
  *       \ingroup    webservices
  *       \brief      File to describe webservices module
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe a WebServices module
@@ -42,14 +42,14 @@ 
 
         $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));
         $this->description = "Enable the Dolibarr web services server";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Name of image file used for this module.
-        $this->picto='technic';
+        $this->picto = 'technic';
 
         // Data directories to create when module is enabled
         $this->dirs = array();
@@ -58,11 +58,11 @@ 
         $this->config_page_url = array("index.php@webservices");
 
         // 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();	// 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(); // 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("other");
 
         // Constants
@@ -77,6 +77,6 @@ 
         // Permissions
         $this->rights = array();
         $this->rights_class = 'webservices';
-        $r=0;
+        $r = 0;
     }
 }

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

Indentation +170 added lines, -170 removed lines

@@ -31,121 +31,121 @@ 
  */
 class modEmailCollector extends DolibarrModules
 {
-	/**
-	 * Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
+    /**
+     * Constructor. Define names, constants, directories, boxes, permissions
+     *
+     * @param DoliDB $db Database handler
+     */
+    public function __construct($db)
+    {
         global $langs,$conf;
 
         $this->db = $db;
 
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 50320;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'emailcollector';
-
-		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
-		// It is used to group modules by family in module setup page
-		$this->family = "interface";
-		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '12';
-		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
-
-		// Module label (no space allowed), used if translation string 'ModuledavName' not found (MyModue is name of module).
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuledavDesc' not found (MyModue is name of module).
-		$this->description = "EmailCollectorDescription";
-		// Used only if file README.md and README-LL.md not found.
-		$this->descriptionlong = "EmailCollectorDescription";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = 'experimental';
-		// Key used in llx_const table to save module status enabled/disabled (where DAV is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// 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 under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='email';
-
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /dav/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /dav/core/modules/barcode)
-		// for specific css file (eg: /dav/css/dav.css.php)
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/dav/temp","/dav/subdir");
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page, stored into dav/admin directory, to use to setup module.
-		$this->config_page_url = array("emailcollector_list.php");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array('always'=>'modCron');		// 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->langfiles = array("admin");
-		$this->phpmin = array(5,4);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(7,0);	// Minimum version of Dolibarr required by module
-		$this->warnings_activation = array();                     // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-		$this->warnings_activation_ext = array();                 // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-		//$this->automatic_activation = array('FR'=>'davWasAutomaticallyActivatedBecauseOfYourCountryChoice');
-		//$this->always_enabled = true;								// If true, can't be disabled
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('DAV_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('DAV_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array(
-			//1=>array('DAV_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
-		);
-
-
-		if (! isset($conf->dav) || ! isset($conf->dav->enabled))
-		{
-			$conf->dav=new stdClass();
-			$conf->dav->enabled=0;
-		}
-
-
-		// Array to add new pages in new tabs
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+        $this->numero = 50320;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'emailcollector';
+
+        // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+        // It is used to group modules by family in module setup page
+        $this->family = "interface";
+        // Module position in the family on 2 digits ('01', '10', '20', ...)
+        $this->module_position = '12';
+        // Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+        //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+
+        // Module label (no space allowed), used if translation string 'ModuledavName' not found (MyModue is name of module).
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module description, used if translation string 'ModuledavDesc' not found (MyModue is name of module).
+        $this->description = "EmailCollectorDescription";
+        // Used only if file README.md and README-LL.md not found.
+        $this->descriptionlong = "EmailCollectorDescription";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+        $this->version = 'experimental';
+        // Key used in llx_const table to save module status enabled/disabled (where DAV is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // 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 under name object_pictovalue.png, use this->picto='pictovalue@module'
+        $this->picto='email';
+
+        // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+        // for default path (eg: /dav/core/xxxxx) (0=disable, 1=enable)
+        // for specific path of parts (eg: /dav/core/modules/barcode)
+        // for specific css file (eg: /dav/css/dav.css.php)
+        $this->module_parts = array();
+
+        // Data directories to create when module is enabled.
+        // Example: this->dirs = array("/dav/temp","/dav/subdir");
+        $this->dirs = array();
+
+        // Config pages. Put here list of php page, stored into dav/admin directory, to use to setup module.
+        $this->config_page_url = array("emailcollector_list.php");
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array('always'=>'modCron');		// 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->langfiles = array("admin");
+        $this->phpmin = array(5,4);					// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(7,0);	// Minimum version of Dolibarr required by module
+        $this->warnings_activation = array();                     // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+        $this->warnings_activation_ext = array();                 // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+        //$this->automatic_activation = array('FR'=>'davWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+        //$this->always_enabled = true;								// If true, can't be disabled
+
+        // Constants
+        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+        // Example: $this->const=array(0=>array('DAV_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+        //                             1=>array('DAV_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+        // );
+        $this->const = array(
+            //1=>array('DAV_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+        );
+
+
+        if (! isset($conf->dav) || ! isset($conf->dav->enabled))
+        {
+            $conf->dav=new stdClass();
+            $conf->dav->enabled=0;
+        }
+
+
+        // Array to add new pages in new tabs
         $this->tabs = array();
-		// Example:
-		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@dav:$user->rights->dav->read:/dav/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+        // Example:
+        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@dav:$user->rights->dav->read:/dav/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
         // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@dav:$user->rights->othermodule->read:/dav/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
         // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
         //
         // Where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
+        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+        // 'contact'          to add a tab in contact view
+        // 'contract'         to add a tab in contract view
+        // 'group'            to add a tab in group view
+        // 'intervention'     to add a tab in intervention view
+        // 'invoice'          to add a tab in customer invoice view
+        // 'invoice_supplier' to add a tab in supplier invoice view
+        // 'member'           to add a tab in fundation member view
+        // 'opensurveypoll'	  to add a tab in opensurvey poll view
+        // 'order'            to add a tab in customer order view
+        // 'order_supplier'   to add a tab in supplier order view
+        // 'payment'		  to add a tab in payment view
+        // 'payment_supplier' to add a tab in supplier payment view
+        // 'product'          to add a tab in product view
+        // 'propal'           to add a tab in propal view
+        // 'project'          to add a tab in project view
+        // 'stock'            to add a tab in stock view
+        // 'thirdparty'       to add a tab in third party view
+        // 'user'             to add a tab in user view
 
 
         // Dictionaries
-		$this->dictionaries=array();
+        $this->dictionaries=array();
         /* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@dav',
@@ -163,25 +163,25 @@ 
 
 
         // Boxes/Widgets
-		// Add here list of php file(s) stored in dav/core/boxes that contains class to show a widget.
+        // Add here list of php file(s) stored in dav/core/boxes that contains class to show a widget.
         $this->boxes = array(
-        	//0=>array('file'=>'davwidget1.php@dav','note'=>'Widget provided by dav','enabledbydefaulton'=>'Home'),
-        	//1=>array('file'=>'davwidget2.php@dav','note'=>'Widget provided by dav'),
-        	//2=>array('file'=>'davwidget3.php@dav','note'=>'Widget provided by dav')
+            //0=>array('file'=>'davwidget1.php@dav','note'=>'Widget provided by dav','enabledbydefaulton'=>'Home'),
+            //1=>array('file'=>'davwidget2.php@dav','note'=>'Widget provided by dav'),
+            //2=>array('file'=>'davwidget3.php@dav','note'=>'Widget provided by dav')
         );
 
 
-		// Cronjobs (List of cron jobs entries to add when module is enabled)
-		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
-		$this->cronjobs = array(
-			0=>array('label'=>'Email collector', 'priority'=>50, 'jobtype'=>'method', 'class'=>'/emailcollector/class/emailcollector.class.php', 'objectname'=>'EmailCollector', 'method'=>'doCollect', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>5, 'unitfrequency'=>60, 'status'=>1, 'test'=>'$conf->emailcollector->enabled')
-		);
+        // Cronjobs (List of cron jobs entries to add when module is enabled)
+        // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+        $this->cronjobs = array(
+            0=>array('label'=>'Email collector', 'priority'=>50, 'jobtype'=>'method', 'class'=>'/emailcollector/class/emailcollector.class.php', 'objectname'=>'EmailCollector', 'method'=>'doCollect', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>5, 'unitfrequency'=>60, 'status'=>1, 'test'=>'$conf->emailcollector->enabled')
+        );
 
 
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
 
-		/*
+        /*
 		$r=0;
 		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read myobject of dav';	// Permission label
@@ -204,14 +204,14 @@ 
 		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->dav->level1->level2)
 		*/
 
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
+        // Main menu entries
+        $this->menu = array();			// List of menus to add
+        $r=0;
 
-		// Add here entries to declare new menus
+        // Add here entries to declare new menus
 
-		/* BEGIN MODULEBUILDER TOPMENU */
-		/*$this->menu[$r++]=array('fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+        /* BEGIN MODULEBUILDER TOPMENU */
+        /*$this->menu[$r++]=array('fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'top',			                // This is a Top menu entry
 								'titre'=>'dav',
 								'mainmenu'=>'dav',
@@ -224,9 +224,9 @@ 
 								'target'=>'',
 								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
 		*/
-		/* END MODULEBUILDER TOPMENU */
+        /* END MODULEBUILDER TOPMENU */
 
-		/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT
+        /* BEGIN MODULEBUILDER LEFTMENU MYOBJECT
 		$this->menu[$r++]=array(	'fk_menu'=>'fk_mainmenu=dav',	    // '' if this is a top menu. For left menu, 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'=>'List MyObject',
@@ -254,11 +254,11 @@ 
 		END MODULEBUILDER LEFTMENU MYOBJECT */
 
 
-		// Exports
-		$r=1;
+        // Exports
+        $r=1;
 
-		/* BEGIN MODULEBUILDER EXPORT MYOBJECT */
-		/*
+        /* BEGIN MODULEBUILDER EXPORT MYOBJECT */
+        /*
 		$langs->load("dav@dav");
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='MyObjectLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
@@ -273,48 +273,48 @@ 
 		$this->export_sql_end[$r] .=' WHERE 1 = 1';
 		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('myobject').')';
 		$r++; */
-		/* END MODULEBUILDER EXPORT MYOBJECT */
-	}
-
-	/**
-	 *	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
-	 *
+        /* END MODULEBUILDER EXPORT MYOBJECT */
+    }
+
+    /**
+     *	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
+     */
+    public function init($options='')
+    {
+        //$this->_load_tables('/dav/sql/');
+
+        // Create extrafields
+        include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+        $extrafields = new ExtraFields($this->db);
+
+        //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1 '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+        //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
+
+        $sql = array();
+
+        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 init($options='')
-	{
-		//$this->_load_tables('/dav/sql/');
-
-		// Create extrafields
-		include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-
-		//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1 '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-
-		$sql = array();
-
-		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();
-
-		return $this->_remove($sql, $options);
-	}
+     *	@return     int             	1 if OK, 0 if KO
+     */
+    public function remove($options = '')
+    {
+        $sql = array();
+
+        return $this->_remove($sql, $options);
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -23,7 +23,7 @@ 
  *  \ingroup    dav
  *  \brief      Description and activation file for module dav
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -38,7 +38,7 @@ 
 	 */
 	public function __construct($db)
 	{
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->db = $db;
 
@@ -57,7 +57,7 @@ 
 		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
 
 		// Module label (no space allowed), used if translation string 'ModuledavName' not found (MyModue is name 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 'ModuledavDesc' not found (MyModue is name of module).
 		$this->description = "EmailCollectorDescription";
 		// Used only if file README.md and README-LL.md not found.
@@ -70,7 +70,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 under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='email';
+		$this->picto = 'email';
 
 		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
 		// for default path (eg: /dav/core/xxxxx) (0=disable, 1=enable)
@@ -86,15 +86,15 @@ 
 		$this->config_page_url = array("emailcollector_list.php");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array('always'=>'modCron');		// 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->hidden = false; // A condition to hide module
+		$this->depends = array('always'=>'modCron'); // 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->langfiles = array("admin");
-		$this->phpmin = array(5,4);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(7,0);	// Minimum version of Dolibarr required by module
-		$this->warnings_activation = array();                     // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-		$this->warnings_activation_ext = array();                 // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(7, 0); // Minimum version of Dolibarr required by module
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
 		//$this->automatic_activation = array('FR'=>'davWasAutomaticallyActivatedBecauseOfYourCountryChoice');
 		//$this->always_enabled = true;								// If true, can't be disabled
 
@@ -108,10 +108,10 @@ 
 		);
 
 
-		if (! isset($conf->dav) || ! isset($conf->dav->enabled))
+		if (!isset($conf->dav) || !isset($conf->dav->enabled))
 		{
-			$conf->dav=new stdClass();
-			$conf->dav->enabled=0;
+			$conf->dav = new stdClass();
+			$conf->dav->enabled = 0;
 		}
 
 
@@ -145,7 +145,7 @@ 
 
 
         // Dictionaries
-		$this->dictionaries=array();
+		$this->dictionaries = array();
         /* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@dav',
@@ -179,7 +179,7 @@ 
 
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
+		$this->rights = array(); // Permission array used by this module
 
 		/*
 		$r=0;
@@ -205,8 +205,8 @@ 
 		*/
 
 		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r=0;
+		$this->menu = array(); // List of menus to add
+		$r = 0;
 
 		// Add here entries to declare new menus
 
@@ -255,7 +255,7 @@ 
 
 
 		// Exports
-		$r=1;
+		$r = 1;
 
 		/* BEGIN MODULEBUILDER EXPORT MYOBJECT */
 		/*
@@ -284,7 +284,7 @@ 
      *	@param      string	$options    Options when enabling module ('', 'noboxes')
 	 *	@return     int             	1 if OK, 0 if KO
 	 */
-	public function init($options='')
+	public function init($options = '')
 	{
 		//$this->_load_tables('/dav/sql/');
 

dolibarr/htdocs/core/modules/action/modules_action.php

Indentation +77 added lines, -77 removed lines

@@ -29,9 +29,9 @@ 
 abstract class ModeleAction extends CommonDocGenerator
 {
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -72,86 +72,86 @@ 
 function action_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
     // phpcs:enable
-	global $conf,$langs,$user;
-	$langs->load("action");
-
-	$error=0;
-
-	$srctemplatepath='';
-
-	// Positionne modele sur le nom du modele de fichinter a utiliser
-	if (! dol_strlen($modele))
-	{
-		if (! empty($conf->global->ACTION_EVENT_ADDON_PDF))
-		{
-			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
-		}
-		else
-		{
-			$modele = 'soleil';
-		}
-	}
-
-	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
+    global $conf,$langs,$user;
+    $langs->load("action");
+
+    $error=0;
+
+    $srctemplatepath='';
+
+    // Positionne modele sur le nom du modele de fichinter a utiliser
+    if (! dol_strlen($modele))
+    {
+        if (! empty($conf->global->ACTION_EVENT_ADDON_PDF))
+        {
+            $modele = $conf->global->ACTION_EVENT_ADDON_PDF;
+        }
+        else
+        {
+            $modele = 'soleil';
+        }
+    }
+
+    // If selected modele is a filename template (then $modele="modelname:filename")
+    $tmp=explode(':',$modele,2);
     if (! empty($tmp[1]))
     {
         $modele=$tmp[0];
         $srctemplatepath=$tmp[1];
     }
 
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-    	foreach(array('doc','pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
-
-    		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/action/doc/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
+    // Search template files
+    $file=''; $classname=''; $filefound=0;
+    $dirmodels=array('/');
+    if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+    foreach($dirmodels as $reldir)
+    {
+        foreach(array('doc','pdf') as $prefix)
+        {
+            $file = $prefix."_".$modele.".modules.php";
+
+            // On verifie l'emplacement du modele
+            $file=dol_buildpath($reldir."core/modules/action/doc/".$file,0);
+            if (file_exists($file))
+            {
+                $filefound=1;
+                $classname=$prefix.'_'.$modele;
+                break;
+            }
+        }
+        if ($filefound) break;
     }
 
-	// Charge le modele
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db);
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// We delete old preview
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"action_pdf_create Error: ".$obj->error);
-			return 0;
-		}
-	}
-	else
-	{
-		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-		return 0;
-	}
+    // Charge le modele
+    if ($filefound)
+    {
+        require_once $file;
+
+        $obj = new $classname($db);
+
+        // We save charset_output to restore it because write_file can change it if needed for
+        // output format that does not support UTF8.
+        $sav_charset_output=$outputlangs->charset_output;
+        if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
+        {
+            $outputlangs->charset_output=$sav_charset_output;
+
+            // We delete old preview
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            dol_delete_preview($object);
+
+            return 1;
+        }
+        else
+        {
+            $outputlangs->charset_output=$sav_charset_output;
+            dol_print_error($db,"action_pdf_create Error: ".$obj->error);
+            return 0;
+        }
+    }
+    else
+    {
+        print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
+        return 0;
+    }
 }

Spacing +28 added lines, -28 removed lines

@@ -31,7 +31,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -41,16 +41,16 @@ 
      *  @param	integer		$maxfilenamelength  Max length of value to show
      * 	@return	array							List of templates
      */
-    static function liste_modeles($db,$maxfilenamelength=0)
+    static function liste_modeles($db, $maxfilenamelength = 0)
     {
         // phpcs:enable
         global $conf;
 
-        $type='action';
-        $liste=array();
+        $type = 'action';
+        $liste = array();
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $liste=getListOfModels($db,$type,$maxfilenamelength);
+        $liste = getListOfModels($db, $type, $maxfilenamelength);
 
         return $liste;
     }
@@ -69,20 +69,20 @@ 
  *  @param  int			$hideref        Hide ref
  *  @return int         				0 if KO, 1 if OK
  */
-function action_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 {
     // phpcs:enable
-	global $conf,$langs,$user;
+	global $conf, $langs, $user;
 	$langs->load("action");
 
-	$error=0;
+	$error = 0;
 
-	$srctemplatepath='';
+	$srctemplatepath = '';
 
 	// Positionne modele sur le nom du modele de fichinter a utiliser
-	if (! dol_strlen($modele))
+	if (!dol_strlen($modele))
 	{
-		if (! empty($conf->global->ACTION_EVENT_ADDON_PDF))
+		if (!empty($conf->global->ACTION_EVENT_ADDON_PDF))
 		{
 			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
 		}
@@ -93,29 +93,29 @@ 
 	}
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
+	$tmp = explode(':', $modele, 2);
+    if (!empty($tmp[1]))
     {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
+        $modele = $tmp[0];
+        $srctemplatepath = $tmp[1];
     }
 
 	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array('/');
+	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
 	{
-    	foreach(array('doc','pdf') as $prefix)
+    	foreach (array('doc', 'pdf') as $prefix)
     	{
     	    $file = $prefix."_".$modele.".modules.php";
 
     		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/action/doc/".$file,0);
+	        $file = dol_buildpath($reldir."core/modules/action/doc/".$file, 0);
     		if (file_exists($file))
     		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
+    			$filefound = 1;
+    			$classname = $prefix.'_'.$modele;
     			break;
     		}
     	}
@@ -131,10 +131,10 @@ 
 
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
+		$sav_charset_output = $outputlangs->charset_output;
 		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
 		{
-			$outputlangs->charset_output=$sav_charset_output;
+			$outputlangs->charset_output = $sav_charset_output;
 
 			// We delete old preview
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -144,14 +144,14 @@ 
 		}
 		else
 		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"action_pdf_create Error: ".$obj->error);
+			$outputlangs->charset_output = $sav_charset_output;
+			dol_print_error($db, "action_pdf_create Error: ".$obj->error);
 			return 0;
 		}
 	}
 	else
 	{
-		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
+		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 		return 0;
 	}
 }

Braces +9 added lines, -8 removed lines

@@ -85,8 +85,7 @@ 
 		if (! empty($conf->global->ACTION_EVENT_ADDON_PDF))
 		{
 			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
-		}
-		else
+		} else
 		{
 			$modele = 'soleil';
 		}
@@ -103,7 +102,9 @@ 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
 	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+	if (is_array($conf->modules_parts['models'])) {
+	    $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+	}
 	foreach($dirmodels as $reldir)
 	{
     	foreach(array('doc','pdf') as $prefix)
@@ -119,7 +120,9 @@ 
     			break;
     		}
     	}
-    	if ($filefound) break;
+    	if ($filefound) {
+    	    break;
+    	}
     }
 
 	// Charge le modele
@@ -141,15 +144,13 @@ 
 			dol_delete_preview($object);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 			dol_print_error($db,"action_pdf_create Error: ".$obj->error);
 			return 0;
 		}
-	}
-	else
+	} else
 	{
 		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
 		return 0;