Dolibarr / dolibarr

htdocs/variants/class/ProductAttributeValue.class.php

Spacing +35 added lines, -35 removed lines

@@ -78,7 +78,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'fk_product_attribute' => array('type'=>'integer:ProductAttribute:variants/class/ProductAttribute.class.php', 'label'=>'ProductAttribute', 'enabled'=>1, 'visible'=>0, 'position'=>10, 'notnull'=>1, 'index'=>1,),
 		'ref' => array('type'=>'varchar(255)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>''),
@@ -160,32 +160,32 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$this->db->begin();
 
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
 		$sql .= " fk_product_attribute, ref, value, entity, position";
 		$sql .= ")";
 		$sql .= " VALUES (";
-		$sql .= "  " . ((int) $this->fk_product_attribute);
-		$sql .= ", '" . $this->db->escape($this->ref) . "'";
-		$sql .= ", '" . $this->db->escape($this->value) . "'";
-		$sql .= ", " . ((int) $this->entity);
-		$sql .= ", " . ((int) $this->position);
+		$sql .= "  ".((int) $this->fk_product_attribute);
+		$sql .= ", '".$this->db->escape($this->ref)."'";
+		$sql .= ", '".$this->db->escape($this->value)."'";
+		$sql .= ", ".((int) $this->entity);
+		$sql .= ", ".((int) $this->position);
 		$sql .= ")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			$error++;
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 		}
 
 		if (!$error && !$notrigger) {
@@ -226,20 +226,20 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$sql = "SELECT rowid, fk_product_attribute, ref, value";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE rowid = " . ((int) $id);
-		$sql .= " AND entity IN (" . getEntity('product') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid = ".((int) $id);
+		$sql .= " AND entity IN (".getEntity('product').")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			$this->errors[] = "Error ".$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -274,15 +274,15 @@ 
 			$sql .= "DISTINCT ";
 		}
 
-		$sql .= "v.fk_product_attribute, v.rowid, v.ref, v.value FROM " . MAIN_DB_PREFIX . "product_attribute_value v ";
+		$sql .= "v.fk_product_attribute, v.rowid, v.ref, v.value FROM ".MAIN_DB_PREFIX."product_attribute_value v ";
 
 		if ($only_used) {
-			$sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v ON c2v.fk_prod_attr_val = v.rowid ";
-			$sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination c ON c.rowid = c2v.fk_prod_combination ";
-			$sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product p ON p.rowid = c.fk_product_child ";
+			$sql .= "LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c2v.fk_prod_attr_val = v.rowid ";
+			$sql .= "LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination c ON c.rowid = c2v.fk_prod_combination ";
+			$sql .= "LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = c.fk_product_child ";
 		}
 
-		$sql .= "WHERE v.fk_product_attribute = " . ((int) $prodattr_id);
+		$sql .= "WHERE v.fk_product_attribute = ".((int) $prodattr_id);
 
 		if ($only_used) {
 			$sql .= " AND c2v.rowid IS NOT NULL AND p.tosell = 1";
@@ -334,25 +334,25 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$this->db->begin();
 
-		$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET";
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
 
-		$sql .= "  fk_product_attribute = " . ((int) $this->fk_product_attribute);
-		$sql .= ", ref = '" . $this->db->escape($this->ref) . "'";
-		$sql .= ", value = '" . $this->db->escape($this->value) . "'";
-		$sql .= ", position = " . ((int) $this->position);
+		$sql .= "  fk_product_attribute = ".((int) $this->fk_product_attribute);
+		$sql .= ", ref = '".$this->db->escape($this->ref)."'";
+		$sql .= ", value = '".$this->db->escape($this->value)."'";
+		$sql .= ", position = ".((int) $this->position);
 
-		$sql .= " WHERE rowid = " . ((int) $this->id);
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			$error++;
 		}
 
@@ -395,7 +395,7 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -419,12 +419,12 @@ 
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element . " WHERE rowid = " . ((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->errors[] = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 				$error++;
 			}
 		}
@@ -457,16 +457,16 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
-		$sql = "SELECT COUNT(*) AS nb FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val WHERE fk_prod_attr_val = " . ((int) $this->id);
+		$sql = "SELECT COUNT(*) AS nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_attr_val = ".((int) $this->id);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			return -1;
 		}
 

htdocs/core/class/commonstickergenerator.class.php

Spacing +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
 		// phpcs:enable
 		$this->_Metric = $format['metric'];
 		$this->_Avery_Name = $format['name'];
-		$this->_Avery_Code = empty($format['code'])?'':$format['code'];
+		$this->_Avery_Code = empty($format['code']) ? '' : $format['code'];
 		$this->_Margin_Left = $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
 		$this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
 		$this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);

htdocs/expensereport/payment/list.php

Spacing +12 added lines, -12 removed lines

@@ -53,20 +53,20 @@ 
 // Security check
 if ($user->socid) $socid = $user->socid;
 
-$search_ref				= GETPOST('search_ref', 'alpha');
-$search_date_startday	= GETPOST('search_date_startday', 'int');
-$search_date_startmonth	= GETPOST('search_date_startmonth', 'int');
-$search_date_startyear	= GETPOST('search_date_startyear', 'int');
+$search_ref = GETPOST('search_ref', 'alpha');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
 $search_date_endday		= GETPOST('search_date_endday', 'int');
