Dolibarr / dolibarr

htdocs/salaries/admin/salaries_extrafields.php

Indentation +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -110,7 +110,7 @@ 
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page

Braces +6 added lines, -2 removed lines

@@ -36,13 +36,17 @@
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'payment_salary'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*

htdocs/product/inventory/lib/inventory.lib.php

Indentation +18 added lines, -18 removed lines

@@ -29,30 +29,30 @@
  */
 function inventoryAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("inventory");
+	$langs->load("inventory");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/inventory.php";
-    $head[$h][1] = $langs->trans("Parameters");
-    $head[$h][2] = 'settings';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/inventory.php";
+	$head[$h][1] = $langs->trans("Parameters");
+	$head[$h][2] = 'settings';
+	$h++;
 
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    //$this->tabs = array(
-    //	'entity:+tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
-    //); // to add new tab
-    //$this->tabs = array(
-    //	'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
-    //); // to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'inventory');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'inventory');
 
-    return $head;
+	return $head;
 }
 
 /**

htdocs/projet/class/taskstats.class.php

Indentation +6 added lines, -6 removed lines

@@ -29,11 +29,11 @@ 
 	public $socid;
 	public $year;
 
-    /**
-     * Constructor of the class
-     *
-     * @param   DoliDb  $db     Database handler
-     */
+	/**
+	 * Constructor of the class
+	 *
+	 * @param   DoliDb  $db     Database handler
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -163,7 +163,7 @@ 
 	 * Return Task number by month for a year
 	 *
 	 * @param 	int 	$year 		Year to scan
-     * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return 	array 				Array of values
 	 */
 	public function getNbByMonth($year, $format = 0)

Braces +31 added lines, -19 removed lines

@@ -59,8 +59,9 @@ 
 		$sql = "SELECT";
 		$sql .= " COUNT(t.rowid), t.priority";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id)
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		if (!$user->rights->societe->client->voir && !$user->soc_id) {
+					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		}
 		$sql .= $this->buildWhere();
 		//$sql .= " AND t.fk_statut <> 0";     // We want historic also, so all task not draft
 		$sql .= " GROUP BY t.priority";
@@ -82,14 +83,17 @@ 
 						$row[1],
 						$row[0]
 					);
-				} else $other += $row[1];
+				} else {
+					$other += $row[1];
+				}
 				$i++;
 			}
-			if ($num > $limit)
-				$result[$i] = array(
+			if ($num > $limit) {
+							$result[$i] = array(
 						$langs->transnoentitiesnoconv("Other"),
 						$other
 				);
+			}
 			$this->db->free($resql);
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
@@ -115,8 +119,9 @@ 
 
 		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id)
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		if (!$user->rights->societe->client->voir && !$user->soc_id) {
+					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		}
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY year";
 		$sql .= $this->db->order('year', 'DESC');
@@ -137,18 +142,24 @@ 
 
 		$sqlwhere[] = ' t.entity IN ('.getEntity('project').')';
 
-		if (!empty($this->userid))
-			$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+		if (!empty($this->userid)) {
+					$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+		}
 		// Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project
-		if (!empty($this->socid))
-			$sqlwhere[] = ' p.fk_soc='.$this->socid; // Link on thirdparty is on project, not on task
-		if (!empty($this->year) && empty($this->yearmonth))
-			$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
-		if (!empty($this->yearmonth))
-			$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->yearmonth))."' AND '".$this->db->idate(dol_get_last_day($this->yearmonth))."'";
+		if (!empty($this->socid)) {
+					$sqlwhere[] = ' p.fk_soc='.$this->socid;
+		}
+		// Link on thirdparty is on project, not on task
+		if (!empty($this->year) && empty($this->yearmonth)) {
+					$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
+		}
+		if (!empty($this->yearmonth)) {
+					$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->yearmonth))."' AND '".$this->db->idate(dol_get_last_day($this->yearmonth))."'";
+		}
 
