X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-sponsor_login.php;h=2d2d5485d4b5a2489d254c6342b9a2b98f4cfd8b;hb=1b54d04f01f8b0a6afb8d40babd41b25cad1eb95;hp=2f7ed2aebda320035273e145e3660f673f424dd0;hpb=a312348b000e45f28d989902bb377218393d5f06;p=mailer.git

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 2f7ed2aebd..2d2d5485d4 100644
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Loginformular und Neues Passwort fuer Sponsor    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                  *
@@ -32,109 +37,105 @@
 
 // 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);
-} elseif ((!EXT_IS_ACTIVE("sponsor"))) {
-	if (IS_ADMIN()) {
-		ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "sponsor"));
-	} else {
-		ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");
-	}
+} elseif ((!EXT_IS_ACTIVE('sponsor'))) {
+	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
 	return;
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", __FILE__);
+ADD_DESCR('guest', __FILE__);
 
-$MODE = "";
-if (!empty($_GET['mode'])) {
+$mode = '';
+if (REQUEST_ISSET_GET(('mode'))) {
 	// A "special" mode of the login system was requested
-	switch ($_GET['mode'])
+	switch (REQUEST_GET('mode'))
 	{
-		case "activate" : $MODE = "activate";  break; // Activation link requested
-		case "lost_pass": $MODE = "lost_pass"; break; // Request new password
+		case 'activate' : $mode = 'activate';  break; // Activation link requested
+		case 'lost_pass': $mode = 'lost_pass'; break; // Request new password
 	}
 } // END - if
 
 // Check if hash for confirmation of email address is given...
-if (!empty($_GET['hash'])) {
+if (REQUEST_ISSET_GET('hash')) {
 	// Lookup sponsor
 	$result = SQL_QUERY_ESC("SELECT id, status, gender, surname, family,
 company, position, tax_ident,
 street_nr1, street_nr2, country, zip, city, email, phone, fax, cell,
 points_amount AS points, last_pay AS pay, last_curr AS curr
-FROM "._MYSQL_PREFIX."_sponsor_data
-WHERE hash='%s' AND (status='UNCONFIRMED' OR status='EMAIL')
-LIMIT 1", array($_GET['hash']), __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`
+WHERE hash='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL')
+LIMIT 1", array(REQUEST_GET('hash')), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Sponsor found, load his data...
 		$SPONSOR = SQL_FETCHARRAY($result);
 
 		// Translate gender and comma
-		$SPONSOR['gender']  = TRANSLATE_GENDER($SPONSOR['gender']);
-		$SPONSOR['points'] = TRANSLATE_COMMA($SPONSOR['points']);
-		$SPONSOR['pay']    = TRANSLATE_COMMA($SPONSOR['pay']);
+		$SPONSOR['gender']  = translateGender($SPONSOR['gender']);
+		$SPONSOR['points'] = translateComma($SPONSOR['points']);
+		$SPONSOR['pay']    = translateComma($SPONSOR['pay']);
 
 		// Unconfirmed account or changed email address?
-		if ($SPONSOR['status'] == "UNCONFIRMED") {
+		if ($SPONSOR['status'] == 'UNCONFIRMED') {
 			// Set account to pending
-			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data SET status='PENDING'
-WHERE id='%s' AND hash='%s' AND status='UNCONFIRMED' LIMIT 1",
- array(bigintval($SPONSOR['id']), $_GET['hash']), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET `status`='PENDING'
+WHERE `id`='%s' AND hash='%s' AND `status`='UNCONFIRMED' LIMIT 1",
+			array(bigintval($SPONSOR['id']), REQUEST_GET('hash')), __FILE__, __LINE__);
 
 			// Check on success
 			if (SQL_AFFECTEDROWS() == 1) {
 				// Prepare mail and send it to the sponsor
-				$MSG = LOAD_EMAIL_TEMPLATE("sponsor_pending", $SPONSOR);
-				SEND_EMAIL($SPONSOR['email'], SPONSOR_ACCOUNT_PENDING_SUBJ, $MSG);
+				$message = LOAD_EMAIL_TEMPLATE('sponsor_pending', $SPONSOR);
+				sendEmail($SPONSOR['email'], getMessage('SPONSOR_ACCOUNT_PENDING_SUBJ'), $message);
 
 				// Send email to admin
-				SEND_ADMIN_NOTIFICATION(ADMIN_NEW_SPONSOR, "admin_sponsor_pending", $SPONSOR);
+				sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_pending', $SPONSOR);
 
 				// Sponsor account set to pending
-				LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_ACCOUNT_IS_PENDING);
+				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_IS_PENDING'));
 			} else {
 				// Could not unlock account!
-				LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_ACCOUNT_PENDING_FAILED);
+				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_PENDING_FAILED'));
 			}
-		} elseif ($SPONSOR['status'] == "EMAIL") {
+		} elseif ($SPONSOR['status'] == 'EMAIL') {
 			// Changed email adress need to be confirmed
-			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data SET status='CONFIRMED'
-WHERE id='%s' AND hash='%s' AND status='EMAIL' LIMIT 1",
- array(bigintval($SPONSOR['id']), $_GET['hash']), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET `status`='CONFIRMED'
+WHERE `id`='%s' AND hash='%s' AND `status`='EMAIL' LIMIT 1",
+			array(bigintval($SPONSOR['id']), REQUEST_GET('hash')), __FILE__, __LINE__);
 
-			// Check on success 
+			// Check on success
 			if (SQL_AFFECTEDROWS() == 1) {
 				// Sponsor account is unlocked again
-				LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_ACCOUNT_IS_CONFIRMED_AGAIN);
+				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_IS_CONFIRMED_AGAIN'));
 			} else {
 				// Could not unlock account!
-				LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_ACCOUNT_EMAIL_FAILED);
+				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_EMAIL_FAILED'));
 			}
 		} else {
 			/// ??? Other status?
-			LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_ACCOUNT_STATUS_FAILED);
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_STATUS_FAILED'));
 		}
 	} else {
 		// No sponsor found
-		LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_ACCOUNT_404);
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_ACCOUNT_NOT_FOUND'));
 	}
 
 	// Free memory
 	SQL_FREERESULT($result);
