X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-nickname.php;h=5312676f6671a0ecc4adaf927cac5746049b2b04;hb=49a9663311b732d12ba0c53af2f9eb39a7850fbc;hp=a0cf5bfecd790cb1de645603d02e19e340343d8b;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index a0cf5bfecd..5312676f66 100644
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
 }
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('nickname')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('nickname'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=nickname%}');
 	return;
 } // END - if
 
@@ -54,42 +54,62 @@ $isValid = false;
 
 if (isFormSent()) {
 	// Nickname was submitted so let's check if it is not already in use
-	if (isPostRequestParameterSet('nickname')) {
+	if (isPostRequestElementSet('nickname')) {
 		// Check if nickname is valid
-		if (preg_match('/[' . getConfig('nickname_pattern') . ']{' . getConfig('nickname_len') . ',}/', postRequestParameter('nickname'), $array)) {
+		if (preg_match('/[' . getConfig('nickname_pattern') . ']{' . getConfig('nickname_len') . ',}/', postRequestElement('nickname'), $array)) {
 			// Entered nickname is valid?
-			$isValid = ($array[0] == postRequestParameter('nickname'));
+			$isValid = (($array[0] == postRequestElement('nickname')) && (isNicknameUsed(postRequestElement('nickname'))));
 		} // END - if
 	} // END - if
 } // END - if
 
 if ($isValid === true) {
+	// Nickname already in use which is the default
+	$content = '{--MEMBER_NICKNAME_ALREADY_IN_USE--}';
+
 	// 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(postRequestParameter('nickname'), getMemberId()), __FILE__, __LINE__);
+		array(
+			postRequestElement('nickname'),
+			getMemberId()
+		), __FILE__, __LINE__);
+
+	// Is it not in use?
 	if (SQL_HASZERONUMS($result)) {
+		// Prepare array
+		$filterData = array(
+			'history_subject' => 'NICKNAME_CHANGED',
+			'history_userid'  => getMemberId(),
+			'history_value'   => postRequestElement('nickname')
+		);
+
+		// Run filter chain
+		runFilterChain('add_history_entry', $filterData);
+
 		// Nickname not in use, so set it now
 		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `nickname`='%s' WHERE `userid`=%s LIMIT 1",
-			array(postRequestParameter('nickname'), getMemberId()), __FILE__, __LINE__);
+			array(
+				postRequestElement('nickname'),
+				getMemberId()
+			), __FILE__, __LINE__);
+
+		// Change message
 		$content = '{--MEMBER_NICKNAME_SAVED--}';
-	} else {
-		// Free result
-		SQL_FREERESULT($result);
+	} // END - if
 
-		// Nickname already in use!
-		$content = '{--MEMBER_NICKNAME_ALREADY_IN_USE--}';
-	}
+	// Free result
+	SQL_FREERESULT($result);
 
 	// Load template
-	loadTemplate('admin_settings_saved', false, $content);
+	displayMessage($content);
 } else {
 	// Do we have already submit the form?
-	if (isPostRequestParameterSet('nickname')) {
+	if (isPostRequestElementSet('nickname')) {
 		loadTemplate('admin_settings_unsaved', false, '{--MEMBER_NICKNAME_IS_INVALID--}');
 	} // END - if
 
 	// Load Template
-	loadTemplate('member_nickname_form', false, getNickname(getMemberId()));
+	loadTemplate('member_nickname_form');
 }
 
 // [EOF]