-		if (!empty($this->status))
-			$sqlwhere[] = " t.priority IN (".$this->priority.")";
+		if (!empty($this->status)) {
+					$sqlwhere[] = " t.priority IN (".$this->priority.")";
+		}
 
 		if (count($sqlwhere) > 0) {
 			$sqlwhere_str = ' WHERE '.implode(' AND ', $sqlwhere);
@@ -172,8 +183,9 @@ 
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id)
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		if (!$user->rights->societe->client->voir && !$user->soc_id) {
+					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		}
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');

htdocs/core/modules/modZapier.class.php

Braces +4 added lines, -1 removed lines

@@ -347,7 +347,10 @@
     public function init($options = '')
     {
         $result = $this->_load_tables('/zapier/sql/');
-        if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
+        if ($result < 0) {
+        	return -1;
+        }
+        // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
 
         // Create extrafields
         //include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

Indentation +264 added lines, -264 removed lines

@@ -30,159 +30,159 @@ 
  */
 class modZapier extends DolibarrModules
 {
-    /**
-     * Constructor. Define names, constants, directories, boxes, permissions
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	/**
+	 * 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 = 50330;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'zapier';
-        // 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 = '22';
-        // Gives the possibility for 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 'ModuleZapierName' not found (Zapier is name of module).
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleZapierDesc' not found (Zapier is name of module).
-        $this->description = "ZapierDescription";
-        // Used only if file README.md and README-LL.md not found.
-        $this->descriptionlong = "Zapier description (Long)";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-        $this->version = 'development';
-        //Url to the file with your last numberversion of this module
-        //$this->url_last_version = 'http://www.example.com/versionmodule.txt';
-        // Key used in llx_const table to save module status enabled/disabled (where ZAPIERFORDOLIBARR 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 = 'zapier';
-        // Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
-        $this->module_parts = array(
-            // Set this to 1 if module has its own trigger directory (core/triggers)
-            'triggers' => 1,
-            // Set this to 1 if module has its own login method file (core/login)
-            'login' => 0,
-            // Set this to 1 if module has its own substitution function file (core/substitutions)
-            'substitutions' => 0,
-            // Set this to 1 if module has its own menus handler directory (core/menus)
-            'menus' => 0,
-            // Set this to 1 if module overwrite template dir (core/tpl)
-            'tpl' => 0,
-            // Set this to 1 if module has its own barcode directory (core/modules/barcode)
-            'barcode' => 0,
-            // Set this to 1 if module has its own models directory (core/modules/xxx)
-            'models' => 0,
-            // Set this to 1 if module has its own theme directory (theme)
-            'theme' => 0,
-            // Set this to relative path of css file if module has its own css file
-            'css' => array(
-                //    '/zapier/css/zapier.css.php',
-            ),
-            // Set this to relative path of js file if module must load a js on all pages
-            'js' => array(
-                //   '/zapier/js/zapier.js.php',
-            ),
-            // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
-            'hooks' => array(
-                //   'data' => array(
-                //       'hookcontext1',
-                //       'hookcontext2',
-                //   ),
-                //   'entity' => '0',
-            ),
-            // Set this to 1 if feature of module are opened to external users
-            'moduleforexternal' => 0,
-        );
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/zapier/temp","/zapier/subdir");
-        $this->dirs = array("/zapier/temp");
-        // Config pages. Put here list of php page, stored into zapier/admin directory, to use to setup module.
-        $this->config_page_url = array(
-        //    "setup.php@zapier"
-        );
-        // Dependencies
-        // A condition to hide module
-        $this->hidden = false;
-        // List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
-        $this->depends = array();
-        // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
-        $this->requiredby = array();
-        // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
-        $this->conflictwith = array();
-        $this->langfiles = array("zapier");
-        // Minimum version of PHP required by module
-        //$this->phpmin = array(5, 5);
-        // Minimum version of Dolibarr required by module
-        $this->need_dolibarr_version = array(10, 0);
-        // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation = array();
-        // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array();
-        // $this->automatic_activation = array(
-        //     'FR'=>'ZapierWasAutomaticallyActivatedBecauseOfYourCountryChoice',
-        // );
-        // If true, can't be disabled
-        // $this->always_enabled = true;
-        // Constants
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(
-        //    1 => array('ZAPIERFORDOLIBARR_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
-        //    2 => array('ZAPIERFORDOLIBARR_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
-        // );
-        $this->const = array(
-            // 1 => array('ZAPIERFORDOLIBARR_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
-        );
-        // Some keys to add into the overwriting translation tables
-        /*$this->overwrite_translation = array(
+		$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 = 50330;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'zapier';
+		// 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 = '22';
+		// Gives the possibility for 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 'ModuleZapierName' not found (Zapier is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleZapierDesc' not found (Zapier is name of module).
+		$this->description = "ZapierDescription";
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "Zapier description (Long)";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'development';
+		//Url to the file with your last numberversion of this module
+		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
+		// Key used in llx_const table to save module status enabled/disabled (where ZAPIERFORDOLIBARR 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 = 'zapier';
+		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 1,
+			// Set this to 1 if module has its own login method file (core/login)
+			'login' => 0,
+			// Set this to 1 if module has its own substitution function file (core/substitutions)
+			'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory (core/menus)
+			'menus' => 0,
+			// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,
+			// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'barcode' => 0,
+			// Set this to 1 if module has its own models directory (core/modules/xxx)
+			'models' => 0,
+			// Set this to 1 if module has its own theme directory (theme)
+			'theme' => 0,
+			// Set this to relative path of css file if module has its own css file
+			'css' => array(
+				//    '/zapier/css/zapier.css.php',
+			),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(
+				//   '/zapier/js/zapier.js.php',
+			),
+			// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
+			'hooks' => array(
+				//   'data' => array(
+				//       'hookcontext1',
+				//       'hookcontext2',
+				//   ),
+				//   'entity' => '0',
+			),
+			// Set this to 1 if feature of module are opened to external users
+			'moduleforexternal' => 0,
+		);
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/zapier/temp","/zapier/subdir");
+		$this->dirs = array("/zapier/temp");
+		// Config pages. Put here list of php page, stored into zapier/admin directory, to use to setup module.
+		$this->config_page_url = array(
+		//    "setup.php@zapier"
+		);
+		// Dependencies
+		// A condition to hide module
+		$this->hidden = false;
+		// List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
+		$this->depends = array();
+		// List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+		$this->requiredby = array();
+		// List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+		$this->conflictwith = array();
+		$this->langfiles = array("zapier");
+		// Minimum version of PHP required by module
+		//$this->phpmin = array(5, 5);
+		// Minimum version of Dolibarr required by module
+		$this->need_dolibarr_version = array(10, 0);
+		// Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation = array();
+		// Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array();
+		// $this->automatic_activation = array(
+		//     'FR'=>'ZapierWasAutomaticallyActivatedBecauseOfYourCountryChoice',
+		// );
+		// If true, can't be disabled
+		// $this->always_enabled = true;
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(
+		//    1 => array('ZAPIERFORDOLIBARR_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//    2 => array('ZAPIERFORDOLIBARR_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array(
+			// 1 => array('ZAPIERFORDOLIBARR_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+		);
+		// Some keys to add into the overwriting translation tables
+		/*$this->overwrite_translation = array(
             'en_US:ParentCompany'=>'Parent company or reseller',
             'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
         )*/
-        if (!isset($conf->zapier) || !isset($conf->zapier->enabled)) {
-            $conf->zapier = new stdClass();
-            $conf->zapier->enabled = 0;
-        }
-        // Array to add new pages in new tabs
-        $this->tabs = array();
-        // Example:
-        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@zapier:$user->rights->zapier->read:/zapier/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@zapier:$user->rights->othermodule->read:/zapier/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
-        // Dictionaries
-        $this->dictionaries = array();
-        /* Example:
+		if (!isset($conf->zapier) || !isset($conf->zapier->enabled)) {
+			$conf->zapier = new stdClass();
+			$conf->zapier->enabled = 0;
+		}
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@zapier:$user->rights->zapier->read:/zapier/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@zapier:$user->rights->othermodule->read:/zapier/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
+		// Dictionaries
+		$this->dictionaries = array();
+		/* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@zapier',
             // List of tables we want to see into dictonnary editor
@@ -205,88 +205,88 @@ 
             'tabcond'=>array($conf->zapier->enabled,$conf->zapier->enabled,$conf->zapier->enabled)
         );
         */
-        // Boxes/Widgets
-        // Add here list of php file(s) stored in zapier/core/boxes that contains class to show a widget.
-        $this->boxes = array(
-            //  0 => array(
-            //      'file' => 'zapierwidget1.php@zapier',
-            //      'note' => 'Widget provided by Zapier',
-            //      'enabledbydefaulton' => 'Home',
-            //  ),
-            //1=>array('file'=>'zapierwidget2.php@zapier','note'=>'Widget provided by Zapier'),
-            //2=>array('file'=>'zapierwidget3.php@zapier','note'=>'Widget provided by Zapier')
-        );
-        // 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' => 'MyJob label',
-            //      'jobtype' => 'method',
-            //      'class' => '/zapier/class/myobject.class.php',
-            //      'objectname' => 'MyObject',
-            //      'method' => 'doScheduledJob',
-            //      'parameters' => '',
-            //      'comment' => 'Comment',
-            //      'frequency' => 2,
-            //      'unitfrequency' => 3600,
-            //      'status' => 0,
-            //      'test' => '$conf->zapier->enabled',
-            //      'priority' => 50,
-            //  ),
-        );
-        // Example: $this->cronjobs=array(
-        //    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50),
-        //    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50)
-        // );
-        // Permissions
-        // Permission array used by this module
-        $this->rights = array();
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in zapier/core/boxes that contains class to show a widget.
+		$this->boxes = array(
+			//  0 => array(
+			//      'file' => 'zapierwidget1.php@zapier',
+			//      'note' => 'Widget provided by Zapier',
+			//      'enabledbydefaulton' => 'Home',
+			//  ),
+			//1=>array('file'=>'zapierwidget2.php@zapier','note'=>'Widget provided by Zapier'),
+			//2=>array('file'=>'zapierwidget3.php@zapier','note'=>'Widget provided by Zapier')
+		);
+		// 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' => 'MyJob label',
+			//      'jobtype' => 'method',
+			//      'class' => '/zapier/class/myobject.class.php',
+			//      'objectname' => 'MyObject',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->zapier->enabled',
+			//      'priority' => 50,
+			//  ),
+		);
+		// Example: $this->cronjobs=array(
+		//    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50),
+		//    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->zapier->enabled', 'priority'=>50)
+		// );
+		// Permissions
+		// Permission array used by this module
+		$this->rights = array();
 
