Dolibarr / dolibarr

htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php

Spacing +5 added lines, -5 removed lines

@@ -269,7 +269,7 @@ 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref . '_' . $newfiletmp;
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -278,11 +278,11 @@ 
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
-					$filename = $newfiletmp . '.' . $newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file = $dir . '/' . $filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -291,7 +291,7 @@ 
 				dol_mkdir($conf->mrp->dir_temp);
 				if (!is_writable($conf->mrp->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->mrp->dir_temp);
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
 					return -1;
 				}
 

htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php

Spacing +6 added lines, -6 removed lines

@@ -187,7 +187,7 @@ 
 		$maxfilesizearray = getMaxFileSizeArray();
 		$maxmin = $maxfilesizearray['maxmin'];
 		if ($maxmin > 0) {
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 		}
 		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -282,7 +282,7 @@ 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref . '_' . $newfiletmp;
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -291,11 +291,11 @@ 
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
-					$filename = $newfiletmp . '.' . $newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file = $dir . '/' . $filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -304,7 +304,7 @@ 
 				dol_mkdir($conf->commande->dir_temp);
 				if (!is_writable($conf->commande->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->commande->dir_temp);
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
 					return -1;
 				}
 

htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php

Spacing +5 added lines, -5 removed lines

@@ -264,7 +264,7 @@ 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref . '_' . $newfiletmp;
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -273,11 +273,11 @@ 
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
-					$filename = $newfiletmp . '.' . $newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file = $dir . '/' . $filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -286,7 +286,7 @@ 
 				dol_mkdir($conf->fournisseur->commande->dir_temp);
 				if (!is_writable($conf->fournisseur->commande->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->fournisseur->commande->dir_temp);
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
 					return -1;
 				}
 

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/hrm/position_note.php

Spacing +3 added lines, -3 removed lines

@@ -28,9 +28,9 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'companies'));

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/class/vcard.class.php

Spacing +3 added lines, -3 removed lines

@@ -134,7 +134,7 @@ 
 	{
 		// $type = "GIF" | "JPEG"
 		//$this->properties["PHOTO;MEDIATYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
-		$this->properties["PHOTO;MEDIATYPE=$type"] = $photo;		// must be url of photo
+		$this->properties["PHOTO;MEDIATYPE=$type"] = $photo; // must be url of photo
 		//$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);   // must be content of image
 	}
 
@@ -356,10 +356,10 @@ 
 	public function getVCard()
 	{
 		$text = "BEGIN:VCARD\r\n";
-		$text .= "VERSION:4.0\r\n";		// With V4, all encoding are UTF-8
+		$text .= "VERSION:4.0\r\n"; // With V4, all encoding are UTF-8
 		//$text.= "VERSION:2.1\r\n";
 		foreach ($this->properties as $key => $value) {
-			$newkey = preg_replace('/-.*$/', '', $key);	// remove suffix -twitter, -facebook, ...
+			$newkey = preg_replace('/-.*$/', '', $key); // remove suffix -twitter, -facebook, ...
 			$text .= $newkey.":".$value."\r\n";
 		}
 		$text .= "REV:".date("Ymd")."T".date("His")."Z\r\n";

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;
 		}
 

htdocs/core/login/functions_http.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
  */
 function decodeHttpBasicAuth($value)
 {
-	$encoded_basic_auth = substr($value, 6);	// Remove the "Basic " string
+	$encoded_basic_auth = substr($value, 6); // Remove the "Basic " string
 	$decoded_basic_auth = base64_decode($encoded_basic_auth);
 	$credentials_basic_auth = explode(':', $decoded_basic_auth);