diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php index 32532f61f50..e9e2e0f1749 100644 --- a/htdocs/admin/system/about.php +++ b/htdocs/admin/system/about.php @@ -26,14 +26,35 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; $langs->load("admin"); $langs->load("help"); $langs->load("members"); +$langs->load("other"); $youuselaststable = 0; +$action=GETPOST('action','alpha'); + +if (! $user->admin) accessforbidden(); + +$sfurl = ''; +$version='0.0'; + + +/* + * Actions + */ + +if ($action == 'getlastversion') +{ + $result = getURLContent('http://sourceforge.net/projects/dolibarr/rss'); + //var_dump($result['content']); + $sfurl = simplexml_load_string($result['content']); +} + /* * View @@ -50,51 +71,49 @@ print '
'.img_picto_common('', 'dolibarr_box.png print '
'; -print $langs->trans("Version").' / '.$langs->trans("DolibarrLicense").':'; -print '
    '; -print '
  • '.DOL_VERSION.''; +print $langs->trans("CurrentVersion").' : '.DOL_VERSION.'
    '; -$result = getURLContent('http://sourceforge.net/projects/dolibarr/rss'); -//var_dump($result['content']); -$sfurl = simplexml_load_string($result['content']); -if ($sfurl) +if (function_exists('curl_init')) { - $i=0; - $version='0.0'; - while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000) + $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10; + + if ($action == 'getlastversion') { - $title=$sfurl->channel[0]->item[$i]->title; - if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg)) + if ($sfurl) { - $newversion=$reg[1]; - $newversionarray=explode('.',$newversion); - $versionarray=explode('.',$version); - //var_dump($newversionarray);var_dump($versionarray); - if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion; + while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000) + { + $title=$sfurl->channel[0]->item[$i]->title; + if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg)) + { + $newversion=$reg[1]; + $newversionarray=explode('.',$newversion); + $versionarray=explode('.',$version); + //var_dump($newversionarray);var_dump($versionarray); + if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion; + } + $i++; + } + + // Show version + print $langs->trans("LastStableVersion").' : '. (($version != '0.0')?$version:$langs->trans("Unknown")) .'
    '; + } + else + { + print $langs->trans("LastStableVersion").' : ' .$langs->trans("UpdateServerOffline").'
    '; } - $i++; } - - // Show version - if ($version != '0.0') + else { - print ' ('.$langs->trans("LastStableVersion").': '.$version.''; - if (DOL_VERSION == $version) - { - $youuselaststable=1; - print $langs->trans("YouUseLastStableVersion"); - } - print ')'; + print $langs->trans("LastStableVersion").' : ' .$langs->trans("Check").'
    '; } } -else -{ - print ' ('.$langs->trans("LastStableVersion").' : ' .$langs->trans("UpdateServerOffline").')
    '; -} -print ' / GNU-GPL v3+
  • '; +print '
    '; - -print '
'; +print $langs->trans("DolibarrLicense").' : '; +print ''; //print "
\n"; diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index d8b17ab989b..d0802d6b473 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -69,7 +69,9 @@ llxHeader('',$langs->trans("Upgrade"),$wikihelp); print load_fiche_titre($langs->trans("Upgrade"),'','title_setup'); -print $langs->trans("CurrentVersion").' : '.DOL_VERSION.'
'; +print '
'; + +print $langs->trans("CurrentVersion").' : '.DOL_VERSION.'
'; if (function_exists('curl_init')) {