lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debu v17

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-12 10:25:03 +01:00
parent 63447e4205
commit 88df865e30
6 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/admin/events.php
View File

@ -110,11 +110,11 @@ print dol_get_fiche_head($head, 'audit', '', -1);
print '<br>'; print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder centpercent">';
print "<tr class=\"liste_titre\">"; print '<tr class="liste_titre">';
print getTitleFieldOfList("TrackableSecurityEvents", 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, '')."\n"; print getTitleFieldOfList("TrackableSecurityEvents", 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, '')."\n";
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n"; print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
print "</tr>\n"; print '</tr>'."\n";
// Loop on each event type // Loop on each event type
foreach ($eventstolog as $key => $arr) { foreach ($eventstolog as $key => $arr) {
if ($arr['id']) { if ($arr['id']) {
@ -129,12 +129,12 @@ foreach ($eventstolog as $key => $arr) {
} }
print '</table>'; print '</table>';
print dol_get_fiche_end();
print '<div class="center">'; print '<div class="center">';
print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">'; print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
print '</div>'; print '</div>';
print dol_get_fiche_end();
print "</form>\n"; print "</form>\n";
// End of page // End of page

8
htdocs/admin/security.php
View File

@ -271,8 +271,8 @@ print '</div>';
print '</form>'; print '</form>';
//if($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK == 1)
// Patter for Password Perso // Pattern for Password Perso
if ($conf->global->USER_PASSWORD_GENERATED == "Perso") { if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
print '<br>'; print '<br>';
@ -320,10 +320,10 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
print '</table>'; print '</table>';
print '<br>';
print '<div class="center">'; print '<div class="center">';
print '<a class="button button-save" id="linkChangePattern">'.$langs->trans("Save").'</a>'; print '<a class="button button-save" id="linkChangePattern">'.$langs->trans("Save").'</a>';
print '</div>'; print '</div>';
print '<br><br>'; print '<br><br>';
print '<script type="text/javascript">'; print '<script type="text/javascript">';
@ -392,7 +392,7 @@ print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("Parameters").'</td>'; print '<td colspan="3">'.$langs->trans("Parameters").'</td>';
print '<td class="center">'.$langs->trans("Activated").'</td>'; print '<td class="center">'.$langs->trans("Activated").'</td>';
print '<td class="center">'.$langs->trans("Action").'</td>'; print '<td class="center"></td>';
print '</tr>'; print '</tr>';
// Disable clear password in database // Disable clear password in database

18
htdocs/admin/security_file.php
View File

@ -115,15 +115,15 @@ print '<br>';
print '<div class="div-table-responsive-no-min">'; print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent nomarginbottom">'; print '<table class="noborder centpercent nomarginbottom">';
print '<tr class="liste_titre">'; 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 '<td>'.$langs->trans("Value").'</td>';
print '</tr>'; print '</tr>';
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td colspan="2">'.$langs->trans("MaxSizeForUploadedFiles").'.'; print '<td>'.$langs->trans("MaxSizeForUploadedFiles").'.';
$max = @ini_get('upload_max_filesize'); $max = @ini_get('upload_max_filesize');
if (isset($max)) { 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 { } else {
print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.'; print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.';
} }
@ -135,8 +135,8 @@ print '</tr>';
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>'.$langs->trans("UMask").'</td><td class="right">'; print '<td>';
print $form->textwithpicto('', $langs->trans("UMaskExplanation")); print $form->textwithpicto($langs->trans("UMask"), $langs->trans("UMaskExplanation"));
print '</td>'; print '</td>';
print '<td class="nowrap">'; print '<td class="nowrap">';
print '<input class="flat" name="MAIN_UMASK" type="text" size="6" value="'.dol_escape_htmltag($conf->global->MAIN_UMASK).'">'; 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 // Use anti virus
print '<tr class="oddeven">'; 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>'; print '<span class="opacitymedium">'.$langs->trans("AntiVirusCommandExample").'</span>';
// Check command in inside safe_mode // Check command in inside safe_mode
print '</td>'; print '</td>';
@ -170,7 +170,7 @@ print '</tr>';
// Use anti virus // Use anti virus
print '<tr class="oddeven">'; 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 '<span class="opacitymedium">'.$langs->trans("AntiVirusParamExample").'</span>';
print '</td>'; print '</td>';
print '<td>'; print '<td>';
@ -198,7 +198,9 @@ $formfile->form_attach_new_file($_SERVER['PHP_SELF'], $langs->trans("FormToTestF
// List of document // List of document
$filearray = dol_dir_list($upload_dir, "files", 0, '', '', $sortfield, $sortorder == 'desc' ? SORT_DESC : SORT_ASC, 1); $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 // End of page
llxFooter(); llxFooter();

2
htdocs/core/class/conf.class.php
View File

@ -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" // 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)) { 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 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) { foreach ($this->modules_parts['moduleforexternal'] as $key => $value) {

16
htdocs/core/lib/admin.lib.php
View File

@ -1840,10 +1840,12 @@ function showModulesExludedForExternal($modules)
global $conf, $langs; global $conf, $langs;
$text = $langs->trans("OnlyFollowingModulesAreOpenedToExternalUsers"); $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; $i = 0;
if (!empty($modules)) { 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; $moduleconst = $module->const_name;
$modulename = strtolower($module->name); $modulename = strtolower($module->name);
//print 'modulename='.$modulename; //print 'modulename='.$modulename;
@ -1860,9 +1862,17 @@ function showModulesExludedForExternal($modules)
$text .= ' '; $text .= ' ';
} }
$i++; $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; return $text;
} }

1
htdocs/langs/en_US/admin.lang
View File

@ -700,6 +700,7 @@ Module62000Name=Incoterms
Module62000Desc=Add features to manage Incoterms Module62000Desc=Add features to manage Incoterms
Module63000Name=Resources Module63000Name=Resources
Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
Module94160Name=Receptions
Permission11=Read customer invoices Permission11=Read customer invoices
Permission12=Create/modify customer invoices Permission12=Create/modify customer invoices
Permission13=Invalidate customer invoices Permission13=Invalidate customer invoices