lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW: No external check of version without explicit click in about page.

Browse Source
This commit is contained in:
Laurent Destailleur 2017-02-16 02:27:07 +01:00
parent 3803330701
commit a1ba4aa941
2 changed files with 57 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
htdocs/admin/system/about.php
View File

@ -26,14 +26,35 @@
require '../../main.inc.php'; require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.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'; require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
$langs->load("admin"); $langs->load("admin");
$langs->load("help"); $langs->load("help");
$langs->load("members"); $langs->load("members");
$langs->load("other");
$youuselaststable = 0; $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 * View
@ -50,51 +71,49 @@ print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png
print '<div class="fichecenter"><div class="fichehalfleft">'; print '<div class="fichecenter"><div class="fichehalfleft">';
print $langs->trans("Version").' / '.$langs->trans("DolibarrLicense").':'; print $langs->trans("CurrentVersion").' : <strong>'.DOL_VERSION.'</strong><br>';
print '<ul>';
print '<li><strong>'.DOL_VERSION.'</strong>';
$result = getURLContent('http://sourceforge.net/projects/dolibarr/rss'); if (function_exists('curl_init'))
//var_dump($result['content']);
$sfurl = simplexml_load_string($result['content']);
if ($sfurl)
{ {
$i=0; $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
$version='0.0';
while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000) if ($action == 'getlastversion')
{ {
$title=$sfurl->channel[0]->item[$i]->title; if ($sfurl)
if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
{ {
$newversion=$reg[1]; while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
$newversionarray=explode('.',$newversion); {
$versionarray=explode('.',$version); $title=$sfurl->channel[0]->item[$i]->title;
//var_dump($newversionarray);var_dump($versionarray); if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion; {
$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").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
}
else
{
print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
} }
$i++;
} }
else
// Show version
if ($version != '0.0')
{ {
print ' ('.$langs->trans("LastStableVersion").': <b>'.$version.'</b>'; print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>';
if (DOL_VERSION == $version)
{
$youuselaststable=1;
print $langs->trans("YouUseLastStableVersion");
}
print ')';
} }
} }
else print '<br>';
{
print ' ('.$langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b>)<br>';
}
print ' / <a href="http://www.gnu.org/copyleft/gpl.html">GNU-GPL v3+</a></li>';
print $langs->trans("DolibarrLicense").' : ';
print '</ul>'; print '<ul><li>';
print '<a href="http://www.gnu.org/copyleft/gpl.html">GNU-GPL v3+</a></li>';
print '</li></ul>';
//print "<br>\n"; //print "<br>\n";

4
htdocs/admin/tools/update.php
View File

@ -69,7 +69,9 @@ llxHeader('',$langs->trans("Upgrade"),$wikihelp);
print load_fiche_titre($langs->trans("Upgrade"),'','title_setup'); print load_fiche_titre($langs->trans("Upgrade"),'','title_setup');
print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>'; print '<br>';
print $langs->trans("CurrentVersion").' : <strong>'.DOL_VERSION.'</strong><br>';
if (function_exists('curl_init')) if (function_exists('curl_init'))
{ {