X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-lock_user.php;h=d5ca361a05144c718a6248aa6d08aa6491bc36b5;hp=fbc3d8bfffe6d0729a5cc4712212a9241efb4c8a;hb=330dbb3e2b34450cd1665497506455e195a0a166;hpb=a443166d3f417109c905dc399ee7149ca4de6319

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index fbc3d8bfff..d5ca361a05 100644
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * 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,12 +41,12 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Is a userid set?
 if (isGetRequestParameterSet('userid')) {
 	// Action not performed by default
-	$ACT = false;
+	$isActive = false;
 
 	// Load user's data
 	if (fetchUserData(getRequestParameter('userid'))) {
@@ -66,17 +64,17 @@ if (isGetRequestParameterSet('userid')) {
 			}
 
 			// 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' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
 				// Send away...
 				sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJECT--}', $message);
 			} // END - if
 
 			// Prepare message
-			$message = getMaskedMessage('USER_ACCOUNT_LOCKED', bigintval(getRequestParameter('userid')));
-			$ACT = true;
+			$message = '{%message,ADMIN_USER_ACCOUNT_LOCKED=' . bigintval(getRequestParameter('userid')) . '%}';
+			$isActive = true;
 		} elseif ((isPostRequestParameterSet('unlock')) && (getUserData('status') == 'LOCKED')) {
 			// Ok, unlock the account!
 			if (isExtensionInstalledAndNewer('user', '0.3.5')) {
@@ -86,7 +84,7 @@ if (isGetRequestParameterSet('userid')) {
 SET
 	`status`='CONFIRMED',
 	`lock_reason`='',
-	`lock_timestamp`='0000-00-00 00:00'
+	`lock_timestamp`=NULL
 WHERE
 	`userid`=%s
 LIMIT 1",
@@ -98,9 +96,9 @@ LIMIT 1",
 			}
 
 			// 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' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
 				// Send away...
 				sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJECT--}', $message);
@@ -110,11 +108,11 @@ LIMIT 1",
 			} // END - if
 
 			// Prepare message
-			$message = getMaskedMessage('USER_ACCOUNT_UNLOCKED', bigintval(getRequestParameter('userid')));
-			$ACT = true;
-		} elseif (isFormSent('del')) {
+			$message = '{%message,ADMIN_USER_ACCOUNT_UNLOCKED=' . bigintval(getRequestParameter('userid')) . '%}';
+			$isActive = true;
+		} elseif (isFormSent('delete')) {
 			// Delete the account
-			$ACT = true;
+			$isActive = true;
 			loadIncludeOnce('inc/modules/admin/what-del_user.php');
 		} elseif (isPostRequestParameterSet('no')) {
 			// Do not lock him...
@@ -129,20 +127,20 @@ LIMIT 1",
 				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(getRequestParameter('userid')), '%}');
 			}
 		}
 
@@ -158,17 +156,17 @@ LIMIT 1",
 		if (!empty($url)) {
 			// Reload and die...
 			redirectToUrl($url);
-		} elseif ($ACT) {
+		} 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(getRequestParameter('userid')), '%}');
 	}
 } else {
 	// List all users