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

- versionchecking via url_fopen now works again and looks better

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-02-23 09:19:41 +00:00
parent 7aba67af11
commit dd9b72e45e
2 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
admin_index.php
View File

@@ -84,26 +84,38 @@ if($page == 'overview')
$webserverinterface = strtoupper(@php_sapi_name());
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(strtolower(ini_get('allow_url_fopen')) == 'on')
if(ini_get('allow_url_fopen'))
{
$latestversion = @file($update_check_uri);
$latestversion = explode(':', $latestversion);
if(is_array($latestversion)
&& count($latestversion) >= 2)
if (isset($latestversion[0]))
{
$lookfornewversion_lable = $latestversion[0];
$lookfornewversion_link = $latestversion[1];
$lookfornewversion_addinfo = '';
$latestversion = explode('|', $latestversion[0]);
if(count($latestversion) >= 3)
if(is_array($latestversion)
&& count($latestversion) >= 1)
{
$lookfornewversion_addinfo = $latestversion[2];
$_version = $latestversion[0];
$_message = $latestversion[1];
$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
$lookfornewversion_lable = $_version;
$lookfornewversion_link = $_link;
$lookfornewversion_addinfo = $_message;
if (version_compare($version, $_version) == -1) {
$isnewerversion = 1;
} else {
$isnewerversion = 0;
}
}
else
{
redirectTo($update_check_uri.'/pretty', NULL);
}
}
else
@@ -121,6 +133,7 @@ if($page == 'overview')
$lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere'];
$lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
$lookfornewversion_addinfo = '';
$isnewerversion = 0;
}
$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $settings['panel']['decimal_places']);
@@ -177,8 +190,8 @@ if($page == 'overview')
$uptime_array = explode(" ", @file_get_contents("/proc/uptime"));
if(is_array($uptime_array)
&& isset($uptime_array[0])
&& is_numeric($uptime_array[0]))
&& isset($uptime_array[0])
&& is_numeric($uptime_array[0]))
{
// Some calculatioon to get a nicly formatted display
@@ -207,7 +220,7 @@ if($page == 'overview')
elseif($page == 'change_password')
{
if(isset($_POST['send'])
&& $_POST['send'] == 'send')
&& $_POST['send'] == 'send')
{
$old_password = validate($_POST['old_password'], 'old password');
@@ -251,7 +264,7 @@ elseif($page == 'change_password')
elseif($page == 'change_language')
{
if(isset($_POST['send'])
&& $_POST['send'] == 'send')
&& $_POST['send'] == 'send')
{
$def_language = validate($_POST['def_language'], 'default language');

8
templates/admin/index/index.tpl
View File

@@ -123,11 +123,15 @@ $header
</tr>
<tr>
<td class="field_name_border_left">{$lng['admin']['latestversion']}:</td>
<td class="field_display"><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
<if $isnewerversion != 0 >
<td class="field_display"><a href="$lookfornewversion_link"><strong>$lookfornewversion_lable</strong></a></td>
<else>
<td class="field_display"><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
</if>
</tr>
<if $lookfornewversion_addinfo != ''>
<tr>
<td class="field_name_border_left" colspan="2">$lookfornewversion_addinfo</td>
<td class="field_name_border_left" colspan="2"><strong>$lookfornewversion_addinfo</strong></td>
</tr>
</if>
</table>