Dolibarr / dolibarr

htdocs/admin/security_captcha.php

Spacing +6 added lines, -6 removed lines

@@ -140,7 +140,7 @@ 
 print '<td class="right" width="100">'.$langs->trans("Status").'</td>';
 print '</tr>';
 
-print '<tr class="oddeven"><td>' . $langs->trans("UseCaptchaCode").' - Login</td><td class="right" width="100">';
+print '<tr class="oddeven"><td>'.$langs->trans("UseCaptchaCode").' - Login</td><td class="right" width="100">';
 if (!empty($conf->use_javascript_ajax)) {
 	print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA', array(), null, 0, 0, 1);
 } else {
@@ -153,7 +153,7 @@ 
 print '</td></tr>';
 
 if (isModEnabled('societe')) {
-	print '<tr class="oddeven"><td>' . $langs->trans("UseCaptchaCode").' - Thirdparty public contact form</td><td class="right" width="100">';
+	print '<tr class="oddeven"><td>'.$langs->trans("UseCaptchaCode").' - Thirdparty public contact form</td><td class="right" width="100">';
 	if (!empty($conf->use_javascript_ajax)) {
 		print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA_THIRDPARTY', array(), null, 0, 0, 1);
 	} else {
@@ -167,7 +167,7 @@ 
 print '</td></tr>';
 
 if (isModEnabled('ticket')) {
-	print '<tr class="oddeven"><td>' . $langs->trans("UseCaptchaCode").' - Public ticket creation</td><td class="right" width="100">';
+	print '<tr class="oddeven"><td>'.$langs->trans("UseCaptchaCode").' - Public ticket creation</td><td class="right" width="100">';
 	if (!empty($conf->use_javascript_ajax)) {
 		print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA_TICKET', array(), null, 0, 0, 1);
 	} else {
@@ -181,7 +181,7 @@ 
 print '</td></tr>';
 
 if (isModEnabled('member')) {
-	print '<tr class="oddeven"><td>' . $langs->trans("UseCaptchaCode").' - Membership public subscription</td><td class="right" width="100">';
+	print '<tr class="oddeven"><td>'.$langs->trans("UseCaptchaCode").' - Membership public subscription</td><td class="right" width="100">';
 	if (!empty($conf->use_javascript_ajax)) {
 		print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA_MEMBER', array(), null, 0, 0, 1);
 	} else {
@@ -195,7 +195,7 @@ 
 print '</td></tr>';
 
 if (isModEnabled('don')) {
-	print '<tr class="oddeven"><td>' . $langs->trans("UseCaptchaCode").' - Donation public form</td><td class="right" width="100">';
+	print '<tr class="oddeven"><td>'.$langs->trans("UseCaptchaCode").' - Donation public form</td><td class="right" width="100">';
 	if (!empty($conf->use_javascript_ajax)) {
 		print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA_DONATION', array(), null, 0, 0, 1);
 	} else {
@@ -209,7 +209,7 @@ 
 print '</td></tr>';
 
 if (isModEnabled('recruitment')) {
-	print '<tr class="oddeven"><td>' . $langs->trans("UseCaptchaCode").' - Recruitment public form</td><td class="right" width="100">';
+	print '<tr class="oddeven"><td>'.$langs->trans("UseCaptchaCode").' - Recruitment public form</td><td class="right" width="100">';
 	if (!empty($conf->use_javascript_ajax)) {
 		print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA_RECRUITMENT', array(), null, 0, 0, 1);
 	} else {

htdocs/commande/list_det.php

Spacing +10 added lines, -10 removed lines

@@ -208,7 +208,7 @@ 
 	'typent.code' => array('label' => "ThirdPartyType", 'checked' => (string) $checkedtypetiers, 'position' => 55),
 	'c.date_commande' => array('label' => "OrderDateShort", 'checked' => '1', 'position' => 60),
 	'c.delivery_date' => array('label' => "DateDeliveryPlanned", 'checked' => '1', 'enabled' => (string) (int) !getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position' => 65),
-	'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => '-1', 'position' => 66 , 'enabled' => (string) (int) isModEnabled('shipping')),
+	'c.fk_shipping_method' => array('label' => "SendingMethod", 'checked' => '-1', 'position' => 66, 'enabled' => (string) (int) isModEnabled('shipping')),
 	'c.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => '-1', 'position' => 67),
 	'c.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => '-1', 'position' => 68),
 	'c.fk_input_reason' => array('label' => "Channel", 'checked' => '-1', 'position' => 69),
@@ -232,7 +232,7 @@ 
 	'c.date_cloture' => array('label' => "DateClosing", 'checked' => '0', 'position' => 130),
 	'c.note_public' => array('label' => 'NotePublic', 'checked' => '0', 'enabled' => (string) (int) (!getDolGlobalString('MAIN_LIST_ALLOW_PUBLIC_NOTES')), 'position' => 135),
 	'c.note_private' => array('label' => 'NotePrivate', 'checked' => '0', 'enabled' => (string) (int) (!getDolGlobalString('MAIN_LIST_ALLOW_PRIVATE_NOTES')), 'position' => 140),
-	'shippable' => array('label' => "Shippable", 'checked' => '1','enabled' => (string) (int) (isModEnabled('shipping')), 'position' => 990),
+	'shippable' => array('label' => "Shippable", 'checked' => '1', 'enabled' => (string) (int) (isModEnabled('shipping')), 'position' => 990),
 	'c.facture' => array('label' => "Billed", 'checked' => '1', 'enabled' => (string) (int) (!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position' => 995),
 	'c.import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'visible' => -2, 'position' => 999),
 	'c.fk_statut' => array('label' => "Status", 'checked' => '1', 'position' => 1000)
@@ -464,7 +464,7 @@ 
 	$sql .= natural_search('pr.ref', $search_refProduct);
 }
 if ($search_descProduct) {
-	$sql .= natural_search(array('pr.label','cdet.description'), $search_descProduct);
+	$sql .= natural_search(array('pr.label', 'cdet.description'), $search_descProduct);
 }
 if ($search_ref) {
 	$sql .= natural_search('c.ref', $search_ref);
@@ -611,7 +611,7 @@ 
 			if ($searchCategoryCustomerOperator == 0) {
 				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategoryCustomer).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryCustomer);
 			}
 		}
 	}
@@ -640,7 +640,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProjectSqlList[] = " EXISTS (SELECT cp.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as cp WHERE cdet.fk_product = cp.fk_product AND cp.fk_categorie = ".((int) $searchCategoryProject).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProject);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProject);
 			}
 		}
 	}
@@ -680,7 +680,7 @@ 
 // Count total nb of records
 $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
-	$result = $db->query('SELECT COUNT(*) as numrows ' .  $sql);
+	$result = $db->query('SELECT COUNT(*) as numrows '.$sql);
 	$obj = $db->fetch_object($result);
 	if (empty($obj)) {
 		$nbtotalofrecords = 0;
@@ -696,7 +696,7 @@ 
 
 $sql .= $db->plimit($limit + 1, $offset);
 //print $sql;
-$resql = $db->query($sqlSelect . $sql);
+$resql = $db->query($sqlSelect.$sql);
 if ($resql) {
 	if ($socid > 0) {
 		$soc = new Societe($db);
@@ -918,7 +918,7 @@ 
 	if (!empty($socid)) {
 		$url .= '&socid='.$socid;
 	}
-	$newcardbutton = '';//dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $contextpage == 'orderlistdet' && $permissiontoadd);
+	$newcardbutton = ''; //dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $contextpage == 'orderlistdet' && $permissiontoadd);
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.dolBuildUrl($_SERVER["PHP_SELF"]).'">';
@@ -2135,10 +2135,10 @@ 
 			if (!empty($show_shippable_command) && isModEnabled('stock')) {
 				$text_icon = '';
 				if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) {
-					$generic_commande->loadExpeditions();	// Load array ->expeditions
+					$generic_commande->loadExpeditions(); // Load array ->expeditions
 
 					if (isset($generic_commande->expeditions[$obj->rowid])) {
-						$reliquat =  $obj->qty - $generic_commande->expeditions[$obj->rowid];
+						$reliquat = $obj->qty - $generic_commande->expeditions[$obj->rowid];
 					} else {
 						$reliquat = $obj->qty;
 					}

htdocs/user/perms.php

Spacing +5 added lines, -5 removed lines

@@ -234,15 +234,15 @@ 
 // Read the permissions of a user inherited by its groups
 $permsgroupbyentity = array();
 
-$sql = "SELECT DISTINCT gr.fk_id, gu.entity";	// fk_id are permission id and entity is entity of the group
+$sql = "SELECT DISTINCT gr.fk_id, gu.entity"; // fk_id are permission id and entity is entity of the group
 $sql .= " FROM ".MAIN_DB_PREFIX."usergroup_rights as gr,";
-$sql .= " ".MAIN_DB_PREFIX."usergroup_user as gu";	// all groups of a user
+$sql .= " ".MAIN_DB_PREFIX."usergroup_user as gu"; // all groups of a user
 $sql .= " WHERE gr.entity = ".((int) $entity); // it's very important, don't change please !
 // The entity on the table gu=usergroup_user should be useless and should never be used because it is already into gr and r.
 // but when using MULTICOMPANY_TRANSVERSE_MODE, we may have inserted record that make rubbish result here due to the duplicate record of
 // other entities, so we are forced to add a filter on gu here
 if (getDolGlobalString("MULTICOMPANY_TRANSVERSE_MODE_FIX_WHEN_GU_CONTAINS_0")) {
-	$sql .= " AND gu.entity IN (0,". ((int) $entity).")";
+	$sql .= " AND gu.entity IN (0,".((int) $entity).")";
 } else {
 	$sql .= " AND gu.entity = ".((int) $entity);
 }
@@ -494,7 +494,7 @@ 
 		} else {
 			$ishidden = 0;
 		}
-		$isexpanded = ! $ishidden;
+		$isexpanded = !$ishidden;
 		//var_dump("isexpanded=".$isexpanded);
 
 		$permsgroupbyentitypluszero = array();
@@ -518,7 +518,7 @@ 
 			} else {
 				$ishidden = 0;
 			}
-			$isexpanded = ! $ishidden;
+			$isexpanded = !$ishidden;
 			//var_dump('$obj->module='.$obj->module.' isexpanded='.$isexpanded);
 
 			// Break detected, we get objMod

htdocs/core/boxes/box_graph_nb_tickets_type.php

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
 		$colorseriesstat = array();
 		if ($user->hasRight('ticket', 'read')) {
 			$sql = "SELECT ctt.rowid, ctt.label, ctt.code";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_type as ctt";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as ctt";
 			$sql .= " WHERE ctt.entity IN (".getEntity('c_ticket_type').")";
 			$sql .= " AND ctt.active = 1";
 			$sql .= $this->db->order('ctt.rowid', 'ASC');
@@ -116,7 +116,7 @@ 
 			$dataseries = array();
 			$data = array();
 			$sql = "SELECT t.type_code, COUNT(t.type_code) as nb";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 			$sql .= " WHERE t.entity IN (".getEntity('ticket').")";
 			$sql .= " AND t.fk_statut <> 8";
 			$sql .= " GROUP BY t.type_code";
@@ -131,7 +131,7 @@ 
 				}
 				foreach ($listofoppcode as $rowid => $code) {
 					$dataseries[] = array(
-						'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort' . $code, 'c_ticket_type', 'code', 'label', $code),
+						'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort'.$code, 'c_ticket_type', 'code', 'label', $code),
 						'data' => (empty($data[$code]) ? 0 : $data[$code])
 					);
 				}

htdocs/core/boxes/box_graph_ticket_by_severity.php

Spacing +5 added lines, -5 removed lines

@@ -77,8 +77,8 @@ 
 		$badgeStatus7 = '#baa32b';
 		$badgeStatus8 = '#993013';
 		$badgeStatus9 = '#e7f0f0';
-		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php')) {
-			include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
+		if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php')) {
+			include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 		}
 		$this->max = $max;
 
@@ -95,7 +95,7 @@ 
 		$colorseriesstat = array();
 		if ($user->hasRight('ticket', 'read')) {
 			$sql = "SELECT cts.rowid, cts.label, cts.code";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_severity as cts";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as cts";
 			$sql .= " WHERE cts.entity IN (".getEntity('c_ticket_severity').")";
 			$sql .= " AND cts.active = 1";
 			$sql .= $this->db->order('cts.rowid', 'ASC');
@@ -133,7 +133,7 @@ 
 			$dataseries = array();
 			$data = array();
 			$sql = "SELECT t.severity_code, COUNT(t.severity_code) as nb";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 			$sql .= " WHERE t.entity IN (".getEntity('ticket').")";
 			$sql .= " AND t.fk_statut <> 8";
 			$sql .= " GROUP BY t.severity_code";
@@ -148,7 +148,7 @@ 
 				}
 				foreach ($listofoppcode as $rowid => $code) {
 					$dataseries[] = array(
-						'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort' . $code, 'c_ticket_severity', 'code', 'label', $code),
+						'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$code, 'c_ticket_severity', 'code', 'label', $code),
 						'data' => (empty($data[$code]) ? 0 : $data[$code])
 					);
 				}

htdocs/public/recruitment/view.php

Spacing +13 added lines, -13 removed lines

@@ -53,7 +53,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/public.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/public.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
@@ -64,11 +64,11 @@ 
 $action   = GETPOST('action', 'aZ09');
 $cancel   = GETPOST('cancel', 'alpha');
 $email    = GETPOST('email', 'alpha');
-$firstname    = GETPOST('firstname', 'alpha');
+$firstname = GETPOST('firstname', 'alpha');
 $lastname    = GETPOST('lastname', 'alpha');
 $birthday    = GETPOST('birthday', 'alpha');
-$phone    	 = GETPOST('phone', 'alpha');
-$message	 = GETPOST('message', 'alpha');
+$phone = GETPOST('phone', 'alpha');
+$message = GETPOST('message', 'alpha');
 $requestedremuneration = GETPOST('requestedremuneration', 'alpha');
 
 $ref = GETPOST('ref', 'alpha');
@@ -179,7 +179,7 @@ 
 	$ok = false;
 	if (getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA_RECRUITMENT') && is_object($captchaobj)) {
 		if (method_exists($captchaobj, 'validateCodeAfterLoginSubmit')) {
-			$ok = $captchaobj->validateCodeAfterLoginSubmit();  // @phan-suppress-current-line PhanUndeclaredMethod
+			$ok = $captchaobj->validateCodeAfterLoginSubmit(); // @phan-suppress-current-line PhanUndeclaredMethod
 		} else {
 			print 'Error, the captcha handler '.get_class($captchaobj).' does not have any method validateCodeAfterLoginSubmit()';
 		}
@@ -192,8 +192,8 @@ 
 	}
 	if (!$error) {
 		$sql = "SELECT rrc.rowid FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rrc";
-		$sql .= " WHERE rrc.email = '". $db->escape($email)."'";
-		$sql .= " AND rrc.entity IN (". getEntity($object->element, 0).")";
+		$sql .= " WHERE rrc.email = '".$db->escape($email)."'";
+		$sql .= " AND rrc.entity IN (".getEntity($object->element, 0).")";
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num = $db->num_rows($resql);
@@ -258,7 +258,7 @@ 
 	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("RecruitmentCandidatureSaved"), null);
-		header("Location: " . $backtopage);
+		header("Location: ".$backtopage);
 		exit;
 	} else {
 		$db->rollback();
@@ -284,7 +284,7 @@ 
 
 $head = '';
 if (getDolGlobalString('MAIN_RECRUITMENT_CSS_URL')) {
-	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('MAIN_RECRUITMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
+	$head = '<link rel="stylesheet" type="text/css" href="'.getDolGlobalString('MAIN_RECRUITMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
 $conf->dol_hide_topmenu = 1;
@@ -357,7 +357,7 @@ 
 
 if (getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE')) {
 	print '<div class="backimagepublicrecruitment">';
-	print '<img id="idRECRUITMENT_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE').'">';
+	print '<img id="idRECRUITMENT_IMAGE_PUBLIC_INTERFACE" src="'.getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE').'">';
 	print '</div>';
 }
 
@@ -371,7 +371,7 @@ 
 	if (preg_match('/^\((.*)\)$/', $conf->global->RECRUITMENT_NEWFORM_TEXT, $reg)) {
 		$text .= $langs->trans($reg[1])."<br>\n";
 	} else {
-		$text .= getDolGlobalString('RECRUITMENT_NEWFORM_TEXT') . "<br>\n";
+		$text .= getDolGlobalString('RECRUITMENT_NEWFORM_TEXT')."<br>\n";
 	}
 	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
@@ -482,7 +482,7 @@ 
 
 		// Other attributes
 		$object = new RecruitmentCandidature($db);
-		$parameters['tpl_context'] = 'public';	// define template context to public
+		$parameters['tpl_context'] = 'public'; // define template context to public
 		$parameters['tdclass'] = 'left';
 		$extrafields->fetch_name_optionals_label("recruitment_recruitmentcandidature");
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
@@ -495,7 +495,7 @@ 
 		if (getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA_RECRUITMENT') && is_object($captchaobj)) {
 			print '<tr><td class="titlefield"><label><span class="fieldrequired">'.$langs->trans($captchaobj->getFieldInputTitle()).'</span></label></td><td><br>';
 			if (method_exists($captchaobj, 'getCaptchaCodeForForm')) {
-				print $captchaobj->getCaptchaCodeForForm('');  // @phan-suppress-current-line PhanUndeclaredMethod
+				print $captchaobj->getCaptchaCodeForForm(''); // @phan-suppress-current-line PhanUndeclaredMethod
 			} else {
 				print 'Error, the captcha handler '.get_class($captchaobj).' does not have any method getCaptchaCodeForForm()';
 			}