X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-updates.php;h=c9e5e2b6d2cad5f0be550f49b4e3a3c5f93b569e;hb=5d89789720c77e954b2eba28c00ec710dd28900d;hp=8955a29616ad3a56bd4dcd3c8ef38e8cc77451a9;hpb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;p=mailer.git

diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php
index 8955a29616..c9e5e2b6d2 100644
--- 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,16 +88,19 @@ 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, '{--NO_UPDATES_AVAILABLE--}');
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_UPDATES_AVAILABLE--}');
 }
 
 // [EOF]