X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-lock_user.php;h=d5ca361a05144c718a6248aa6d08aa6491bc36b5;hb=12effdb00f104773905152bfb2950496c2efaec4;hp=1f334602c0f38dfbbfb66387d57802cd53f2fe9a;hpb=0ff49cce0f61b9ad28162f824e45777eb768a133;p=mailer.git diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index 1f334602c0..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')), getMessage('ADMIN_LOCKED_SUBJ'), $message); + sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJECT--}', $message); } // END - if // Prepare message - $message = getMaskedMessage('USER_ACCOUNT_LOCKED', 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,84 +96,77 @@ 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')), getMessage('ADMIN_UNLOCKED_SUBJ'), $message); + sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJECT--}', $message); if (isExtensionActive('rallye')) { addUserToReferalRallye(getRequestParameter('userid')); } // END - if } // END - if // Prepare message - $message = getMaskedMessage('USER_ACCOUNT_UNLOCKED', 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... - $URL = adminCreateUserLink(getRequestParameter('userid')); + $url = adminCreateUserLink(getRequestParameter('userid')); } else { // Load user data we need if (fetchUserData(getRequestParameter('userid'))) { // Transfer data to constants for the template - $content['email'] = generateEmailLink(getUserData('email'), 'user_data'); - $content['surname'] = getUserData('surname'); - $content['family'] = getUserData('family'); - $content['status'] = getUserData('status'); - $content['userid'] = bigintval(getRequestParameter('userid')); + $content['userid'] = getRequestParameter('userid'); // Realy want to lock? - switch ($content['status']) { + 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_DEL_ACCOUNT', $content['userid']); - $content['text'] = getMaskedMessage('ADMIN_TEXT_DEL_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; } - // Translate user status - $content['status'] = translateUserStatus($content['status']); - // Output form loadTemplate('admin_lock_user', false, $content); } else { // Account does not exists! - loadTemplate('admin_settings_saved', false, '