A lot more wrapper functions introduced, 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 618e389a2dc9b5f12943ca31a23fefbd3b418a61..37db8171fc99141e61b20498c98126fbac94f8d8 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -43,7 +43,7 @@ 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'));
@@ -56,8 +56,7 @@ if (isFormSent()) {
        // Nickname was submitted so let's check if it is not already in use
        if (isPostRequestParameterSet('nickname')) {
                // Check if nickname is valid
-               $PATTERN = '[' . getConfig('nickname_pattern') . ']{' . getConfig('nickname_len') . ',}';
-               if (isInString($PATTERN, postRequestParameter('nickname'), $array)) {
+               if (preg_match('/[' . getConfig('nickname_pattern') . ']{' . getConfig('nickname_len') . ',}/', postRequestParameter('nickname'), $array)) {
                        // Entered nickname is valid?
                        $isValid = ($array[0] == postRequestParameter('nickname'));
                } // END - if
@@ -66,7 +65,7 @@ if (isFormSent()) {
 
 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