Dolibarr / dolibarr

htdocs/contact/list.php

Spacing +7 added lines, -7 removed lines

@@ -500,7 +500,7 @@ 
 
 // Add fields from hooks - ListFrom
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= ' WHERE p.entity IN ('.getEntity('contact').')';
 if (empty($user->rights->societe->client->voir) && !$socid) { //restriction
@@ -543,7 +543,7 @@ 
 			if ($searchCategoryContactOperator == 0) {
 				$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE p.rowid = ck.fk_socpeople AND ck.fk_categorie = ".((int) $searchCategoryContact).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryContact);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryContact);
 			}
 		}
 	}
@@ -575,7 +575,7 @@ 
 			if ($searchCategoryCustomerOperator == 0) {
 				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategoryCustomer).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryCustomer);
 			}
 		}
 	}
@@ -607,7 +607,7 @@ 
 			if ($searchCategorySupplierOperator == 0) {
 				$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategorySupplier).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategorySupplier);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategorySupplier);
 			}
 		}
 	}
@@ -897,7 +897,7 @@ 
 if (count($search_roles) > 0) {
 	$param .= implode('&search_roles[]=', $search_roles);
 }
-if ($search_birthday_start)	{
+if ($search_birthday_start) {
 	$param .= '&search_birthday_start='.urlencode(dol_print_date($search_birthday_start, '%d')).'&search_birthday_startmonth='.urlencode(dol_print_date($search_birthday_start, '%m')).'&search_birthday_startyear='.urlencode(dol_print_date($search_birthday_start, '%Y'));
 }
 if ($search_birthday_end) {
@@ -918,7 +918,7 @@ 
 if (isModEnabled('category') && $user->hasRight('societe', 'creer')) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
 	$arrayofmassactions = array();
 }
 if ($contextpage != 'poslist') $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -946,7 +946,7 @@ 
 if ($contextpage != 'poslist') {
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewContactAddress'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create', '', $permissiontoadd);
 } elseif ($user->hasRight('societe', 'contact', 'creer')) {
-	$url = DOL_URL_ROOT . '/contact/card.php?action=create&type=t&contextpage=poslist&optioncss=print&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?token=' . newToken() . 'type=t&contextpage=poslist&nomassaction=1&optioncss=print&place='.$place);
+	$url = DOL_URL_ROOT.'/contact/card.php?action=create&type=t&contextpage=poslist&optioncss=print&backtopage='.urlencode($_SERVER["PHP_SELF"].'?token='.newToken().'type=t&contextpage=poslist&nomassaction=1&optioncss=print&place='.$place);
 	$label = 'MenuNewCustomer';
 	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url);
 }

htdocs/core/lib/modulebuilder.lib.php

Spacing +51 added lines, -51 removed lines

@@ -270,22 +270,22 @@ 
 	// Edit .sql file
 	if ($moduletype == 'internal') {
 		$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+		if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 			$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';
-			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+			if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 				$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
-				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+				if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 					$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'.sql';
 				}
 			}
 		}
 	} else {
 		$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+		if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 			$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';
-			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+			if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 				$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
-				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+				if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 					$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'.sql';
 				}
 			}
@@ -442,7 +442,7 @@ 
 			$objects[$fileobj['fullname']] = $objectnameloop;
 		}
 	}