-} elseif ($MODE == "activate") {
+} elseif ($mode == 'activate') {
 	// Send activation link again
-	if (isset($_POST['ok'])) {
+	if (isFormSent()) {
 		// Check submitted data
-		if (empty($_POST['email'])) unset($_POST['ok']);
+		if (!REQUEST_ISSET_POST('email')) REQUEST_UNSET_POST('ok');
 	}
 
-	if (isset($_POST['ok'])) {
+	if (isFormSent()) {
 		// Check email
 		$result = SQL_QUERY_ESC("SELECT id, hash, status, remote_addr, gender, surname, family, sponsor_created
-FROM "._MYSQL_PREFIX."_sponsor_data
-WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1",
-			array($_POST['email']), __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`
+WHERE email='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL') LIMIT 1",
+		array(REQUEST_POST('email')), __FILE__, __LINE__);
 
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
@@ -142,127 +143,126 @@ WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1",
 			$SPONSOR = SQL_FETCHARRAY($result);
 
 			// Translate some data
-			$SPONSOR['gender']           = TRANSLATE_GENDER($SPONSOR['gender']);
-			$SPONSOR['sponsor_created'] = MAKE_DATETIME($SPONSOR['sponsor_created']);
+			$SPONSOR['gender']           = translateGender($SPONSOR['gender']);
+			$SPONSOR['sponsor_created'] = generateDateTime($SPONSOR['sponsor_created']);
 
 			// Prepare email and send it to the sponsor
-			if ($SPONSOR['status'] == "UNCONFIRMED") {
+			if ($SPONSOR['status'] == 'UNCONFIRMED') {
 				// Unconfirmed accounts
-				$msg_sponsor = LOAD_EMAIL_TEMPLATE("sponsor_activate", $SPONSOR);
+				$msg_sponsor = LOAD_EMAIL_TEMPLATE('sponsor_activate', $SPONSOR);
 			} else {
 				// Confirmed email address
-				$msg_sponsor = LOAD_EMAIL_TEMPLATE("sponsor_email", $SPONSOR);
+				$msg_sponsor = LOAD_EMAIL_TEMPLATE('sponsor_email', $SPONSOR);
 			}
-			SEND_EMAIL($_POST['email'], SPONSOR_ACTIVATION_LINK_SUBJ, $msg_sponsor);
+			sendEmail(REQUEST_POST('email'), getMessage('SPONSOR_ACTIVATION_LINK_SUBJ'), $msg_sponsor);
 
 			// Output message
-			LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_ACTIVATION_LINK_SENT);
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_ACTIVATION_LINK_SENT'));
 		} else {
 			// No account found or not UNCONFIRMED
-			LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_ACTIVATION_LINK_404);
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_ACTIVATION_LINK_404'));
 		}
 
 		// Free memory
 		SQL_FREERESULT($result);
 	} else {
 		// Load form
-		LOAD_TEMPLATE("guest_sponsor_activate");
+		LOAD_TEMPLATE('guest_sponsor_activate');
 	}
-} elseif ($MODE == "lost_pass") {
+} elseif ($mode == 'lost_pass') {
 	// Send new password
-	if (isset($_POST['ok'])) {
+	if (isFormSent()) {
 		// Check submitted data
-		if (empty($_POST['email'])) unset($_POST['ok']);
+		if (!REQUEST_ISSET_POST('email')) REQUEST_UNSET_POST('ok');
 	} // END - if
 
-	if (isset($_POST['ok'])) {
+	if (isFormSent()) {
 		// Check email
 		$result = SQL_QUERY_ESC("SELECT id, hash, remote_addr, gender, surname, family, sponsor_created
-FROM "._MYSQL_PREFIX."_sponsor_data
-WHERE email='%s' AND id='%s' AND status='CONFIRMED' LIMIT 1",
-			array($_POST['email'], bigintval($_POST['id'])), __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`
+WHERE email='%s' AND id='%s' AND `status`='CONFIRMED' LIMIT 1",
+		array(REQUEST_POST('email'), bigintval(REQUEST_POST('id'))), __FILE__, __LINE__);
+
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
 			// Unconfirmed sponsor account found so let's load the requested data
 			$SPONSOR = SQL_FETCHARRAY($result);
 
 			// Translate some data
-			$SPONSOR['gender']           = TRANSLATE_GENDER($SPONSOR['gender']);
-			$SPONSOR['sponsor_created'] = MAKE_DATETIME($SPONSOR['sponsor_created']);
+			$SPONSOR['gender']           = translateGender($SPONSOR['gender']);
+			$SPONSOR['sponsor_created'] = generateDateTime($SPONSOR['sponsor_created']);
 
 			// Generate password
-			$SPONSOR['password']        = GEN_PASS();
+			$SPONSOR['password']        = generatePassword();
 
 			// Prepare email and send it to the sponsor
-			$msg_sponsor = LOAD_EMAIL_TEMPLATE("sponsor_lost", $SPONSOR);
-			SEND_EMAIL($_POST['email'], SPONSOR_LOST_PASSWORD_SUBJ, $msg_sponsor);
+			$msg_sponsor = LOAD_EMAIL_TEMPLATE('sponsor_lost', $SPONSOR);
+			sendEmail(REQUEST_POST('email'), getMessage('SPONSOR_LOST_PASSWORD_SUBJ'), $msg_sponsor);
 
 			// Update password
-			SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_sponsor_data SET password='%s'
-WHERE id='%s' LIMIT 1",
- array(md5($SPONSOR['password']), bigintval($SPONSOR['id'])), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET password='%s'
+WHERE `id`='%s' LIMIT 1",
+			array(md5($SPONSOR['password']), bigintval($SPONSOR['id'])), __FILE__, __LINE__);
 
 			// Output message
-			LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_LOST_PASSWORD_SENT);
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_LOST_PASSWORD_SENT'));
 		} else {
 			// No account found or not UNCONFIRMED
-			LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_LOST_PASSWORD_404);
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_LOST_PASSWORD_404'));
 		}
 
 		// Free memory
 		SQL_FREERESULT($result);
 	} else {
 		// Load form
-		LOAD_TEMPLATE("guest_sponsor_lost");
+		LOAD_TEMPLATE('guest_sponsor_lost');
 	}