-        $r = 0;
-        // Permission id (must not be already used)
-        $this->rights[$r][0] = $this->numero + $r;
-        // Permission label
-        $this->rights[$r][1] = 'Read myobject of Zapier';
-        // Permission by default for new user (0/1)
-        $this->rights[$r][3] = 1;
-        // In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
-        $this->rights[$r][4] = 'read';
-        // In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
-        $this->rights[$r][5] = '';
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r;
-        $this->rights[$r][1] = 'Create/Update myobject of Zapier';
-        $this->rights[$r][3] = 1;
-        $this->rights[$r][4] = 'write';
-        $this->rights[$r][5] = '';
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r;
-        $this->rights[$r][1] = 'Delete myobject of Zapier';
-        $this->rights[$r][3] = 1;
-        $this->rights[$r][4] = 'delete';
-        $this->rights[$r][5] = '';
+		$r = 0;
+		// Permission id (must not be already used)
+		$this->rights[$r][0] = $this->numero + $r;
+		// Permission label
+		$this->rights[$r][1] = 'Read myobject of Zapier';
+		// Permission by default for new user (0/1)
+		$this->rights[$r][3] = 1;
+		// In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
+		$this->rights[$r][4] = 'read';
+		// In php code, permission will be checked by test if ($user->rights->zapier->level1->level2)
+		$this->rights[$r][5] = '';
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r;
+		$this->rights[$r][1] = 'Create/Update myobject of Zapier';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'write';
+		$this->rights[$r][5] = '';
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r;
+		$this->rights[$r][1] = 'Delete myobject of Zapier';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'delete';
+		$this->rights[$r][5] = '';
 
