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

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

dev/tools/test/testtcpdf.php

Spacing +5 added lines, -5 removed lines

@@ -65,11 +65,11 @@
  - To convert pfx certificate to pem: openssl pkcs12 -in tcpdf.pfx -out tcpdf.crt -nodes
 
 */
-$permissions=array('copy');
-$user_pass='aaa';
-$owner_pass=null;
-$mode=0;
-$pubkeys=null;
+$permissions = array('copy');
+$user_pass = 'aaa';
+$owner_pass = null;
+$mode = 0;
+$pubkeys = null;
 $pdf->SetProtection($permissions, $user_pass, $owner_pass, $mode, $pubkeys);
 
 // Example with public-key

dev/translation/autotranslator.php

Spacing +10 added lines, -10 removed lines

@@ -28,7 +28,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -45,17 +45,17 @@ 
 $langs->load("main");
 
 // Global variables
-$version='1.14';
-$error=0;
+$version = '1.14';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") *****\n";
-$dir=DOL_DOCUMENT_ROOT."/langs";
+$dir = DOL_DOCUMENT_ROOT."/langs";
 
 // Check parameters
-if (! isset($argv[3])) {
+if (!isset($argv[3])) {
 	print "Usage:   ".$script_file."  lang_code_src lang_code_dest|all APIKEY [langfile.lang]\n";
 	print "Example: ".$script_file."  en_US         pt_PT              123456\n";
 	print "Rem:     lang_code to use can be found on https://translate.google.com\n";
@@ -66,18 +66,18 @@ 
 print 'Argument 1='.$argv[1]."\n";
 print 'Argument 2='.$argv[2]."\n";
 print 'Argument 3='.$argv[3]."\n";
-$file='';
+$file = '';
 if (isset($argv[4])) {
-	$file=$argv[4];
+	$file = $argv[4];
 	print 'Argument 4='.$argv[4]."\n";
 }
 print 'Files will be generated/updated in directory '.$dir."\n";
 
 if ($argv[2] != 'all') {
-	if (! is_dir($dir.'/'.$argv[2])) {
+	if (!is_dir($dir.'/'.$argv[2])) {
 		print 'Create directory '.$dir.'/'.$argv[2]."\n";
-		$result=mkdir($dir.'/'.$argv[2]);
-		if (! $result) {
+		$result = mkdir($dir.'/'.$argv[2]);
+		if (!$result) {
 			$db->close();
 			return -1;
 		}