X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-confirm.php;h=12dace12c630e44d964ea8d149cca712a3d98042;hp=a41e757126850fdaed65ca66ab5bac97d209d71e;hb=f928ad2bed60fa256d0641eaf6d2c027a2944688;hpb=c47144dd555bbab4acdf9085e4623900dedb0e7c

diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index a41e757126..12dace12c6 100644
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alles um den Bestaetigungslink                   *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,59 +38,59 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", __FILE__);
+ADD_DESCR('guest', __FILE__);
 
-if (!empty($_GET['hash'])) {
+if (REQUEST_ISSET_GET('hash')) {
 	// Initialize the user ID
 	$uid = 0;
 
 	// Search for an unconfirmed or confirmed account
 	$result = SQL_QUERY_ESC("SELECT userid, email, refid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE user_hash='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
-		array($_GET['hash']), __FILE__, __LINE__);
+	array(REQUEST_GET('hash')), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Ok, he want's to confirm now so we load some data
 		list ($uid, $email, $rid) = SQL_FETCHROW($result);
 
 		// Unlock his account (but only when it is on UNCONFIRMED!)
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='CONFIRMED', ref_payout=%s, user_hash=NULL WHERE user_hash='%s' AND `status`='UNCONFIRMED' LIMIT 1",
-			array(getConfig('ref_payout'), $_GET['hash']), __FILE__, __LINE__);
+		array(getConfig('ref_payout'), REQUEST_GET('hash')), __FILE__, __LINE__);
 		if (SQL_AFFECTEDROWS() == 1) {
-			$msg = LOAD_EMAIL_TEMPLATE("confirm-member", array('points' => getConfig('points_register')), bigintval($uid));
+			$message = LOAD_EMAIL_TEMPLATE("confirm-member", array('points' => getConfig('points_register')), bigintval($uid));
 
 			// And send him right away the confirmation mail
-			SEND_EMAIL($email, getMessage('GUEST_THANX_CONFIRM'), $msg);
+			sendEmail($email, getMessage('GUEST_THANX_CONFIRM'), $message);
 
 			// Maybe he got "referaled"?
 			if (($rid > 0) && ($rid != $uid)) {
 				// Select the referal userid
 				$result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-					array(bigintval($rid)), __FILE__, __LINE__);
+				array(bigintval($rid)), __FILE__, __LINE__);
 				if (SQL_NUMROWS($result) == 1) {
 					// Update ref counter...
-					UPDATE_REF_COUNTER($rid);
+					updateReferalCounter($rid);
 
 					// Ok, write the ref-points to this user and his parent-ref
 					unset($GLOBALS['ref_level']);
 
-					// Shall I "pay" the referal points imidiately?
-					if (getConfig('ref_payout') == "0") {
-						// Yes, "pay" it now
+					// Shall I 'pay' the referal points imidiately?
+					if (getConfig('ref_payout') == '0') {
+						// Yes, 'pay' it now
 						$locked = false;
 					} else {
-						// No, "pay" it later
+						// No, 'pay' it later
 						$locked = true;
 					}
 
 					// If version matches add ref bonus to refid's account
-					if ((GET_EXT_VERSION("bonus") >= "0.4.4") && (getConfig('bonus_active') == "Y")) {
+					if ((GET_EXT_VERSION('bonus') >= '0.4.4') && (getConfig('bonus_active') == 'Y')) {
 						// Add points (directly only!)
 						SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET bonus_ref=bonus_ref+%s WHERE userid=%s LIMIT 1",
-							array(getConfig('bonus_ref'), bigintval($rid)), __FILE__, __LINE__);
+						array(getConfig('bonus_ref'), bigintval($rid)), __FILE__, __LINE__);
 
 						// Subtract points from system
 						BONUS_POINTS_HANDLER(getConfig('bonus_ref'));
@@ -93,78 +98,77 @@ if (!empty($_GET['hash'])) {
 
 					// Add one-time referal bonus over referal system or directly
 					unset($GLOBALS['ref_level']);
-					ADD_POINTS_REFSYSTEM("referal_bonus", $rid, getConfig('points_ref'), true, bigintval($uid), $locked, getConfig('reg_points_mode'));
+					ADD_POINTS_REFSYSTEM('referal_bonus', $rid, getConfig('points_ref'), true, bigintval($uid), $locked, getConfig('reg_points_mode'));
 				} // END - if
 			} // END - if
 
-			if (EXT_IS_ACTIVE("rallye")) {
+			if (EXT_IS_ACTIVE('rallye')) {
 				// Add user to rallye (or not?)
 				RALLYE_AUTOADD_USER(bigintval($uid));
 			} // END - if
 
 			// Account confirmed!
-			if (defined('LEAD_CODE_ENABLED') && defined('LEAD_EXPIRY_TIME')) {
+			if (EXT_IS_ACTIVE('lead')) {
 				// Set special lead cookie
-				set_session('lead_uid', bigintval($uid));
+				setSession('lead_uid', bigintval($uid));
 
 				// Lead-Code mode enabled
-				LOAD_URL("lead-confirm.php");
+				redirectToUrl('lead-confirm.php');
 			} else {
 				define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_DONE'));
 				define('__UID', bigintval($uid));
-				LOAD_TEMPLATE("guest_confirm_table");
+				LOAD_TEMPLATE('guest_confirm_table');
 			}
-		} elseif (defined('LEAD_CODE_ENABLED') && defined('LEAD_EXPIRY_TIME')) {
+		} elseif (EXT_IS_ACTIVE('lead')) {
 			// Set special lead cookie
-			set_session('lead_uid', bigintval($uid));
+			setSession('lead_uid', bigintval($uid));
 
 			// Lead-Code mode enabled
-			LOAD_URL("lead-confirm.php");
+			redirectToUrl('lead-confirm.php');
 		} else {
 			// Nobody was found unter this hash key... or our new member want's to confirm twice?
 			define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_TWICE'));
-			define('__UID', "0");
-			LOAD_TEMPLATE("guest_confirm_table");
+			define('__UID', '0');
+			LOAD_TEMPLATE('guest_confirm_table');
 		}
 	} else {
 		// Nobody was found unter this hash key... or our new member want's to confirm twice?
 		define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_TWICE'));
-		define('__UID', "0");
-		LOAD_TEMPLATE("guest_confirm_table");
+		define('__UID', '0');
+		LOAD_TEMPLATE('guest_confirm_table');
 	}
-} elseif ((isset($_POST['ok'])) && (!empty($_POST['email']))) {
-	// Confirmation link requested      0     1         2
-	$result = SQL_QUERY_ESC("SELECT userid, status, user_hash FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
-		array($_POST['email']), __FILE__, __LINE__);
+} elseif ((isFormSent()) && (REQUEST_ISSET_POST('email'))) {
+	// Confirmation link requested      0         1          2
+	$result = SQL_QUERY_ESC("SELECT `userid`, `status`, `user_hash` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `email`='%s' LIMIT 1",
+		array(REQUEST_POST('email')), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Email address found
 		$DATA = SQL_FETCHROW($result);
-		switch ($DATA[1])
-		{
-		case "UNCONFIRMED": // Account not confirmed
-			$msg = LOAD_EMAIL_TEMPLATE("guest_request_confirm", array('hash' => $DATA[2]), $DATA[0]);
-			SEND_EMAIL($_POST['email'], getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $msg);
-			$content = getMessage('CONFIRM_LINK_SENT');
-			break;
-
-		case "CONFIRMED": // Account already confirmed
-			$content = getMessage('LOGIN_ID_CONFIRMED');
-			break;
-
-		case "LOCKED": // Account is locked
-			$content = getMessage('LOGIN_ID_LOCKED');
-			break;
-		}
+		switch ($DATA[1]) {
+			case 'UNCONFIRMED': // Account not confirmed
+				$message = LOAD_EMAIL_TEMPLATE('guest_request_confirm', array('hash' => $DATA[2]), $DATA[0]);
+				sendEmail(REQUEST_POST('email'), getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $message);
+				$content = getMessage('CONFIRM_LINK_SENT');
+				break;
+
+			case 'CONFIRMED': // Account already confirmed
+				$content = getMessage('LOGIN_ID_CONFIRMED');
+				break;
+
+			case 'LOCKED': // Account is locked
+				$content = getMessage('LOGIN_ID_LOCKED');
+				break;
+		} // END - switch
 	} else {
 		// Email address not registered
 		$content = getMessage('EMAIL_ADDY_404');
 	}
 
 	define('__CONFIRM_MSG', $content);
-	LOAD_TEMPLATE("guest_confirm_table");
+	LOAD_TEMPLATE('guest_confirm_table');
 } else {
 	// No hash found, the guest may want to enter his email address to re-get his confirmation link?
-	LOAD_TEMPLATE("guest_confirm_link");
+	LOAD_TEMPLATE('guest_confirm_link');
 }
 
 //