-	if (count($objects)>0) {
+	if (count($objects) > 0) {
 		return $objects;
 	}
 
@@ -552,12 +552,12 @@ 
 			}
 		}
 	} elseif ($action == -2 && !empty($objectname) && !empty($module)) {
-		$key= null;
+		$key = null;
 		$right = null;
 		$objectOfRights = array();
 		//check if object already declared in rights file
 		foreach ($permissions as $right) {
-			$objectOfRights[]= $right[4];
+			$objectOfRights[] = $right[4];
 		}
 		if (in_array(strtolower($objectname), $objectOfRights)) {
 			$error++;
@@ -584,7 +584,7 @@ 
 	if (!$error) {
 		// prepare permissions array
 		$count_perms = count($permissions);
-		for ($i = 0;$i<$count_perms;$i++) {
+		for ($i = 0; $i < $count_perms; $i++) {
 			$permissions[$i][0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', \$r + 1)";
 			$permissions[$i][1] = "\$this->rights[\$r][1] = '".$permissions[$i][1]."'";
 			$permissions[$i][4] = "\$this->rights[\$r][4] = '".$permissions[$i][4]."'";
@@ -604,7 +604,7 @@ 
 
 
 		// parcourir les objets
-		$o=0;
+		$o = 0;
 		foreach ($permissions as &$object) {
 			// récupérer la permission de l'objet
 			$p = 1;
@@ -699,7 +699,7 @@ 
 {
 
 	// stock all properties in array
-	$attributesUnique = array ('type','label', 'enabled', 'position', 'notnull', 'visible', 'noteditable', 'index', 'default' , 'foreignkey', 'arrayofkeyval', 'alwayseditable','validate', 'searchall','comment', 'isameasure', 'css', 'cssview','csslist', 'help', 'showoncombobox','picto' );
+	$attributesUnique = array('type', 'label', 'enabled', 'position', 'notnull', 'visible', 'noteditable', 'index', 'default', 'foreignkey', 'arrayofkeyval', 'alwayseditable', 'validate', 'searchall', 'comment', 'isameasure', 'css', 'cssview', 'csslist', 'help', 'showoncombobox', 'picto');
 
 	$start = "public \$fields=array(";
 	$end = ");";
@@ -729,7 +729,7 @@ 
 	foreach ($attributesUnique as $attUnique) {
 		$table .= "|".$attUnique;
 	}
-	$table .="\n";
+	$table .= "\n";
 	$valuesModif = array();
 	foreach ($keys as $string) {
 		$string = trim($string, "'");
@@ -769,8 +769,8 @@ 
 				$valuesModif[$attUnique] = $values[$attUnique];
 			}
 		}
-		$table .= "|*" . $field[0] . "*|";
-		$table .= implode("|", $valuesModif) . "\n";
+		$table .= "|*".$field[0]."*|";
+		$table .= implode("|", $valuesModif)."\n";
 	}
 
 	// end table
@@ -779,7 +779,7 @@ 
 
 	//write in file
 	$writeInFile = dolReplaceInFile($destfile, array('== DATA SPECIFICATIONS' => $table));
-	if ($writeInFile<0) {
+	if ($writeInFile < 0) {
 		return -1;
 	}
 	return 1;
@@ -801,13 +801,13 @@ 
 
 		$str = file_get_contents($file);
 
-		$search = '/' . preg_quote($start, '/') . '(.*?)' . preg_quote($end, '/') . '/s';
+		$search = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
 		$new_contents = preg_replace($search, '', $str);
 		file_put_contents($file, $new_contents);
 
 		//perms If Exist
 		$perms = "|*".strtolower($objectname)."*|";
-		$search_pattern_perms = '/' . preg_quote($perms, '/') . '.*?\n/';
+		$search_pattern_perms = '/'.preg_quote($perms, '/').'.*?\n/';
 		$new_contents = preg_replace($search_pattern_perms, '', $new_contents);
 		file_put_contents($file, $new_contents);
 	}
@@ -864,7 +864,7 @@ 
 	$string = "[options='header',grid=rows,width=60%,caption=Organisation]\n";
 	$string .= "|===\n";
 	// header for table
-	$header = array($langs->trans('Objects'),$langs->trans('Permission'));
+	$header = array($langs->trans('Objects'), $langs->trans('Permission'));
 	foreach ($header as $h) {
 		$string .= "|".$h;
 	}
@@ -891,7 +891,7 @@ 
 	foreach ($permissions as $key => $element) {
 		$element = str_replace(" '", '', $element);
 		$element = trim($element, "'");
-		$permsN[] = substr($element, strpos($element, "=")+1);
+		$permsN[] = substr($element, strpos($element, "=") + 1);
 	}
 	array_pop($permsN);
 
@@ -921,7 +921,7 @@ 
 	// end table
 	$string .= "\n|===\n";
 	$write = dolReplaceInFile($destfile, array('__DATA_PERMISSIONS__'=> $string));
-	if ($write<0) {
+	if ($write < 0) {
 		return -1;
 	}
 	return 1;
@@ -950,26 +950,26 @@ 
 		if (strpos($lineContent, $varcomented) !== false) {
 			$lineContent = '';
 			foreach ($objects as $object) {
-				$lineContent .= "\t * @var ".$object." \$".strtolower($object)." {@type ".$object."}". PHP_EOL;
+				$lineContent .= "\t * @var ".$object." \$".strtolower($object)." {@type ".$object."}".PHP_EOL;
 			}
 			//var_dump($lineContent);exit;
 		}
 		if (strpos($lineContent, $props) !== false) {
 			$lineContent = '';
 			foreach ($objects as $object) {
-				$lineContent .= "\tpublic \$".strtolower($object).";". PHP_EOL;
+				$lineContent .= "\tpublic \$".strtolower($object).";".PHP_EOL;
 			}
 		}
 		if (strpos($lineContent, $constructObj) !== false) {
 			$lineContent = '';
 			foreach ($objects as $object) {
-				$lineContent .= "\t\t\$this->".strtolower($object)." = new ".$object."(\$this->db);". PHP_EOL;
+				$lineContent .= "\t\t\$this->".strtolower($object)." = new ".$object."(\$this->db);".PHP_EOL;
 			}
 		}
 		if (strpos($lineContent, $includeClass) !== false) {
 			$lineContent = '';
 			foreach ($objects as $object) {
-				$lineContent .= "dol_include_once('/".strtolower($modulename)."/class/".strtolower($object).".class.php');". PHP_EOL;
+				$lineContent .= "dol_include_once('/".strtolower($modulename)."/class/".strtolower($object).".class.php');".PHP_EOL;
 			}
 		}
 	}
@@ -979,10 +979,10 @@ 
 	//add methods for each object
 	$allContent = getFromFile($file, '/*begin methods CRUD*/', '/*end methods CRUD*/');
 	foreach ($objects as $object) {
-		$contentReplaced =str_replace(["myobject","MyObject"], [strtolower($object),$object], $allContent);
+		$contentReplaced = str_replace(["myobject", "MyObject"], [strtolower($object), $object], $allContent);
 		dolReplaceInFile($file, array('/*end methods CRUD*/' => '/*CRUD FOR '.strtoupper($object).'*/'."\n".$contentReplaced."\n\t".'/*END CRUD FOR '.strtoupper($object).'*/'."\n\t".'/*end methods CRUD*/'));
 	}
-	dolReplaceInFile($file, array($allContent => '','MyModule' => ucfirst($modulename)));
+	dolReplaceInFile($file, array($allContent => '', 'MyModule' => ucfirst($modulename)));
 	return 1;
 }
 
@@ -1043,7 +1043,7 @@ 
  */
 function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action)
 {
-	$errors =0;
+	$errors = 0;
 	$counter = 0;
 	if (!file_exists($file)) {
 		return -1;
@@ -1056,7 +1056,7 @@ 
 		array_push($menus, $menuWantTo);
 	} elseif ($action == 2 && !empty($key) && !empty($menuWantTo)) {
 		// update right from permissions array
-		$urlCounter=0;
+		$urlCounter = 0;
 		// check if the values already exists
 		foreach ($menus as $index => $menu) {
 			if ($index !== $key) {
@@ -1104,20 +1104,20 @@ 
 				$next_val = empty($menus[$index + 1]) ? null : $menus[$index + 1];
 
 				$str_menu .= $start."\n";
-				$str_menu.= "\t\t\$this->menu[\$r++]=array(\n";
-				$str_menu.= "\t\t\t 'fk_menu' =>'".$menu['fk_menu']."',\n";
-				$str_menu.= "\t\t\t 'type' =>'".$menu['type']."',\n";
-				$str_menu.= "\t\t\t 'titre' =>'".$menu['titre']."',\n";
-				$str_menu.= "\t\t\t 'mainmenu' =>'".$menu['mainmenu']."',\n";
-				$str_menu.= "\t\t\t 'leftmenu' =>'".$menu['leftmenu']."',\n";
-				$str_menu.= "\t\t\t 'url' =>'".$menu['url']."',\n";
-				$str_menu.= "\t\t\t 'langs' =>'".$menu['langs']."',\n";
-				$str_menu.= "\t\t\t 'position' =>".$menu['position'].",\n";
-				$str_menu.= "\t\t\t 'enabled' =>'".$menu['enabled']."',\n";
-				$str_menu.= "\t\t\t 'perms' =>'".$menu['perms']."',\n";
-				$str_menu.= "\t\t\t 'target' =>'".$menu['target']."',\n";
-				$str_menu.= "\t\t\t 'user' =>".$menu['user'].",\n";
-				$str_menu.= "\t\t);\n";
+				$str_menu .= "\t\t\$this->menu[\$r++]=array(\n";
+				$str_menu .= "\t\t\t 'fk_menu' =>'".$menu['fk_menu']."',\n";
+				$str_menu .= "\t\t\t 'type' =>'".$menu['type']."',\n";
+				$str_menu .= "\t\t\t 'titre' =>'".$menu['titre']."',\n";
+				$str_menu .= "\t\t\t 'mainmenu' =>'".$menu['mainmenu']."',\n";
+				$str_menu .= "\t\t\t 'leftmenu' =>'".$menu['leftmenu']."',\n";
+				$str_menu .= "\t\t\t 'url' =>'".$menu['url']."',\n";
+				$str_menu .= "\t\t\t 'langs' =>'".$menu['langs']."',\n";
+				$str_menu .= "\t\t\t 'position' =>".$menu['position'].",\n";
+				$str_menu .= "\t\t\t 'enabled' =>'".$menu['enabled']."',\n";
+				$str_menu .= "\t\t\t 'perms' =>'".$menu['perms']."',\n";
+				$str_menu .= "\t\t\t 'target' =>'".$menu['target']."',\n";
+				$str_menu .= "\t\t\t 'user' =>".$menu['user'].",\n";
+				$str_menu .= "\t\t);\n";
 
 				if (is_null($next_val) || $val_actuel['leftmenu'] !== $next_val['leftmenu']) {
 					$str_menu .= $end."\n";
@@ -1154,21 +1154,21 @@ 
 		$dicData .= "\t\t\t'$key'=>";
 
 		if ($key === 'tabcond') {
-			$conditions = array_map(function ($val) use ($module) {
+			$conditions = array_map(function($val) use ($module) {
 				return ($val === true || $val === false) ? "isModEnabled('$module')" : $val;
 			}, $value);
-			$dicData .= "array(" . implode(",", $conditions) . ")";
+			$dicData .= "array(".implode(",", $conditions).")";
 		} elseif ($key === 'tabhelp') {
 			$helpItems = array();
 			foreach ($value as $key => $helpValue) {
 				$helpItems[] = "array('code'=>\$langs->trans('".$helpValue['code']."'), 'field2' => 'field2tooltip')";
 			}
-			$dicData .= "array(" . implode(",", $helpItems) . ")";
+			$dicData .= "array(".implode(",", $helpItems).")";
 		} else {
 			if (is_array($value)) {
-				$dicData .= "array(" . implode(",", array_map(function ($val) {
+				$dicData .= "array(".implode(",", array_map(function($val) {
 					return "'$val'";
-				}, $value)) . ")";
+				}, $value)).")";
 			} else {
 				$dicData .= "'$value'";
 			}
@@ -1234,7 +1234,7 @@ 
 		}
 	}
 	// check if tablename exist in Database and create it if not
-	$query = "SHOW TABLES LIKE '" . MAIN_DB_PREFIX.strtolower($namedic) . "'";
+	$query = "SHOW TABLES LIKE '".MAIN_DB_PREFIX.strtolower($namedic)."'";
 	$checkTable = $db->query($query);
 	if ($checkTable && $db->num_rows($checkTable) > 0) {
 		setEventMessages($langs->trans("ErrorTableExist", $namedic), null, 'errors');
@@ -1343,9 +1343,9 @@ 
 
 	foreach ($allFilesAndDirs as $item) {
 		if ($item != '.' && $item != '..') {
-			if ($type == 1 && is_file($path . DIRECTORY_SEPARATOR . $item) && strpos($item, '.back') === false) {
+			if ($type == 1 && is_file($path.DIRECTORY_SEPARATOR.$item) && strpos($item, '.back') === false) {
 				$count++;
-			} elseif ($type == 2 && is_dir($path . DIRECTORY_SEPARATOR . $item)) {
+			} elseif ($type == 2 && is_dir($path.DIRECTORY_SEPARATOR.$item)) {
 				$count++;
 			}
 		}

htdocs/admin/mails_ticket.php

Spacing +6 added lines, -6 removed lines

@@ -307,7 +307,7 @@ 
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 
 	// SuperAdministrator access only
-	if (!isModEnabled('multicompany')  || ($user->admin && !$user->entity)) {
+	if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 		print $form->selectarray('MAIN_MAIL_SENDMODE_TICKET', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE_TICKET);
 	} else {
 		$text = $listofmethods[getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET')];
@@ -316,7 +316,7 @@ 
 		}
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
 		print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
-		print '<input type="hidden" name="MAIN_MAIL_SENDMODE_TICKET" value="' . getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET').'">';
+		print '<input type="hidden" name="MAIN_MAIL_SENDMODE_TICKET" value="'.getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET').'">';
 	}
 	print '</td></tr>';
 
@@ -437,7 +437,7 @@ 
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) {
 		print '<tr class="oddeven smtp_oauth_service hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").'</td><td>';
 		// SuperAdministrator access only
-		if (!isModEnabled('multicompany')  || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET);
 		} else {
 			$text = $oauthservices[getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET')];
@@ -446,7 +446,7 @@ 
 			}
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
-			print '<input type="hidden" name="MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET" value="' . getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET').'">';
+			print '<input type="hidden" name="MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET" value="'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET').'">';
 		}
 		print '</td></tr>';
 	}
@@ -526,13 +526,13 @@ 
 		// AUTH method
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET'), array('smtps', 'swiftmailer'))) {
 			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET', 'LOGIN');
-			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ?  $langs->trans("UseOauth") : '') ;
+			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ? $langs->trans("UseOauth") : '');
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>'.$text.'</td></tr>';
 		}
 
 		// SMTPS ID
 		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer'))) {
-			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>' . getDolGlobalString('MAIN_MAIL_SMTPS_ID_TICKET').'</td></tr>';
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.getDolGlobalString('MAIN_MAIL_SMTPS_ID_TICKET').'</td></tr>';
 		}
 
 		// SMTPS PW

htdocs/admin/mails_emailing.php

Spacing +23 added lines, -23 removed lines

@@ -327,7 +327,7 @@ 
 		}
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
 		print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
-		print '<input type="hidden" name="MAIN_MAIL_SENDMODE_EMAILING" value="' . getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING').'">';
+		print '<input type="hidden" name="MAIN_MAIL_SENDMODE_EMAILING" value="'.getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING').'">';
 	}
 	print '</td></tr>';
 
@@ -352,15 +352,15 @@ 
 		print '</td><td>';
 		// SuperAdministrator access only
 		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
-			print '<input class="flat minwidth300" id="MAIN_MAIL_SMTP_SERVER_EMAILING" name="MAIN_MAIL_SMTP_SERVER_EMAILING" size="18" value="' . $mainserver . '">';
-			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" name="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" value="' . $mainserver . '">';
-			print '<span id="smtp_server_mess" class="opacitymedium">' . $langs->trans("SeeLocalSendMailSetup") . '</span>';
-			print ' <span class="opacitymedium smtp_method">' . $langs->trans("SeeLinkToOnlineDocumentation") . '</span>';
+			print '<input class="flat minwidth300" id="MAIN_MAIL_SMTP_SERVER_EMAILING" name="MAIN_MAIL_SMTP_SERVER_EMAILING" size="18" value="'.$mainserver.'">';
+			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" name="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" value="'.$mainserver.'">';
+			print '<span id="smtp_server_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+			print ' <span class="opacitymedium smtp_method">'.$langs->trans("SeeLinkToOnlineDocumentation").'</span>';
 		} else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
-			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_EMAILING" name="MAIN_MAIL_SMTP_SERVER_EMAILING" value="' . $mainserver . '">';
+			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_EMAILING" name="MAIN_MAIL_SMTP_SERVER_EMAILING" value="'.$mainserver.'">';
 		}
 		print '</td>';
 	}
@@ -384,14 +384,14 @@ 
 		print '</td><td>';
 		// SuperAdministrator access only
 		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
-			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT_EMAILING" name="MAIN_MAIL_SMTP_PORT_EMAILING" size="3" value="' . $mainport . '">';
-			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_EMAILING_sav" name="MAIN_MAIL_SMTP_PORT_EMAILING_sav" value="' . $mainport . '">';
-			print '<span id="smtp_port_mess" class="opacitymedium">' . $langs->trans("SeeLocalSendMailSetup") . '</span>';
+			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT_EMAILING" name="MAIN_MAIL_SMTP_PORT_EMAILING" size="3" value="'.$mainport.'">';
+			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_EMAILING_sav" name="MAIN_MAIL_SMTP_PORT_EMAILING_sav" value="'.$mainport.'">';
+			print '<span id="smtp_port_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 		} else {
 			$text = (!empty($mainport) ? $mainport : $smtpport);
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
-			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_EMAILING" name="MAIN_MAIL_SMTP_PORT_EMAILING" value="' . $mainport . '">';
+			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_EMAILING" name="MAIN_MAIL_SMTP_PORT_EMAILING" value="'.$mainport.'">';
 		}
 	}
 	print '</td></tr>';
