More misc fixes and rewrites (sorry, lame description)

[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 b7517830bc8ba6d69e3f57a23fbd7f8b3deb70f6..ce052c1c1d133e2faee1f55f8620eeaeed01c1b9 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -41,9 +41,9 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL('modules.php?module=index');
+       redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('nickname')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'nickname'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('nickname'));
        return;
 }
 
@@ -51,11 +51,11 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('member', __FILE__);
 $isValid = false;
 
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
        // Nickname was submitted so let's check if it is not already in use
-       if (REQUEST_ISSET_POST(('nickname'))) {
+       if (REQUEST_ISSET_POST('nickname')) {
                // Check if nickname is valid
-               $PATTERN = "[".getConfig('nickname_pattern')."]{".getConfig('nickname_length').",}";
+               $PATTERN = '[' . getConfig('nickname_pattern') . ']{' . getConfig('nickname_length') . ',}';
                if (ereg($PATTERN, REQUEST_POST('nickname'), $array)) {
                        // Entered nickname is valid?
                        if ($array[0] == REQUEST_POST('nickname')) $isValid = true;
@@ -65,11 +65,11 @@ if (IS_FORM_SENT()) {
 
 if ($isValid === true) {
        // 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",
+       $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) {
                // Nickname not in use, so set it now
-               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nickname='%s' WHERE userid=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `nickname`='%s' WHERE `userid`=%s LIMIT 1",
                        array(REQUEST_POST('nickname'), getUserId()), __FILE__, __LINE__);
                $content = getMessage('NICKNAME_SAVED');
        } else {
@@ -84,15 +84,16 @@ if ($isValid === true) {
        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'))) {
+       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');
 }
 
 //