First batch of removal of the headers needed for revision-functions.php

[mailer.git] / inc / loader / load-points_data.php

diff --git a/inc/loader/load-points_data.php b/inc/loader/load-points_data.php
index 744b616ba7103ccf18e5bdf7894e7704b7511136..46265e3d5849ec513bd063f430f1d8be16aa16e0 100644 (file)
--- a/inc/loader/load-points_data.php
+++ b/inc/loader/load-points_data.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,9 +33,13 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+} elseif (isInstaller()) {
+       // Do not run in installation phase
+       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Run from installation phase.');
+       return FALSE;
+} elseif (!isExtensionInstalledAndNewer('sql_patches', '0.8.0')) {
+       // Is not installed or recent enough
+       return FALSE;
 }
 
 // Let's start with the admins table...
@@ -48,13 +47,22 @@ if (($GLOBALS['cache_instance']->loadCacheFile('points_data')) && ($GLOBALS['cac
        // Load cache
        $GLOBALS['cache_array']['points_data'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
+       // Is there cache?
+       if (!isset($GLOBALS['cache_array']['points_data']['subject'])) {
+               // Try to remove the cache file
+               $GLOBALS['cache_instance']->removeCacheFile();
+
+               // Not found, so better abort here
+               reportBug(__FILE__, __LINE__, 'points_data has been generated, but does not contain "subject". Please try to reload to fix this.');
+       } // END - if
+
        // Init temporary array
        $pointsData = array();
 
        // Rewrite all to subject
-       foreach ($GLOBALS['cache_array']['points_data']['subject'] as $key=>$subject) {
+       foreach ($GLOBALS['cache_array']['points_data']['subject'] as $key => $subject) {
                // Re-add key with subject
-               foreach ($GLOBALS['cache_array']['points_data'] as $key2=>$array) {
+               foreach ($GLOBALS['cache_array']['points_data'] as $key2 => $array) {
                        // Is key2 not 'subject'?
                        if ($key2 != 'subject') {
                                // Then Add it
@@ -66,19 +74,19 @@ if (($GLOBALS['cache_instance']->loadCacheFile('points_data')) && ($GLOBALS['cac
        // Set the array back and remove temporary
        $GLOBALS['cache_array']['points_data'] = $pointsData;
        unset($pointsData);
-} elseif (isHtmlOutputMode()) {
+} elseif (((isHtmlOutputMode()) || (isAjaxOutputMode()) || (isRawOutputMode())) && (isExtensionInstalledAndNewer('sql_patches', '0.8.6'))) {
        // Create cache file
        $GLOBALS['cache_instance']->init();
 
        // Query the database about this
-       $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_points_data` ORDER BY `id` ASC', __FILE__, __LINE__);
-       while ($dummy = SQL_FETCHARRAY($result)) {
+       $result = sqlQuery('SELECT * FROM `{?_MYSQL_PREFIX?}_points_data` ORDER BY `id` ASC', __FILE__, __LINE__);
+       while ($data = sqlFetchArray($result)) {
                // Save row
-               $GLOBALS['cache_instance']->addRow($dummy);
+               $GLOBALS['cache_instance']->addRow($data);
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Close cache
        $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');