Previous fix fixed, a lot constants rewritten (unfinished)

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 6da430d5da5094f1e0c9c5a869f5e00552c8b8e7..3ef321ce3234673aef4bbefeb043c8c86e51c0e2 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -70,7 +70,7 @@ function INIT_FILTER_SYSTEM () {
 
                // Load all active filers
                $result = SQL_QUERY("SELECT `filter_name`, `filter_function`, `filter_active`".$ADD."
-FROM `{!MYSQL_PREFIX!}_filters`
+FROM `{!_MYSQL_PREFIX!}_filters`
 ORDER BY `filter_id` ASC", __FILE__, __LINE__);
 
                // Are there entries?
@@ -264,8 +264,8 @@ function FILTER_FLUSH_FILTERS () {
        $inserted = 0; $removed = 0;
 
        // Prepare SQL queries
-       $insertSQL = "INSERT INTO `{!MYSQL_PREFIX!}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES";
-       $removeSQL = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_filters` WHERE";
+       $insertSQL = "INSERT INTO `{!_MYSQL_PREFIX!}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES";
+       $removeSQL = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_filters` WHERE";
 
        // Write all filters to database
        foreach ($filters as $filterName => $filterArray) {
@@ -309,7 +309,7 @@ function FILTER_FLUSH_FILTERS () {
                        // Walk through all filters
                        foreach ($filterArray as $filterFunction => $cnt) {
                                // Construct and add the query
-                               $SQLs[] = sprintf("UPDATE `{!MYSQL_PREFIX!}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
+                               $SQLs[] = sprintf("UPDATE `{!_MYSQL_PREFIX!}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
                                        bigintval($cnt),
                                        $filterName,
                                        $filterFunction
@@ -451,7 +451,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
        $GLOBALS['userid'] = bigintval(get_session('userid'));
 
        // Load last module and last online time
-       $result = SQL_QUERY_ESC("SELECT last_module, last_online FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT last_module, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Entry found?
@@ -475,7 +475,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
                } // END - if
 
                // Update last module / online time
-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET last_module='%s', last_online=UNIX_TIMESTAMP(), REMOTE_ADDR='%s' WHERE userid=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET last_module='%s', last_online=UNIX_TIMESTAMP(), REMOTE_ADDR='%s' WHERE userid=%s LIMIT 1",
                        array($GLOBALS['what'], GET_REMOTE_ADDR(), $GLOBALS['userid']), __FILE__, __LINE__);
        }  else {
                // Destroy session, we cannot update!