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

[mailer.git] / inc / modules / member / what-nickname.php

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 6afe0ce978136f78114353e5340b196f1dbb59dd..73ae2b3fc14e4b94928b39c6843d25de69d8a0c3 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -46,14 +46,14 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 $VALID = false;
 
-if (isset($_POST['ok'])) {
+if (IS_FORM_SENT()) {
        // Nickname was submitted so let's check if it is not already in use
-       if (!empty($_POST['nickname'])) {
+       if (REQUEST_ISSET_POST(('nickname'))) {
                // Check if nickname is valid
                $PATTERN = "[".__NICKNAME_PATTERN."]{".__NICKNAME_LENGTH.",}";
-               if (ereg($PATTERN, $_POST['nickname'], $array)) {
+               if (ereg($PATTERN, REQUEST_POST('nickname'), $array)) {
                        // Entered nickname is valid?
-                       if ($array[0] == $_POST['nickname']) $VALID = true;
+                       if ($array[0] == REQUEST_POST('nickname')) $VALID = true;
                } // END - if
        } // END - if
 } // END - if
@@ -61,11 +61,11 @@ if (isset($_POST['ok'])) {
 if ($VALID) {
        // Look for nickname in database (we only need just one entry so don't worry about the "LIMIT 1" !
        $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND userid != '%s' LIMIT 1",
-               array($_POST['nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
+               array(REQUEST_POST('nickname'), $GLOBALS['userid']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Nickname not in use, so set it now
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nickname='%s' WHERE userid=%s LIMIT 1",
-                       array($_POST['nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
+                       array(REQUEST_POST('nickname'), $GLOBALS['userid']), __FILE__, __LINE__);
                $content = NICKNAME_SAVED;
        } else {
                // Free result
@@ -82,7 +82,7 @@ if ($VALID) {
        define('__NICKNAME', NICKNAME_GET_NICK($GLOBALS['userid']));
 
        // Do we have already submit the form?
-       if (!empty($_POST['nickname'])) {
+       if (REQUEST_ISSET_POST(('nickname'))) {
                LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">".NICKNAME_IS_INVALID."</div");
        } // END - if