From a893b4220263317dc5dd81134a34704577396396 Mon Sep 17 00:00:00 2001 From: Tobias Sekan Date: Wed, 15 Jan 2020 10:02:18 +0100 Subject: [PATCH 1/3] Show extra short php function overview --- htdocs/admin/system/phpinfo.php | 103 +++++++++++++++++++++++++++++--- 1 file changed, 96 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index bcc3aba20d4..fc98460892c 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -28,6 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("admin"); +$langs->load("install"); +$langs->load("errors"); if (! $user->admin) accessforbidden(); @@ -66,20 +68,107 @@ if ($maxphp > 0 && $maxphp2 > 0 && $maxphp > $maxphp2) print '
'; } - print ''; print ''; print "\n"; +$ErrorPicturePath = "../../theme/eldy/img/error.png"; +$WarningPicturePath = "../../theme/eldy/img/warning.png"; +$OkayPicturePath = "../../theme/eldy/img/tick.png"; -// Get PHP version -$phpversion=version_php(); -print '\n"; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.$langs->trans("Version")."".$phpversion."
'.$langs->trans("Version").''; +if (versioncompare(versionphparray(), array(5,5,0)) < 0) +{ + print 'Error '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror)); +} +elseif (versioncompare(versionphparray(), array(5,5,0)) < 0) +{ + print 'Error '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning)); +} +else +{ + print 'Ok '.versiontostring(versionphparray()); +} + +print '
GET and POST support'; + +if (! isset($_GET["testget"]) && ! isset($_POST["testpost"])) +{ + print 'Warning '.$langs->trans("PHPSupportPOSTGETKo"); + print ' ('.$langs->trans("Recheck").')'; +} +else +{ + print 'Ok '.$langs->trans("PHPSupportPOSTGETOk"); +} + +print '
Sessions support'; + +if (! function_exists("session_id")) +{ + print 'Error '.$langs->trans("ErrorPHPDoesNotSupportSessions"); +} +else +{ + print 'Ok '.$langs->trans("PHPSupportSessions"); +} + +print '
GD support'; + +if (! function_exists("imagecreate")) +{ + print 'Error '.$langs->trans("ErrorPHPDoesNotSupportGD"); +} +else +{ + print 'Ok '.$langs->trans("PHPSupportGD"); +} + +print '
Curl support'; + +if (! function_exists("curl_init")) +{ + print 'Error '.$langs->trans("ErrorPHPDoesNotSupportCurl"); +} +else +{ + print 'Ok '.$langs->trans("PHPSupportCurl"); +} + +print '
UTF-8 support'; + +if (! function_exists("utf8_encode")) +{ + print 'Error '.$langs->trans("ErrorPHPDoesNotSupportUTF8"); +} +else +{ + print 'Ok '.$langs->trans("PHPSupportUTF8"); +} + +print '
Intl support'; + +if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@localhost') +{ + if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region")) + { + print 'Error '.$langs->trans("ErrorPHPDoesNotSupportIntl"); + } + else + { + print 'Ok '.$langs->trans("PHPSupportIntl"); + } +} + +print '
'; -print '
'; - - // Get php_info array $phparray=phpinfo_array(); From c47da64476065e2c0f7f03176a4f8940c536213d Mon Sep 17 00:00:00 2001 From: Tobias Sekan Date: Wed, 15 Jan 2020 10:13:55 +0100 Subject: [PATCH 2/3] A few fixes --- htdocs/admin/system/phpinfo.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index fc98460892c..237973f26df 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -78,13 +78,15 @@ $OkayPicturePath = "../../theme/eldy/img/tick.png"; print ''.$langs->trans("Version").''; -if (versioncompare(versionphparray(), array(5,5,0)) < 0) +$arrayphpminversionerror = array(5,5,0); +$arrayphpminversionwarning = array(5,5,0); +if (versioncompare(versionphparray(), , $arrayphpminversionerror) < 0) { print 'Error '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror)); } -elseif (versioncompare(versionphparray(), array(5,5,0)) < 0) +elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0) { - print 'Error '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning)); + print 'Warning '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning)); } else { @@ -109,7 +111,7 @@ print 'Sessions support'; if (! function_exists("session_id")) { - print 'Error '.$langs->trans("ErrorPHPDoesNotSupportSessions"); + print 'Error '.$langs->trans("ErrorPHPDoesNotSupportSessions"); } else { @@ -121,7 +123,7 @@ print 'GD support'; if (! function_exists("imagecreate")) { - print 'Error '.$langs->trans("ErrorPHPDoesNotSupportGD"); + print 'Warning '.$langs->trans("ErrorPHPDoesNotSupportGD"); } else { @@ -133,7 +135,7 @@ print 'Curl support'; if (! function_exists("curl_init")) { - print 'Error '.$langs->trans("ErrorPHPDoesNotSupportCurl"); + print 'Warning '.$langs->trans("ErrorPHPDoesNotSupportCurl"); } else { @@ -145,7 +147,7 @@ print 'UTF-8 support'; if (! function_exists("utf8_encode")) { - print 'Error '.$langs->trans("ErrorPHPDoesNotSupportUTF8"); + print 'Warning '.$langs->trans("ErrorPHPDoesNotSupportUTF8"); } else { @@ -159,7 +161,7 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc { if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region")) { - print 'Error '.$langs->trans("ErrorPHPDoesNotSupportIntl"); + print 'Warning '.$langs->trans("ErrorPHPDoesNotSupportIntl"); } else { From 503671a307e63c5f1d08eef0a4225b009c4f45c6 Mon Sep 17 00:00:00 2001 From: Tobias Sekan Date: Wed, 15 Jan 2020 10:21:36 +0100 Subject: [PATCH 3/3] Fix lint error --- htdocs/admin/system/phpinfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index 237973f26df..45d9166811a 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -80,7 +80,7 @@ print ''.$langs->trans("Version").''; $arrayphpminversionerror = array(5,5,0); $arrayphpminversionwarning = array(5,5,0); -if (versioncompare(versionphparray(), , $arrayphpminversionerror) < 0) +if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0) { print 'Error '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror)); }