Ref link fixed, nickname fixed, several rewrites, TODOs.txt updated:

[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 ce052c1c1d133e2faee1f55f8620eeaeed01c1b9..a086dfd3fe9494c86cf50142d2da3c317528cd99 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -55,16 +55,16 @@ if (isFormSent()) {
        // Nickname was submitted so let's check if it is not already in use
        if (REQUEST_ISSET_POST('nickname')) {
                // Check if nickname is valid
-               $PATTERN = '[' . getConfig('nickname_pattern') . ']{' . getConfig('nickname_length') . ',}';
+               $PATTERN = '[' . getConfig('nickname_pattern') . ']{' . getConfig('nickname_len') . ',}';
                if (ereg($PATTERN, REQUEST_POST('nickname'), $array)) {
                        // Entered nickname is valid?
-                       if ($array[0] == REQUEST_POST('nickname')) $isValid = true;
+                       $isValid = ($array[0] == REQUEST_POST('nickname'));
                } // END - if
        } // END - if
 } // END - if
 
 if ($isValid === true) {
-       // Look for nickname in database (we only need just one entry so don't worry about the "LIMIT 1" !
+       // 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(REQUEST_POST('nickname'), getUserId()), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
@@ -83,17 +83,13 @@ if ($isValid === true) {
        // Load template
        LOAD_TEMPLATE('admin_settings_saved', false, $content);
 } else {
-       // Load current nickname
-       // @TODO Rewrite this constant
-       define('__NICKNAME', NICKNAME_GET_NICK(getUserId()));
-
        // Do we have already submit the form?
        if (REQUEST_ISSET_POST('nickname')) {
                LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"member_failed\">{--NICKNAME_IS_INVALID--}</div");
        } // END - if
 
        // Load Template
-       LOAD_TEMPLATE('member_nickname_form');
+       LOAD_TEMPLATE('member_nickname_form', false, NICKNAME_GET_NICK(getUserId()));
 }
 
 //