X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-updates.php;h=f3b4890f3e185cc56f07ac5bda3e184d52b48951;hb=c9b2e406d8e94ffcff8bac9d453e671f337552e4;hp=5d702805a0132fdf11f3230ff0c36732dc1ce26e;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php index 5d702805a0..f3b4890f3e 100644 --- a/inc/modules/admin/what-updates.php +++ b/inc/modules/admin/what-updates.php @@ -16,8 +16,8 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); // Init array $ONLINE['code'] = '???'; @@ -56,21 +56,7 @@ 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( @@ -89,18 +75,18 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($ if (empty($ONLINE['version'])) { // Disconnected? loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')'); -} elseif (($ONLINE['version'] != getFullVersion()) || ($ONLINE['revision'] > getCurrSvnRevision())) { +} 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'] < getCurrSvnRevision()) { +} elseif ($ONLINE['revision'] < getCurrentRepositoryRevision()) { // Installed revision is newer than on server - loadTemplate('admin_settings_saved', false, '{--ADMIN_LOCAL_REVISION_IS_NEWER_THAN_UPDATE--}'); + displayMessage('{--ADMIN_LOCAL_REVISION_IS_NEWER_THAN_UPDATE--}'); } else { // You have the latest version! - loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_UPDATES_AVAILABLE--}'); + displayMessage('{--ADMIN_NO_UPDATES_AVAILABLE--}'); } // [EOF]