@@ -418,14 +418,14 @@ 
 	// ID
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
 		$mainstmpid = (!empty($conf->global->MAIN_MAIL_SMTPS_ID_EMAILING) ? $conf->global->MAIN_MAIL_SMTPS_ID_EMAILING : '');
-		print '<tr class="drag drop oddeven hideifdefault"><td>' . $langs->trans("MAIN_MAIL_SMTPS_ID") . '</td><td>';
+		print '<tr class="drag drop oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
 		// SuperAdministrator access only
 		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
-			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID_EMAILING" size="32" value="' . $mainstmpid . '">';
+			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID_EMAILING" size="32" value="'.$mainstmpid.'">';
 		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID_EMAILING, $htmltext, 1, 'superadmin');
-			print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID_EMAILING" value="' . $mainstmpid . '">';
+			print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID_EMAILING" value="'.$mainstmpid.'">';
 		}
 		print '</td></tr>';
 	}
@@ -433,14 +433,14 @@ 
 	// PW
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
 		$mainsmtppw = (!empty($conf->global->MAIN_MAIL_SMTPS_PW_EMAILING) ? $conf->global->MAIN_MAIL_SMTPS_PW_EMAILING : '');
-		print '<tr class="drag drop oddeven smtp_pw hideifdefault"><td>' . $langs->trans("MAIN_MAIL_SMTPS_PW") . '</td><td>';
+		print '<tr class="drag drop oddeven smtp_pw hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
 		// SuperAdministrator access only
 		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
