Complete rewrite of and , wrapper functions added, see bug #101

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 2a9072d89719481bfc2fd1aa85c2e8225f474c3d..a5eccf7e271e727d4e968695b70ddd50a5aa6096 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -512,7 +512,7 @@ function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
                        $OUT = "";
                        while (list($value, $comment) = SQL_FETCHROW($result)) {
                                $OUT .= "      <option value=\"".$value."\"";
-                               if ($_POST['max_mails'] == $value) $OUT .= " selected=\"selected\"";
+                               if (REQUEST_POST('max_mails') == $value) $OUT .= " selected=\"selected\"";
                                $OUT .= ">".$value." {--PER_DAY--}";
                                if (!empty($comment)) $OUT .= " (".$comment.")";
                                $OUT .= "</option>\n";
@@ -734,7 +734,7 @@ function SEND_MODE_MAILS($mod, $modes) {
 
                // Now let's compare passwords
                $hash = generatePassString($hashDB);
-               if (($hash == get_session('u_hash')) || ($_POST['pass1'] == $_POST['pass2'])) {
+               if (($hash == get_session('u_hash')) || (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
                        // Load user's data
                        $result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, country, zip, city, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND password='%s' LIMIT 1",
                                array($GLOBALS['userid'], $hashDB), __FILE__, __LINE__);
@@ -761,7 +761,7 @@ function SEND_MODE_MAILS($mod, $modes) {
                                                case "normal": break; // Do not add any special lines
 
                                                case "email": // Email was changed!
-                                                       $content = MEMBER_CHANGED_EMAIL.": ".$_POST['old_addy']."\n";
+                                                       $content = MEMBER_CHANGED_EMAIL.": ".REQUEST_POST('old_addy')."\n";
                                                        break;
 
                                                case "pass": // Password was changed
@@ -777,7 +777,7 @@ function SEND_MODE_MAILS($mod, $modes) {
 
                                        if (EXT_IS_ACTIVE("country")) {
                                                // Replace code with description
-                                               $DATA[4] = COUNTRY_GENERATE_INFO($_POST['country_code']);
+                                               $DATA[4] = COUNTRY_GENERATE_INFO(REQUEST_POST('country_code'));
                                        } // END - if
 
                                        // Load template
@@ -1204,7 +1204,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 
                                // And sent it away
                                SEND_EMAIL($email, SUBJECT_DIRECT_PAYMENT, $msg);
-                               if (!isset($_GET['mid'])) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_POINTS_ADDED'));
+                               if (!REQUEST_ISSET_GET(('mid'))) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_POINTS_ADDED'));
                        }
 
                        // Maybe there's another ref?