Dolibarr / dolibarr

htdocs/viewimage.php

Spacing +5 added lines, -5 removed lines

@@ -122,9 +122,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $action = GETPOST('action', 'aZ09');
-$original_file = GETPOST('file', 'alphanohtml'); 	// Do not use urldecode here ($_GET are already decoded by PHP).
-$hashp = GETPOST('hashp', 'aZ09', 1);				// Must be read only by GET
-$modulepart = GETPOST('modulepart', 'alpha', 1);	// Must be read only by GET
+$original_file = GETPOST('file', 'alphanohtml'); // Do not use urldecode here ($_GET are already decoded by PHP).
+$hashp = GETPOST('hashp', 'aZ09', 1); // Must be read only by GET
+$modulepart = GETPOST('modulepart', 'alpha', 1); // Must be read only by GET
 $urlsource = GETPOST('urlsource', 'alpha');
 $entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : $conf->entity);
 
@@ -158,7 +158,7 @@ 
 	if (empty($dolibarr_nocache)) {
 		header('Cache-Control: max-age=3600, public, must-revalidate');
 		header('Pragma: cache'); // This is to avoid to have Pragma: no-cache set by proxy or web server
-		header('Expires: '.gmdate('D, d M Y H:i:s', time() + 3600).' GMT');	// This is to avoid to have Expires set by proxy or web server
+		header('Expires: '.gmdate('D, d M Y H:i:s', time() + 3600).' GMT'); // This is to avoid to have Expires set by proxy or web server
 		//header('Expires: '.strtotime('+1 hour');
 	} else {
 		header('Cache-Control: no-cache');
@@ -215,7 +215,7 @@ 
 }
 
 // Security: Delete string ../ or ..\ into $original_file
-$original_file = preg_replace('/\.\.+/', '..', $original_file);	// Replace '... or more' with '..'
+$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..'
 $original_file = str_replace('../', '/', $original_file);
 $original_file = str_replace('..\\', '/', $original_file);
 

htdocs/public/emailing/mailing-unsubscribe.php

Spacing +5 added lines, -5 removed lines

@@ -45,11 +45,11 @@ 
 if (!defined("NOSESSION")) {
 	define("NOSESSION", '1');
 }
-if (! defined('NOREQUIREHTML')) {
-	define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
-if (! defined('NOREQUIREAJAX')) {
-	define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1'); // Do not load ajax.lib.php library
 }
 
 
@@ -63,7 +63,7 @@ 
 
 $mtid = GETPOST('mtid');
 $email = GETPOST('email');
-$tag = GETPOST('tag');	// To retreive the emailing, and recipient
+$tag = GETPOST('tag'); // To retreive the emailing, and recipient
 $unsuscrib = GETPOST('unsuscrib');
 $securitykey = GETPOST('securitykey');
 

htdocs/comm/mailing/cibles.php

Spacing +5 added lines, -5 removed lines

@@ -354,7 +354,7 @@ 
 			}
 		}
 		if (empty($nbemail)) {
-			$nbemail .= ' '.img_warning($langs->trans('ToAddRecipientsChooseHere'));//.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
+			$nbemail .= ' '.img_warning($langs->trans('ToAddRecipientsChooseHere')); //.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
 		}
 		if ($text) {
 			print $form->textwithpicto($nbemail, $text, 1, 'warning');
@@ -417,7 +417,7 @@ 
 		print '</div>';
 		print '</div>';
 		print '<div class="tagtd">&nbsp;</div>';
-		print '</div>';	// End tr
+		print '</div>'; // End tr
 
 		clearstatcache();
 
@@ -488,12 +488,12 @@ 
 					}
 					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle width25 size15x"');
 					print '</div>';
-					print '<div class="tagtd valignmiddle">';	//  style="height: 4em"
+					print '<div class="tagtd valignmiddle">'; //  style="height: 4em"
 					print $obj->getDesc();
 					print '</div>';
 
 					try {
-						$obj->evenunsubscribe = $object->evenunsubscribe;	// Set flag to include/exclude email that has opt-out.
+						$obj->evenunsubscribe = $object->evenunsubscribe; // Set flag to include/exclude email that has opt-out.
 
 						$nbofrecipient = $obj->getNbOfRecipients('');
 					} catch (Exception $e) {
@@ -546,7 +546,7 @@ 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
-		print '</div>';	// End table
+		print '</div>'; // End table
 		print '</div>';
 
 		print '<br>';

htdocs/debugbar/class/DebugBar.php

Spacing +4 added lines, -4 removed lines

@@ -75,10 +75,10 @@
 	public function getRenderer()
 	{
 		$renderer = parent::getJavascriptRenderer(DOL_URL_ROOT.'/includes/maximebf/debugbar/src/DebugBar/Resources');
-		$renderer->disableVendor('jquery');			// We already have jquery loaded globally by the main.inc.php
-		$renderer->disableVendor('fontawesome');	// We already have fontawesome loaded globally by the main.inc.php
-		$renderer->disableVendor('highlightjs');	// We don't need this
-		$renderer->setEnableJqueryNoConflict(false);	// We don't need no conflict
+		$renderer->disableVendor('jquery'); // We already have jquery loaded globally by the main.inc.php
+		$renderer->disableVendor('fontawesome'); // We already have fontawesome loaded globally by the main.inc.php
+		$renderer->disableVendor('highlightjs'); // We don't need this
+		$renderer->setEnableJqueryNoConflict(false); // We don't need no conflict
 
 		return $renderer;
 	}

htdocs/contact/document.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 }
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
 
