Script rewritten to setConfigEntry(), getConfig() and incrementConfigEntry()

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 9e82899320d6fc47a5ed41c1364f7b03d1a9006b..6413d766877b4076ddb0a7e58799d0362b5eaf09 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -155,7 +155,7 @@ function CHECK_MODULE ($mod) {
        // Still no luck or not found?
        if (($ret == "cache_miss") || (!$found)) {
                //              ----- Legacy module -----                                   ---- Module in base folder  ----                       --- Module with extension's name ---
-               if ((FILE_READABLE(sprintf("%sinc/modules/%s.php", PATH, $mod))) || (FILE_READABLE(sprintf("%s%s.php", PATH, $mod))) || (FILE_READABLE(sprintf("%s%s/%s.php", PATH, $extension, $mod)))) {
+               if ((FILE_READABLE(sprintf("%sinc/modules/%s.php", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s.php", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s/%s.php", constant('PATH'), $extension, $mod)))) {
                        // Data is missing so we add it
                        if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
                                // Since 0.3.6 we have a has_menu column, this took me a half hour
@@ -369,9 +369,8 @@ function ADD_MENU ($MODE, $act, $wht) {
 
                                        // Full file name for checking menu
                                        //* DEBUG: */ echo __LINE__.":!!!!".$sub_what."!!!<br />\n";
-                                       $test_inc = sprintf("%sinc/modules/%s/what-%s.php", PATH, $MODE, $sub_what);
-                                       $test = (FILE_READABLE($test_inc));
-                                       if ($test) {
+                                       $FQFN = sprintf("%sinc/modules/%s/what-%s.php", constant('PATH'), $MODE, $sub_what);
+                                       if (FILE_READABLE($FQFN)) {
                                                if ((!empty($wht)) && (($wht == $sub_what))) {
                                                        $content = "<strong>";
                                                }
@@ -385,7 +384,7 @@ function ADD_MENU ($MODE, $act, $wht) {
                                        // Menu title
                                        $content .= getConfig('menu_blur_spacer') . $sub_title;
 
-                                       if ($test) {
+                                       if (FILE_READABLE($FQFN)) {
                                                $content .= "</a>";
                                        } else {
                                                $content .= "</em>";
@@ -411,14 +410,14 @@ function ADD_MENU ($MODE, $act, $wht) {
                        } else {
                                // This is a menu block... ;-)
                                $BLOCK_MODE = true;
-                               $INC_BLOCK = sprintf("%sinc/modules/%s/action-%s.php", PATH, $MODE, $main_action);
+                               $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $MODE, $main_action);
                                if (FILE_READABLE($INC_BLOCK)) {
                                        // Load include file
                                        if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML("<tr>
 
   <td class=\"".$MODE."_menu_whats\">");
                                        //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
-                                       include ($INC_BLOCK);
+                                       LOAD_INC($INC_BLOCK);
                                        //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
                                        if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML("  </td>
 </tr>");
@@ -729,7 +728,7 @@ function SEND_MODE_MAILS($mod, $modes) {
        global $DATA;
 
        // Load hash
-       $result_main = SQL_QUERY_ESC("SELECT password FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+       $result_main = SQL_QUERY_ESC("SELECT password FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
                array($GLOBALS['userid']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_main) == 1) {
                // Load hash from database
@@ -813,15 +812,15 @@ function SEND_MODE_MAILS($mod, $modes) {
                                } // END - switch
                        } else {
                                // Could not load profile data
-                               $content = "<span class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</span>";
+                               $content = "<span class=\"member_failed\">{!MEMBER_CANNOT_LOAD_PROFILE!}</span>";
                        }
                } else {
                        // Passwords mismatch
-                       $content = "<span class=\"member_failed\">".MEMBER_PASSWORD_ERROR."</span>";
+                       $content = "<span class=\"member_failed\">{!MEMBER_PASSWORD_ERROR!}</span>";
                }
        } else {
                // Could not load profile
-               $content = "<span class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</span>";
+               $content = "<span class=\"member_failed\">{!MEMBER_CANNOT_LOAD_PROFILE!}</span>";
        }
 
        // Send email to user if required
@@ -1140,7 +1139,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
        if ($locked) $data = "locked_points";
 
        // Check user account
-       $result_user = SQL_QUERY_ESC("SELECT refid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+       $result_user = SQL_QUERY_ESC("SELECT refid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
                array(bigintval($uid)), __FILE__, __LINE__);
 
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},numRows=".SQL_NUMROWS($result_user).",points={$points}<br />\n";
@@ -1708,6 +1707,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
                        // Update mode set?
                        if (!empty($updateMode)) {
                                // Update entry
+                               // @TODO Find a way for updating $_CONFIG here
                                $all .= sprintf("%s=%s%s%s,", $entry, $entry, $updateMode, (float)$values[$idx]);
                        } else {
                                // Check if string or number
@@ -1722,14 +1722,21 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
                                        $all .= sprintf("%s='%s',", $entry, SQL_ESCAPE($values[$idx]));
                                }
                        }
+
+                       // Set it in $_CONFIG as well
+                       setConfigEntry($entry, $values[$idx]);
                } // END - foreach
 
                // Remove last comma
                $entries = substr($all, 0, -1);
        } elseif (!empty($updateMode)) {
                // Update mode set
+               // @TODO Find a way for updating $_CONFIG here
                $entries .= sprintf("=%s%s%s", $entries, $updateMode, (float)$values);
        } else {
+               // Set it in $_CONFIG first
+               setConfigEntry($entries, $values);
+
                // Regular entry to update
                $entries .= sprintf("='%s'", SQL_ESCAPE($values));
        }
@@ -1767,7 +1774,7 @@ function GET_TOTAL_RECEIVERS ($mode="normal") {
        // Query database
        $result_all = SQL_QUERY("SELECT userid
 FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE status='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mode),
+WHERE `status`='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mode),
                __FILE__, __LINE__);
 
        // Get num rows
@@ -1810,7 +1817,7 @@ function ADD_CATEGORY_OPTIONS ($mode) {
                        $uid_cnt = 0;
                        while (list($ucat) = SQL_FETCHROW($result_uids)) {
                                $result_ver = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE userid=%s AND status='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode)." LIMIT 1",
+WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode)." LIMIT 1",
  array(bigintval($ucat)), __FILE__, __LINE__);
                                $uid_cnt += SQL_NUMROWS($result_ver);
 
@@ -1836,7 +1843,7 @@ WHERE userid=%s AND status='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_H
                }
        } else {
                // No cateogries are defined yet
-               $OUT = "<option class=\"member_failed\">".MEMBER_NO_CATS."</option>\n";
+               $OUT = "<option class=\"member_failed\">{!MEMBER_NO_CATS!}</option>\n";
        }
 
        // Return HTML code
@@ -1938,11 +1945,11 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
 
        if ((EXT_IS_ACTIVE("html_mail")) && ($mode == "html")) {
                // Only include HTML receivers
-               $result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.status='CONFIRMED' AND d.html='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
+               $result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.html='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
                 array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__);
        } else {
                // Include all
-               $result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.status='CONFIRMED'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
+               $result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
                 array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__);
        }