Dolibarr / dolibarr

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

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

htdocs/printing/admin/printing.php

Spacing +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
 			$i++;
 
 			if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS') {
-				$keyforprovider = '';	// @BUG This must be set
+				$keyforprovider = ''; // @BUG This must be set
 
 				// Token
 				print '<tr class="oddeven">';

htdocs/user/virtualcard.php

Spacing +2 added lines, -2 removed lines

@@ -288,7 +288,7 @@ 
 	print $langs->trans("Text");
 	print '</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$extendededitor = 0;	// We force no WYSIWYG editor
+	$extendededitor = 0; // We force no WYSIWYG editor
 	$doleditor = new DolEditor('USER_PUBLIC_MORE', getDolUserString('USER_PUBLIC_MORE', '', $object), '', 160, 'dolibarr_notes', '', false, false, $extendededitor, ROWS_5, '90%');
 	$doleditor->Create();
 	print "</td></tr>\n";
@@ -302,7 +302,7 @@ 
 
 	print '<br>';
 
-	print '</div>';	// End hide/show
+	print '</div>'; // End hide/show
 
 	print '<br>';
 

dev/tools/dolibarr-postgres2mysql.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
  - If you're having problems creating your postgres dump, make sure you use "--format p --inserts"
  - Default output engine if not specified is InnoDB
 