-        // 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
-        // $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' => 'Zapier',
-        //     'mainmenu' => 'zapier',
-        //     'leftmenu' => '',
-        //     'url' => '/zapier/zapierindex.php',
-        //     'langs' => 'zapier@zapier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-        //     'position' => 1000+$r,
-        //     'enabled' => '$conf->zapier->enabled',  // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled.
-        //     'perms' => '1',			                // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
-        //     'target' => '',
-        //     'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
-        // );
+		// Add here entries to declare new menus
+		// $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' => 'Zapier',
+		//     'mainmenu' => 'zapier',
+		//     'leftmenu' => '',
+		//     'url' => '/zapier/zapierindex.php',
+		//     'langs' => 'zapier@zapier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+		//     'position' => 1000+$r,
+		//     'enabled' => '$conf->zapier->enabled',  // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled.
+		//     'perms' => '1',			                // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
+		//     'target' => '',
+		//     'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+		// );
 
-        /*
+		/*
         $this->menu[$r++]=array(
             'fk_menu'=>'fk_mainmenu=zapier',	    // '' 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
@@ -316,44 +316,44 @@ 
             'user'=>2,                              // 0=Menu for internal users, 1=external users, 2=both
         );
         */
-    }
+	}
 
-    /**
-     *  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 = '')
-    {
-        $result = $this->_load_tables('/zapier/sql/');
-        if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
+	/**
+	 *  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 = '')
+	{
+		$result = $this->_load_tables('/zapier/sql/');
+		if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
 
-        // 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, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->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, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
-        $sql = array();
-        return $this->_init($sql, $options);
-    }
+		// 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, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->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, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+		//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->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);
-    }
+	/**
+	 *  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);
+	}
 }

htdocs/zapier/lib/zapier.lib.php

Indentation +22 added lines, -22 removed lines

@@ -28,31 +28,31 @@
  */
 function zapierAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("zapier@zapier");
