Renamed function so it might be more understandable

[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 9b1fe93afd78706e9aee4e09237af07be06205f7..c9e5e2b6d2cad5f0be550f49b4e3a3c5f93b569e 100644 (file)
--- a/inc/modules/admin/what-updates.php
+++ b/inc/modules/admin/what-updates.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Init array
 $ONLINE['code'] = '???';
@@ -76,9 +74,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 {
@@ -90,13 +88,16 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 // Is a newer version available?
 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())) {
+       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')');
+} elseif (($ONLINE['version'] != getFullVersion()) || ($ONLINE['revision'] > getCurrentRepositoryRevision())) {
        // 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'] < getCurrentRepositoryRevision()) {
+       // 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, '{--ADMIN_NO_UPDATES_AVAILABLE--}');