Dolibarr / dolibarr

htdocs/variants/card.php

Spacing +42 added lines, -42 removed lines

@@ -98,7 +98,7 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
 	if ($cancel) {
 		if (!empty($backtopage)) {
-			header("Location: " . $backtopage);
+			header("Location: ".$backtopage);
 			exit;
 		}
 		$action = '';
@@ -127,7 +127,7 @@ 
 		$result = $object->addLine($line_ref, $line_value);
 		if ($result > 0) {
 			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-			header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id);
+			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$object->id);
 			exit();
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -140,7 +140,7 @@ 
 		$result = $object->updateLine($lineid, $line_ref, $line_value);
 		if ($result > 0) {
 			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-			header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id);
+			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$object->id);
 			exit();
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -160,33 +160,33 @@ 
 
 // Part to create
 if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("ProductAttribute")), '', 'object_' . $object->picto);
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("ProductAttribute")), '', 'object_'.$object->picto);
 
-	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
 	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
 
 	print dol_get_fiche_head(array(), '');
 
-	print '<table class="border centpercent tableforfieldcreate">' . "\n";
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_add.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
 
-	print '</table>' . "\n";
+	print '</table>'."\n";
 
 	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="' . dol_escape_htmltag($langs->trans("Create")) . '">';
+	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
-	print '<input type="' . ($backtopage ? "submit" : "button") . '" class="button button-cancel" name="cancel" value="' . dol_escape_htmltag($langs->trans("Cancel")) . '"' . ($backtopage ? '' : ' onclick="history.go(-1)"') . '>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -194,25 +194,25 @@ 
 	dol_set_focus('input[name="ref"]');
 } elseif (($id || $ref) && $action == 'edit') {
 	// Part to edit record
-	print load_fiche_titre($langs->trans("ProductAttribute"), '', 'object_' . $object->picto);
+	print load_fiche_titre($langs->trans("ProductAttribute"), '', 'object_'.$object->picto);
 
-	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="id" value="' . $object->id . '">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
 	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
 	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
 
 	print dol_get_fiche_head();
 
-	print '<table class="border centpercent tableforfieldedit">' . "\n";
+	print '<table class="border centpercent tableforfieldedit">'."\n";
 
 	// Common attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_edit.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
 
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
@@ -221,8 +221,8 @@ 
 
 	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button button-save" name="save" value="' . $langs->trans("Save") . '">';
-	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="' . $langs->trans("Cancel") . '">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -237,12 +237,12 @@ 
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyObject'), $langs->trans('ProductAttributeDeleteDialog'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ProductAttributeDeleteDialog'), 'confirm_delete', '', 0, 1);
 	} elseif ($action == 'ask_deleteline') {
 		// Confirmation to delete line
 		$object_value = new ProductAttributeValue($db);
 		if ($object_value->fetch($lineid) > 0) {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteLine'), $langs->trans('ProductAttributeValueDeleteDialog', dol_htmlentities($object_value->value), dol_htmlentities($object_value->ref)), 'confirm_deleteline', '', 0, 1);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ProductAttributeValueDeleteDialog', dol_htmlentities($object_value->value), dol_htmlentities($object_value->ref)), 'confirm_deleteline', '', 0, 1);
 		}
 	}
 
@@ -260,18 +260,18 @@ 
 
 	// Object card
 	// ------------------------------------------------------------
-	$backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT . '/variants/list.php?leftmenu=?restore_lastsearch_values=1');
-	$linkback = '<a href="' . dol_sanitizeUrl($backtolist) . '">' . $langs->trans("BackToList") . '</a>';
+	$backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/variants/list.php?leftmenu=?restore_lastsearch_values=1');
+	$linkback = '<a href="'.dol_sanitizeUrl($backtolist).'">'.$langs->trans("BackToList").'</a>';
 
 	dol_banner_tab($object, 'id', $linkback);
 
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent tableforfield">' . "\n";
+	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Common attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
 	print '</table>';
 	print '</div>';
