X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-confirm.php;h=ae489f2666bbfd39a72cd5d1dcee0493f6b77eb7;hb=7db85bc0c45b62c28ba49e728f489ad4bc1c115f;hp=a3f4e8617530828194aea5ab89aafab4253d2806;hpb=c83e419cd563049c7db0a0484caab329c5e59570;p=mailer.git diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php index a3f4e86175..ae489f2666 100644 --- a/inc/modules/guest/what-confirm.php +++ b/inc/modules/guest/what-confirm.php @@ -14,8 +14,6 @@ * $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 * @@ -54,39 +52,8 @@ if (isGetRequestParameterSet('hash')) { // Do user account confirmation doConfirmUserAccount(getRequestParameter('hash')); } elseif ((isFormSent()) && (isPostRequestParameterSet('email'))) { - // Confirmation link requested 0 1 2 - if (fetchUserData(postRequestParameter('email'), 'email')) { - // Email address found - $content = getUserDataArray(); - - // Detect status - switch ($content['status']) { - case 'UNCONFIRMED': // Account not confirmed - // Load email template - $message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']); - - // Send email - sendEmail(postRequestParameter('email'), '{--REQUEST_CONFIRM_LINK_SUBJECT--}', $message); - - // And set message - $content['message'] = '{--CONFIRM_LINK_SENT--}'; - break; - - case 'CONFIRMED': // Account already confirmed - $content['message'] = '{--LOGIN_ID_CONFIRMED--}'; - break; - - case 'LOCKED': // Account is locked - $content['message'] = '{--LOGIN_ID_LOCKED--}'; - break; - } // END - switch - } else { - // Email address not registered - $content['message'] = '{--EMAIL_404--}'; - } - - // Load template - loadTemplate('admin_settings_saved', false, $content['message']); + // Resend confirmation link + doResendUserConfirmationLink(postRequestParameter('email')); } else { // No hash found, the guest may want to enter his email address to re-get his confirmation link? loadTemplate('guest_confirm_link');