Swapped all

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

diff --git a/inc/loader/load-refsystem.php b/inc/loader/load-refsystem.php
index 55cf614561b50c1cb7013e1f4c3551db85ad5b1d..dab0a40d145960ef2fe0d30646c5dac61a7a112a 100644 (file)
--- a/inc/loader/load-refsystem.php
+++ b/inc/loader/load-refsystem.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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 *
@@ -38,21 +38,32 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
+} elseif (isInstallationPhase()) {
+       // Do not run in installation phase
+       return FALSE;
 }
 
-// Use this code if you don't want to run this cache loader on installation phase
-if (isInstallationPhase()) return;
-
-// Next cached table is the referal system (refsystem)...
+// Next cached table is the referral system (refsystem)...
 if (($GLOBALS['cache_instance']->loadCacheFile('refsystem')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
-       // Load referal system from cache
+       // Load referral system from cache
        $GLOBALS['cache_array']['refsystem'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif (isHtmlOutputMode()) {
+} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 
-       // Load all modules and their data
-       $result = SQL_QUERY('SELECT `id`, `userid`, `level`, `counter` FROM `{?_MYSQL_PREFIX?}_refsystem` ORDER BY `userid` ASC, `level` ASC', __FILE__, __LINE__);
+       // Query for all referrals
+       $result = SQL_QUERY('SELECT
+       `id`,
+       `userid`,
+       `level`,
+       `counter`
+FROM
+       `{?_MYSQL_PREFIX?}_refsystem`
+ORDER BY
+       `userid` ASC,
+       `level` ASC', __FILE__, __LINE__);
+
+       // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
                // Add row to cache file
                $GLOBALS['cache_instance']->addRow($content);