Dolibarr / dolibarr

htdocs/core/ajax/ajaxextrafield.php

Spacing +22 added lines, -22 removed lines

@@ -40,7 +40,7 @@ 
 }
 
 include '../../main.inc.php';
-include_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -69,7 +69,7 @@ 
 // Load object according to $element
 $object = fetchObjectByElement($objectid, $objecttype, $element_ref);
 if (empty($object->element)) {
-	httponly_accessforbidden('Failed to get object with fetchObjectByElement(id=' . $objectid . ', objecttype=' . $objecttype . ')');
+	httponly_accessforbidden('Failed to get object with fetchObjectByElement(id='.$objectid.', objecttype='.$objecttype.')');
 }
 
 $module = $object->module;
@@ -127,8 +127,8 @@ 
 		// 7 : sort field (not used here but used into format for commobject)
 
 		// If there is a filter, we extract it by taking all content inside parenthesis.
-		if (! empty($InfoFieldList[4])) {
-			$pos = 0;	// $pos will be position of ending filter
+		if (!empty($InfoFieldList[4])) {
+			$pos = 0; // $pos will be position of ending filter
 			$parenthesisopen = 0;
 			while (substr($InfoFieldList[4], $pos, 1) !== '' && ($parenthesisopen || $pos == 0 || substr($InfoFieldList[4], $pos, 1) != ':')) {
 				if (substr($InfoFieldList[4], $pos, 1) == '(') {
@@ -150,7 +150,7 @@ 
 			// Fix better compatibility with some old extrafield syntax filter "(field=123)"
 			$reg = array();
 			if (preg_match('/^\(?([a-z0-9]+)([=<>]+)(\d+)\)?$/i', $InfoFieldList[4], $reg)) {
-				$InfoFieldList[4] = '(' . $reg[1] . ':' . $reg[2] . ':' . $reg[3] . ')';
+				$InfoFieldList[4] = '('.$reg[1].':'.$reg[2].':'.$reg[3].')';
 			}
 
 			//var_dump($InfoFieldList);
@@ -158,17 +158,17 @@ 
 
 		$parentName = '';
 		$parentField = '';
-		$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+		$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 		if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
 			list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-			$keyList .= ', ' . $parentField;
+			$keyList .= ', '.$parentField;
 		}
 		if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
 			if (strpos($InfoFieldList[4], 'extra.') !== false) {
-				$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+				$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 			} else {
-				$keyList = $InfoFieldList[2] . ' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 		}
 
@@ -187,8 +187,8 @@ 
 			}
 
 			$sqlwhere = '';
-			$sql = "SELECT " . $keyList;
-			$sql .= ' FROM ' . $db->prefix() . $InfoFieldList[0];
+			$sql = "SELECT ".$keyList;
+			$sql .= ' FROM '.$db->prefix().$InfoFieldList[0];
 
 			// Add filter from 4th field
 			if (!empty($InfoFieldList[4])) {
@@ -231,11 +231,11 @@ 
 				// We have to filter on a field of the extrafield table
 				$errstr = '';
 				if (strpos($InfoFieldList[4], 'extra.') !== false) {
-					$sql .= ' as main, ' . $db->sanitize($db->prefix() . $InfoFieldList[0]) . '_extrafields as extra';	// Add the join
-					$sqlwhere .= " WHERE extra.fk_object = main." . $db->sanitize($InfoFieldList[2]);
-					$sqlwhere .= " AND " . forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1);	// Add the filter
+					$sql .= ' as main, '.$db->sanitize($db->prefix().$InfoFieldList[0]).'_extrafields as extra'; // Add the join
+					$sqlwhere .= " WHERE extra.fk_object = main.".$db->sanitize($InfoFieldList[2]);
+					$sqlwhere .= " AND ".forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1); // Add the filter
 				} else {
-					$sqlwhere .= " WHERE " . forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1);
+					$sqlwhere .= " WHERE ".forgeSQLFromUniversalSearchCriteria($InfoFieldList[4], $errstr, 1);
 				}
 			} else {
 				$sqlwhere .= ' WHERE 1=1';
@@ -243,11 +243,11 @@ 
 
 			// Some tables may have field, some other not. For the moment we disable it.
 			if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-				$sqlwhere .= ' AND entity = ' . ((int) $conf->entity);
+				$sqlwhere .= ' AND entity = '.((int) $conf->entity);
 			}
 			if ($search) {
 				if ($fields_label) {
-					$sqlwhere .= " " . natural_search($fields_label, $search, 0);
+					$sqlwhere .= " ".natural_search($fields_label, $search, 0);
 				}
 			}
 
@@ -278,7 +278,7 @@ 
 					if (count($fields_label) > 1) {
 						$notrans = true;
 						foreach ($fields_label as $field_toshow) {
-							$labeltoshow .= $obj->$field_toshow . ' ';
+							$labeltoshow .= $obj->$field_toshow.' ';
 						}
 					} else {
 						$labeltoshow = $obj->{$InfoFieldList[1]};
@@ -288,7 +288,7 @@ 
 						if (!$notrans) {
 							foreach ($fields_label as $field_toshow) {
 								$translabel = $langs->trans($obj->$field_toshow);
-								$labeltoshow = $translabel . ' ';
+								$labeltoshow = $translabel.' ';
 							}
 						}
 						// $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
@@ -325,11 +325,11 @@ 
 				}
 				$db->free($resql);
 			} else {
-				dol_syslog('Error in request ' . $db->lasterror() . '. Check setup of extra parameters.', LOG_ERR);
+				dol_syslog('Error in request '.$db->lasterror().'. Check setup of extra parameters.', LOG_ERR);
 			}
 		} else {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 		}
 	}
 }