X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-lock_user.php;h=46c8d6a9961a5483a6ec51e4b5241ea752c58e2d;hb=0176313718a3887a7d833d578142ae41d3a06a15;hp=32d6f2a29979b7522abae001e7712af6491178d1;hpb=260430dc9cc9e160ff5782f62b6908c7d41df8b6;p=mailer.git diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index 32d6f2a299..46c8d6a996 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,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); // Is a userid set? if (isGetRequestParameterSet('userid')) { @@ -66,7 +64,7 @@ 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'))); @@ -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,7 +96,7 @@ 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'))); @@ -112,7 +110,7 @@ LIMIT 1", // Prepare message $message = getMaskedMessage('ADMIN_USER_ACCOUNT_UNLOCKED', bigintval(getRequestParameter('userid'))); $isActive = true; - } elseif (isFormSent('del')) { + } elseif (isFormSent('delete')) { // Delete the account $isActive = true; loadIncludeOnce('inc/modules/admin/what-del_user.php'); @@ -140,7 +138,7 @@ LIMIT 1", break; case 'UNCONFIRMED': // Unconfirmed accounts cannot be unlocked! - $content['ok'] = 'del'; + $content['ok'] = 'delete'; $content['header'] = getMaskedMessage('ADMIN_HEADER_DELETE_ACCOUNT', $content['userid']); $content['text'] = getMaskedMessage('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, '
' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
'); + loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . ''); } } @@ -161,14 +159,14 @@ LIMIT 1", } elseif ($isActive) { // An action was performed... if (!empty($message)) { - loadTemplate('admin_settings_saved', false, '
' . $message . '
'); + loadTemplate('admin_settings_unsaved', false, $message); } else { - loadTemplate('admin_settings_saved', false, '
{--ADMIN_USER_UPDATED--}
'); + displayMessage('{--ADMIN_USER_UPDATED--}'); } } } else { // Account does not exists! - loadTemplate('admin_settings_saved', false, '
' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '
'); + loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid')))); } } else { // List all users