X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-lock_user.php;h=79cc7c84e203e8ab9d08ba2b08c8605b6139c63d;hp=32d6f2a29979b7522abae001e7712af6491178d1;hb=a18efdcd57ba91893f0958a457b5c58639b135c3;hpb=83b592ec7b67258426acab646f682830ce9128c7

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index 32d6f2a299..79cc7c84e2 100644
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 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 *
@@ -43,41 +41,41 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Is a userid set?
-if (isGetRequestParameterSet('userid')) {
+if (isGetRequestElementSet('userid')) {
 	// Action not performed by default
 	$isActive = false;
 
 	// Load user's data
-	if (fetchUserData(getRequestParameter('userid'))) {
+	if (fetchUserData(getRequestElement('userid'))) {
 		// Is a lock reason set?
 		if ((isFormSent('lock')) && (getUserData('status') != 'LOCKED')) {
 			// Ok, lock the account!
 			if (isExtensionInstalledAndNewer('user', '0.3.5')) {
 				// Lock with reason
-				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `status`='LOCKED', `lock_reason`='%s', `lock_timestamp`=NOW() WHERE `userid`=%s LIMIT 1",
-					array(postRequestParameter('reason'), bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
+				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `status`='LOCKED',`lock_reason`='%s',`lock_timestamp`=NOW() WHERE `userid`=%s LIMIT 1",
+					array(postRequestElement('reason'), bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
 			} else {
 				// Lock with no lock reason saved
 				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `status`='LOCKED' WHERE `userid`=%s LIMIT 1",
-					array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
+					array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
 			}
 
 			// Entry updated?
-			if (SQL_AFFECTEDROWS() == 1) {
+			if (!SQL_HASZEROAFFECTED()) {
 				// Send an email to the user! In later version you can optionally switch this feature off
-				$message = loadEmailTemplate('lock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
+				$message = loadEmailTemplate('member_user_locked', array('text' => postRequestElement('reason')), bigintval(getRequestElement('userid')));
 
 				// Send away...
-				sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJECT--}', $message);
+				sendEmail(bigintval(getRequestElement('userid')), '{--ADMIN_LOCKED_SUBJECT--}', $message);
 			} // END - if
 
 			// Prepare message
-			$message = getMaskedMessage('ADMIN_USER_ACCOUNT_LOCKED', bigintval(getRequestParameter('userid')));
+			$message = '{%message,ADMIN_USER_ACCOUNT_LOCKED=' . bigintval(getRequestElement('userid')) . '%}';
 			$isActive = true;
-		} elseif ((isPostRequestParameterSet('unlock')) && (getUserData('status') == 'LOCKED')) {
+		} elseif ((isPostRequestElementSet('unlock')) && (getUserData('status') == 'LOCKED')) {
 			// Ok, unlock the account!
 			if (isExtensionInstalledAndNewer('user', '0.3.5')) {
 				// Reset lock reason as well
@@ -86,63 +84,63 @@ if (isGetRequestParameterSet('userid')) {
 SET
 	`status`='CONFIRMED',
 	`lock_reason`='',
-	`lock_timestamp`='0000-00-00 00:00'
+	`lock_timestamp`=NULL
 WHERE
 	`userid`=%s
 LIMIT 1",
-					array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
+					array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
 			} else {
 				// No lock reason to reset
 				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `status`='CONFIRMED' WHERE `userid`=%s LIMIT 1",
-					array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
+					array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
 			}
 
 			// Entry updated?
-			if (SQL_AFFECTEDROWS() == 1) {
+			if (!SQL_HASZEROAFFECTED()) {
 				// Send an email to the user! In later version you can optionally switch this feature off
-				$message = loadEmailTemplate('unlock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
+				$message = loadEmailTemplate('member_user_unlocked', array('text' => postRequestElement('reason')), bigintval(getRequestElement('userid')));
 
 				// Send away...
-				sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJECT--}', $message);
+				sendEmail(bigintval(getRequestElement('userid')), '{--ADMIN_UNLOCKED_SUBJECT--}', $message);
 				if (isExtensionActive('rallye')) {
-					addUserToReferalRallye(getRequestParameter('userid'));
+					addUserToReferralRallye(getRequestElement('userid'));
 				} // END - if
 			} // END - if
 
 			// Prepare message
-			$message = getMaskedMessage('ADMIN_USER_ACCOUNT_UNLOCKED', bigintval(getRequestParameter('userid')));
+			$message = '{%message,ADMIN_USER_ACCOUNT_UNLOCKED=' . bigintval(getRequestElement('userid')) . '%}';
 			$isActive = true;
-		} elseif (isFormSent('del')) {
+		} elseif (isFormSent('delete')) {
 			// Delete the account
 			$isActive = true;
 			loadIncludeOnce('inc/modules/admin/what-del_user.php');
-		} elseif (isPostRequestParameterSet('no')) {
+		} elseif (isPostRequestElementSet('no')) {
 			// Do not lock him...
-			$url = adminCreateUserLink(getRequestParameter('userid'));
+			$url = adminCreateUserLink(getRequestElement('userid'));
 		} else {
 			// Load user data we need
-			if (fetchUserData(getRequestParameter('userid'))) {
+			if (fetchUserData(getRequestElement('userid'))) {
 				// Transfer data to constants for the template
-				$content['userid']  = getRequestParameter('userid');
+				$content['userid']  = getRequestElement('userid');
 
 				// Realy want to lock?
 				switch (getUserData('status')) {
 					case 'CONFIRMED': // Yes, lock him down... ;-)
 						$content['ok']     = 'lock';
-						$content['header'] = getMaskedMessage('ADMIN_HEADER_LOCK_ACCOUNT', $content['userid']);
-						$content['text']   = getMaskedMessage('ADMIN_TEXT_LOCK_ACCOUNT', $content['userid']);
+						$content['header'] = '{%message,ADMIN_HEADER_LOCK_ACCOUNT=' . $content['userid'] . '%}';
+						$content['text']   = '{%message,ADMIN_TEXT_LOCK_ACCOUNT=' . $content['userid'] . '%}';
 						break;
 
 					case 'LOCKED': // Unlock the user
 						$content['ok']     = 'unlock';
-						$content['header'] = getMaskedMessage('ADMIN_HEADER_UNLOCK_ACCOUNT', $content['userid']);
-						$content['text']   = getMaskedMessage('ADMIN_TEXT_UNLOCK_ACCOUNT', $content['userid']);
+						$content['header'] = '{%message,ADMIN_HEADER_UNLOCK_ACCOUNT=' . $content['userid'] . '%}';
+						$content['text']   = '{%message,ADMIN_TEXT_UNLOCK_ACCOUNT=' . $content['userid'] . '%}';
 						break;
 
 					case 'UNCONFIRMED': // Unconfirmed accounts cannot be unlocked!
-						$content['ok'] = 'del';
-						$content['header'] = getMaskedMessage('ADMIN_HEADER_DELETE_ACCOUNT', $content['userid']);
-						$content['text']   = getMaskedMessage('ADMIN_TEXT_DELETE_ACCOUNT', $content['userid']);
+						$content['ok']     = 'delete';
+						$content['header'] = '{%message,ADMIN_HEADER_DELETE_ACCOUNT=' . $content['userid'] . '%}';
+						$content['text']   = '{%message,ADMIN_TEXT_DELETE_ACCOUNT=' . $content['userid'] . '%}';
 						break;
 				}
 
@@ -150,7 +148,7 @@ LIMIT 1",
 				loadTemplate('admin_lock_user', false, $content);
 			} else {
 				// Account does not exists!
-				loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
+				loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')), '%}');
 			}
 		}
 
@@ -161,14 +159,14 @@ LIMIT 1",
 		} elseif ($isActive) {
 			// An action was performed...
 			if (!empty($message)) {
-				loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . $message . '</div>');
+				loadTemplate('admin_settings_unsaved', false, $message);
 			} else {
-				loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--ADMIN_USER_UPDATED--}</div>');
+				displayMessage('{--ADMIN_USER_UPDATED--}');
 			}
 		}
 	} else {
 		// Account does not exists!
-		loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')), '%}');
 	}
 } else {
 	// List all users