maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

show whether curl extension is installed when trying to check for a new version in admin-dashboard

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-29 11:11:39 +02:00
parent be0099bf01
commit e58192edc2
1 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
admin_index.php
View File

@@ -85,35 +85,42 @@ if ($page == 'overview') {
if ((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes') if ((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes')
|| (isset($lookfornewversion) && $lookfornewversion == 'yes') || (isset($lookfornewversion) && $lookfornewversion == 'yes')
) { ) {
$update_check_uri = 'http://version.froxlor.org/Froxlor/legacy/' . $version; if (function_exists('curl_version')) {
$latestversion = HttpClient::urlGet($update_check_uri); $update_check_uri = 'http://version.froxlor.org/Froxlor/legacy/' . $version;
$latestversion = explode('|', $latestversion); $latestversion = HttpClient::urlGet($update_check_uri);
$latestversion = explode('|', $latestversion);
if (is_array($latestversion) if (is_array($latestversion)
&& count($latestversion) >= 1 && count($latestversion) >= 1
) { ) {
$_version = $latestversion[0]; $_version = $latestversion[0];
$_message = isset($latestversion[1]) ? $latestversion[1] : ''; $_message = isset($latestversion[1]) ? $latestversion[1] : '';
$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes'); $_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
// add the branding so debian guys are not gettings confused // add the branding so debian guys are not gettings confused
// about their version-number // about their version-number
$lookfornewversion_lable = $_version.$branding; $lookfornewversion_lable = $_version.$branding;
$lookfornewversion_link = $_link; $lookfornewversion_link = $_link;
$lookfornewversion_addinfo = $_message; $lookfornewversion_addinfo = $_message;
// not numeric -> error-message // not numeric -> error-message
if (!preg_match('/^((\d+\\.)(\d+\\.)(\d+\\.)?(\d+)?(\-(svn|dev|rc)(\d+))?)$/', $_version)) { if (!preg_match('/^((\d+\\.)(\d+\\.)(\d+\\.)?(\d+)?(\-(svn|dev|rc)(\d+))?)$/', $_version)) {
// check for customized version to not output // check for customized version to not output
// "There is a newer version of froxlor" besides the error-message // "There is a newer version of froxlor" besides the error-message
$isnewerversion = 2; $isnewerversion = 2;
} elseif (version_compare2($version, $_version) == -1) { } elseif (version_compare2($version, $_version) == -1) {
$isnewerversion = 1; $isnewerversion = 1;
} else {
$isnewerversion = 0;
}
} else { } else {
$isnewerversion = 0; redirectTo($update_check_uri.'/pretty', NULL, false);
} }
} else { } else {
redirectTo($update_check_uri.'/pretty', NULL, false); $lookfornewversion_lable = "Version-check not available due to missing php-curl extension";
$lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
$lookfornewversion_addinfo = '';
$isnewerversion = 0;
} }
} else { } else {
$lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere']; $lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere'];