Dolibarr / dolibarr

htdocs/core/db/DoliDB.class.php

Spacing +2 added lines, -2 removed lines

@@ -119,10 +119,10 @@
 	public function regexpsql($subject, $pattern, $sqlstring = false)
 	{
 		if ($sqlstring) {
-			return "(". $subject ." REGEXP '" . $pattern . "')";
+			return "(".$subject." REGEXP '".$pattern."')";
 		}
 
-		return "('". $subject ."' REGEXP '" . $pattern . "')";
+		return "('".$subject."' REGEXP '".$pattern."')";
 	}
 
 

htdocs/core/ajax/selectsearchbox.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 if (isModEnabled('supplier_proposal') && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->hasRight('supplier_proposal', 'lire')) {
 	$arrayresult['searchintosupplierpropal'] = array('position'=>100, 'img'=>'object_supplier_proposal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_proposal', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled('supplier_order') &&  $user->hasRight('supplier_order', 'lire'))) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED)) {
+if (((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire'))) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED)) {
 	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_supplier_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_order', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 if (((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED)) {

htdocs/core/ajax/row.php

Spacing +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
 	if ($reshook > 0) {
 		$perm = $hookmanager->resArray['perm'];
 	}
-	if (! $perm) {
+	if (!$perm) {
 		// We should not be here. If we are not allowed to reorder rows, feature should not be visible on script.
 		// If we are here, it is a hack attempt, so we report a warning.
 		print 'Bad permission to modify position of lines for object in table '.$table_element_line;
@@ -154,7 +154,7 @@ 
 
 	// Reorder line to have position of children lines sharing same counter than parent lines
 	// This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
-	if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande','fk_contrat'))) {
+	if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande', 'fk_contrat'))) {
 		$result = $row->line_order(true);
 	}
 } else {

htdocs/core/lib/company.lib.php

Braces +9 added lines, -3 removed lines

@@ -1538,7 +1538,9 @@ 
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);
 		$reshook = $hookmanager->executeHooks('showActionsDoneListSelect', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$sql.= $hookmanager->resPrint;
+		}
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
@@ -1554,7 +1556,9 @@ 
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);
 		$reshook = $hookmanager->executeHooks('showActionsDoneListFrom', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$sql.= $hookmanager->resPrint;
+		}
 
 		if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
@@ -1659,7 +1663,9 @@ 
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon, 'module' => $module);
 		$reshook = $hookmanager->executeHooks('showActionsDoneListWhere', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$sql.= $hookmanager->resPrint;
+		}
 
 		if (is_array($actioncode)) {
 			foreach ($actioncode as $code) {

Spacing +17 added lines, -17 removed lines

@@ -81,7 +81,7 @@ 
 					$nbContact = $obj->nb;
 				}
 
-				dol_setcache($cachekey, $nbContact, 120);	// If setting cache fails, this is not a problem, so we do not test result.
+				dol_setcache($cachekey, $nbContact, 120); // If setting cache fails, this is not a problem, so we do not test result.
 			}
 
 			$head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id;
@@ -159,7 +159,7 @@ 
 			} else {
 				dol_print_error($db);
 			}
-			dol_setcache($cachekey, $nbProject, 120);	// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $nbProject, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
 		$head[$h][0] = DOL_URL_ROOT.'/societe/project.php?socid='.$object->id;
 		$head[$h][1] = $langs->trans("Projects");
@@ -318,7 +318,7 @@ 
 				} else {
 					dol_print_error($db);
 				}
-				dol_setcache($cachekey, $nbNotif, 120);		// If setting cache fails, this is not a problem, so we do not test result.
+				dol_setcache($cachekey, $nbNotif, 120); // If setting cache fails, this is not a problem, so we do not test result.
 			}
 
 			$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.urlencode($object->id);
@@ -361,7 +361,7 @@ 
 			$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 			$nbLinks = Link::count($db, $object->element, $object->id);
 			$totalAttached = $nbFiles + $nbLinks;
-			dol_setcache($cachekey, $totalAttached, 120);		// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $totalAttached, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
 
 		$head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id;
@@ -375,7 +375,7 @@ 
 
 	$head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
+	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 		$nbEvent = 0;
 		// Enable caching of thirdparty count actioncomm
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -394,7 +394,7 @@ 
 			} else {
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
 			}
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
 
 		$head[$h][1] .= '/';
@@ -788,7 +788,7 @@ 
 		return false;
 	}
 
-	$country_code_in_EEC = getCountriesInEEC();		// This make a database call but there is a cache done into $conf->cache['country_code_in_EEC']
+	$country_code_in_EEC = getCountriesInEEC(); // This make a database call but there is a cache done into $conf->cache['country_code_in_EEC']
 
 	//print "dd".$object->country_code;
 	return in_array($object->country_code, $country_code_in_EEC);
@@ -1354,7 +1354,7 @@ 
 				print '<td class="nowrap center">';
 
 				// Add to agenda