-} elseif (isset($_POST['ok'])) {
+} elseif (isFormSent()) {
 	// Check status and login data ...
-	$result = SQL_QUERY_ESC("SELECT status FROM "._MYSQL_PREFIX."_sponsor_data
-WHERE id='%s' AND password='%s' LIMIT 1",
- array(bigintval($_POST['sponsorid']), md5($_POST['pass'])), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_sponsor_data`
+WHERE `id`='%s' AND password='%s' LIMIT 1",
+	array(bigintval(REQUEST_POST('sponsorid')), md5(REQUEST_POST('pass'))), __FILE__, __LINE__);
+
 	if (SQL_NUMROWS($result) == 1) {
 		// Okay, first login data check passed, now has he/she an approved (CONFIRMED) account?
 		list($status) = SQL_FETCHROW($result);
-		if ($status == "CONFIRMED") {
+		if ($status == 'CONFIRMED') {
 			// Is confirmed so both is fine and we can continue with login procedure
-			$login = ((set_session('sponsorid'  , bigintval($_POST['sponsorid']))) &&
-			          (set_session('sponsorpass', md5($_POST['pass'])           ))
+			$login = ((setSession('sponsorid'  , bigintval(REQUEST_POST('sponsorid')))) &&
+			(setSession('sponsorpass', md5(REQUEST_POST('pass'))           ))
 			);
 
-			if ($login) {
+			if ($login === true) {
 				// Cookie setup successfull so we can forward to sponsor area
-				LOAD_URL("modules.php?module=sponsor");
+				redirectToUrl('modules.php?module=sponsor');
 			} else {
 				// Cookie setup failed!
-				LOAD_TEMPLATE("admin_settings_saved", false, SPONSPOR_COOKIE_SETUP_FAILED);
-				OUTPUT_HTML("<br />");
+				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSPOR_COOKIE_SETUP_FAILED'));
 
 				// Login formular and other links
-				LOAD_TEMPLATE("guest_sponsor_login");
+				LOAD_TEMPLATE('guest_sponsor_login');
 			}
 		} else {
 			// Status is not fine
 			$content = constant('SPONSOR_LOGIN_FAILED_'.strtoupper($status).'');
-			LOAD_TEMPLATE("admin_settings_saved", false, $content);
-			OUTPUT_HTML("<br />");
+			LOAD_TEMPLATE('admin_settings_saved', false, $content);
 
 			// Login formular and other links
-			LOAD_TEMPLATE("guest_sponsor_login");
+			LOAD_TEMPLATE('guest_sponsor_login');
 		}
 	} else {
-		// Account missing or wrong pass! We shall not find this out for the "hacker folks"...
-		LOAD_TEMPLATE("admin_settings_saved", false, SPONSOR_LOGIN_FAILED_404_WRONG_PASS);
-		OUTPUT_HTML("<br />");
+		// Account missing or wrong pass! We shall not find this out for the "cracker folks"...
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SPONSOR_LOGIN_FAILED_404_WRONG_PASS'));
 
 		// Login formular and other links
-		LOAD_TEMPLATE("guest_sponsor_login");
+		LOAD_TEMPLATE('guest_sponsor_login');
 	}
 
 	// Free memory
 	SQL_FREERESULT($result);
 } else {
 	// Login formular and other links
-	LOAD_TEMPLATE("guest_sponsor_login");
+	LOAD_TEMPLATE('guest_sponsor_login');
 }
 
 //