@@ -283,19 +283,19 @@ 
 
 	// Buttons for actions
 	if ($action != 'editline') {
-		print '<div class="tabsAction">' . "\n";
+		print '<div class="tabsAction">'."\n";
 		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		if (empty($reshook)) {
 			// Modify
-			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit', '', $permissiontoedit);
+			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit', '', $permissiontoedit);
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
-			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=delete', '', $permissiontodelete);
+			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete', '', $permissiontodelete);
 		}
-		print '</div>' . "\n";
+		print '</div>'."\n";
 	}
 
 	/*
@@ -305,24 +305,24 @@ 
 		// Show object lines
 		$result = $object->getLinesArray();
 
-		print load_fiche_titre($langs->trans("PossibleValues") . (!empty($object->lines) ? '<span class="opacitymedium colorblack paddingleft">(' . count($object->lines) . ')</span>' : ''));
+		print load_fiche_titre($langs->trans("PossibleValues").(!empty($object->lines) ? '<span class="opacitymedium colorblack paddingleft">('.count($object->lines).')</span>' : ''));
 
-		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
-		<input type="hidden" name="token" value="' . newToken() . '">
-		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		<input type="hidden" name="token" value="' . newToken().'">
+		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
 		<input type="hidden" name="page_y" value="">
-		<input type="hidden" name="id" value="' . $object->id . '">
+		<input type="hidden" name="id" value="' . $object->id.'">
 		';
 		if ($backtopage) {
-			print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 		}
 		if ($backtopageforcancel) {
-			print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+			print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 		}
 
 		if (!empty($conf->use_javascript_ajax)) {
-			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 		}
 
 		print '<div class="div-table-responsive-no-min">';

htdocs/variants/class/ProductAttribute.class.php

Spacing +111 added lines, -111 removed lines

@@ -98,7 +98,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"),
 		'ref' => array('type'=>'varchar(255)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'width200'),
 		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'ExternalRef', 'enabled' => 1, 'visible' => 0, 'position' => 20, 'searchall'=>1),
@@ -224,32 +224,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 .= " ref, ref_ext, label, entity, position";
 		$sql .= ")";
 		$sql .= " VALUES (";
-		$sql .= "  '" . $this->db->escape($this->ref) . "'";
-		$sql .= ", '" . $this->db->escape($this->ref_ext) . "'";
-		$sql .= ", '" . $this->db->escape($this->label) . "'";
-		$sql .= ", " . ((int) $this->entity);
-		$sql .= ", " . ((int) $this->position);
+		$sql .= "  '".$this->db->escape($this->ref)."'";
+		$sql .= ", '".$this->db->escape($this->ref_ext)."'";
+		$sql .= ", '".$this->db->escape($this->label)."'";
+		$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) {
@@ -290,20 +290,20 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$sql = "SELECT rowid, ref, ref_ext, label, position";
-		$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;
 		}
 
@@ -333,14 +333,14 @@ 
 		$return = array();
 
 		$sql = "SELECT rowid, ref, ref_ext, label, position";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE entity IN (".getEntity('product').")";
 		$sql .= $this->db->order("position", "asc");
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->errors[] = "Error ".$this->db->lasterror();
 			dol_print_error($this->db);
 			return $return;
 		}
@@ -392,25 +392,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 .= "  ref = '" . $this->db->escape($this->ref) . "'";
-		$sql .= ", ref_ext = '" . $this->db->escape($this->ref_ext) . "'";
-		$sql .= ", label = '" . $this->db->escape($this->label) . "'";
-		$sql .= ", position = " . ((int) $this->position);
+		$sql .= "  ref = '".$this->db->escape($this->ref)."'";
+		$sql .= ", ref_ext = '".$this->db->escape($this->ref_ext)."'";
+		$sql .= ", label = '".$this->db->escape($this->label)."'";
+		$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++;
 		}
 
@@ -453,7 +453,7 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -478,25 +478,25 @@ 
 
 		if (!$error) {
 			// Delete values
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element_line;
-			$sql .= " WHERE " . $this->fk_element . " = " . ((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;
+			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
 
-			dol_syslog(__METHOD__ . ' - Delete values', LOG_DEBUG);
+			dol_syslog(__METHOD__.' - Delete values', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->errors[] = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 				$error++;
 			}
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= " WHERE rowid = " . ((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
-			dol_syslog(__METHOD__ . ' - Delete attribute', LOG_DEBUG);
+			dol_syslog(__METHOD__.' - Delete attribute', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->errors[] = "Error " . $this->db->lasterror();
+				$this->errors[] = "Error ".$this->db->lasterror();
 				$error++;
 			}
 		}
@@ -535,15 +535,15 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$sql = "SELECT td.rowid, td.fk_product_attribute, td.ref, td.value, td.position";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element_line . " AS td";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $this->table_element . " AS t ON t.rowid = td." . $this->fk_element;
-		$sql .= " WHERE t.rowid = " . ((int) $this->id);
-		$sql .= " AND t.entity IN (" . getEntity('product') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element_line." AS td";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$this->table_element." AS t ON t.rowid = td.".$this->fk_element;
+		$sql .= " WHERE t.rowid = ".((int) $this->id);
+		$sql .= " AND t.entity IN (".getEntity('product').")";
 		if ($filters) {
 			$sql .= $filters;
 		}
@@ -552,8 +552,8 @@ 
 		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 -3;
 		}
 
@@ -607,7 +607,7 @@ 
 	public function addLine($ref, $value, $position = -1, $notrigger = 0)
 	{
 		global $langs, $user;
-		dol_syslog(__METHOD__ . " id=".$this->id.", ref=".$ref.", value=".$value.", notrigger=".$notrigger);
+		dol_syslog(__METHOD__." id=".$this->id.", ref=".$ref.", value=".$value.", notrigger=".$notrigger);
 		$error = 0;
 
 		// Clean parameters
@@ -619,7 +619,7 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -668,7 +668,7 @@ 
 	{
 		global $user;
 
-		dol_syslog(__METHOD__ . " lineid=$lineid, ref=$ref, value=$value, notrigger=$notrigger");
+		dol_syslog(__METHOD__." lineid=$lineid, ref=$ref, value=$value, notrigger=$notrigger");
 
 		// Clean parameters
 		$lineid = $lineid > 0 ? $lineid : 0;
@@ -709,7 +709,7 @@ 
 	 */
 	public function deleteLine(User $user, $lineid, $notrigger = 0)
 	{
-		dol_syslog(__METHOD__ . " lineid=$lineid, notrigger=$notrigger");
+		dol_syslog(__METHOD__." lineid=$lineid, notrigger=$notrigger");
 
 		// Clean parameters
 		$lineid = $lineid > 0 ? $lineid : 0;
@@ -756,19 +756,19 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$sql = "SELECT COUNT(*) AS count";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element_line;
-		$sql .= " WHERE " . $this->fk_element . " = " . ((int) $this->id);
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element_line;
+		$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
 
 		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;
 		}
 