-				if (isModEnabled('agenda')&& $user->hasRight('agenda', 'myactions', 'create')) {
+				if (isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) {
 					print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
 					print img_object($langs->trans("Event"), "action");
 					print '</a> &nbsp; ';
@@ -1432,7 +1432,7 @@ 
 
 			if ($showuserlogin) {
 				print '<td class="tdoverflowmax125">';
-				$tmpuser= new User($db);
+				$tmpuser = new User($db);
 				$resfetch = $tmpuser->fetch(0, '', '', 0, -1, '', $contactstatic->id);
 				if ($resfetch > 0) {
 					print $tmpuser->getNomUrl(1, '', 0, 0, 24, 1);
@@ -1449,7 +1449,7 @@ 
 				print '<td class="nowrap center">';
 
 				// Add to agenda
-				if (isModEnabled('agenda')&& $user->hasRight('agenda', 'myactions', 'create')) {
+				if (isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) {
 					print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
 					print img_object($langs->trans("Event"), "action");
 					print '</a> &nbsp; ';
@@ -1632,8 +1632,8 @@ 
 
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);
-		$reshook = $hookmanager->executeHooks('showActionsDoneListSelect', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		$reshook = $hookmanager->executeHooks('showActionsDoneListSelect', $parameters); // Note that $action and $object may have been modified by hook
+		if (!empty($hookmanager->resPrint)) $sql .= $hookmanager->resPrint;
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
@@ -1648,8 +1648,8 @@ 
 
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);
-		$reshook = $hookmanager->executeHooks('showActionsDoneListFrom', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		$reshook = $hookmanager->executeHooks('showActionsDoneListFrom', $parameters); // Note that $action and $object may have been modified by hook
+		if (!empty($hookmanager->resPrint)) $sql .= $hookmanager->resPrint;
 
 		if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
@@ -1771,8 +1771,8 @@ 
 
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon, 'module' => $module);
-		$reshook = $hookmanager->executeHooks('showActionsDoneListWhere', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		$reshook = $hookmanager->executeHooks('showActionsDoneListWhere', $parameters); // Note that $action and $object may have been modified by hook
+		if (!empty($hookmanager->resPrint)) $sql .= $hookmanager->resPrint;
 
 		if (is_array($actioncode)) {
 			foreach ($actioncode as $code) {
@@ -1880,7 +1880,7 @@ 
 		}
 	}
 
-	if (isModEnabled('agenda')|| (isModEnabled('mailing') && !empty($objcon->email))) {
+	if (isModEnabled('agenda') || (isModEnabled('mailing') && !empty($objcon->email))) {
 		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

htdocs/core/lib/product.lib.php

Spacing +4 added lines, -4 removed lines

@@ -38,11 +38,11 @@ 
 	$langs->load("products");
 
 	$label = $langs->trans('Product');
-	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read');
+	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read');
 
 	if ($object->isService()) {
 		$label = $langs->trans('Service');
-		$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read');
+		$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read');
 	}
 
 	$h = 0;
@@ -276,10 +276,10 @@ 
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT .'/product/stock/productlot_note.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/product/stock/productlot_note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbNote . '</span>';
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 		}
 		$head[$h][2] = 'note';
 		$h++;

htdocs/core/lib/fourn.lib.php

Spacing +2 added lines, -2 removed lines

@@ -175,10 +175,10 @@
 			$dispachedLines = $object->getDispachedLines(1);
 			$nbDispachedLines = count($dispachedLines);
 
-			for ($line = 0 ; $line < $nbDispachedLines; $line++) {
+			for ($line = 0; $line < $nbDispachedLines; $line++) {
 				$sumQtyAllreadyDispatched = $sumQtyAllreadyDispatched + $dispachedLines[$line]['qty'];
 			}
-			for ($line = 0 ; $line < $nbLinesOrdered; $line++) {
+			for ($line = 0; $line < $nbLinesOrdered; $line++) {
 				//If line is a product of conf to manage stocks for services
 				if ($object->lines[$line]->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 					$sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty;

htdocs/core/actions_setmoduleoptions.inc.php

Spacing +6 added lines, -6 removed lines

@@ -78,19 +78,19 @@ 
 
 	$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
 	foreach ($listofdir as $key => $tmpdir) {
-		$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
+		$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
 		if (!$tmpdir) {
 			unset($listofdir[$key]);
 			continue;
 		}
-		$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
+		$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
 		if (!is_dir($tmpdir)) {
 			if (empty($nomessageinsetmoduleoptions)) {
 				setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
 			}
 		} else {
 			$upload_dir = $tmpdir;
-			break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
+			break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
 		}
 	}
 
@@ -130,19 +130,19 @@ 
 
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
-			$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
+			$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
 			if (!$tmpdir) {
 				unset($listofdir[$key]);
 				continue;
 			}
-			$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
+			$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
 			if (!is_dir($tmpdir)) {
 				if (empty($nomessageinsetmoduleoptions)) {
 					setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
 				}
 			} else {
 				$upload_dir = $tmpdir;
-				break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
+				break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
 			}
 		}
 

htdocs/core/class/cunits.class.php

Spacing +1 added lines, -1 removed lines

@@ -429,7 +429,7 @@
 		if ($mode == 'short_label') {
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid', 0, " AND unit_type = '".$this->db->escape($unit_type)."'");
 		} elseif ($mode == 'code') {
-			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, " AND unit_type = '". $this->db->escape($unit_type) ."'");
+			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, " AND unit_type = '".$this->db->escape($unit_type)."'");
 		}
 
 		return $code;

htdocs/core/modules/societe/mod_codecompta_digitaria.php

Spacing +4 added lines, -4 removed lines

@@ -295,11 +295,11 @@
 		}
 
 		if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-			$sql = "SELECT " . $typethirdparty . " FROM " . MAIN_DB_PREFIX . "societe_perentity";
-			$sql .= " WHERE " . $typethirdparty . " = '" . $db->escape($code) . "'";
+			$sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe_perentity";
+			$sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'";
 		} else {
-			$sql = "SELECT " . $typethirdparty . " FROM " . MAIN_DB_PREFIX . "societe";
-			$sql .= " WHERE " . $typethirdparty . " = '" . $db->escape($code) . "'";
+			$sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe";
+			$sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'";
 		}
 		$sql .= " AND entity IN (".getEntity('societe').")";