Members can now no longer enter 'NULL' as their nickname

[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 cbb093773663322c20b5fcb17d8be8868d5224fe..58c3db924ae01ba0e79b24e357952c9829745d40 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,10 +43,10 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('nickname')) && (!isAdmin())) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('nickname'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=nickname%}');
        return;
 } // END - if
 
@@ -56,16 +56,16 @@ if (isFormSent()) {
        // Nickname was submitted so let's check if it is not already in use
        if (isPostRequestParameterSet('nickname')) {
                // Check if nickname is valid
-               if (isInString('[' . getConfig('nickname_pattern') . ']{' . getConfig('nickname_len') . ',}', postRequestParameter('nickname'))) {
+               if (preg_match('/[' . getConfig('nickname_pattern') . ']{' . getConfig('nickname_len') . ',}/', postRequestParameter('nickname'), $array)) {
                        // Entered nickname is valid?
-                       $isValid = ($array[0] == postRequestParameter('nickname'));
+                       $isValid = (($array[0] == postRequestParameter('nickname')) && (isNicknameUsed(postRequestParameter('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" !)
-       $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(postRequestParameter('nickname'), getMemberId()), __FILE__, __LINE__);
        if (SQL_HASZERONUMS($result)) {
                // Nickname not in use, so set it now
@@ -81,7 +81,7 @@ if ($isValid === true) {
        }
 
        // Load template
-       loadTemplate('admin_settings_saved', false, $content);
+       displayMessage($content);
 } else {
        // Do we have already submit the form?
        if (isPostRequestParameterSet('nickname')) {
@@ -89,7 +89,7 @@ if ($isValid === true) {
        } // END - if
 
        // Load Template
-       loadTemplate('member_nickname_form', false, getNickname(getMemberId()));
+       loadTemplate('member_nickname_form');
 }
 
 // [EOF]