-XHTML;
+xhtml;
 }
 
 /**
@@ -100,7 +100,7 @@ 
 function formatsize($s)
 {
 	if ($s < pow(2, 14)) {
-		return "{$s}B";
+		return "{$s}b";
 	} elseif ($s < pow(2, 20)) {
 		return sprintf("%.1f", round($s / 1024, 1)) . "K";
 	} elseif ($s < pow(2, 30)) {

Spacing +34 added lines, -34 removed lines

@@ -28,12 +28,12 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = dirname(__FILE__) . '/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute " . $script_file . " from command line, you must use PHP for CLI mode.\n";
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
 	exit();
 }
 
@@ -102,11 +102,11 @@ 
 	if ($s < pow(2, 14)) {
 		return "{$s}B";
 	} elseif ($s < pow(2, 20)) {
-		return sprintf("%.1f", round($s / 1024, 1)) . "K";
+		return sprintf("%.1f", round($s / 1024, 1))."K";
 	} elseif ($s < pow(2, 30)) {
-		return sprintf("%.1f", round($s / 1024 / 1024, 1)) . "M";
+		return sprintf("%.1f", round($s / 1024 / 1024, 1))."M";
 	} else {
-		return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1)) . "G";
+		return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1))."G";
 	}
 }
 
@@ -138,7 +138,7 @@ 
 	}
 
 	$fs = filesize($infilename);
-	echo "Filesize: " . formatsize($fs) . "\n";
+	echo "Filesize: ".formatsize($fs)."\n";
 
 	while ($instr = fgets($infp)) {
 		$linenum++;
@@ -215,13 +215,13 @@ 
 
 	fputs($outfp, "\n");
 
-	fputs($outfp, '/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;' . "\n");
-	fputs($outfp, '/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;' . "\n");
-	fputs($outfp, '/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;' . "\n");
-	fputs($outfp, '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . "\n");
-	fputs($outfp, '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;' . "\n");
-	fputs($outfp, '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;' . "\n");
-	fputs($outfp, '/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;' . "\n");
+	fputs($outfp, '/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;'."\n");
+	fputs($outfp, '/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;'."\n");
+	fputs($outfp, '/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;'."\n");
+	fputs($outfp, '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;'."\n");
+	fputs($outfp, '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;'."\n");
+	fputs($outfp, '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;'."\n");
+	fputs($outfp, '/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;'."\n");
 
 	printf("Completed! %9d lines   %9d sql chunks\n\n", $linenum, $chunkcount);
 
@@ -250,8 +250,8 @@ 
 	}
 
 	if ($header) {
-		$output = "-- Converted with " . PRODUCT . "-" . VERSION . "\n";
-		$output .= "-- Converted on " . date("r") . "\n";
+		$output = "-- Converted with ".PRODUCT."-".VERSION."\n";
+		$output .= "-- Converted on ".date("r")."\n";
 		$output .= "\n";
 
 		$output .= "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;\n";
@@ -282,8 +282,8 @@ 
 
 		$reg = array();
 		if (preg_match('/CREATE SEQUENCE (?:public\.)(.*)_(id|rowid|id_comment)_seq/', $line, $reg)) {
-			$outputatend .= '-- Make field ' . $reg[2] . ' auto_increment for table ' . $reg[1] . "\n";
-			$outputatend .= 'ALTER TABLE ' . $reg[1] . ' CHANGE COLUMN ' . $reg[2] . ' ' . $reg[2] . ' INTEGER NOT NULL AUTO_INCREMENT;' . "\n\n";
+			$outputatend .= '-- Make field '.$reg[2].' auto_increment for table '.$reg[1]."\n";
+			$outputatend .= 'ALTER TABLE '.$reg[1].' CHANGE COLUMN '.$reg[2].' '.$reg[2].' INTEGER NOT NULL AUTO_INCREMENT;'."\n\n";
 			// var_dump($outputatend);
 		}
 
@@ -299,7 +299,7 @@ 
 
 			$reg2 = array();
 			if (preg_match('/CREATE TABLE ([^\s]+)/', $line, $reg2)) {
-				$output .= 'DROP TABLE IF EXISTS `' . $reg2[1] . '`;' . "\n";
+				$output .= 'DROP TABLE IF EXISTS `'.$reg2[1].'`;'."\n";
 			}
 			$output .= $line;
 			$linenumber++;
@@ -379,7 +379,7 @@ 
 				$arrayofprimaryalreadyintabledef[$in_create_table] = $in_create_table;
 			}
 
-			$specialfields = array("repeat","status","type","call");
+			$specialfields = array("repeat", "status", "type", "call");
 
 			$field = getfieldname($line);
 			if (in_array($field, $specialfields)) {
@@ -398,7 +398,7 @@ 
 				$lastchr = substr($output, -2, 1);
 				// echo "lastchr=$lastchr";
 				if ($lastchr == ",") {
-					$output = substr($output, 0, -2) . "\n";
+					$output = substr($output, 0, -2)."\n";
 				}
 			}
 
@@ -423,7 +423,7 @@ 
 				$after = str_replace(" (E'", " ('", $after);
 				$after = str_replace(", E'", ", '", $after);
 
-				$output .= $before . " VALUES " . $after;
+				$output .= $before." VALUES ".$after;
 				$linenumber++;
 				continue;
 			} else {
@@ -451,7 +451,7 @@ 
 					$inquotes = false;
 				}
 
-				$output .= $before . " VALUES " . $after;
+				$output .= $before." VALUES ".$after;
 				do {
 					$linenumber++;
 
@@ -501,14 +501,14 @@ 
 						$output .= str_replace("\n", "", $pkey);
 						// the postgres and mysql syntax for this is (at least, in the example im looking at)
 						// identical, so we can just add it as is.
-						$output .= $line . "\n";
+						$output .= $line."\n";
 					} else {
-						$output .= '-- ' . str_replace("\n", "", $pkey);
-						$output .= '-- ' . $line . "\n";
+						$output .= '-- '.str_replace("\n", "", $pkey);
+						$output .= '-- '.$line."\n";
 					}
 				} else {
-					$output .= '-- ' . str_replace("\n", "", $pkey);
-					$output .= '-- ' . $line . "\n";
+					$output .= '-- '.str_replace("\n", "", $pkey);
+					$output .= '-- '.$line."\n";
 				}
 			}
 		}
@@ -522,7 +522,7 @@ 
 				$tablename = str_replace('public.', '', $matches[2]);
 				$columns = $matches[3];
 				if ($tablename && $columns) {
-					$output .= "ALTER TABLE `" . $tablename . "` ADD INDEX " . $indexname . "( {$columns} ) ;\n";
+					$output .= "ALTER TABLE `".$tablename."` ADD INDEX ".$indexname."( {$columns} ) ;\n";
 				}
 			}
 		}
@@ -534,7 +534,7 @@ 
 				$tablename = str_replace('public.', '', $matches[2]);
 				$columns = str_replace('"', '', $matches[3]);
 				if ($tablename && $columns) {
-					$output .= "ALTER TABLE `" . $tablename . "` ADD UNIQUE INDEX " . $indexname . " ( {$columns} ) ;\n";
+					$output .= "ALTER TABLE `".$tablename."` ADD UNIQUE INDEX ".$indexname." ( {$columns} ) ;\n";
 				}
 			}
 		}
@@ -565,16 +565,16 @@ 
 			if ($line == "\\.\n") {
 				$in_insert = false;
 				if ($values) {
-					$output .= "INSERT INTO $heads VALUES\n" . implode(",\n", $values) . ";\n\n";
+					$output .= "INSERT INTO $heads VALUES\n".implode(",\n", $values).";\n\n";
 				}
 			} else {
 				$vals = explode('	', $line);
 				foreach ($vals as $i => $val) {
-					$vals[$i] = ($val == '\\N') ? 'NULL' : "'" . str_replace("'", "\\'", trim($val)) . "'";
+					$vals[$i] = ($val == '\\N') ? 'NULL' : "'".str_replace("'", "\\'", trim($val))."'";
 				}
-				$values[] = '(' . implode(',', $vals) . ')';
+				$values[] = '('.implode(',', $vals).')';
 				if (count($values) >= 1000) {
-					$output .= "INSERT INTO $heads VALUES\n" . implode(",\n", $values) . ";\n";
+					$output .= "INSERT INTO $heads VALUES\n".implode(",\n", $values).";\n";
 					$values = array();
 				}
 			}
@@ -583,5 +583,5 @@ 
 		$linenumber++;
 	}
 
-	return array('output' => $output,'outputatend' => $outputatend);
+	return array('output' => $output, 'outputatend' => $outputatend);
 }

dev/tools/test/namespacemig/bbb.class.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
  */
 class Bbb
 {
-	const BBB='bbb';
+	const BBB = 'bbb';
 
 	/**
 	 * do
@@ -29,7 +29,7 @@ 
 	{
 		global $globalaaa, $globalbbb;
 		echo 'dobbb'."\n";
-		$globalaaa.='+bbb';
-		$globalbbb.='+bbb';
+		$globalaaa .= '+bbb';
+		$globalbbb .= '+bbb';
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -25,9 +25,11 @@
 	 *
 	 * @return void
 	 */
-	public function do()
+	public function do {
+		()
 	{
 		global $globalaaa, $globalbbb;
+	}
 		echo 'dobbb'."\n";
 		$globalaaa.='+bbb';
 		$globalbbb.='+bbb';

dev/tools/test/namespacemig/aaa.class.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  */
 class Aaa
 {
-	const AAA='aaa';
+	const AAA = 'aaa';
 
 	/**
 	 * do

Braces +3 added lines, -1 removed lines

@@ -27,8 +27,10 @@
 	 *
 	 * @return void
 	 */
-	public function do()
+	public function do {
+		()
 	{
 		echo 'doaaa'."\n";
 	}
+	}
 }