Compilation time added, some compileCode() calles removed, ADMIN_WHAT_404 added

[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 14aba0e9a7fea033c5f069a2369dc758773118c7..6d73b593ac92c35a5afeb8b84f40c10502747a4a 100644 (file)
--- a/inc/modules/admin/what-updates.php
+++ b/inc/modules/admin/what-updates.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,13 +37,12 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
 // Init array
 $ONLINE['code'] = '???';
@@ -56,7 +55,7 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
        $response = array('', '', '');
 } else {
        // Analyse header for response code
-       if (eregi("200 OK", $response[0])) {
+       if (eregi('200 OK', $response[0])) {
                // Found, kill header
                $pos = 0;
                foreach($response as $k => $v) {
@@ -79,46 +78,8 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
                        'version'  => str_replace("\n", '', $response[0]),
                        'changed'  => str_replace("\n", '', $response[1]),
                        'revision' => str_replace("\n", '', $response[2]),
+                       'code'     => '200 OK'
                );
-
-               // Array for available patches
-               $PATCHES = array(
-                       'fname' => array(),
-                       'fsize' => array(),
-                       'ctime' => array()
-               );
-
-               if (($response[3] != "[EOF]") && ($ONLINE['version'] == getConfig('FULL_VERSION'))) {
-                       // We have found new patches (newer than FULL_VERSION)
-                       $max = str_replace("\n", '', $response[count($response) - 2]); $totalSize = 0;
-
-                       // Maximum of available pacthes extracted (above). Now we can get all informations
-                       for ($idx = 0; $idx < $max; $idx++) {
-                               // List only newer patches
-                               $TEST = substr(str_replace("\n", '', $response[$idx * 5 + 2]), 0, strlen(getConfig('patch_level')));
-
-                               // I have removed the addional test for the stored timemark in database or you cannot find
-                               // new updates on my server when you haven't installed it before I upload a patch... :-(
-                               if (bigintval($TEST) > getConfig(('patch_level'))) {
-                                       // Copy every data from the response array
-                                       $PATCHES['fname'][] = str_replace("\n", '', $response[$idx * 5 + 2]);
-                                       $PATCHES['fsize'][] = str_replace("\n", '', $response[$idx * 5 + 3]);
-                                       $PATCHES['ctime'][] = str_replace("\n", '', $response[$idx * 5 + 4]);
-                                       switch (getLanguage()) {
-                                               case 'de': $PATCHES['descr'][] = str_replace("\n", '', $response[$idx * 5 + 5]); break; // Load german description
-                                               default  : $PATCHES['descr'][] = str_replace("\n", '', $response[$idx * 5 + 6]); break; // Load english description as default
-                                       }
-
-                                       // Add patch's size to total
-                                       $totalSize += $PATCHES['fsize'][$idx];
-                               }
-                       }
-
-                       array_pk_sort($PATCHES, array("ctime", "fname"));
-
-                       // All done here!
-                       $ONLINE['code'] = "200 OK";
-               }
        } else {
                // 404 / 403 error from server
                $ONLINE['code'] = $response[0];
@@ -128,19 +89,17 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($
 // Is a newer version available?
 if (empty($ONLINE['version'])) {
        // Disconnected?
-       LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_failed\">{--ADMIN_CANNOT_CHECK_VERSION--} (".$ONLINE['code'].")</div>");
+       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'))) {
        // New full-version available (all previous released patches are included in this version!)
-       define('__ONLINE_VERSION', $ONLINE['version']);
-       define('__ONLINE_CHANGE' , generateDateTime($ONLINE['changed'], '2'));
-       define('__ONLINE_REVISION', $ONLINE['revision']);
+       $ONLINE['changed'] = generateDateTime($ONLINE['changed'], 2);
 
        // Load template
-       LOAD_TEMPLATE('admin_update_download');
+       loadTemplate('admin_update_download', false, $ONLINE);
 } else {
        // You have the latest version!
-       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('NO_UPDATES_AVAILABLE'));
+       loadTemplate('admin_settings_saved', false, getMessage('NO_UPDATES_AVAILABLE'));
 }
 
-//
+// [EOF]
 ?>