Dolibarr / dolibarr

htdocs/admin/tools/listsessions.php

Spacing +2 added lines, -2 removed lines

@@ -22,8 +22,8 @@
  *      \brief      List of PHP sessions
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) {
-	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 }
 
 // Load Dolibarr environment

htdocs/core/actions_setmoduleoptions.inc.php

Spacing +6 added lines, -6 removed lines

@@ -78,19 +78,19 @@ 
 
 	$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
 	foreach ($listofdir as $key => $tmpdir) {
-		$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
+		$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
 		if (!$tmpdir) {
 			unset($listofdir[$key]);
 			continue;
 		}
-		$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
+		$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
 		if (!is_dir($tmpdir)) {
 			if (empty($nomessageinsetmoduleoptions)) {
 				setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
 			}
 		} else {
 			$upload_dir = $tmpdir;
-			break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
+			break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
 		}
 	}
 
@@ -130,19 +130,19 @@ 
 
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
-			$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
+			$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
 			if (!$tmpdir) {
 				unset($listofdir[$key]);
 				continue;
 			}
-			$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
+			$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
 			if (!is_dir($tmpdir)) {
 				if (empty($nomessageinsetmoduleoptions)) {
 					setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
 				}
 			} else {
 				$upload_dir = $tmpdir;
-				break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
+				break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
 			}
 		}
 

htdocs/core/modules/workstation/mod_workstation_standard.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  *  \ingroup    workstation
  *  \brief      File of class to manage Workstation numbering rules standard
  */
-require_once DOL_DOCUMENT_ROOT . '/core/modules/workstation/modules_workstation.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/workstation/modules_workstation.php';
 
 /**
  * Class to manage the Standard numbering rule for Workstation

htdocs/core/modules/mailings/thirdparties_services_expired.modules.php

Spacing +2 added lines, -2 removed lines

@@ -135,8 +135,8 @@
 					'lastname' => $obj->name, // For thirdparties, lastname must be name
 					'firstname' => '', // For thirdparties, firstname is ''
 					'other' =>
-					('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'.	// date start real
-					('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'.			// date end planned
+					('DateStart='.dol_print_date($this->db->jdate($obj->date_start_real), 'day')).';'.// date start real
+					('DateEnd='.dol_print_date($this->db->jdate($obj->date_end), 'day')).';'.// date end planned
 					('Contract='.$obj->fk_contrat).';'.
 					('ContactLine='.$obj->cdid),
 					'source_url' => $this->url($obj->id),

htdocs/hrm/lib/hrm.lib.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 
 	$h = 0;
 	$head = array();
-	$head[$h][0] = DOL_URL_ROOT . "/admin/hrm.php";
+	$head[$h][0] = DOL_URL_ROOT."/admin/hrm.php";
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
@@ -54,7 +54,7 @@ 
 	$head[$h][2] = 'establishments';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/skill_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/skill_extrafields.php';
 	$head[$h][1] = $langs->trans("SkillsExtraFields");
 	$nbExtrafields = $extrafields->attributes['hrm_skill']['count'];
 	if ($nbExtrafields > 0) {
@@ -63,7 +63,7 @@ 
 	$head[$h][2] = 'skillsAttributes';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/job_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/job_extrafields.php';
 	$head[$h][1] = $langs->trans("JobsExtraFields");
 	$nbExtrafields = $extrafields->attributes['hrm_job']['count'];
 	if ($nbExtrafields > 0) {
@@ -72,7 +72,7 @@ 
 	$head[$h][2] = 'jobsAttributes';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/evaluation_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/evaluation_extrafields.php';
 	$head[$h][1] = $langs->trans("EvaluationsExtraFields");
 	$nbExtrafields = $extrafields->attributes['hrm_evaluation']['count'];
 	if ($nbExtrafields > 0) {

htdocs/commande/document.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 
 $object = new Commande($db);
 
-$usercancreate  =  $user->hasRight("commande", "creer");
+$usercancreate = $user->hasRight("commande", "creer");
 $permissiontoadd = $usercancreate;
 
 // Security check

htdocs/variants/class/ProductCombination2ValuePair.class.php

Spacing +8 added lines, -8 removed lines

@@ -69,8 +69,8 @@ 
 	 */
 	public function __toString()
 	{
-		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttributeValue.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
 		$prodattr = new ProductAttribute($this->db);
 		$prodattrval = new ProductAttributeValue($this->db);
@@ -78,7 +78,7 @@ 
 		$prodattr->fetch($this->fk_prod_attr);
 		$prodattrval->fetch($this->fk_prod_attr_val);
 
-		return $prodattr->label . ': ' . $prodattrval->value;
+		return $prodattr->label.': '.$prodattrval->value;
 	}
 
 	/**
@@ -89,14 +89,14 @@ 
 	 */
 	public function create($user)
 	{
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_attribute_combination2val
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination2val
 		(fk_prod_combination, fk_prod_attr, fk_prod_attr_val)
-		VALUES(" . (int) $this->fk_prod_combination . ", " . (int) $this->fk_prod_attr . ", " . (int) $this->fk_prod_attr_val . ")";
+		VALUES(" . (int) $this->fk_prod_combination.", ".(int) $this->fk_prod_attr.", ".(int) $this->fk_prod_attr_val.")";
 
 		$query = $this->db->query($sql);
 
 		if ($query) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . 'product_attribute_combination2val');
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination2val');
 
 			return 1;
 		}
