X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-updates.php;h=b0b07ae95fac8eab2eff08c03a36ad771920ef8a;hb=5fc7cb9d73815d9d766caffa798e6dd115d9da41;hp=0219bab845f1aba6e987d3ef289ec016890bf8fe;hpb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;p=mailer.git

diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php
index 0219bab845..b0b07ae95f 100644
--- a/inc/modules/admin/what-updates.php
+++ b/inc/modules/admin/what-updates.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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'] = '???';
@@ -58,27 +56,13 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 	// Analyse header for response code
 	if (isInStringIgnoreCase('200 OK', $response[0])) {
 		// Found, kill header
-		$pos = '0';
-		foreach($response as $k => $v) {
-			$v = trim($v);
-			if (empty($v)) {
-				// Header ends here (+1)
-				$pos = $k + 1; break;
-			}
-		}
-
-		$response2 = array();
-		for($i = $pos; $i < count($response); $i++) {
-			$response2[] = trim($response[$i]);
-		}
-		$response = $response2; unset($response2);
-		unset($pos);
+		$response = removeHttpHeaderFromResponse($response);
 
 		// 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 +74,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'] != getConfig('FULL_VERSION')) || ($ONLINE['revision'] != getConfig('CURR_SVN_REVISION'))) {
+	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
+	displayMessage('{--ADMIN_LOCAL_REVISION_IS_NEWER_THAN_UPDATE--}');
 } else {
 	// You have the latest version!
-	loadTemplate('admin_settings_saved', false, '{--NO_UPDATES_AVAILABLE--}');
+	displayMessage('{--ADMIN_NO_UPDATES_AVAILABLE--}');
 }
 
 // [EOF]