Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 10:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2024-09-03 01:58:02 +02:00
parent 12799d5485 ebab2bfdc7
commit 38612e3cf7
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/admin/system/phpinfo.php
View File

@@ -105,37 +105,37 @@ $arrayphpminversionerror = array(5, 5, 0);
$arrayphpminversionwarning = array(5, 6, 0); $arrayphpminversionwarning = array(5, 6, 0);
if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0) { if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0) {
print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror)); print img_picto('Error', 'error').' '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
} elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0) { } elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0) {
print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning)); print img_picto('Warning', 'warning').' '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
} else { } else {
print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.versiontostring(versionphparray()); print img_picto('Ok', 'tick').' '.versiontostring(versionphparray());
} }
print '</td></tr>'; print '</td></tr>';
print '<tr><td>GET and POST support</td><td>'; print '<tr><td>GET and POST support</td><td>';
if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["mainmenu"])) { // We must keep $_GET and $_POST here. This is a specific test. if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["mainmenu"])) { // We must keep $_GET and $_POST here. This is a specific test.
print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("PHPSupportPOSTGETKo"); print img_picto('Warning', 'warning').' '.$langs->trans("PHPSupportPOSTGETKo");
print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)'; print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
} else { } else {
print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportPOSTGETOk"); print img_picto('Ok', 'tick').' '.$langs->trans("PHPSupportPOSTGETOk");
} }
print '</td></tr>'; print '</td></tr>';
print '<tr><td>Sessions support</td><td>'; print '<tr><td>Sessions support</td><td>';
if (!function_exists("session_id")) { if (!function_exists("session_id")) {
print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions"); print img_picto('Error', 'error').' '.$langs->trans("ErrorPHPDoesNotSupportSessions");
} else { } else {
print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportSessions"); print img_picto('Ok', 'tick').' '.$langs->trans("PHPSupportSessions");
} }
print '</td></tr>'; print '</td></tr>';
print '<tr><td>UTF-8 support</td><td>'; print '<tr><td>UTF-8 support</td><td>';
if (!function_exists("utf8_encode")) { if (!function_exists("utf8_encode")) {
print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupport", "UTF8"); print img_picto('Warning', 'warning').' '.$langs->trans("ErrorPHPDoesNotSupport", "UTF8");
} else { } else {
print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupport", "UTF8"); print img_picto('Ok', 'tick').' '.$langs->trans("PHPSupport", "UTF8");
} }
print '</td></tr>'; print '</td></tr>';

3
htdocs/admin/system/security.php
View File

@@ -293,6 +293,8 @@ if (file_exists($installlock)) {
} else { } else {
print img_warning().' '.$langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT); print img_warning().' '.$langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT);
} }
print '<br>';
print '<br>'; print '<br>';
// Is upgrade unlocked // Is upgrade unlocked
@@ -301,6 +303,7 @@ if (file_exists($installlock)) { // If install not locked, no need to show this.
print '<strong>'.$langs->trans("DolibarrUpgrade").'</strong>: '; print '<strong>'.$langs->trans("DolibarrUpgrade").'</strong>: ';
print img_warning().' '.$langs->trans("WarningUpgradeHasBeenUnlocked", $upgradeunlock); print img_warning().' '.$langs->trans("WarningUpgradeHasBeenUnlocked", $upgradeunlock);
print '<br>'; print '<br>';
print '<br>';
} }
} }

2
htdocs/categories/class/categorie.class.php
View File

@@ -1260,7 +1260,7 @@ class Categorie extends CommonObject
dol_syslog(get_class($this)."::get_full_arbo dol_sort_array", LOG_DEBUG); dol_syslog(get_class($this)."::get_full_arbo dol_sort_array", LOG_DEBUG);
$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', 1, 0, 1); $this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', 1, 0, 1); // Sort on full label like "Label 1 >> Sublabel a >> Subsublabel"
return $this->cats; return $this->cats;
} }