-			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW_EMAILING" size="32" value="' . $mainsmtppw . '">';
+			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW_EMAILING" size="32" value="'.$mainsmtppw.'">';
 		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW_EMAILING, $htmltext, 1, 'superadmin');
-			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW_EMAILING" value="' . $mainsmtppw . '">';
+			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW_EMAILING" value="'.$mainsmtppw.'">';
 		}
 		print '</td></tr>';
 	}
@@ -450,7 +450,7 @@ 
 		print '<tr class="oddeven smtp_oauth_service hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").'</td><td>';
 
 		// SuperAdministrator access only
-		if (!isModEnabled('multicompany')  || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING);
 		} else {
 			$text = $oauthservices[getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING')];
@@ -459,7 +459,7 @@ 
 			}
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
-			print '<input type="hidden" name="MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING" value="' . getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING').'">';
+			print '<input type="hidden" name="MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING" value="'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING').'">';
 		}
 		print '</td></tr>';
 	}
@@ -552,7 +552,7 @@ 
 		// AUTH method
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING'), array('smtps', 'swiftmailer'))) {
 			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN');
-			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ?  $langs->trans("UseOauth") : '') ;
+			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ? $langs->trans("UseOauth") : '');
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>'.$text.'</td></tr>';
 		}
 
