fooRequestElementBar() functions renamed, adding of request parameters added:

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 7b13a2a412809f0ce95bcccc1e1112e16302f81b..96785ed9d3b7b746b68c3822398bfd1e27ea0204 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -768,7 +768,7 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        $OUT .= '      <option value="' . $content['value'] . '"';
-                       if (postRequestElement('max_mails') == $content['value']) $OUT .= ' selected="selected"';
+                       if (postRequestParameter('max_mails') == $content['value']) $OUT .= ' selected="selected"';
                        $OUT .= '>' . $content['value'] . ' {--PER_DAY--}';
                        if (!empty($content['comment'])) $OUT .= '(' . $content['comment'] . ')';
                        $OUT .= '</option>';
@@ -889,9 +889,9 @@ function getModeAction ($mode, $what) {
 
        if ($mode == 'admin') {
                // Action value for admin area
-               if (isGetRequestElementSet('action')) {
+               if (isGetRequestParameterSet('action')) {
                        // Use from request!
-                       return getRequestElement('action');
+                       return getRequestParameter('action');
                } elseif (isActionSet()) {
                        // Get it directly from URL
                        return getAction();
@@ -1253,7 +1253,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 
                                // And sent it away
                                sendEmail($userid, getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
-                               if (!isGetRequestElementSet('mid')) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
+                               if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
                        }
 
                        // Maybe there's another ref?
@@ -1519,7 +1519,7 @@ function getAdminDefaultAcl ($adminId) {
 }
 
 // Generates an option list from various parameters
-function generateOptionList ($table, $id, $name, $default='', $special='', $where='') {
+function generateOptionList ($table, $id, $name, $default='', $special='', $where='', $disabled=array()) {
        $ret = '';
        if ($table == '/ARRAY/') {
                // Selection from array
@@ -1527,7 +1527,13 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
                        // Both are arrays
                        foreach ($id as $idx => $value) {
                                $ret .= '<option value="' . $value . '"';
-                               if ($default == $value) $ret .= ' selected="selected"';
+                               if ($default == $value) {
+                                       // Selected by default
+                                       $ret .= ' selected="selected"';
+                               } elseif (isset($disabled[$value])) {
+                                       // Disabled!
+                                       $ret .= ' disabled="disabled"';
+                               }
                                $ret .= '>' . $name[$idx] . '</option>';
                        } // END - foreach
                } else {
@@ -1555,7 +1561,13 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
                        while (list($value, $title, $add) = SQL_FETCHROW($result)) {
                                if (empty($special)) $add = '';
                                $ret .= '<option value="' . $value . '"';
-                               if ($default == $value) $ret .= ' selected="selected"';
+                               if ($default == $value) {
+                                       // Selected by default
+                                       $ret .= ' selected="selected"';
+                               } elseif (isset($disabled[$value])) {
+                                       // Disabled!
+                                       $ret .= ' disabled="disabled"';
+                               }
                                if (!empty($add)) $add = ' ('.$add.')';
                                $ret .= '>' . $title . $add . '</option>';
                        } // END - while
@@ -1679,9 +1691,9 @@ function generateMetaDescriptionCode ($module, $what) {
 // Gets the matching what name from module
 function getWhatFromModule ($modCheck) {
        // Is the request element set?
-       if (isGetRequestElementSet('what')) {
+       if (isGetRequestParameterSet('what')) {
                // Then return this!
-               return getRequestElement('what');
+               return getRequestParameter('what');
        } // END - if
 
        // Default is empty