-$permissiontoadd = $user->hasRight('societe', 'contact', 'creer');	// Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php
 
 
 /*

htdocs/contact/perso.php

Spacing +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
 		$maxfilesizearray = getMaxFileSizeArray();
 		$maxmin = $maxfilesizearray['maxmin'];
 		if ($maxmin > 0) {
-			print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+			print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 		}
 		print '<input type="file" class="flat" name="photo" id="photoinput">';
 		print '</td></tr>';

htdocs/product/inventory/class/inventory.class.php

Spacing +8 added lines, -8 removed lines

@@ -61,10 +61,10 @@ 
 	 */
 	public $picto = 'inventory';
 
-	const STATUS_DRAFT     = 0;		// Draft
-	const STATUS_VALIDATED = 1;		// Inventory is in process
-	const STATUS_RECORDED  = 2;		// Inventory is finisged. Stock movement has been recorded.
-	const STATUS_CANCELED  = 9;		// Canceled
+	const STATUS_DRAFT     = 0; // Draft
+	const STATUS_VALIDATED = 1; // Inventory is in process
+	const STATUS_RECORDED  = 2; // Inventory is finisged. Stock movement has been recorded.
+	const STATUS_CANCELED  = 9; // Canceled
 
 	/**
 	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -104,7 +104,7 @@ 
 		'fk_warehouse'       => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'InventoryForASpecificWarehouse', 'picto'=>'stock', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax150'),
 		'fk_product'         => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'get_name_url_params' => '0::0:-1:0::1', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'InventoryForASpecificProduct', 'picto'=>'product', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax150'),
 		'categories_product' => array('type'=>'chkbxlst:categorie:label:rowid::type=0:0:', 'label'=>'OrProductsWithCategories', 'visible'=>3, 'enabled'=>1, 'position'=>33, 'help'=>'', 'picto'=>'category', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx'),
-		'date_inventory'     => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>'$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position'=>35, 'csslist'=>'nowraponall'),	// This date is not used so disabled by default.
+		'date_inventory'     => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>'$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position'=>35, 'csslist'=>'nowraponall'), // This date is not used so disabled by default.
 		'date_creation'      => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500, 'csslist'=>'nowraponall'),
 		'tms'                => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501, 'csslist'=>'nowraponall'),
 		'date_validation'    => array('type'=>'datetime', 'label'=>'DateValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>502, 'csslist'=>'nowraponall'),
@@ -763,10 +763,10 @@ 
 	public function getChildWarehouse($id, &$TChildWarehouse)
 	{
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'entrepot';
-		$sql.= ' WHERE fk_parent='.(int) $id;
-		$sql.= ' ORDER BY rowid';
+		$sql .= ' WHERE fk_parent='.(int) $id;
+		$sql .= ' ORDER BY rowid';
 		$resql = $this->db->query($sql);
-		if ($resql && $this->db->num_rows($resql)>0) {
+		if ($resql && $this->db->num_rows($resql) > 0) {
 			while ($obj = $this->db->fetch_object($resql)) {
 				$TChildWarehouse[] = $obj->rowid;
 				$this->getChildWarehouse($obj->rowid, $TChildWarehouse);

htdocs/product/inventory/list.php

Spacing +5 added lines, -5 removed lines

@@ -73,7 +73,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($object->fields);					// Reset is required to avoid key() to return null.
+	reset($object->fields); // Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -285,7 +285,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck WHERE p.rowid = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}
@@ -374,7 +374,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -484,7 +484,7 @@ 
 	$categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -';
 	$moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300', 0, 0, '', 'category', $tmptitle);
 	$moreforfilter .= ' <input type="checkbox" class="valignmiddle" id="search_category_product_operator" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/>';
-	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories') . ' : ' . $tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_pro'); // Tooltip on click
+	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories').' : '.$tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_pro'); // Tooltip on click
 	$moreforfilter .= '</div>';
 }
 
@@ -596,7 +596,7 @@ 
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $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.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 		$totalarray['nbfield']++;

htdocs/product/class/api_products.class.php

Spacing +4 added lines, -4 removed lines

@@ -189,7 +189,7 @@ 
 
 		$sql = "SELECT t.rowid, t.ref, t.ref_ext";
 		$sql .= " FROM ".$this->db->prefix()."product as t";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields AS ef ON ef.fk_object = t.rowid"; // So we will be able to filter on extrafields
 		if ($category > 0) {
 			$sql .= ", ".$this->db->prefix()."categorie_product as c";
 		}
@@ -229,7 +229,7 @@ 
 		}
 
 		//this query will return total products with the filters given
-		$sqlTotals =  str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
+		$sqlTotals = str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
@@ -292,7 +292,7 @@ 
 			$obj_ret['pagination'] = array(
 				'total' => (int) $total,
 				'page' => $page, //count starts from 0
-				'page_count' => ceil((int) $total/$limit),
+				'page_count' => ceil((int) $total / $limit),
 				'limit' => $limit
 			);
 		}
@@ -1980,7 +1980,7 @@ 
 		unset($object->fk_bank);
 		unset($object->fk_account);
 
-		unset($object->supplierprices);	// Mut use another API to get them
+		unset($object->supplierprices); // Mut use another API to get them
 
 		if (empty(DolibarrApiAccess::$user->rights->stock->lire)) {
 			unset($object->stock_reel);