Dolibarr / dolibarr

htdocs/core/tpl/extrafields_view.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -215,7 +215,7 @@ 
 
 			$html_id = !empty($object->id) ? $object->element.'_extras_'.$tmpkeyextra.'_'.$object->id : '';
 
-			print '<td id="' . $html_id . '" class="valuefield ' . $object->element . '_extras_' . $tmpkeyextra . ' wordbreakimp"' . (!empty($cols) ? ' colspan="' . $cols . '"' : '') . '>';
+			print '<td id="'.$html_id.'" class="valuefield '.$object->element.'_extras_'.$tmpkeyextra.' wordbreakimp"'.(!empty($cols) ? ' colspan="'.$cols.'"' : '').'>';
 
 			// Convert date into timestamp format
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('date'))) {
@@ -243,7 +243,7 @@ 
 				if ($object->table_element == 'societe') {
 					$fieldid = 'socid';
 				}
-				print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"] . '?' . $fieldid . '=' . $object->id . '" method="post" name="formextra">';
+				print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'?'.$fieldid.'='.$object->id.'" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="'.$tmpkeyextra.'">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';

htdocs/core/boxes/box_birthdays_members.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 			$sql .= " WHERE u.entity IN (".getEntity('adherent').")";
 			$sql .= " AND u.statut = ".Adherent::STATUS_VALIDATED;
 			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
-			$sql .= " ORDER BY daya ASC";	// We want to have date of the month sorted by the day without taking into consideration the year
+			$sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);

htdocs/core/boxes/box_graph_product_distribution.php

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 		$userid = 0; // No filter on user creation
 
 		$WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '300' : '320';
-		$HEIGHT = '150';	// Height require to have 5+1 entries into legend visible.
+		$HEIGHT = '150'; // Height require to have 5+1 entries into legend visible.
 
 		if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)

htdocs/core/boxes/box_members_by_tags.php

Spacing +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
  *	\brief      Module to show box of members by tags
  */
 
-include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 
 
 /**
@@ -84,7 +84,7 @@ 
 
 		$this->max = $max;
 
-		include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$staticmember = new Adherent($this->db);
 
 		$now = dol_now();
@@ -99,7 +99,7 @@ 
 			$stats = new AdherentStats($this->db, $user->socid, $user->id);
 
 			// Show array
-			$sumMembers= $stats->countMembersByTagAndStatus($numberyears);
+			$sumMembers = $stats->countMembersByTagAndStatus($numberyears);
 			if ($sumMembers) {
 				$line = 0;
 				$this->info_box_contents[$line][] = array(
@@ -152,7 +152,7 @@ 
 					$adhtag = new Categorie($this->db);
 					$adhtag->id = $key;
 
-					if ($key=='total') {
+					if ($key == 'total') {
 						break;
 					}
 					$adhtag->label = $data['label'];
@@ -165,32 +165,32 @@ 
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($data['members_draft']) && $data['members_draft'] > 0 ? $data['members_draft'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_DRAFT, 1, 0, 3),
+						'text' => (isset($data['members_draft']) && $data['members_draft'] > 0 ? $data['members_draft'] : '').' '.$staticmember->LibStatut(Adherent::STATUS_DRAFT, 1, 0, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($data['members_pending']) && $data['members_pending'] > 0 ? $data['members_pending'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 0, 3),
+						'text' => (isset($data['members_pending']) && $data['members_pending'] > 0 ? $data['members_pending'] : '').' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 0, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($data['members_uptodate']) && $data['members_uptodate'] > 0 ? $data['members_uptodate'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 0, $now + 86400, 3),
+						'text' => (isset($data['members_uptodate']) && $data['members_uptodate'] > 0 ? $data['members_uptodate'] : '').' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 0, $now + 86400, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($data['members_expired']) && $data['members_expired'] > 0 ? $data['members_expired'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now - 86400, 3),
+						'text' => (isset($data['members_expired']) && $data['members_expired'] > 0 ? $data['members_expired'] : '').' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now - 86400, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($data['members_excluded']) && $data['members_excluded'] > 0 ? $data['members_excluded'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_EXCLUDED, 1, $now, 3),
+						'text' => (isset($data['members_excluded']) && $data['members_excluded'] > 0 ? $data['members_excluded'] : '').' '.$staticmember->LibStatut(Adherent::STATUS_EXCLUDED, 1, $now, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($data['members_resiliated']) && $data['members_resiliated'] > 0 ? $data['members_resiliated'] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_RESILIATED, 1, 0, 3),
+						'text' => (isset($data['members_resiliated']) && $data['members_resiliated'] > 0 ? $data['members_resiliated'] : '').' '.$staticmember->LibStatut(Adherent::STATUS_RESILIATED, 1, 0, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(

htdocs/core/boxes/box_scheduled_jobs.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
  *      \brief      Widget of scheduled jobs
  */
 