@@ -646,16 +646,16 @@ 
 	if (!empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default') {
 		if ($conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'mail' || !$linuxlike) {
 			if (function_exists('fsockopen') && $port && $server) {
-				print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=testconnect">' . $langs->trans("DoTestServerAvailability") . '</a>';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect">'.$langs->trans("DoTestServerAvailability").'</a>';
 			}
 		} else {
-			print '<a class="butActionRefused classfortooltip" href="#" title="' . $langs->trans("FeatureNotAvailableOnLinux") . '">' . $langs->trans("DoTestServerAvailability") . '</a>';
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 		}
 
-		print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=test&amp;mode=init">' . $langs->trans("DoTestSend") . '</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
 
 		if (isModEnabled('fckeditor')) {
-			print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=testhtml&amp;mode=init">' . $langs->trans("DoTestSendHTML") . '</a>';
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testhtml&amp;mode=init">'.$langs->trans("DoTestSendHTML").'</a>';
 		}
 	}
 

htdocs/admin/mails.php

Spacing +8 added lines, -8 removed lines

@@ -383,7 +383,7 @@ 
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 
 	// SuperAdministrator access only
-	if (!isModEnabled('multicompany')  || ($user->admin && !$user->entity)) {
+	if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 		print $form->selectarray('MAIN_MAIL_SENDMODE', $listofmethods, getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'));
 	} else {
 		$text = $listofmethods[getDolGlobalString('MAIN_MAIL_SENDMODE')];
@@ -502,11 +502,11 @@ 
 		print '</td><td>';
 		// SuperAdministrator access only
 		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
-			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW" size="32" value="' . htmlspecialchars($mainsmtppw, ENT_COMPAT, 'UTF-8') . '" autocomplete="off">';
+			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW" size="32" value="'.htmlspecialchars($mainsmtppw, ENT_COMPAT, 'UTF-8').'" autocomplete="off">';
 		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW, $htmltext, 1, 'superadmin');
-			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW" value="' . htmlspecialchars($mainsmtppw, ENT_COMPAT, 'UTF-8') . '">';
+			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW" value="'.htmlspecialchars($mainsmtppw, ENT_COMPAT, 'UTF-8').'">';
 		}
 		print '</td></tr>';
 	}
