X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-updates.php;h=204e21e02b0febabc8ab82daf51f5ba3f03d2141;hp=54f27bc8476f386a1a6e974b4665d7621f856085;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hpb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php index 54f27bc847..204e21e02b 100644 --- a/inc/modules/admin/what-updates.php +++ b/inc/modules/admin/what-updates.php @@ -14,11 +14,10 @@ * $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 * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2016 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 * @@ -42,42 +41,27 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); // Init array $ONLINE['code'] = '???'; // Get response from our server in an array -$response = sendGetRequest('check-updates3.php'); +$response = sendHttpGetRequest('check-updates3.php'); if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($response[3])) { // Error! $response = array('', '', ''); } else { // Analyse header for response code - if (eregi('200 OK', $response[0])) { + 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(PHP_EOL, '', $response[0])), + 'changed' => trim(str_replace(PHP_EOL, '', $response[1])), 'code' => '200 OK' ); } else { @@ -89,16 +73,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, '
{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')
'); -} elseif (($ONLINE['version'] != getConfig('FULL_VERSION')) || ($ONLINE['revision'] != getConfig('CURR_SVN_REVISION'))) { + displayErrorMessage('{--ADMIN_CANNOT_CHECK_VERSION--} (' . $ONLINE['code'] . ')'); +} elseif ($ONLINE['version'] != getFullVersion()) { // 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); + loadTemplate('admin_update_download', FALSE, $ONLINE); } else { // You have the latest version! - loadTemplate('admin_settings_saved', false, getMessage('NO_UPDATES_AVAILABLE')); + displayMessage('{--ADMIN_NO_UPDATES_AVAILABLE--}'); } // [EOF]