-include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 
 
 /**
@@ -80,14 +80,14 @@ 
 		$this->info_box_head = array('text' => $langs->trans("BoxScheduledJobs", $max));
 
 		if ($user->hasRight('cron', 'read')) {
-			include_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php';
 			$cronstatic = new Cronjob($this->db);
 			$resultarray = array();
 
 			$result = 0;
 			$sql = "SELECT t.rowid, t.datelastrun, t.datenextrun, t.datestart,";
 			$sql .= " t.label, t.status, t.test, t.lastresult, t.processing";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "cronjob as t";
+			$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
 			$sql .= " WHERE status <> ".$cronstatic::STATUS_DISABLED;
 			$sql .= " AND entity IN (0, ".$conf->entity.")";
 			$sql .= $this->db->order("t.datelastrun", "DESC");
@@ -192,7 +192,7 @@ 
 				$this->info_box_contents[0][0] = array(
 					'td' => '',
 					'maxlength' => 500,
-					'text' => ($this->db->lasterror() . ' sql=' . $sql)
+					'text' => ($this->db->lasterror().' sql='.$sql)
 				);
 			}
 		} else {

htdocs/core/boxes/box_dolibarr_state_board.php

Spacing +49 added lines, -49 removed lines

@@ -24,7 +24,7 @@ 
  *	\brief      Module Dolibarr state base
  */
 