-$search_date_endmonth	= GETPOST('search_date_endmonth', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
 $search_date_endyear	= GETPOST('search_date_endyear', 'int');
-$search_date_start		= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
-$search_date_end		= dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_user			= GETPOST('search_user', 'alpha');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_user = GETPOST('search_user', 'alpha');
 $search_payment_type	= GETPOST('search_payment_type');
-$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
+$search_cheque_num = GETPOST('search_cheque_num', 'alpha');
 $search_bank_account	= GETPOST('search_bank_account', 'int');
-$search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
+$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
@@ -198,10 +198,10 @@ 
 	$sql .= natural_search('pndf.rowid', $search_ref);
 }
 if ($search_date_start) {
-	$sql .= " AND pndf.datep >= '" . $db->idate($search_date_start) . "'";
+	$sql .= " AND pndf.datep >= '".$db->idate($search_date_start)."'";
 }
 if ($search_date_end) {
-	$sql .=" AND pndf.datep <= '" . $db->idate($search_date_end) . "'";
+	$sql .= " AND pndf.datep <= '".$db->idate($search_date_end)."'";
 }
 
 if ($search_user) {

htdocs/takepos/admin/setup.php

Spacing +2 added lines, -2 removed lines

@@ -259,7 +259,7 @@ 
 print '<tr class="oddeven"><td>';
 print $langs->trans("NumberOfTerminals");
 print '<td colspan="2">';
-print '<input type="number" name="TAKEPOS_NUM_TERMINALS" min="1" value="' . (empty($conf->global->TAKEPOS_NUM_TERMINALS) ? '1' : $conf->global->TAKEPOS_NUM_TERMINALS)  . '">';
+print '<input type="number" name="TAKEPOS_NUM_TERMINALS" min="1" value="'.(empty($conf->global->TAKEPOS_NUM_TERMINALS) ? '1' : $conf->global->TAKEPOS_NUM_TERMINALS).'">';
 print "</td></tr>\n";
 
 // Services
@@ -392,7 +392,7 @@ 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("TakeposBarcodeRuleToInsertProduct"), $langs->trans("TakeposBarcodeRuleToInsertProductDesc"));
 	print '<td colspan="2">';
-	print '<input type="text" name="TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT" value="' . (getDolGlobalString('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT')) . '">';
+	print '<input type="text" name="TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT" value="'.(getDolGlobalString('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT')).'">';
 	print "</td></tr>\n";
 }
 

htdocs/core/modules/stock/doc/pdf_standard.modules.php

Spacing +6 added lines, -6 removed lines

@@ -685,7 +685,7 @@ 
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 
 		// Output Rect
-		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect takes a length in 3rd parameter and 4th parameter
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
 		$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(200, 200, 200)));
 		$pdf->SetDrawColor(200, 200, 200);
@@ -696,24 +696,24 @@ 
 
 
 		if (empty($hidetop)) {
-			$pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11);	// line takes a position y in 2nd parameter and 4th parameter
+			$pdf->line($this->marge_gauche, $tab_top + 11, $this->page_largeur - $this->marge_droite, $tab_top + 11); // line takes a position y in 2nd parameter and 4th parameter
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell($this->wref, 3, $outputlangs->transnoentities("Ref"), '', 'L');
 		}
 
-		$pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height);
+		$pdf->line($this->posxlabel - 1, $tab_top, $this->posxlabel - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxlabel - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxlabel - 1, 2, $outputlangs->transnoentities("Label"), '', 'C');
 		}
 
-		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxup - $this->posxqty - 1, 2, $outputlangs->transnoentities("Units"), '', 'C');
 		}
 
-		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+		$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxup - 1, 2, $outputlangs->transnoentities("AverageUnitPricePMPShort"), '', 'C');
@@ -725,7 +725,7 @@ 
 			$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("EstimatedStockValueShort"), '', 'C');
 		}
 
-		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+		$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
 			$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("SellPriceMin"), '', 'C');

htdocs/recruitment/recruitmentjobposition_list.php

Spacing +1 added lines, -1 removed lines

@@ -303,7 +303,7 @@
 					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t.".$db->escape($columnName)." <= '" . $db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}

htdocs/theme/md/dropdown.inc.php

Spacing +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
 }
 
 div#topmenu-global-search-dropdown, div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown {
-	line-height: <?php echo (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '35' : '46' ); ?>px;
+	line-height: <?php echo (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '35' : '46'); ?>px;
 }
 a.top-menu-dropdown-link {
 	padding: 8px;

htdocs/debugbar/class/DataCollector/DolLogsCollector.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	{
 		global $conf;
 
-		$uselogfile =  getDolGlobalInt('DEBUGBAR_USE_LOG_FILE');
+		$uselogfile = getDolGlobalInt('DEBUGBAR_USE_LOG_FILE');
 
 		if ($uselogfile) {
 			$this->getStorageLogs($this->path);

htdocs/admin/emailcollector_list.php

Spacing +1 added lines, -1 removed lines

@@ -507,7 +507,7 @@
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 		$totalarray['nbfield']++;