@@ -799,21 +799,21 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__.' '.$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
 		$sql = "SELECT COUNT(*) AS count";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val AS pac2v";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination AS pac ON pac2v.fk_prod_combination = pac.rowid";
-		$sql .= " WHERE pac2v.fk_prod_attr = " . ((int) $this->id);
-		$sql .= " AND pac.entity IN (" . getEntity('product') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_attribute_combination2val AS pac2v";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination AS pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql .= " WHERE pac2v.fk_prod_attr = ".((int) $this->id);
+		$sql .= " AND pac.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;
 		}
 
@@ -843,16 +843,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 = " . ((int) $this->id);
+		$sql = "SELECT COUNT(*) AS nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_attr = ".((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;
 		}
 
@@ -876,8 +876,8 @@ 
 	{
 		// Count number of attributes to reorder (according to choice $renum)
 		$nl = 0;
-		$sql = "SELECT count(rowid) FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+		$sql = "SELECT count(rowid) FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE entity IN (".getEntity('product').")";
 		if (!$renum) {
 			$sql .= " AND position = 0";
 		} else {
@@ -897,11 +897,11 @@ 
 			$rows = array();
 
 			// We first search all attributes
-			$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= " WHERE entity IN (" . getEntity('product') . ")";
-			$sql .= " ORDER BY position ASC, rowid " . $rowidorder;
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE entity IN (".getEntity('product').")";
+			$sql .= " ORDER BY position ASC, rowid ".$rowidorder;
 
-			dol_syslog(__METHOD__ . " search all attributes", LOG_DEBUG);
+			dol_syslog(__METHOD__." search all attributes", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$i = 0;
@@ -936,8 +936,8 @@ 
 	{
 		global $hookmanager;
 
-		$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) $position);
-		$sql .= " WHERE rowid = " . ((int) $rowid);
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET position = ".((int) $position);
+		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		if (!$this->db->query($sql)) {
@@ -959,8 +959,8 @@ 
 	 */
 	public function getPositionOfAttribute($rowid)
 	{
-		$sql = "SELECT position FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+		$sql = "SELECT position FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE entity IN (".getEntity('product').")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1023,12 +1023,12 @@ 
 	public function updateAttributePositionUp($rowid, $position)
 	{
 		if ($position > 1) {
-			$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) $position);
-			$sql .= " WHERE entity IN (" . getEntity('product') . ")";
-			$sql .= " AND position = " . ((int) ($position - 1));
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET position = ".((int) $position);
+			$sql .= " WHERE entity IN (".getEntity('product').")";
+			$sql .= " AND position = ".((int) ($position - 1));
 			if ($this->db->query($sql)) {
-				$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) ($position - 1));
-				$sql .= " WHERE rowid = " . ((int) $rowid);
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET position = ".((int) ($position - 1));
+				$sql .= " WHERE rowid = ".((int) $rowid);
 				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 				}
@@ -1049,12 +1049,12 @@ 
 	public function updateAttributePositionDown($rowid, $position, $max)
 	{
 		if ($position < $max) {
-			$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) $position);
-			$sql .= " WHERE entity IN (" . getEntity('product') . ")";
-			$sql .= " AND position = " . ((int) ($position + 1));
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET position = ".((int) $position);
+			$sql .= " WHERE entity IN (".getEntity('product').")";
+			$sql .= " AND position = ".((int) ($position + 1));
 			if ($this->db->query($sql)) {
-				$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) ($position + 1));
-				$sql .= " WHERE rowid = " . ((int) $rowid);
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET position = ".((int) ($position + 1));
+				$sql .= " WHERE rowid = ".((int) $rowid);
 				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 				}
@@ -1072,8 +1072,8 @@ 
 	public function getMaxAttributesPosition()
 	{
 		// Search the last position of attributes
-		$sql = "SELECT max(position) FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+		$sql = "SELECT max(position) FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE entity IN (".getEntity('product').")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1119,17 +1119,17 @@ 
 
 		$result = '';
 
-		$label = img_picto('', $this->picto) . ' <u>' . $langs->trans("ProductAttribute") . '</u>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("ProductAttribute").'</u>';
 		if (isset($this->status)) {
-			$label .= ' ' . $this->getLibStatut(5);
+			$label .= ' '.$this->getLibStatut(5);
 		}
 		$label .= '<br>';
-		$label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->label)) {
-			$label .= '<br><b>' . $langs->trans('Label') . ':</b> ' . $this->label;
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
 		}
 
