Several double->single convertions, fix for missing constant '_MYSQL_PREFIX' which...

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 8acc8e75a3b5df62059451fbdefca11601be2b9a..a50e4e23fa8707ca9bd448082fc1cd1a6363cb18 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -410,8 +410,8 @@ function ADD_MENU ($mode, $act, $wht) {
        } // END - if
 
        // Load SQL data and add the menu to the output stream...
-       $result_main = SQL_QUERY_ESC("SELECT title, action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$AND." ORDER BY `sort`",
-       array($mode), __FUNCTION__, __LINE__);
+       $result_main = SQL_QUERY_ESC("SELECT `title`, `action` FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$AND." ORDER BY `sort`",
+               array($mode), __FUNCTION__, __LINE__);
        //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$main_action.'/'.$sub_what.':'.getWhat()."*<br />\n";
        if (SQL_NUMROWS($result_main) > 0) {
                OUTPUT_HTML("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"".$mode."_menu\">");
@@ -419,15 +419,15 @@ function ADD_MENU ($mode, $act, $wht) {
                while ($content = SQL_FETCHARRAY($result_main)) {
                        //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$sub_what.':'.getWhat()."*<br />\n";
                        // Init variables
-                       $GLOBALS['block_mode'] = false;
+                       enableBlockMode(false);
                        $act = $content['action'];
 
                        // Load menu header template
-                       LOAD_TEMPLATE($mode."_menu_title", false, $content);
+                       LOAD_TEMPLATE($mode . '_menu_title', false, $content);
 
                        // Sub menu
-                       $result_sub = SQL_QUERY_ESC("SELECT title AS sub_title, what AS sub_what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`",
-                       array($mode, $content['action']), __FUNCTION__, __LINE__);
+                       $result_sub = SQL_QUERY_ESC("SELECT `title` AS sub_title, `what` AS sub_what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`",
+                               array($mode, $content['action']), __FUNCTION__, __LINE__);
 
                        // Get number of rows
                        $ctl = SQL_NUMROWS($result_sub);
@@ -490,7 +490,9 @@ function ADD_MENU ($mode, $act, $wht) {
                                }
                        } else {
                                // This is a menu block... ;-)
-                               $GLOBALS['block_mode'] = true;
+                               enableBlockMode();
+
+                               // Load menu block
                                $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
                                if (isFileReadable($INC_BLOCK)) {
                                        // Load include file
@@ -1730,10 +1732,11 @@ function getWhatFromModule ($modCheck) {
                return REQUEST_GET('what');
        } // END - if
 
+       // Default is empty
        $wht = '';
+
        //* DEBUG: */ echo __LINE__.'!'.$modCheck."!<br />\n";
-       switch ($modCheck)
-       {
+       switch ($modCheck) {
                case 'admin':
                        $wht = 'overview';
                        break;
@@ -1747,7 +1750,7 @@ function getWhatFromModule ($modCheck) {
                default:
                        $wht = '';
                        break;
-       }
+       } // END - switch
 
        // Return what value
        return $wht;
@@ -1757,9 +1760,10 @@ function getWhatFromModule ($modCheck) {
 function SUB_POINTS ($subject, $uid, $points) {
        // Add points to used points
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `used_points`=`used_points`+%s WHERE userid=%s LIMIT 1",
-       array($points, bigintval($uid)), __FUNCTION__, __LINE__);
+               array($points, bigintval($uid)), __FUNCTION__, __LINE__);
 
        // Insert booking record
+       // @TODO Rewrite this to a filter
        if (EXT_IS_ACTIVE('booking')) {
                // Add record
                ADD_BOOKING_RECORD($subject, $uid, $points, 'sub');