nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use same format of version file as in upgrade.pl.

Browse Source
This commit is contained in:
Michal Čihař
2005-12-12 21:48:23 +00:00
parent aa7136b7a6
commit 43bae7bd90
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-12-12 Michal Čihař <michal@cihar.com>
* scripts/setup.php: Use same format of version file as in upgrade.pl.
2005-12-12 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-12-12 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.inc.php, libraries/grab_globals.inc.php: * libraries/common.inc.php, libraries/grab_globals.inc.php:
preprare removal of grab_globals: preprare removal of grab_globals:

19
scripts/setup.php
View File

@@ -1697,7 +1697,7 @@ switch ($action) {
case 'versioncheck': // Check for latest available version case 'versioncheck': // Check for latest available version
PMA_dl('curl'); PMA_dl('curl');
$url = 'http://phpmyadmin.net/home_page/version.php'; $url = 'http://phpmyadmin.net/home_page/version.php';
$version = ''; $data = '';
$f = @fopen($url, 'r'); $f = @fopen($url, 'r');
if ($f === FALSE) { if ($f === FALSE) {
if (!function_exists('curl_init')) { if (!function_exists('curl_init')) {
@@ -1705,21 +1705,30 @@ switch ($action) {
break; break;
} }
} else { } else {
$version = fread($f, 20); $data = fread($f, 20);
fclose($f); fclose($f);
} }
if (empty($version) && function_exists('curl_init')) { if (empty($data) && function_exists('curl_init')) {
$ch = curl_init($url); $ch = curl_init($url);
curl_setopt($ch, CURLOPT_HEADER, FALSE); curl_setopt($ch, CURLOPT_HEADER, FALSE);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE); curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
$version = curl_exec($ch); $data = curl_exec($ch);
curl_close($ch); curl_close($ch);
} }
if (empty($version)) { if (empty($data)) {
message('error', 'Reading of version failed. Maybe you\'re offline or server does not respond.'); message('error', 'Reading of version failed. Maybe you\'re offline or server does not respond.');
break; break;
} }
/* Format: version\ndate\n(download\n)* */
$data_list = split("\n", $data);
if (count($data_list) > 0) {
$version = $data_list[0];
} else {
$version = '';
}
$version_upstream = version_to_int($version); $version_upstream = version_to_int($version);
if ($version_upstream === FALSE) { if ($version_upstream === FALSE) {
message('error', 'Got invalid version string from server.'); message('error', 'Got invalid version string from server.');