@@ -516,7 +516,7 @@ 
 		print '<tr class="oddeven smtp_oauth_service"><td>'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").'</td><td>';
 
 		// SuperAdministrator access only
-		if (!isModEnabled('multicompany')  || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE);
 		} else {
 			$text = $oauthservices[getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE')];
@@ -525,7 +525,7 @@ 
 			}
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
-			print '<input type="hidden" name="MAIN_MAIL_SMTPS_OAUTH_SERVICE" value="' . getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'">';
+			print '<input type="hidden" name="MAIN_MAIL_SMTPS_OAUTH_SERVICE" value="'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'">';
 		}
 		print '</td></tr>';
 	}
@@ -717,13 +717,13 @@ 
 		// AUTH method
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer'))) {
 			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE', 'LOGIN');
-			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ?  $langs->trans("UseOauth") : '') ;
+			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ? $langs->trans("UseOauth") : '');
 			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>'.$text.'</td></tr>';
 		}
 
 		// SMTPS ID
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer'))) {
-			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>' . getDolGlobalString('MAIN_MAIL_SMTPS_ID').'</td></tr>';
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.getDolGlobalString('MAIN_MAIL_SMTPS_ID').'</td></tr>';
 		}
 
 		// SMTPS PW
@@ -832,7 +832,7 @@ 
 		// From
 		$help = img_help(1, $langs->trans("EMailHelpMsgSPFDKIM"));
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).' '.$help.'</td>';
-		print '<td>' . getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
+		print '<td>'.getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 		if (empty($conf->global->MAIN_MAIL_EMAIL_FROM)) {
 			print img_warning($langs->trans("Mandatory"));
 		} elseif (!isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) {

htdocs/includes/markrogoyski/math-php/src/Finance.php

Spacing +7 added lines, -7 removed lines

@@ -88,10 +88,10 @@ 
         $when = $beginning ? 1 : 0;
 
         if ($rate == 0) {
-            return - ($future_value + $present_value) / $periods;
+            return -($future_value + $present_value) / $periods;
         }
 
-        return - ($future_value + ($present_value * \pow(1 + $rate, $periods)))
+        return -($future_value + ($present_value * \pow(1 + $rate, $periods)))
             /
             ((1 + $rate * $when) / $rate * (\pow(1 + $rate, $periods) - 1));
     }
