Dolibarr / dolibarr

htdocs/webportal/controllers/membercard.controller.class.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  * \brief       This file is a controller for member card
  */
 
-require_once DOL_DOCUMENT_ROOT . '/webportal/class/html.formcardwebportal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webportal/class/html.formcardwebportal.class.php';
 
 /**
  * Class for MemberCardController

htdocs/webportal/controllers/default.controller.class.php

Indentation +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@
  */
 
  /**
- * \file        htdocs/webportal/controllers/default.controller.class.php
- * \ingroup     webportal
- * \brief       This file is a controller for default
- */
+  * \file        htdocs/webportal/controllers/default.controller.class.php
+  * \ingroup     webportal
+  * \brief       This file is a controller for default
+  */
 
 /**
  * Class for DefaultController

htdocs/webportal/controllers/propallist.controller.class.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  * \brief       This file is a controller for propal list
  */
 
-require_once DOL_DOCUMENT_ROOT . '/webportal/class/html.formlistwebportal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webportal/class/html.formlistwebportal.class.php';
 
 /**
  * Class for PropalListController

htdocs/webportal/controllers/login.controller.class.php

Indentation +6 added lines, -6 removed lines

@@ -17,13 +17,13 @@
  */
 
  /**
- * \file        htdocs/webportal/controllers/login.controller.class.php
- * \ingroup     webportal
- * \brief       This file is a controller for login
- */
+  * \file        htdocs/webportal/controllers/login.controller.class.php
+  * \ingroup     webportal
+  * \brief       This file is a controller for login
+  */
 /**
- * Class for LoginController
- */
+  * Class for LoginController
+  */
 class LoginController extends Controller
 {
 	/**

htdocs/webportal/controllers/partnershipcard.controller.class.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  * \brief       This file is a controller for partnership card
  */
 
-require_once DOL_DOCUMENT_ROOT . '/webportal/class/html.formcardwebportal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webportal/class/html.formcardwebportal.class.php';
 
 /**
  * Class for PartnershipCardController

htdocs/webportal/controllers/orderlist.controller.class.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  * \brief       This file is a controller for order list
  */
 
-require_once DOL_DOCUMENT_ROOT . '/webportal/class/html.formlistwebportal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webportal/class/html.formlistwebportal.class.php';
 
 /**
  * Class for OrderListController

htdocs/webportal/class/html.formlistwebportal.class.php

Spacing +76 added lines, -76 removed lines

@@ -26,9 +26,9 @@ 
  * \brief      File of class with all html predefined components for WebPortal
  */
 
-require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/webportal/class/html.formwebportal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webportal/class/html.formwebportal.class.php';
 
 /**
  *    Class to manage generation of HTML components
@@ -135,10 +135,10 @@ 
 		}
 
 		// load module libraries
-		dol_include_once('/webportal/class/webportal' . $elementEn . '.class.php');
+		dol_include_once('/webportal/class/webportal'.$elementEn.'.class.php');
 
 		// Initialize technical objects
-		$objectclass = 'WebPortal' . ucfirst($elementEn);
+		$objectclass = 'WebPortal'.ucfirst($elementEn);
 		$object = new $objectclass($this->db);
 
 		// set form list
@@ -148,18 +148,18 @@ 
 		$this->sortfield = GETPOST('sortfield', 'aZ09comma');
 		$this->sortorder = GETPOST('sortorder', 'aZ09comma');
 		$this->page = GETPOSTISSET('page') ? GETPOSTINT('page') : 1;
-		$this->titleKey = $objectclass . 'ListTitle';
+		$this->titleKey = $objectclass.'ListTitle';
 
 		// Initialize array of search criteria
 		//$search_all = GETPOST('search_all', 'alphanohtml');
 		$search = array();
 		foreach ($object->fields as $key => $val) {
-			if (GETPOST('search_' . $key, 'alpha') !== '') {
-				$search[$key] = GETPOST('search_' . $key, 'alpha');
+			if (GETPOST('search_'.$key, 'alpha') !== '') {
+				$search[$key] = GETPOST('search_'.$key, 'alpha');
 			}
 			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-				$postDateStart = GETPOST('search_' . $key . '_dtstart', 'alphanohtml');
-				$postDateEnd = GETPOST('search_' . $key . '_dtend', 'alphanohtml');
+				$postDateStart = GETPOST('search_'.$key.'_dtstart', 'alphanohtml');
+				$postDateEnd = GETPOST('search_'.$key.'_dtend', 'alphanohtml');
 				// extract date YYYY-MM-DD for year, month and day
 				$dateStartArr = explode('-', $postDateStart);
 				$dateEndArr = explode('-', $postDateEnd);
@@ -167,13 +167,13 @@ 
 					$dateStartYear = (int) $dateStartArr[0];
 					$dateStartMonth = (int) $dateStartArr[1];
 					$dateStartDay = (int) $dateStartArr[2];
-					$search[$key . '_dtstart'] = dol_mktime(0, 0, 0, $dateStartMonth, $dateStartDay, $dateStartYear);
+					$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, $dateStartMonth, $dateStartDay, $dateStartYear);
 				}
 				if (count($dateEndArr) == 3) {
 					$dateEndYear = (int) $dateEndArr[0];
 					$dateEndMonth = (int) $dateEndArr[1];
 					$dateEndDay = (int) $dateEndArr[2];
-					$search[$key . '_dtend'] = dol_mktime(23, 59, 59, $dateEndMonth, $dateEndDay, $dateEndYear);
+					$search[$key.'_dtend'] = dol_mktime(23, 59, 59, $dateEndMonth, $dateEndDay, $dateEndYear);
 				}
 			}
 		}
@@ -188,7 +188,7 @@ 
 			// If $val['visible']==0, then we never show the field
 			if (!empty($val['visible'])) {
 				$visible = (int) dol_eval($val['visible'], 1);
-				$arrayfields['t.' . $key] = array(
+				$arrayfields['t.'.$key] = array(
 					'label' => $val['label'],
 					'checked' => (($visible < 0) ? 0 : 1),
 					'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
@@ -224,8 +224,8 @@ 
 			foreach ($object->fields as $key => $val) {
 				$search[$key] = '';
 				if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-					$search[$key . '_dtstart'] = '';
-					$search[$key . '_dtend'] = '';
+					$search[$key.'_dtstart'] = '';
+					$search[$key.'_dtend'] = '';
 				}
 			}
 			$this->search = $search;
@@ -280,7 +280,7 @@ 
 		$offset = $limit * ($page - 1);
 		if (!$sortfield) {
 			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.
+			$sortfield = 't.'.key($object->fields); // Set here default search field. By default 1st field in definition.
 		}
 		if (!$sortorder) {
 			$sortorder = 'DESC';
@@ -299,18 +299,18 @@ 
 
 		$sqlfields = $sql; // $sql fields to remove for count total
 
-		$sql .= " FROM " . $this->db->prefix() . $object->table_element . " as t";
+		$sql .= " FROM ".$this->db->prefix().$object->table_element." as t";
 		// Add table from hooks
-		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		$sql .= $hookmanager->resPrint;
 		if ($object->ismultientitymanaged == 1) {
-			$sql .= " WHERE t.entity IN (" . getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)) . ")";
+			$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")";
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
 		// filter on logged third-party
-		$sql .= " AND t.fk_soc = " . (int) $context->logged_thirdparty->id;
+		$sql .= " AND t.fk_soc = ".(int) $context->logged_thirdparty->id;
 		foreach ($search as $key => $val) {
 			if (array_key_exists($key, $object->fields)) {
 				if (($key == 'status' || $key == 'fk_statut') && $search[$key] == $emptyValueKey) {
@@ -324,17 +324,17 @@ 
 					$mode_search = 2;
 				}
 				if ($search[$key] != '') {
-					$sql .= natural_search("t." . $this->db->escape($key), $search[$key], (($key == 'status' || $key == 'fk_statut') ? ($search[$key] < 0 ? 1 : 2) : $mode_search));
+					$sql .= natural_search("t.".$this->db->escape($key), $search[$key], (($key == 'status' || $key == 'fk_statut') ? ($search[$key] < 0 ? 1 : 2) : $mode_search));
 				}
 			} else {
 				if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
 					$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
 					if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 						if (preg_match('/_dtstart$/', $key)) {
-							$sql .= " AND t." . $this->db->escape($columnName) . " >= '" . $this->db->idate($search[$key]) . "'";
+							$sql .= " AND t.".$this->db->escape($columnName)." >= '".$this->db->idate($search[$key])."'";
 						}
 						if (preg_match('/_dtend$/', $key)) {
-							$sql .= " AND t." . $this->db->escape($columnName) . " <= '" . $this->db->idate($search[$key]) . "'";
+							$sql .= " AND t.".$this->db->escape($columnName)." <= '".$this->db->idate($search[$key])."'";
 						}
 					}
 				}
@@ -344,7 +344,7 @@ 
 		//    $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 		//}
 		// Add where from hooks
-		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		$sql .= $hookmanager->resPrint;
 
@@ -352,7 +352,7 @@ 
 		$nbtotalofrecords = 0;
 		if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 			/* The fast and low memory method to get and count full list converts the sql into a sql count */
-			$sqlforcount = preg_replace('/^' . preg_quote($sqlfields, '/') . '/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+			$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
 			$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
 			$resql = $this->db->query($sqlforcount);
 			if ($resql) {
@@ -405,52 +405,52 @@ 
 		}
 
 		$param = '';
-		$param .= '&contextpage=' . urlencode($contextpage);
-		$param .= '&limit=' . $limit;
+		$param .= '&contextpage='.urlencode($contextpage);
+		$param .= '&limit='.$limit;
 		foreach ($search as $key => $val) {
 			if (is_array($search[$key])) {
 				foreach ($search[$key] as $skey) {
 					if ($skey != '') {
-						$param .= '&search_' . $key . '[]=' . urlencode($skey);
+						$param .= '&search_'.$key.'[]='.urlencode($skey);
 					}
 				}
 			} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-				$param .= '&search_' . $key . 'month=' . (GETPOSTINT('search_' . $key . 'month'));
-				$param .= '&search_' . $key . 'day=' . (GETPOSTINT('search_' . $key . 'day'));
-				$param .= '&search_' . $key . 'year=' . (GETPOSTINT('search_' . $key . 'year'));
+				$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+				$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+				$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 			} elseif ($search[$key] != '') {
-				$param .= '&search_' . $key . '=' . urlencode($search[$key]);
+				$param .= '&search_'.$key.'='.urlencode($search[$key]);
 			}
 		}
 		// Add $param from hooks
-		$parameters = array();  // @phan-suppress-current-line PhanPluginRedundantAssignment
+		$parameters = array(); // @phan-suppress-current-line PhanPluginRedundantAssignment
 		$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		$param .= $hookmanager->resPrint;
 
 		$url_file = $context->getControllerUrl($context->controller);
-		$html .= '<form method="POST" id="searchFormList" action="' . $url_file . '">' . "\n";
+		$html .= '<form method="POST" id="searchFormList" action="'.$url_file.'">'."\n";
 		$html .= $context->getFormToken();
 		$html .= '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 		$html .= '<input type="hidden" name="action" value="list">';
-		$html .= '<input type="hidden" name="sortfield" value="' . $sortfield . '">';
-		$html .= '<input type="hidden" name="sortorder" value="' . $sortorder . '">';
-		$html .= '<input type="hidden" name="page" value="' . $page . '">';
-		$html .= '<input type="hidden" name="contextpage" value="' . $contextpage . '">';
+		$html .= '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+		$html .= '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+		$html .= '<input type="hidden" name="page" value="'.$page.'">';
+		$html .= '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 		// pagination
-		$pagination_param = $param . '&sortfield=' . $sortfield . '&sortorder=' . $sortorder;
-		$html .= '<nav id="webportal-' . $elementEn . '-pagination">';
+		$pagination_param = $param.'&sortfield='.$sortfield.'&sortorder='.$sortorder;
+		$html .= '<nav id="webportal-'.$elementEn.'-pagination">';
 		$html .= '<ul>';
-		$html .= '<li><strong>' . $langs->trans($titleKey) . '</strong> (' . $nbtotalofrecords . ')</li>';
+		$html .= '<li><strong>'.$langs->trans($titleKey).'</strong> ('.$nbtotalofrecords.')</li>';
 		$html .= '</ul>';
 
 		/* Generate pagination list */
-		$html .= static::generatePageListNav($url_file . $pagination_param, $nbpages, $page);
+		$html .= static::generatePageListNav($url_file.$pagination_param, $nbpages, $page);
 
 		$html .= '</nav>';
 
 		// table with search filters and column titles
-		$html .= '<table id="webportal-' . $elementEn . '-list" responsive="scroll" role="grid">';
+		$html .= '<table id="webportal-'.$elementEn.'-list" responsive="scroll" role="grid">';
 		// title and desc for table
 		//if ($titleKey != '') {
 		//    $html .= '<caption id="table-collapse-responsive">';
@@ -474,22 +474,22 @@ 
 		$html .= '</td>';
 		// }
 		foreach ($object->fields as $key => $val) {
-			if (!empty($arrayfields['t.' . $key]['checked'])) {
-				$html .= '<td data-label="' . $arrayfields['t.' . $key]['label'] . '" data-col="'.dol_escape_htmltag($key).'" >';
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
+				$html .= '<td data-label="'.$arrayfields['t.'.$key]['label'].'" data-col="'.dol_escape_htmltag($key).'" >';
 				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-					$html .= $this->form->selectarray('search_' . $key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', '');
+					$html .= $this->form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', '');
 				} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-					$postDateStart = GETPOST('search_' . $key . '_dtstart', 'alphanohtml');
-					$postDateEnd = GETPOST('search_' . $key . '_dtend', 'alphanohtml');
+					$postDateStart = GETPOST('search_'.$key.'_dtstart', 'alphanohtml');
+					$postDateEnd = GETPOST('search_'.$key.'_dtend', 'alphanohtml');
 
 					$html .= '<div class="grid">';
-					$html .= $this->form->inputDate('search_' . $key . '_dtstart', $postDateStart ? $postDateStart : '', $langs->trans('From'));
+					$html .= $this->form->inputDate('search_'.$key.'_dtstart', $postDateStart ? $postDateStart : '', $langs->trans('From'));
 					$html .= '</div>';
 					$html .= '<div class="grid">';
-					$html .= $this->form->inputDate('search_' . $key . '_dtend', $postDateEnd ? $postDateEnd : '', $langs->trans('to'));
+					$html .= $this->form->inputDate('search_'.$key.'_dtend', $postDateEnd ? $postDateEnd : '', $langs->trans('to'));
 					$html .= '</div>';
 				} else {
-					$html .= '<input type="text" name="search_' . $key . '" value="' . dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '') . '">';
+					$html .= '<input type="text" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 				}
 				$html .= '</td>';
 			}
@@ -500,12 +500,12 @@ 
 		$html .= $hookmanager->resPrint;
 		// Remain to pay
 		if (!empty($arrayfields['remain_to_pay']['checked'])) {
-			$html .= '<td data-label="' . $arrayfields['remain_to_pay']['label'] . '">';
+			$html .= '<td data-label="'.$arrayfields['remain_to_pay']['label'].'">';
 			$html .= '</td>';
 		}
 		// Download link
 		if (!empty($arrayfields['download_link']['checked'])) {
-			$html .= '<td data-label="' . $arrayfields['download_link']['label'] . '">';
+			$html .= '<td data-label="'.$arrayfields['download_link']['label'].'">';
 			$html .= '</td>';
 		}
 		$html .= '</tr>';
@@ -523,16 +523,16 @@ 
 		$totalarray['nbfield']++;
 		// }
 		foreach ($object->fields as $key => $val) {
-			$tableKey = 't.' . $key;
+			$tableKey = 't.'.$key;
 			if (!empty($arrayfields[$tableKey]['checked'])) {
 				$tableOrder = '';
 				if (array_key_exists($tableKey, $sortList)) {
 					$tableOrder = strtolower($sortList[$tableKey]);
 				}
-				$url_param = $url_file . '&sortfield=' . $tableKey . '&sortorder=' . ($tableOrder == 'desc' ? 'asc' : 'desc') . $param;
-				$html .= '<th data-col="'.dol_escape_htmltag($key).'"  scope="col"' . ($tableOrder != '' ? ' table-order="' . $tableOrder . '"' : '') . '>';
-				$html .= '<a href="' . $url_param . '">';
-				$html .= $langs->trans($arrayfields['t.' . $key]['label']);
+				$url_param = $url_file.'&sortfield='.$tableKey.'&sortorder='.($tableOrder == 'desc' ? 'asc' : 'desc').$param;
+				$html .= '<th data-col="'.dol_escape_htmltag($key).'"  scope="col"'.($tableOrder != '' ? ' table-order="'.$tableOrder.'"' : '').'>';
+				$html .= '<a href="'.$url_param.'">';
+				$html .= $langs->trans($arrayfields['t.'.$key]['label']);
 				$html .= '</a>';
 				$html .= '</th>';
 				$totalarray['nbfield']++;
@@ -601,13 +601,13 @@ 
 					$remaintopay = 0;
 				}
 				if ($object->type == Facture::TYPE_CREDIT_NOTE && $obj->paye == 1 && $discount) {
-					$remaincreditnote = $discount->getAvailableDiscounts($companyStatic, '', 'rc.fk_facture_source=' . $object->id);
+					$remaincreditnote = $discount->getAvailableDiscounts($companyStatic, '', 'rc.fk_facture_source='.$object->id);
 					$remaintopay = -$remaincreditnote;
 				}
 			}
 
 			// Show line of result
-			$html .= '<tr data-rowid="' . $object->id . '">';
+			$html .= '<tr data-rowid="'.$object->id.'">';
 			// if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			$html .= '<td class="nowraponall">';
 			$html .= '</td>';
@@ -616,8 +616,8 @@ 
 			}
 			// }
 			foreach ($object->fields as $key => $val) {
-				if (!empty($arrayfields['t.' . $key]['checked'])) {
-					$html .= '<td class="nowraponall" data-label="' . $arrayfields['t.' . $key]['label'] . '">';
+				if (!empty($arrayfields['t.'.$key]['checked'])) {
+					$html .= '<td class="nowraponall" data-label="'.$arrayfields['t.'.$key]['label'].'">';
 					if ($key == 'status' || $key == 'fk_statut') {
 						if ($elementEn == 'invoice') {
 							// specific to get invoice status (depends on payment)
@@ -638,21 +638,21 @@ 
 					}
 					if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 						if (!$i) {
-							$totalarray['pos'][$totalarray['nbfield']] = 't.' . $key;
+							$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 						}
 						if (!isset($totalarray['val'])) {
 							$totalarray['val'] = array();
 						}
-						if (!isset($totalarray['val']['t.' . $key])) {
-							$totalarray['val']['t.' . $key] = 0;
+						if (!isset($totalarray['val']['t.'.$key])) {
+							$totalarray['val']['t.'.$key] = 0;
 						}
-						$totalarray['val']['t.' . $key] += $object->$key;
+						$totalarray['val']['t.'.$key] += $object->$key;
 					}
 				}
 			}
 			// Remain to pay
 			if (!empty($arrayfields['remain_to_pay']['checked'])) {
-				$html .= '<td class="nowraponall" data-label="' . $arrayfields['remain_to_pay']['label'] . '">';
+				$html .= '<td class="nowraponall" data-label="'.$arrayfields['remain_to_pay']['label'].'">';
 				$html .= $this->form->showOutputFieldForObject($object, $arrayfields['remain_to_pay'], 'remain_to_pay', $remaintopay, '');
 				//$html .= price($remaintopay);
 				$html .= '</td>';
@@ -663,9 +663,9 @@ 
 			// Download link
 			if (!empty($arrayfields['download_link']['checked'])) {
 				$element = $object->element;
-				$html .= '<td class="nowraponall" data-label="' . $arrayfields['download_link']['label'] . '">';
+				$html .= '<td class="nowraponall" data-label="'.$arrayfields['download_link']['label'].'">';
 				$filename = dol_sanitizeFileName($obj->ref);
-				$filedir = $conf->{$element}->multidir_output[$obj->element_entity] . '/' . dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->{$element}->multidir_output[$obj->element_entity].'/'.dol_sanitizeFileName($obj->ref);
 				$html .= $this->form->getDocumentsLink($element, $filename, $filedir);
 				$html .= '</td>';
 				if (!$i) {
@@ -702,7 +702,7 @@ 
 					$html .= '</td>';
 				} else {
 					if ($i == 1) {
-						$html .= '<td>' . $langs->trans("Total") . '</td>';
+						$html .= '<td>'.$langs->trans("Total").'</td>';
 					} else {
 						$html .= '<td></td>';
 					}
@@ -719,7 +719,7 @@ 
 					$colspan++;
 				}
 			}
-			$html .= '<tr><td colspan="' . $colspan . '"><span class="opacitymedium">' . $langs->trans("NoRecordFound") . '</span></td></tr>';
+			$html .= '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 		}
 
 		$html .= '</tbody>';
@@ -754,7 +754,7 @@ 
 		$html = '<ul class="pages-nav-list">';
 
 		if ($currentPage > 1) {
-			$html .= '<li><a class="pages-nav-list__icon --prev" aria-label="' . dol_escape_htmltag($langs->trans('AriaPrevPage')) . '" href="' . $url . $pSep . 'page=' . ($currentPage - 1) . '" ' . ($currentPage <= 1 ? ' disabled' : '') . '></a></li>';
+			$html .= '<li><a class="pages-nav-list__icon --prev" aria-label="'.dol_escape_htmltag($langs->trans('AriaPrevPage')).'" href="'.$url.$pSep.'page='.($currentPage - 1).'" '.($currentPage <= 1 ? ' disabled' : '').'></a></li>';
 		}
 
 		$maxPaginItem = min($nbPages, 5);
@@ -762,21 +762,21 @@ 
 		$maxPageNum = min($nbPages, $currentPage + 3);
 
 		if ($minPageNum > 1) {
-			$html .= '<li><a class="pages-nav-list__link ' . ($currentPage == 1 ? '--active' : '') . '" aria-label="' . dol_escape_htmltag($langs->trans('AriaPageX', 1)) . '" href="' . $url . $pSep . 'page=1" >1</a></li>';
+			$html .= '<li><a class="pages-nav-list__link '.($currentPage == 1 ? '--active' : '').'" aria-label="'.dol_escape_htmltag($langs->trans('AriaPageX', 1)).'" href="'.$url.$pSep.'page=1" >1</a></li>';
 			$html .= '<li>&hellip;</li>';
 		}
 
 		for ($p = $minPageNum; $p <= $maxPageNum; $p++) {
-			$html .= '<li><a class="pages-nav-list__link ' . ($currentPage === $p ? '--active' : '') . '" aria-label="' . dol_escape_htmltag($langs->trans('AriaPageX', $p)) . '"  href="' . $url . $pSep . 'page=' . $p . '">' . $p . '</a></li>';
+			$html .= '<li><a class="pages-nav-list__link '.($currentPage === $p ? '--active' : '').'" aria-label="'.dol_escape_htmltag($langs->trans('AriaPageX', $p)).'"  href="'.$url.$pSep.'page='.$p.'">'.$p.'</a></li>';
 		}
 
 		if ($maxPaginItem < $nbPages) {
 			$html .= '<li>&hellip;</li>';
-			$html .= '<li><a class="pages-nav-list__link ' . ($currentPage == $nbPages ? '--active' : '') . '" aria-label="' . dol_escape_htmltag($langs->trans('AriaPageX', $nbPages)) . '" href="' . $url . $pSep . 'page=' . $nbPages . '">' . $nbPages . '</a></li>';
+			$html .= '<li><a class="pages-nav-list__link '.($currentPage == $nbPages ? '--active' : '').'" aria-label="'.dol_escape_htmltag($langs->trans('AriaPageX', $nbPages)).'" href="'.$url.$pSep.'page='.$nbPages.'">'.$nbPages.'</a></li>';
 		}
 
 		if ($currentPage < $nbPages) {
-			$html .= '<li><a class="pages-nav-list__icon --next" aria-label="' . dol_escape_htmltag($langs->trans('AriaNextPage')) . '" href="' . $url . $pSep . 'page=' . ($currentPage + 1) . '" ' . ($currentPage >= $nbPages ? ' disabled' : '') . '></a></li>';
+			$html .= '<li><a class="pages-nav-list__icon --next" aria-label="'.dol_escape_htmltag($langs->trans('AriaNextPage')).'" href="'.$url.$pSep.'page='.($currentPage + 1).'" '.($currentPage >= $nbPages ? ' disabled' : '').'></a></li>';
 		}
 
 		$html .= '</ul>';

htdocs/webportal/class/html.formcardwebportal.class.php

Spacing +42 added lines, -42 removed lines

@@ -25,7 +25,7 @@ 
  * \brief      File of class with all html predefined components for WebPortal
  */
 
-require_once DOL_DOCUMENT_ROOT . '/webportal/class/html.formwebportal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webportal/class/html.formwebportal.class.php';
 
 /**
  *    Class to manage generation of HTML components
@@ -152,15 +152,15 @@ 
 		global $hookmanager, $langs;
 
 		$elementEnUpper = strtoupper($elementEn);
-		$objectclass = 'WebPortal' . ucfirst($elementEn);
+		$objectclass = 'WebPortal'.ucfirst($elementEn);
 
-		$elementCardAccess = getDolGlobalString('WEBPORTAL_' . $elementEnUpper . '_CARD_ACCESS', 'hidden');
+		$elementCardAccess = getDolGlobalString('WEBPORTAL_'.$elementEnUpper.'_CARD_ACCESS', 'hidden');
 		if ($elementCardAccess == 'hidden' || $id <= 0) {
 			accessforbidden();
 		}
 
 		// load module libraries
-		dol_include_once('/webportal/class/webportal' . $elementEn . '.class.php');
+		dol_include_once('/webportal/class/webportal'.$elementEn.'.class.php');
 
 		// Load translation files required by the page
 		$langs->loadLangs(array('website', 'other'));
@@ -171,15 +171,15 @@ 
 		$action = GETPOST('action', 'aZ09');
 		$confirm = GETPOST('confirm', 'alpha');
 		$cancel = GETPOST('cancel', 'aZ09');
-		$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'webportal' . $elementEn . 'card'; // To manage different context of search
-		$backtopage = GETPOST('backtopage', 'alpha');                    // if not set, a default page will be used
-		$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');    // if not set, $backtopage will be used
+		$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'webportal'.$elementEn.'card'; // To manage different context of search
+		$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used
+		$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used
 		$backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
 
 		// Initialize technical objects
 		$object = new $objectclass($this->db);
 		//$extrafields = new ExtraFields($db);
-		$hookmanager->initHooks(array('webportal' . $elementEn . 'card', 'globalcard')); // Note that conf->hooks_modules contains array
+		$hookmanager->initHooks(array('webportal'.$elementEn.'card', 'globalcard')); // Note that conf->hooks_modules contains array
 
 		// Fetch optionals attributes and labels
 		//$extrafields->fetch_name_optionals_label($object->table_element);
@@ -190,7 +190,7 @@ 
 		}
 
 		// Load object
-		include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+		include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 		// Security check (enable the most restrictive one)
 		if (!isModEnabled('webportal')) {
@@ -214,7 +214,7 @@ 
 		$this->permissiontodelete = $permissiontodelete;
 		$this->permissionnote = $permissionnote;
 		$this->permissiondellink = $permissiondellink;
-		$this->titleKey = $objectclass . 'CardTitle';
+		$this->titleKey = $objectclass.'CardTitle';
 		$this->ref = $ref;
 	}
 
@@ -247,17 +247,17 @@ 
 
 		if (empty($backtopage) || ($cancel && empty($id))) {
 			if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
-				$backtopage = $context->getControllerUrl($elementEn . 'card');
+				$backtopage = $context->getControllerUrl($elementEn.'card');
 			}
 		}
 
 		// Action to cancel record
 		if ($cancel) {
 			if (!empty($backtopageforcancel)) {
-				header("Location: " . $backtopageforcancel);
+				header("Location: ".$backtopageforcancel);
 				exit;
 			} elseif (!empty($backtopage)) {
-				header("Location: " . $backtopage);
+				header("Location: ".$backtopage);
 				exit;
 			}
 			$action = '';
@@ -268,7 +268,7 @@ 
 			foreach ($object->fields as $key => $val) {
 				// Check if field was submitted to be edited
 				if ($object->fields[$key]['type'] == 'duration') {
-					if (!GETPOSTISSET($key . 'hour') || !GETPOSTISSET($key . 'min')) {
+					if (!GETPOSTISSET($key.'hour') || !GETPOSTISSET($key.'min')) {
 						continue; // The field was not submitted to be saved
 					}
 				} elseif ($object->fields[$key]['type'] == 'boolean') {
@@ -319,7 +319,7 @@ 
 						$dateDay = (int) $dateArr[2];
 					}
 					// extract time HH:ii:ss for hours, minutes and seconds
-					$postTime = GETPOST($key . '_time', 'alphanohtml');
+					$postTime = GETPOST($key.'_time', 'alphanohtml');
 					$timeArr = explode(':', $postTime);
 					$timeHours = 12;
 					$timeMinutes = 0;
@@ -337,8 +337,8 @@ 
 					}
 					$value = dol_mktime($timeHours, $timeMinutes, $timeSeconds, $dateMonth, $dateDay, $dateYear);
 				} elseif ($object->fields[$key]['type'] == 'duration') {
-					if (GETPOSTINT($key . 'hour') != '' || GETPOSTINT($key . 'min') != '') {
-						$value = 60 * 60 * GETPOSTINT($key . 'hour') + 60 * GETPOSTINT($key . 'min');
+					if (GETPOSTINT($key.'hour') != '' || GETPOSTINT($key.'min') != '') {
+						$value = 60 * 60 * GETPOSTINT($key.'hour') + 60 * GETPOSTINT($key.'min');
 					} else {
 						$value = '';
 					}
@@ -407,7 +407,7 @@ 
 					$urltogo = $backtopage ? str_replace('__ID__', $result, $backtopage) : $backurlforlist;
 					$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', (string) $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
 					if ($urltogo && empty($noback)) {
-						header("Location: " . $urltogo);
+						header("Location: ".$urltogo);
 						exit;
 					}
 				} else {
@@ -466,7 +466,7 @@ 
 		// main information - begin
 		$html .= '<div class="header-card-main-information">';
 		// ref
-		$html .= '<div><strong>' . $object->ref . '</strong></div>';
+		$html .= '<div><strong>'.$object->ref.'</strong></div>';
 		// full name
 		$fullname = '';
 		if (method_exists($object, 'getFullName')) {
@@ -476,11 +476,11 @@ 
 		if ($object->element == 'member') {
 			if ($object->morphy == 'mor' && !empty($object->societe)) {
 				$html .= dol_htmlentities($object->societe);
-				$html .= (!empty($fullname) && $object->societe != $fullname) ? ' (' . dol_htmlentities($fullname) . $addgendertxt . ')' : '';
+				$html .= (!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).$addgendertxt.')' : '';
 			} else {
-				$html .= dol_htmlentities($fullname) . $addgendertxt;
+				$html .= dol_htmlentities($fullname).$addgendertxt;
 				if (empty($object->fk_soc)) {
-					$html .= (!empty($object->societe) && $object->societe != $fullname) ? ' (' . dol_htmlentities($object->societe) . ')' : '';
+					$html .= (!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '';
 				}
 			}
 		} else {
@@ -570,23 +570,23 @@ 
 
 			$value = $object->$key;
 
-			$html .= '<div class="grid field_' . $key . '">';
+			$html .= '<div class="grid field_'.$key.'">';
 
-			$html .= '<div class="' . (empty($val['tdcss']) ? '' : $val['tdcss']) . ' fieldname_' . $key;
+			$html .= '<div class="'.(empty($val['tdcss']) ? '' : $val['tdcss']).' fieldname_'.$key;
 			$html .= '">';
 			$labeltoshow = '';
-			$labeltoshow .= '<strong>' . $langs->trans($val['label']) . '</strong>';
+			$labeltoshow .= '<strong>'.$langs->trans($val['label']).'</strong>';
 			$html .= $labeltoshow;
 			$html .= '</div>';
 
-			$html .= '<div class="valuefield fieldname_' . $key;
+			$html .= '<div class="valuefield fieldname_'.$key;
 			if (!empty($val['cssview'])) {
-				$html .= ' ' . $val['cssview'];
+				$html .= ' '.$val['cssview'];
 			}
 			$html .= '">';
 			if ($key == 'lang') {
 				$langs->load('languages');
-				$labellang = ($value ? $langs->trans('Language_' . $value) : '');
+				$labellang = ($value ? $langs->trans('Language_'.$value) : '');
 				//$html .= picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
 				$html .= $labellang;
 			} else {
@@ -646,7 +646,7 @@ 
 				continue; // We don't want this field
 			}
 
-			$html .= '<div class="grid field_' . $key . '">';
+			$html .= '<div class="grid field_'.$key.'">';
 			$html .= '<div class="titlefieldcreate';
 			if (isset($val['notnull']) && $val['notnull'] > 0) {
 				$html .= ' required';
@@ -678,15 +678,15 @@ 
 				$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $object->$key;
 			} elseif (in_array($val['type'], array('date', 'datetime'))) {
 				$isPostDate = GETPOSTISSET($key);
-				$isPostTime = GETPOSTISSET($key . '_time');
+				$isPostTime = GETPOSTISSET($key.'_time');
 				if ($isPostDate) {
 					$postDate = GETPOST($key, 'alphanohtml');
 					if ($isPostTime) {
-						$postTime = GETPOST($key . '_time', 'alphanohtml') . ':00';
+						$postTime = GETPOST($key.'_time', 'alphanohtml').':00';
 					} else {
 						$postTime = '00:00:00';
 					}
-					$valueDateTimeStr = $postDate . ' ' . $postTime;
+					$valueDateTimeStr = $postDate.' '.$postTime;
 				} else {
 					// format date timestamp to YYYY-MM-DD HH:ii:ss
 					$valueDateTimeStr = dol_print_date($object->$key, '%Y-%m-%d %H:%M:%S');
@@ -758,19 +758,19 @@ 
 			$html .= '<article>';
 			//$html .= load_fiche_titre($title, '', 'object_'.$object->picto);
 			$html .= '<header>';
-			$html .= '<h2>' . $title . '</h2>';
+			$html .= '<h2>'.$title.'</h2>';
 			$html .= '</header>';
 
 			$url_file = $context->getControllerUrl($context->controller, '', false);
-			$html .= '<form method="POST" action="' . $url_file . '">';
+			$html .= '<form method="POST" action="'.$url_file.'">';
 			$html .= $context->getFormToken();
 			$html .= '<input type="hidden" name="action" value="update">';
-			$html .= '<input type="hidden" name="id" value="' . $object->id . '">';
+			$html .= '<input type="hidden" name="id" value="'.$object->id.'">';
 			if ($backtopage) {
-				$html .= '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+				$html .= '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 			}
 			if ($backtopageforcancel) {
-				$html .= '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+				$html .= '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 			}
 
 			//$html .= '<table>'."\n";
@@ -784,8 +784,8 @@ 
 
 			// Save and Cancel buttons
 			$html .= '<div class="grid">';
-			$html .= '<div><input type="submit" name="save" role="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '" /></div>';
-			$html .= '<div><input type="submit" name="cancel" role="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '" /></div>';
+			$html .= '<div><input type="submit" name="save" role="button" value="'.dol_escape_htmltag($langs->trans('Save')).'" /></div>';
+			$html .= '<div><input type="submit" name="cancel" role="button" value="'.dol_escape_htmltag($langs->trans('Cancel')).'" /></div>';
 			$html .= '</div>';
 
 			$html .= '</form>';
@@ -826,7 +826,7 @@ 
 
 			// Buttons for actions
 			if ($action != 'presend' && $action != 'editline') {
-				$html .= '<div>' . "\n";
+				$html .= '<div>'."\n";
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 				if ($reshook < 0) {
@@ -836,10 +836,10 @@ 
 				if (empty($reshook)) {
 					if ($permissiontoadd) {
 						$url_file = $context->getControllerUrl($context->controller, '', false);
-						$html .= '<a href="' . $url_file . '&id=' . $object->id . '&action=edit" role="button">' . $langs->trans('Modify') . '</a>';
+						$html .= '<a href="'.$url_file.'&id='.$object->id.'&action=edit" role="button">'.$langs->trans('Modify').'</a>';
 					}
 				}
-				$html .= '</div>' . "\n";
+				$html .= '</div>'."\n";
 			}
 		}
 

htdocs/accountancy/bookkeeping/card.php

Spacing +10 added lines, -10 removed lines

@@ -564,7 +564,7 @@ 
 		if ($mode != "_tmp") {
 			// Date document export
 			print '<tr>';
-			print '<td class="titlefield">' . $langs->trans("DateExport") . '</td>';
+			print '<td class="titlefield">'.$langs->trans("DateExport").'</td>';
 			print '<td>';
 			print $object->date_export ? dol_print_date($object->date_export, 'dayhour') : '&nbsp;';
 			print '</td>';
@@ -572,7 +572,7 @@ 
 
 			// Date document validation
 			print '<tr>';
-			print '<td class="titlefield">' . $langs->trans("DateValidation") . '</td>';
+			print '<td class="titlefield">'.$langs->trans("DateValidation").'</td>';
 			print '<td>';
 			print $object->date_validation ? dol_print_date($object->date_validation, 'dayhour') : '&nbsp;';
 			print '</td>';
@@ -581,7 +581,7 @@ 
 			// Id_import
 			if (!empty($object->import_key)) {
 				print '<tr>';
-				print '<td class="titlefield">' . $langs->trans("ImportId") . '</td>';
+				print '<td class="titlefield">'.$langs->trans("ImportId").'</td>';
 				print '<td>';
 				print $object->import_key;
 				print '</td>';
@@ -639,7 +639,7 @@ 
 
 		print '<br>';
 
-		$result = $object->fetchAllPerMvt($piece_num, $mode);	// This load $object->linesmvt
+		$result = $object->fetchAllPerMvt($piece_num, $mode); // This load $object->linesmvt
 
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -735,14 +735,14 @@ 
 							if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
 								print $formaccounting->select_auxaccount('', 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
 							} else {
-								print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">';
+								print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
 							}
-							print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">';
+							print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">';
 							print '</td>';
-							print '<td><input type="text" class="minwidth200" name="label_operation" value="' . $label_operation . '"/></td>';
+							print '<td><input type="text" class="minwidth200" name="label_operation" value="'.$label_operation.'"/></td>';
 							print '<td class="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
 							print '<td class="right"><input type="text" size="6" class="right" name="credit" value=""/></td>';
-							print '<td class="center"><input type="submit" class="button small" name="save" value="' . $langs->trans("Add") . '"></td>';
+							print '<td class="center"><input type="submit" class="button small" name="save" value="'.$langs->trans("Add").'"></td>';
 						}
 					} else {
 						print '<!-- td columns in display mode -->';
@@ -765,7 +765,7 @@ 
 
 						print '<td class="center nowraponall">';
 						if (empty($line->date_export) && empty($line->date_validation)) {
-							print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
+							print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=update&id='.$line->id.'&piece_num='.urlencode($line->piece_num).'&mode='.urlencode($mode).'&token='.urlencode(newToken()).'">';
 							print img_edit('', 0, 'class="marginrightonly"');
 							print '</a> &nbsp;';
 						} else {
@@ -780,7 +780,7 @@ 
 								$actiontodelete = 'confirm_delete';
 							}
 
-							print '<a href="' . $_SERVER["PHP_SELF"] . '?action=' . $actiontodelete . '&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action='.$actiontodelete.'&id='.$line->id.'&piece_num='.urlencode($line->piece_num).'&mode='.urlencode($mode).'&token='.urlencode(newToken()).'">';
 							print img_delete();
 							print '</a>';
 						} else {