Generic function accepts eights (!) but optional parameter $callback, ext-network...

[mailer.git] / inc / modules / admin / what-updates.php

diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php
index 8955a29616ad3a56bd4dcd3c8ef38e8cc77451a9..33b0d7f7b6353777a17be411cd62100fc617918f 100644 (file)
--- a/inc/modules/admin/what-updates.php
+++ b/inc/modules/admin/what-updates.php
@@ -76,9 +76,9 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 
                // Which is the latest version on server?
                $ONLINE = array(
-                       'version'  => str_replace("\n", '', $response[0]),
-                       'changed'  => str_replace("\n", '', $response[1]),
-                       'revision' => str_replace("\n", '', $response[2]),
+                       'version'  => trim(str_replace("\n", '', $response[0])),
+                       'changed'  => trim(str_replace("\n", '', $response[1])),
+                       'revision' => trim(str_replace("\n", '', $response[2])),
                        'code'     => '200 OK'
                );
        } else {
@@ -91,15 +91,18 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 if (empty($ONLINE['version'])) {
        // Disconnected?
        loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')</div>');
-} elseif (($ONLINE['version'] != getFullVersion()) || ($ONLINE['revision'] != getCurrSvnRevision())) {
+} elseif (($ONLINE['version'] != getFullVersion()) || ($ONLINE['revision'] > getCurrSvnRevision())) {
        // New full-version available (all previous released patches are included in this version!)
        $ONLINE['changed'] = generateDateTime($ONLINE['changed'], 2);
 
        // Load template
        loadTemplate('admin_update_download', false, $ONLINE);
+} elseif ($ONLINE['revision'] < getCurrSvnRevision()) {
+       // Installed revision is newer than on server
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_LOCAL_REVISION_IS_NEWER_THAN_UPDATE--}');
 } else {
        // You have the latest version!
-       loadTemplate('admin_settings_saved', false, '{--NO_UPDATES_AVAILABLE--}');
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_UPDATES_AVAILABLE--}');
 }
 
 // [EOF]