@@ -117,7 +117,7 @@ 
         c2v.fk_prod_attr_val,
         c2v.fk_prod_attr,
         c2v.fk_prod_combination
-        FROM " . MAIN_DB_PREFIX . "product_attribute c LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
+        FROM " . MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
         WHERE c2v.fk_prod_combination = " . (int) $fk_combination;
 
 		$sql .= $this->db->order('c.position', 'asc');
@@ -151,7 +151,7 @@ 
 	 */
 	public function deleteByFkCombination($fk_combination)
 	{
-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val WHERE fk_prod_combination = " . (int) $fk_combination;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_combination = ".(int) $fk_combination;
 
 		if ($this->db->query($sql)) {
 			return 1;

htdocs/core/modules/mailings/contacts1.modules.php

Spacing +6 added lines, -6 removed lines

@@ -120,7 +120,7 @@ 
 	 */
 	public function formFilter()
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Load translation files required by the page
 		$langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
@@ -131,7 +131,7 @@ 
 		$sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND (sp.poste IS NOT NULL AND sp.poste <> '')";
 		$sql .= " GROUP BY sp.poste";
@@ -166,7 +166,7 @@ 
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_contact as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
 		$sql .= " AND cs.fk_socpeople = sp.rowid";
@@ -239,7 +239,7 @@ 
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_societe as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
 		$sql .= " AND cs.fk_soc = sp.fk_soc";
@@ -276,7 +276,7 @@ 
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
 		$sql .= " AND cs.fk_soc = sp.fk_soc";
@@ -434,7 +434,7 @@ 
 
 		// Filter on job position
 		$key = $filter_jobposition;
-		if (!empty($key) && $key != 'all'  && $key != '-1') {
+		if (!empty($key) && $key != 'all' && $key != '-1') {
 			$sql .= " AND sp.poste = '".$this->db->escape($key)."'";
 		}
 

htdocs/core/search_page.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 $title = $langs->trans("Search");
 
 // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Quick access -->'."\n";	// This is used by DoliDroid to know page is a search page
+$head = '<!-- Quick access -->'."\n"; // This is used by DoliDroid to know page is a search page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
@@ -110,7 +110,7 @@ 
 
 		$accesskey = '';
 		if (empty($accesskeyalreadyassigned[$val['label'][0]])) {
-			$accesskey = $val['label'][0];	// First char of string
+			$accesskey = $val['label'][0]; // First char of string
 			$accesskeyalreadyassigned[$accesskey] = $accesskey;
 		}