Unknown module in non-HTML mode, debug comments removed :(

diff --git a/inc/filters.php b/inc/filters.php
index 40fb713d99717057726f740728e1541e1455260b..20dae9fdb550520baea88f911f4ebd918990ba42 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -591,9 +591,12 @@ function FILTER_DETERMINE_WHAT_ACTION () {
                        if (isGetRequestElementSet('module')) {
                                // Set module from request
                                setModule(getRequestElement('module'));
-                       } else {
+                       } elseif (getOutputMode() == '0') {
                                // Set default module 'index'
                                setModule('index');
+                       } else {
+                               // Unknown module
+                               setModule('unknown');
                        }
                } // END - if
 
@@ -850,7 +853,7 @@ function FILTER_FLUSH_TEMPLATE_CACHE () {
                // Now flush all
                foreach ($GLOBALS['template_eval'] as $template=>$eval) {
                        // Flush the cache (if not yet found)
-                       //flushTemplateCache($template, $eval);
+                       flushTemplateCache($template, $eval);
                } // END - if
        } // END - if
 }

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 4f61d180fac8992287b497a416d376d20cf54385..0cd50f820f5980a5be2f71cc57d91b1f899d66fa 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -51,13 +51,13 @@ $mark = mktime(0, 0, 0, getConfig('last_month'), date('d', time()), date('Y', ti
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT userid, email FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (beg_ral_notify ";
+$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_ral_notify` ";
 switch (getConfig('beg_rallye')) {
        case 'Y': // Begging rallye is activated
                if (getConfig('beg_ral_en_notify') == 'Y') {
                        // Okay, let's check for member accounts
-                       $sql .= "= 0 OR (beg_ral_notify > 0 AND beg_ral_en_notify < beg_ral_di_notify)";
-                       $mode = "en";
+                       $sql .= '= 0 OR (`beg_ral_notify` > 0 AND `beg_ral_en_notify` < `beg_ral_di_notify`)';
+                       $mode = 'en';
                } else {
                        // Do not notify!
                        $sql = '';
@@ -67,14 +67,14 @@ switch (getConfig('beg_rallye')) {
        case 'N': // Begging rallye is deactivated
                if (getConfig('beg_ral_di_notify') == 'Y') {
                        // Okay, let's check for member accounts
-                       $sql .= " > 0 AND beg_ral_di_notify < beg_ral_en_notify";
-                       $mode = "di";
+                       $sql .= ' > 0 AND `beg_ral_di_notify` < `beg_ral_en_notify`';
+                       $mode = 'di';
                } else {
-               // Do not notify!
-               $sql = '';
+                       // Do not notify!
+                       $sql = '';
                }
                break;
-}
+} // END - switch
 
 if (!empty($sql)) {
        // The SQL command needs to be finisched here (only confirmed accounts!)
@@ -109,9 +109,13 @@ if (!empty($sql)) {
                // Okay lets notify all users!
                while ($content = merge_array($content, SQL_FETCHARRAY($result_main))) {
                        // Update account
-                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
-SET `beg_ral_notify`=UNIX_TIMESTAMP(),` beg_ral_%s_notify`=UNIX_TIMESTAMP()
-WHERE `userid`=%s
+                       SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_user_data`
+SET
+       `beg_ral_notify`=UNIX_TIMESTAMP(),
+       `beg_ral_%s_notify`=UNIX_TIMESTAMP()
+WHERE
+       `userid`=%s
 LIMIT 1",
                                array(
                                        $mode,

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 568a2f0f98e116f2cd0cd160e8122c7ca5578d55..1dc632d6751e486ae955b26d04bb5aba733febaf 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -57,7 +57,7 @@ switch (getConfig('bonus_active'))
        case 'Y': // Active rallye is activated
                if (getConfig('bonus_en_notify') == 'Y') {
                        // Okay, let's check for member accounts
-                       $sql .= "= 0 OR (`bonus_ral_notify` > 0 AND `bonus_ral_en_notify` < `bonus_ral_di_notify`)";
+                       $sql .= '= 0 OR (`bonus_ral_notify` > 0 AND `bonus_ral_en_notify` < `bonus_ral_di_notify`)';
                        $mode = 'en';
                } else {
                        // Do not notify!
@@ -68,7 +68,7 @@ switch (getConfig('bonus_active'))
        case 'N': // Active rallye is deactivated
                if (getConfig('bonus_di_notify') == 'Y') {
                        // Okay, let's check for member accounts
-                       $sql .= " > 0 AND `bonus_ral_di_notify` < `bonus_ral_en_notify`";
+                       $sql .= ' > 0 AND `bonus_ral_di_notify` < `bonus_ral_en_notify`';
                        $mode = 'di';
                } else {
                        // Do not notify!

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 6279fd213d9608a3dfe3fecff272aefb80264248..69852389ddef0c34a27192fcf136c38966e6ddbd 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -64,24 +64,44 @@ setSession('DOUBLER_UID', '');
 if (empty($GLOBALS['doubler_userid'])) $GLOBALS['doubler_userid'] = '0';
 
 // Check for doubles which we can pay out
-$result_total = SQL_QUERY_ESC("SELECT d.id, d.userid, d.points, d.remote_ip, d.timemark
-FROM `{?_MYSQL_PREFIX?}_doubler` AS d
-LEFT JOIN `{?_MYSQL_PREFIX?}_user_data` AS u
-ON d.userid=u.userid
-WHERE u.`status`='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed='N' AND d.is_ref='N'
-ORDER BY d.timemark",
+$result_total = SQL_QUERY_ESC("SELECT
+       d.id, d.userid, d.points, d.remote_ip, d.timemark
+FROM
+       `{?_MYSQL_PREFIX?}_doubler` AS d
+LEFT JOIN
+       `{?_MYSQL_PREFIX?}_user_data` AS u
+ON
+       d.userid=u.userid
+WHERE
+       u.`status`='CONFIRMED' AND
+       d.points <= %s AND
+       d.points >= %s AND
+       d.completed='N' AND
+       d.is_ref='N'
+ORDER BY
+       d.timemark ASC",
        array(
                $DOUBLER_POINTS,
                getConfig(('doubler_min') * 2)
        ), __FILE__, __LINE__);
 
 // Check for accounts with limitation
-$result_main = SQL_QUERY_ESC("SELECT d.id, d.userid, d.points, d.remote_ip, d.timemark
-FROM `{?_MYSQL_PREFIX?}_doubler` AS d
-LEFT JOIN `{?_MYSQL_PREFIX?}_user_data` AS u
-ON d.userid=u.userid
-WHERE u.`status`='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed='N' AND d.is_ref='N'
-ORDER BY d.timemark
+$result_main = SQL_QUERY_ESC("SELECT
+       d.id, d.userid, d.points, d.remote_ip, d.timemark
+FROM
+       `{?_MYSQL_PREFIX?}_doubler` AS d
+LEFT JOIN
+       `{?_MYSQL_PREFIX?}_user_data` AS u
+ON
+       d.userid=u.userid
+WHERE
+       u.`status`='CONFIRMED' AND
+       d.points <= %s AND
+       d.points >= %s AND
+       d.completed='N' AND
+       d.is_ref='N'
+ORDER BY
+       d.timemark ASC
 LIMIT %d",
        array(
                $DOUBLER_POINTS,

diff --git a/inc/reset/reset_100_bonus.php b/inc/reset/reset_100_bonus.php
index 511b107a2ffb7b5ed160d29d02a4972d3bba5d2e..860af31134318f9cb90a00bf833e7875be156606 100644 (file)
--- a/inc/reset/reset_100_bonus.php
+++ b/inc/reset/reset_100_bonus.php
@@ -53,7 +53,9 @@ $result_bonus = SQL_QUERY("SELECT
 FROM
        `{?_MYSQL_PREFIX?}_user_stats`
 WHERE
-       `max_rec`=`clicks` AND `clicks` > 0 AND `bonus_stats_active`='N'
+       `max_rec`=`clicks` AND
+       `clicks` > 0 AND
+       `bonus_stats_active`='N'
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 

diff --git a/inc/reset/reset_beg.php b/inc/reset/reset_beg.php
index dc59885448ef6c2c811078db7d027f67e81db52a..04124255e04e9807ddbb8d7a3b6f1ad12cfca66c 100644 (file)
--- a/inc/reset/reset_beg.php
+++ b/inc/reset/reset_beg.php
@@ -48,7 +48,7 @@ if ((getOutputMode() != 0) || (!isResetModeEnabled()) || (getConfig('beg_rallye'
 //* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
 
 // Reset accounts
-$result = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET beg_points=0.00000 WHERE beg_points > 0",
+$result = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_points`=0.00000 WHERE `beg_points` > 0",
        __FILE__, __LINE__);
 
 // [EOF]