+	$langs->load("zapier@zapier");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = dol_buildpath("/zapier/admin/setup.php", 1);
-    $head[$h][1] = $langs->trans("Settings");
-    $head[$h][2] = 'settings';
-    $h++;
-    $head[$h][0] = dol_buildpath("/zapier/admin/about.php", 1);
-    $head[$h][1] = $langs->trans("About");
-    $head[$h][2] = 'about';
-    $h++;
+	$head[$h][0] = dol_buildpath("/zapier/admin/setup.php", 1);
+	$head[$h][1] = $langs->trans("Settings");
+	$head[$h][2] = 'settings';
+	$h++;
+	$head[$h][0] = dol_buildpath("/zapier/admin/about.php", 1);
+	$head[$h][1] = $langs->trans("About");
+	$head[$h][2] = 'about';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    //$this->tabs = array(
-    //	'entity:+tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
-    //); // to add new tab
-    //$this->tabs = array(
-    //	'entity:-tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
-    //); // to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'zapier');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'zapier');
 
-    return $head;
+	return $head;
 }

htdocs/zapier/hook_document.php

Indentation +2 added lines, -2 removed lines

@@ -128,9 +128,9 @@
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
 	// Number of files

Braces +9 added lines, -3 removed lines

@@ -54,8 +54,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 //if (! $sortfield) $sortfield="position_name";
 
 // Initialize technical objects