-		$url = dol_buildpath('/variants/card.php', 1) . '?id=' . $this->id;
+		$url = dol_buildpath('/variants/card.php', 1).'?id='.$this->id;
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
@@ -1146,20 +1146,20 @@ 
 		if (empty($notooltip)) {
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowProductAttribute");
-				$linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ' title="' . dol_escape_htmltag($label, 1) . '"';
-			$linkclose .= ' class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 		} else {
-			$linkclose = ($morecss ? ' class="' . $morecss . '"' : '');
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
 
 		if ($option == 'nolink' || empty($url)) {
 			$linkstart = '<span';
 		} else {
-			$linkstart = '<a href="' . $url . '"';
+			$linkstart = '<a href="'.$url.'"';
 		}
-		$linkstart .= $linkclose . '>';
+		$linkstart .= $linkclose.'>';
 		if ($option == 'nolink' || empty($url)) {
 			$linkend = '</span>';
 		} else {
@@ -1170,29 +1170,29 @@ 
 
 		if (empty($this->showphoto_on_popup)) {
 			if ($withpicto) {
-				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 			}
 		} else {
 			if ($withpicto) {
-				require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 				list($class, $module) = explode('@', $this->picto);
-				$upload_dir = $conf->$module->multidir_output[$conf->entity] . "/$class/" . dol_sanitizeFileName($this->ref);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
 				$filearray = dol_dir_list($upload_dir, "files");
 				$filename = $filearray[0]['name'];
 				if (!empty($filename)) {
 					$pospoint = strpos($filearray[0]['name'], '.');
 
-					$pathtophoto = $class . '/' . $this->ref . '/thumbs/' . substr($filename, 0, $pospoint) . '_mini' . substr($filename, $pospoint);
-					if (!getDolGlobalString(strtoupper($module . '_' . $class) . '_FORMATLISTPHOTOSASUSERS')) {
-						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo' . $module . '" alt="No photo" border="0" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $module . '&entity=' . $conf->entity . '&file=' . urlencode($pathtophoto) . '"></div></div>';
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (!getDolGlobalString(strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS')) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
 					} else {
-						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $module . '&entity=' . $conf->entity . '&file=' . urlencode($pathtophoto) . '"></div>';
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
 					}
 
 					$result .= '</div>';
 				} else {
-					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 				}
 			}
 		}
@@ -1279,9 +1279,9 @@ 
 		$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
 		foreach ($dirtpls as $module => $reldir) {
 			if (!empty($module)) {
-				$tpl = dol_buildpath($reldir . '/productattributevalueline_create.tpl.php');
+				$tpl = dol_buildpath($reldir.'/productattributevalueline_create.tpl.php');
 			} else {
-				$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_create.tpl.php';
+				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/productattributevalueline_create.tpl.php';
 			}
 
 			if (empty($conf->file->strict_mode)) {
@@ -1330,9 +1330,9 @@ 
 			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
 			foreach ($dirtpls as $module => $reldir) {
 				if (!empty($module)) {
-					$tpl = dol_buildpath($reldir . '/productattributevalueline_title.tpl.php');
+					$tpl = dol_buildpath($reldir.'/productattributevalueline_title.tpl.php');
 				} else {
-					$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_title.tpl.php';
+					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/productattributevalueline_title.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
 					$res = @include $tpl;
@@ -1411,9 +1411,9 @@ 
 			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
 			foreach ($dirtpls as $module => $reldir) {
 				if (!empty($module)) {
-					$tpl = dol_buildpath($reldir . '/productattributevalueline_view.tpl.php');
+					$tpl = dol_buildpath($reldir.'/productattributevalueline_view.tpl.php');
 				} else {
-					$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_view.tpl.php';
+					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/productattributevalueline_view.tpl.php';
 				}
 
 				if (empty($conf->file->strict_mode)) {
@@ -1435,9 +1435,9 @@ 
 			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
 			foreach ($dirtpls as $module => $reldir) {
 				if (!empty($module)) {
-					$tpl = dol_buildpath($reldir . '/productattributevalueline_edit.tpl.php');
+					$tpl = dol_buildpath($reldir.'/productattributevalueline_edit.tpl.php');
 				} else {
-					$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_edit.tpl.php';
+					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/productattributevalueline_edit.tpl.php';
 				}
 
 				if (empty($conf->file->strict_mode)) {