@@ -251,7 +251,7 @@ 
         $when = $beginning ? 1 : 0;
 
         if ($rate == 0) {
-            return - ($present_value + $future_value) / $payment;
+            return -($present_value + $future_value) / $payment;
         }
 
         $initial = $payment * (1.0 + $rate * $when);
@@ -499,7 +499,7 @@ 
     {
         $when = $beginning ? 1 : 0;
 
-        $func = function ($x, $periods, $payment, $present_value, $future_value, $when) {
+        $func = function($x, $periods, $payment, $present_value, $future_value, $when) {
             return $future_value + $present_value * (1 + $x) ** $periods + $payment * (1 + $x * $when) / $x * ((1 + $x) ** $periods - 1);
         };
 
@@ -533,7 +533,7 @@ 
      */
     public static function irr(array $values, float $initial_guess = 0.1): float
     {
-        $func = function ($x, $values) {
+        $func = function($x, $values) {
             return Finance::npv($x, $values);
         };
 
@@ -631,7 +631,7 @@ 
             }
         }
 
-        $nonzero = function ($x) {
+        $nonzero = function($x) {
             return $x != 0;
         };
 
@@ -764,7 +764,7 @@ 
             }
         }
 
-        $nonzero = function ($x) {
+        $nonzero = function($x) {
             return $x != 0;
         };
 

htdocs/includes/markrogoyski/math-php/src/NumericalAnalysis/RootFinding/NewtonsMethod.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
         do {
             $args1[$position] = $guess + $tol; // load the initial guess into the arguments
-            $args[$position]  = $guess;        // load the initial guess into the arguments
+            $args[$position]  = $guess; // load the initial guess into the arguments
             $y                = $function(...$args);
             $y_at_xplusdelx   = $function(...$args1);
             $slope            = ($y_at_xplusdelx - $y) / $tol;

htdocs/api/index.php

Spacing +4 added lines, -4 removed lines

@@ -91,7 +91,7 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
 
-call_user_func(function () {
+call_user_func(function() {
 	$loader = Luracast\Restler\AutoLoader::instance();
 	spl_autoload_register($loader);
 	return $loader;
@@ -112,7 +112,7 @@ 
 }
 
 // Enable and test if module Api is enabled
-if (!isModEnabled('api') ) {
+if (!isModEnabled('api')) {
 	$langs->load("admin");
 	dol_syslog("Call of Dolibarr API interfaces with module API REST are disabled");
 	print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
@@ -169,7 +169,7 @@ 
 // If MAIN_API_DEBUG is set to 1, we save logs into file "dolibarr_api.log"
 if (!empty($conf->global->MAIN_API_DEBUG)) {
 	$r = $api->r;
-	$r->onCall(function () use ($r) {
+	$r->onCall(function() use ($r) {
 		// Don't log Luracast Restler Explorer recources calls
 		//if (!preg_match('/^explorer/', $r->url)) {
 		//	'method'  => $api->r->requestMethod,
@@ -354,7 +354,7 @@ 
 			}
 		}
 
-		if (! $endpointisallowed) {
+		if (!$endpointisallowed) {
 			dol_syslog('The API with endpoint /'.$classfile.' is forbidden by config API_ENDPOINT_RULES', LOG_WARNING);
 			print 'The API with endpoint /'.$classfile.' is forbidden by config API_ENDPOINT_RULES';
 			header('HTTP/1.1 501 API is forbidden by API_ENDPOINT_RULES');

htdocs/api/admin/explorer_withredoc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 require_once '../../main.inc.php';
 
 // Enable and test if module Api is enabled
-if (!isModEnabled('api') ) {
+if (!isModEnabled('api')) {
 	$langs->load("admin");
 	dol_syslog("Call of Dolibarr API interfaces with module API REST are disabled");
 	print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';