-include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 
 
 /**
@@ -80,7 +80,7 @@ 
 			$hookmanager->initHooks(array('index'));
 			$object = new stdClass();
 			$action = '';
-			$parameters =array();
+			$parameters = array();
 			$hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action);
 			$boxstatItems = array();
 			$boxstatFromHook = '';
@@ -164,52 +164,52 @@ 
 				'dolresource' => 'Dolresource'
 			);
 			$includes = array(
-				'users' => DOL_DOCUMENT_ROOT . "/user/class/user.class.php",
-				'members' => DOL_DOCUMENT_ROOT . "/adherents/class/adherent.class.php",
-				'customers' => DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
-				'prospects' => DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
-				'suppliers' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.class.php",
-				'contacts' => DOL_DOCUMENT_ROOT . "/contact/class/contact.class.php",
-				'products' => DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
-				'services' => DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
-				'proposals' => DOL_DOCUMENT_ROOT . "/comm/propal/class/propal.class.php",
-				'orders' => DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php",
-				'invoices' => DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php",
-				'donations' => DOL_DOCUMENT_ROOT . "/don/class/don.class.php",
-				'contracts' => DOL_DOCUMENT_ROOT . "/contrat/class/contrat.class.php",
-				'interventions' => DOL_DOCUMENT_ROOT . "/fichinter/class/fichinter.class.php",
-				'supplier_orders' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.commande.class.php",
-				'supplier_invoices' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php",
-				'supplier_proposals' => DOL_DOCUMENT_ROOT . "/supplier_proposal/class/supplier_proposal.class.php",
-				'projects' => DOL_DOCUMENT_ROOT . "/projet/class/project.class.php",
-				'expensereports' => DOL_DOCUMENT_ROOT . "/expensereport/class/expensereport.class.php",
-				'holidays' => DOL_DOCUMENT_ROOT . "/holiday/class/holiday.class.php",
-				'ticket' => DOL_DOCUMENT_ROOT . "/ticket/class/ticket.class.php",
-				'dolresource' => DOL_DOCUMENT_ROOT . "/resource/class/dolresource.class.php"
+				'users' => DOL_DOCUMENT_ROOT."/user/class/user.class.php",
+				'members' => DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
+				'customers' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+				'prospects' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+				'suppliers' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
+				'contacts' => DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
+				'products' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+				'services' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+				'proposals' => DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
+				'orders' => DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
+				'invoices' => DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
+				'donations' => DOL_DOCUMENT_ROOT."/don/class/don.class.php",
+				'contracts' => DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
+				'interventions' => DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
+				'supplier_orders' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
+				'supplier_invoices' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
+				'supplier_proposals' => DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
+				'projects' => DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
+				'expensereports' => DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
+				'holidays' => DOL_DOCUMENT_ROOT."/holiday/class/holiday.class.php",
+				'ticket' => DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php",
+				'dolresource' => DOL_DOCUMENT_ROOT."/resource/class/dolresource.class.php"
 			);
 			$links = array(
-				'users' => DOL_URL_ROOT . '/user/list.php',
-				'members' => DOL_URL_ROOT . '/adherents/list.php?statut=1&mainmenu=members',
-				'customers' => DOL_URL_ROOT . '/societe/list.php?type=c&mainmenu=companies',
-				'prospects' => DOL_URL_ROOT . '/societe/list.php?type=p&mainmenu=companies',
-				'suppliers' => DOL_URL_ROOT . '/societe/list.php?type=f&mainmenu=companies',
-				'contacts' => DOL_URL_ROOT . '/contact/list.php?mainmenu=companies',
-				'products' => DOL_URL_ROOT . '/product/list.php?type=0&mainmenu=products',
-				'services' => DOL_URL_ROOT . '/product/list.php?type=1&mainmenu=products',
-				'proposals' => DOL_URL_ROOT . '/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',
-				'orders' => DOL_URL_ROOT . '/commande/list.php?mainmenu=commercial&leftmenu=orders',
-				'invoices' => DOL_URL_ROOT . '/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',
-				'donations' => DOL_URL_ROOT . '/don/list.php?leftmenu=donations',
-				'contracts' => DOL_URL_ROOT . '/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
-				'interventions' => DOL_URL_ROOT . '/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',
-				'supplier_orders' => DOL_URL_ROOT . '/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',
-				'supplier_invoices' => DOL_URL_ROOT . '/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',
-				'supplier_proposals' => DOL_URL_ROOT . '/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',
-				'projects' => DOL_URL_ROOT . '/projet/list.php?mainmenu=project',
-				'expensereports' => DOL_URL_ROOT . '/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
-				'holidays' => DOL_URL_ROOT . '/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
-				'ticket' => DOL_URL_ROOT . '/ticket/list.php?leftmenu=ticket',
-				'dolresource' => DOL_URL_ROOT . '/resource/list.php?mainmenu=agenda',
+				'users' => DOL_URL_ROOT.'/user/list.php',
+				'members' => DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
+				'customers' => DOL_URL_ROOT.'/societe/list.php?type=c&mainmenu=companies',
+				'prospects' => DOL_URL_ROOT.'/societe/list.php?type=p&mainmenu=companies',
+				'suppliers' => DOL_URL_ROOT.'/societe/list.php?type=f&mainmenu=companies',
+				'contacts' => DOL_URL_ROOT.'/contact/list.php?mainmenu=companies',
+				'products' => DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
+				'services' => DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',
+				'proposals' => DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',
+				'orders' => DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial&leftmenu=orders',
+				'invoices' => DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',
+				'donations' => DOL_URL_ROOT.'/don/list.php?leftmenu=donations',
+				'contracts' => DOL_URL_ROOT.'/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
+				'interventions' => DOL_URL_ROOT.'/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',
+				'supplier_orders' => DOL_URL_ROOT.'/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',
+				'supplier_invoices' => DOL_URL_ROOT.'/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',
+				'supplier_proposals' => DOL_URL_ROOT.'/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',
+				'projects' => DOL_URL_ROOT.'/projet/list.php?mainmenu=project',
+				'expensereports' => DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
+				'holidays' => DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
+				'ticket' => DOL_URL_ROOT.'/ticket/list.php?leftmenu=ticket',
+				'dolresource' => DOL_URL_ROOT.'/resource/list.php?mainmenu=agenda',
 			);
 			$titres = array(
 				'users' => "Users",
@@ -272,10 +272,10 @@ 
 					$langs->load(empty($langfile[$val]) ? $val : $langfile[$val]);
 
 					$text = $langs->trans($titres[$val]);
-					$boxstatItem .= '<a href="' . $links[$val] . '" class="boxstatsindicator thumbstat nobold nounderline">';
+					$boxstatItem .= '<a href="'.$links[$val].'" class="boxstatsindicator thumbstat nobold nounderline">';
 					$boxstatItem .= '<div class="boxstats">';
-					$boxstatItem .= '<span class="boxstatstext" title="' . dol_escape_htmltag($text) . '">' . $text . '</span><br>';
-					$boxstatItem .= '<span class="boxstatsindicator">' . img_object("", $board->picto, 'class="inline-block"') . ' ' . (!empty($board->nb[$val]) ? $board->nb[$val] : 0) . '</span>';
+					$boxstatItem .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';
+					$boxstatItem .= '<span class="boxstatsindicator">'.img_object("", $board->picto, 'class="inline-block"').' '.(!empty($board->nb[$val]) ? $board->nb[$val] : 0).'</span>';
 					$boxstatItem .= '</div>';
 					$boxstatItem .= '</a>';
 

htdocs/core/boxes/box_birthdays.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 			$sql .= " AND u.statut = ".User::STATUS_ENABLED;
 			$sql .= dolSqlDateFilter('u.dateemployment', 0, $tmparray['mon'], 0);
 			$sql .= " AND u.dateemployment < '".$this->db->idate(dol_get_first_day($tmparray['year']))."'";
-			$sql .= " ORDER BY daya ASC";	// We want to have date of the month sorted by the day without taking into consideration the year
+			$sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);

htdocs/core/login/functions_dolibarr.php

Spacing +2 added lines, -2 removed lines

@@ -160,7 +160,7 @@ 
 					}
 				} else {
 					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO user not found for '".$usertotest."'", LOG_NOTICE);
-					sleep(1);	// Anti brut force protection. Must be same delay when password is not valid
+					sleep(1); // Anti brut force protection. Must be same delay when password is not valid
 
 					// Load translation files required by the page
 					$langs->loadLangs(array('main', 'errors'));
@@ -174,7 +174,7 @@ 
 			}
 		} else {
 			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO Too many attempts", LOG_NOTICE);
-			sleep(1);	// Anti brut force protection. Must be same delay when password is not valid
+			sleep(1); // Anti brut force protection. Must be same delay when password is not valid
 			// Load translation files required by the page
 			$langs->loadLangs(array('main', 'errors'));
 			$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorTooManyAttempts");

htdocs/core/login/functions_googleoauth.php

Spacing +3 added lines, -3 removed lines

@@ -75,12 +75,12 @@
 			//global $dolibarr_main_url_root;
 			//$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 			//$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-			$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+			$urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current
 
 			//$shortscope = 'userinfo_email,userinfo_profile';
-			$shortscope = 'openid,email,profile';	// For openid connect
+			$shortscope = 'openid,email,profile'; // For openid connect
 
-			$oauthstateanticsrf = bin2hex(random_bytes(128/8));
+			$oauthstateanticsrf = bin2hex(random_bytes(128 / 8));
 			$_SESSION['oauthstateanticsrf'] = $shortscope.'-'.$oauthstateanticsrf;
 
 			$url = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.urlencode($shortscope).'&state='.urlencode('forlogin-'.$shortscope.'-'.$oauthstateanticsrf).'&username='.urlencode($usertotest);