@@ -71,7 +75,9 @@ 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 //if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/myobject/" . dol_sanitizeFileName($object->id);
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity]."/myobject/".dol_sanitizeFileName($object->ref);
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->sellyoursaas->multidir_output[$object->entity]."/myobject/".dol_sanitizeFileName($object->ref);
+}
 
 
 /*

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

Braces +3 added lines, -1 removed lines

@@ -215,7 +215,9 @@
     {
 		$last = "";
 
-		if (empty($this->NbRepeat)) return 1;
+		if (empty($this->NbRepeat)) {
+			return 1;
+		}
 
 		$count = 0;
 		$char = str_split($password);

Indentation +10 added lines, -10 removed lines

@@ -47,9 +47,9 @@ 
 	public $WithoutAmbi;
 
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	public $conf;
 	public $lang;
@@ -145,22 +145,22 @@ 
 	{
 		$pass = "";
 		for ($i = 0; $i < $this->NbMaj; $i++) {
-            // Y
+			// Y
 			$pass .= $this->Maj[mt_rand(0, strlen($this->Maj) - 1)];
 		}
 
 		for ($i = 0; $i < $this->NbNum; $i++) {
-            // X
+			// X
 			$pass .= $this->Nb[mt_rand(0, strlen($this->Nb) - 1)];
 		}
 
 		for ($i = 0; $i < $this->NbSpe; $i++) {
-            // @
+			// @
 			$pass .= $this->Spe[mt_rand(0, strlen($this->Spe) - 1)];
 		}
 
 		for ($i = strlen($pass); $i < $this->length2; $i++) {
-            // y
+			// y
 			$pass .= $this->All[mt_rand(0, strlen($this->All) - 1)];
 		}
 
@@ -211,8 +211,8 @@ 
 	 *  @param		string	$password	Password to check
 	 *  @return     bool
 	 */
