From 88df865e30994c0259a22dc2ab8923d6ba387f87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Dec 2022 10:25:03 +0100
Subject: [PATCH] Debu v17

---
 htdocs/admin/events.php          | 10 +++++-----
 htdocs/admin/security.php        |  8 ++++----
 htdocs/admin/security_file.php   | 18 ++++++++++--------
 htdocs/core/class/conf.class.php |  2 +-
 htdocs/core/lib/admin.lib.php    | 16 +++++++++++++---
 htdocs/langs/en_US/admin.lang    |  1 +
 6 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 4085207642b..4b4bdf18974 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -110,11 +110,11 @@ print dol_get_fiche_head($head, 'audit', '', -1);
 
 print '<br>';
 
-print '<table class="noborder" width="100%">';
-print "<tr class=\"liste_titre\">";
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
 print getTitleFieldOfList("TrackableSecurityEvents", 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, '')."\n";
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
-print "</tr>\n";
+print '</tr>'."\n";
 // Loop on each event type
 foreach ($eventstolog as $key => $arr) {
 	if ($arr['id']) {
@@ -129,12 +129,12 @@ foreach ($eventstolog as $key => $arr) {
 }
 print '</table>';
 
-print dol_get_fiche_end();
-
 print '<div class="center">';
 print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
 print '</div>';
 
+print dol_get_fiche_end();
+
 print "</form>\n";
 
 // End of page
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 063f1668d15..33344363cf7 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -271,8 +271,8 @@ print '</div>';
 
 print '</form>';
 
-//if($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK == 1)
-// Patter for Password Perso
+
+// Pattern for Password Perso
 if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
 	print '<br>';
 
@@ -320,10 +320,10 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
 
 	print '</table>';
 
-	print '<br>';
 	print '<div class="center">';
 	print '<a class="button button-save" id="linkChangePattern">'.$langs->trans("Save").'</a>';
 	print '</div>';
+
 	print '<br><br>';
 
 	print '<script type="text/javascript">';
@@ -392,7 +392,7 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td colspan="3">'.$langs->trans("Parameters").'</td>';
 print '<td class="center">'.$langs->trans("Activated").'</td>';
-print '<td class="center">'.$langs->trans("Action").'</td>';
+print '<td class="center"></td>';
 print '</tr>';
 
 // Disable clear password in database
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index ff0d5780ad4..c545cc7e0dd 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -115,15 +115,15 @@ print '<br>';
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent nomarginbottom">';
 print '<tr class="liste_titre">';
-print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
+print '<td>'.$langs->trans("Parameters").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print '</tr>';
 
 print '<tr class="oddeven">';
-print '<td colspan="2">'.$langs->trans("MaxSizeForUploadedFiles").'.';
+print '<td>'.$langs->trans("MaxSizeForUploadedFiles").'.';
 $max = @ini_get('upload_max_filesize');
 if (isset($max)) {
-	print ' '.$langs->trans("MustBeLowerThanPHPLimit", ((int) $max) * 1024, $langs->trans("Kb")).'.';
+	print '<br><span class="opacitymedium">'.$langs->trans("MustBeLowerThanPHPLimit", ((int) $max) * 1024, $langs->trans("Kb")).'.</span>';
 } else {
 	print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.';
 }
@@ -135,8 +135,8 @@ print '</tr>';
 
 
 print '<tr class="oddeven">';
-print '<td>'.$langs->trans("UMask").'</td><td class="right">';
-print $form->textwithpicto('', $langs->trans("UMaskExplanation"));
+print '<td>';
+print $form->textwithpicto($langs->trans("UMask"), $langs->trans("UMaskExplanation"));
 print '</td>';
 print '<td class="nowrap">';
 print '<input class="flat" name="MAIN_UMASK" type="text" size="6" value="'.dol_escape_htmltag($conf->global->MAIN_UMASK).'">';
@@ -146,7 +146,7 @@ print '</tr>';
 // Use anti virus
 
 print '<tr class="oddeven">';
-print '<td colspan="2">'.$langs->trans("AntiVirusCommand").'<br>';
+print '<td>'.$langs->trans("AntiVirusCommand").'<br>';
 print '<span class="opacitymedium">'.$langs->trans("AntiVirusCommandExample").'</span>';
 // Check command in inside safe_mode
 print '</td>';
@@ -170,7 +170,7 @@ print '</tr>';
 // Use anti virus
 
 print '<tr class="oddeven">';
-print '<td colspan="2">'.$langs->trans("AntiVirusParam").'<br>';
+print '<td>'.$langs->trans("AntiVirusParam").'<br>';
 print '<span class="opacitymedium">'.$langs->trans("AntiVirusParamExample").'</span>';
 print '</td>';
 print '<td>';
@@ -198,7 +198,9 @@ $formfile->form_attach_new_file($_SERVER['PHP_SELF'], $langs->trans("FormToTestF
 
 // List of document
 $filearray = dol_dir_list($upload_dir, "files", 0, '', '', $sortfield, $sortorder == 'desc' ? SORT_DESC : SORT_ASC, 1);
-$formfile->list_of_documents($filearray, null, 'admin_temp', '');
+if (count($filearray) > 0) {
+	$formfile->list_of_documents($filearray, null, 'admin_temp', '');
+}
 
 // End of page
 llxFooter();
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index d03604dc124..279ccded71c 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -790,7 +790,7 @@ class Conf
 
 			// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
 			if (!isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) {
-				$this->global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.
+				$this->global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,reception,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.
 			}
 			if (!empty($this->modules_parts['moduleforexternal'])) {		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list
 				foreach ($this->modules_parts['moduleforexternal'] as $key => $value) {
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 2ce3094f41b..7ed3419800f 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1840,10 +1840,12 @@ function showModulesExludedForExternal($modules)
 	global $conf, $langs;
 
 	$text = $langs->trans("OnlyFollowingModulesAreOpenedToExternalUsers");
-	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);	// List of modules qualified for external user management
+
 	$i = 0;
 	if (!empty($modules)) {
-		foreach ($modules as $module) {
+		$tmpmodules = dol_sort_array($modules, 'module_position');
+		foreach ($tmpmodules as $module) {		// Loop on array of modules
 			$moduleconst = $module->const_name;
 			$modulename = strtolower($module->name);
 			//print 'modulename='.$modulename;
@@ -1860,9 +1862,17 @@ function showModulesExludedForExternal($modules)
 				$text .= ' ';
 			}
 			$i++;
-			$text .= $langs->trans('Module'.$module->numero.'Name');
+
+			$tmptext = $langs->trans('Module'.$module->numero.'Name');
+			if ($tmptext != 'Module'.$module->numero.'Name') {
+				$text .= $langs->trans('Module'.$module->numero.'Name');
+			} else {
+				var_dump($module->numero);
+				$text .= $langs->trans($module->name);
+			}
 		}
 	}
+
 	return $text;
 }
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index c7f88185f74..775c12a6c88 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -700,6 +700,7 @@ Module62000Name=Incoterms
 Module62000Desc=Add features to manage Incoterms
 Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Module94160Name=Receptions
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
 Permission13=Invalidate customer invoices