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 8505e6d0f188df45d4101db1a64fd391a1ae75a1..a086dfd3fe9494c86cf50142d2da3c317528cd99 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Nickname anstelle der ID                         *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -38,40 +38,40 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL("modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("nickname")) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "nickname");
+       redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('nickname')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('nickname'));
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
-$VALID = false;
+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_len') . ',}';
                if (ereg($PATTERN, REQUEST_POST('nickname'), $array)) {
                        // Entered nickname is valid?
-                       if ($array[0] == REQUEST_POST('nickname')) $VALID = true;
+                       $isValid = ($array[0] == REQUEST_POST('nickname'));
                } // END - if
        } // END - if
 } // END - if
 
-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",
+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",
                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 = NICKNAME_SAVED;
+               $content = getMessage('NICKNAME_SAVED');
        } else {
                // Free result
                SQL_FREERESULT($result);
@@ -81,18 +81,15 @@ if ($VALID) {
        }
 
        // Load template
-       LOAD_TEMPLATE("admin_settings_saved", false, $content);
+       LOAD_TEMPLATE('admin_settings_saved', false, $content);
 } else {
-       // Load current nickname
-       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");
+       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()));
 }
 
 //