X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fguest%2Fwhat-confirm.php;h=bcb07f0d4a433775edea1f73255ee029bb71c8a2;hb=2df9f7a53f8b1dd5164f87824a324ccb3b6634cb;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..bcb07f0d4a 100644
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.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 - 2012 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 *
@@ -39,54 +37,23 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('guest', __FILE__);
+addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('user')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('user'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');
 	return;
 } // END - if
 
-if (isGetRequestParameterSet('hash')) {
+if (isGetRequestElementSet('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']);
+	doConfirmUserAccount(getRequestElement('hash'));
+} elseif ((isFormSent()) && (isPostRequestElementSet('email'))) {
+	// Resend confirmation link
+	doResendUserConfirmationLink(postRequestElement('email'));
 } else {
 	// No hash found, the guest may want to enter his email address to re-get his confirmation link?
 	loadTemplate('guest_confirm_link');