-    private function consecutiveInterationSameCharacter($password)
-    {
+	private function consecutiveInterationSameCharacter($password)
+	{
 		$last = "";
 
 		if (empty($this->NbRepeat)) return 1;
@@ -228,7 +228,7 @@ 
 				continue;
 			}
 
-            $count++;
+			$count++;
 			if ($count > $this->NbRepeat) {
 				return false;
 			}

htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php

Braces +7 added lines, -3 removed lines

@@ -53,10 +53,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "")
+if ($sortorder == "") {
 	$sortorder = "ASC";
-if ($sortfield == "")
+}
+if ($sortfield == "") {
 	$sortfield = "bk.doc_date";
+}
 
 /*
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
@@ -247,7 +249,9 @@ 
 	$solde = 0;
 	$tmp = '';
 	while ($obj = $db->fetch_object($resql)) {
-		if ($tmp != $obj->lettering_code || empty($tmp))						$tmp = $obj->lettering_code;
+		if ($tmp != $obj->lettering_code || empty($tmp)) {
+			$tmp = $obj->lettering_code;
+		}
 		/*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/	$solde += ($obj->credit - $obj->debit);
 
 		print '<tr class="oddeven">';

Indentation +20 added lines, -20 removed lines

@@ -193,17 +193,17 @@ 
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-    $param = "&socid=".$socid;
+	$param = "&socid=".$socid;
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="socid" value="'.$object->id.'">';
 
-    $letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
+	$letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
 
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit);
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="liste centpercent">'."\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="liste centpercent">'."\n";
 
 	/*
     print '<tr class="liste_titre">';
@@ -242,7 +242,7 @@ 
 	print_liste_field_titre("Balancing", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Codejournal", $_SERVER["PHP_SELF"], "bk.code_journal", "", $param, "", $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("LetteringCode", $_SERVER["PHP_SELF"], "bk.lettering_code", "", $param, "", $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
+	print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
 	print "</tr>\n";
 
 	$solde = 0;
@@ -261,21 +261,21 @@ 
 		print '<td class="nowrap right">'.price($obj->credit).'</td>';
 		print '<td class="nowrap right">'.price(round($solde, 2)).'</td>';
 
-        // Journal
-        $accountingjournal = new AccountingJournal($db);
-        $result = $accountingjournal->fetch('', $obj->code_journal);
-        $journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
-        print '<td class="center">'.$journaltoshow.'</td>';
+		// Journal
+		$accountingjournal = new AccountingJournal($db);
+		$result = $accountingjournal->fetch('', $obj->code_journal);
+		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
+		print '<td class="center">'.$journaltoshow.'</td>';
 
 		if (empty($obj->lettering_code) && empty($obj->date_validated)) {
 			print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
-		    print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
-		    print img_edit();
-            print '</a></td>'."\n";
+			print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
+			print img_edit();
+			print '</a></td>'."\n";
 		} else {
-            print '<td class="center">'.$obj->lettering_code.'</td>';
-            print '<td></td>';
-        }
+			print '<td class="center">'.$obj->lettering_code.'</td>';
+			print '<td></td>';
+		}
 
 		print "</tr>\n";
 	}
@@ -296,9 +296,9 @@ 
 
 	print "</table>";
 
-    print '<div class="tabsAction tabsActionNoBottom">'."\n";
+	print '<div class="tabsAction tabsActionNoBottom">'."\n";
 	print $letteringbutton;
-    print '</div>';
+	print '</div>';
 
 	print "</form>";
 	$db->free($resql);

htdocs/admin/const.php

Indentation +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
 // Add logic to show/hide buttons
 if ($conf->use_javascript_ajax)
 {
-    ?>
+	?>
 <script type="text/javascript">
 jQuery(document).ready(function() {
 	jQuery("#updateconst").hide();

Braces +24 added lines, -8 removed lines

@@ -30,8 +30,9 @@ 
 // Load translation files required by the page
 $langs->load("admin");
 
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 $rowid = GETPOST('rowid', 'int');
 $entity = GETPOST('entity', 'int');
@@ -53,8 +54,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (empty($sortfield)) $sortfield = 'entity,name';
-if (empty($sortorder)) $sortorder = 'ASC';
+if (empty($sortfield)) {
+	$sortfield = 'entity,name';
+}
+if (empty($sortorder)) {
+	$sortorder = 'ASC';
+}
 
 
 /*
@@ -107,7 +112,9 @@ 
 			}
 		}
 	}
-	if ($nbmodified > 0) setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+	if ($nbmodified > 0) {
+		setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+	}
 	$action = '';
 }
 
@@ -117,17 +124,21 @@ 
 	$nbdeleted = 0;
 	foreach ($consts as $const)
 	{
-		if (!empty($const["check"]))	// Is checkbox checked
+		if (!empty($const["check"])) {
+			// Is checkbox checked
 		{
 			if (dolibarr_del_const($db, $const["rowid"], -1) >= 0)
 			{
 				$nbdeleted++;
+		}
 			} else {
 				dol_print_error($db);
 			}
 		}
 	}
-	if ($nbdeleted > 0) setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+	if ($nbdeleted > 0) {
+		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+	}
 	$action = '';
 }
 
@@ -243,8 +254,13 @@ 
 $sql .= " FROM ".MAIN_DB_PREFIX."const";
 $sql .= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
 if ((empty($user->entity) || $user->admin) && $debug) {} 										// to force for superadmin to debug
-elseif (!GETPOST('visible') || GETPOST('visible') != 'all') $sql .= " AND visible = 1"; // We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits
-if (GETPOST('name')) $sql .= natural_search("name", GETPOST('name'));
+elseif (!GETPOST('visible') || GETPOST('visible') != 'all') {
+	$sql .= " AND visible = 1";
+}
+// We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits
+if (GETPOST('name')) {
+	$sql .= natural_search("name", GETPOST('name'));
+}
 $sql .= $db->order($sortfield, $sortorder);
 
 dol_syslog("Const::listConstant", LOG_DEBUG);