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

29
admin_index.php
View File

@@ -88,22 +88,34 @@ if($page == 'overview')
{ {
$update_check_uri = 'http://version.froxlor.org/Froxlor/legacy/' . $version; $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 = @file($update_check_uri);
$latestversion = explode(':', $latestversion); if (isset($latestversion[0]))
{
$latestversion = explode('|', $latestversion[0]);
if(is_array($latestversion) if(is_array($latestversion)
&& count($latestversion) >= 2) && count($latestversion) >= 1)
{ {
$lookfornewversion_lable = $latestversion[0]; $_version = $latestversion[0];
$lookfornewversion_link = $latestversion[1]; $_message = $latestversion[1];
$lookfornewversion_addinfo = ''; $_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
if(count($latestversion) >= 3) $lookfornewversion_lable = $_version;
$lookfornewversion_link = $_link;
$lookfornewversion_addinfo = $_message;
if (version_compare($version, $_version) == -1) {
$isnewerversion = 1;
} else {
$isnewerversion = 0;
}
}
else
{ {
$lookfornewversion_addinfo = $latestversion[2]; redirectTo($update_check_uri.'/pretty', NULL);
} }
} }
else else
@@ -121,6 +133,7 @@ if($page == 'overview')
$lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere']; $lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere'];
$lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes'); $lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
$lookfornewversion_addinfo = ''; $lookfornewversion_addinfo = '';
$isnewerversion = 0;
} }
$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $settings['panel']['decimal_places']); $userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $settings['panel']['decimal_places']);

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

@@ -123,11 +123,15 @@ $header
</tr> </tr>
<tr> <tr>
<td class="field_name_border_left">{$lng['admin']['latestversion']}:</td> <td class="field_name_border_left">{$lng['admin']['latestversion']}:</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> <td class="field_display"><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
</if>
</tr> </tr>
<if $lookfornewversion_addinfo != ''> <if $lookfornewversion_addinfo != ''>
<tr> <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> </tr>
</if> </if>
</table> </table>