X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fsponsor%2Faccount.php;h=76889dc415ab0d92a76f80d66cf690575c6974b6;hb=f55a18dbd4f2312a8812fb3feb3296b350ba269b;hp=ba9a45360eacd2a846a7aecfd604492b7b4281b0;hpb=2f0357c7ac9da6c17d361b8e7cb0b1ad09eb85f6;p=mailer.git

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index ba9a45360e..76889dc415 100644
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/30/2005 *
- * ===============                              Last change: 05/19/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 09/30/2005 *
+ * ===================                          Last change: 05/19/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : account.php                                      *
@@ -17,12 +17,14 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
- * This program is free software. You can redistribute it and/or modify *
+ * 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 *
- * the Free Software Foundation; either version 2 of the License.       *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
  *                                                                      *
  * This program is distributed in the hope that it will be useful,      *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
@@ -37,123 +39,116 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif ((!EXT_IS_ACTIVE('sponsor'))
-	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'sponsor'));
+	die();
+} elseif (!isExtensionActive('sponsor')) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('sponsor'));
 	return;
-} elseif (!IS_SPONSOR()) {
+} elseif (!isSponsor()) {
 	// No sponsor!
-	addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+	addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
 	return;
 }
 
 // Data for the formular
-$result = SQL_QUERY_ESC("SELECT company, position, tax_ident,
-gender, surname, family, street_nr1, street_nr2, zip, city, country,
-phone, fax, cell, email, url,
-status, receive_warnings
-FROM `{!_MYSQL_PREFIX!}_sponsor_data`
-WHERE id='%s' AND password='%s' LIMIT 1",
-	array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
+$result = SQL_QUERY_ESC("SELECT
+	`id`, `company`, `position`, `tax_ident`,
+	`gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
+	`phone`, `fax`, `cell`, `email`, `url`,
+	`status`, `receive_warnings`
+FROM
+	`{?_MYSQL_PREFIX?}_sponsor_data`
+WHERE
+	`id`=%s AND
+	`password`='%s'
+LIMIT 1",
+	array(
+		bigintval(getSession('sponsor_id')),
+		getSession('sponsorpass')
+	), __FILE__, __LINE__);
 
 // Entry found?
 if (SQL_NUMROWS($result) == 1) {
 	// Load sponsor data
 	$content = SQL_FETCHARRAY($result);
-	if ($content['status'] == "CONFIRMED") {
+	if ($content['status'] == 'CONFIRMED') {
 		// Check if form was submitted or not
-		if (IS_FORM_SENT()) {
+		if (isFormSent()) {
 			// Check passwords
-			if (!REQUEST_ISSET_POST(('pass_old'))) {
+			if (!isPostRequestParameterSet('pass_old')) {
 				// No current password entered
-				$message = getMessage('SPONSOR_NO_CURRENT_PASSWORD_ENTERED');
-			} elseif (md5(REQUEST_POST('pass_old')) != get_session('sponsorpass')) {
+				$message = '{--SPONSOR_NO_CURRENT_PASSWORD_ENTERED--}';
+			} elseif (md5(postRequestParameter('pass_old')) != getSession('sponsorpass')) {
 				// Entered password didn't match password in DB
-				$message = getMessage('SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB');
-			} elseif ((REQUEST_ISSET_POST(('pass1'))) && (REQUEST_ISSET_POST(('pass2'))) && (REQUEST_POST('pass1') != REQUEST_POST('pass2'))) {
+				$message = '{--SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB--}';
+			} elseif ((isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')) && (postRequestParameter('pass1') != postRequestParameter('pass2'))) {
 				// Both new passwords did not match
-				$message = getMessage('SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH');
-			} elseif ((!REQUEST_ISSET_POST(('pass1'))) && (REQUEST_ISSET_POST(('pass2')))) {
+				$message = '{--SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH--}';
+			} elseif ((!isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
 				// No password one entered
-				$message = getMessage('SPONSOR_PASSWORD_ONE_EMPTY');
-			} elseif ((REQUEST_ISSET_POST(('pass1'))) && (!REQUEST_ISSET_POST(('pass2')))) {
+				$message = '{--SPONSOR_PASSWORD_ONE_EMPTY--}';
+			} elseif ((isPostRequestParameterSet('pass1')) && (!isPostRequestParameterSet('pass2'))) {
 				// No password two entered
-				$message = getMessage('SPONSOR_PASSWORD_TWO_EMPTY');
-			} elseif ((REQUEST_ISSET_POST(('pass1'))) && (strlen(REQUEST_POST('pass1')) < getConfig('pass_len'))) {
+				$message = '{--SPONSOR_PASSWORD_TWO_EMPTY--}';
+			} elseif ((isPostRequestParameterSet('pass1')) && (strlen(postRequestParameter('pass1')) < getConfig('pass_len'))) {
 				// Too short password
-				$message = sprintf(getMessage('SPONSOR_PASSWORD_TOO_SHORT'), getConfig('pass_len'));
+				$message = '{--SPONSOR_PASSWORD_TOO_SHORT--}';
 			} else {
 				// Default is we don't want to change password!
 				$PASS_AND = ''; $PASS_DATA = '';
 
 				// Check if we want to change password or not
-				if ((REQUEST_POST('pass1') == REQUEST_POST('pass2')) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_POST('pass1') != REQUEST_POST('pass_old'))) {
+				if ((postRequestParameter('pass1') == postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (postRequestParameter('pass1') != postRequestParameter('pass_old'))) {
 					// Change current password
-					$PASS_AND  = ", password='%s'";
-					$PASS_DATA = md5(REQUEST_POST('pass1'));
-				}
+					$PASS_AND  = ", `password`='%s'";
+					$PASS_DATA = md5(postRequestParameter('pass1'));
+				} // END - if
 
 				// Unsecure data which we don't want here
-					$UNSAFE = array('receive_warnings', 'warning_interval');
+				$UNSAFE = array('receive_warnings', 'warning_interval');
 
 				// Remove all (maybe spoofed) unsafe data from array
 				foreach ($UNSAFE as $remove) {
-					REQUEST_UNSET_POST($remove);
-				}
+					unsetPostRequestParameter($remove);
+				} // END - foreach
 
 				// Set last change timestamp
-				REQUEST_SET_POST('last_change', "UNIX_TIMESTAMP()");
+				setPostRequestParameter('last_change', 'UNIX_TIMESTAMP()');
 
 				// Save data
-				$message = SPONSOR_SAVE_DATA(REQUEST_POST_ARRAY(), $content);
+				$message = saveSponsorData(postRequestArray(), $content);
 			}
 
 			if (!empty($message)) {
 				// Output message
-				$OUT = LOAD_TEMPLATE('admin_settings_saved', true, $message);
+				$GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, $message);
 			} else {
 				// No message generated
-				$OUT = LOAD_TEMPLATE('admin_settings_saved', true, getMessage('SPONSOR_NO_MESSAGE_GENERATED'));
+				$GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MESSAGE_GENERATED--}');
 			}
 		} else {
-			// Check for gender selection
-			switch ($content['gender'])
-			{
-			case "M": // Male
-				define('__GENDER_M', ' selected="selected"');
-				define('__GENDER_F', '');
-				define('__GENDER_C', '');
-				break;
-
-			case "F": // Female
-				define('__GENDER_M', '');
-				define('__GENDER_F', ' selected="selected"');
-				define('__GENDER_C', '');
-				break;
+			// Init gender
+			foreach (array('m', 'f', 'c') as $gender) {
+				$content['gender_' . $gender] = '';
+			} // END - foreach
 
-			case "C": // Company
-				define('__GENDER_M', '');
-				define('__GENDER_F', '');
-				define('__GENDER_C', ' selected="selected"');
-				break;
-			}
+			// Check for gender selection
+			$content['gender_' . strtolower($content['gender'])] = ' selected="selected"';
 
 			// Output formular
-			$OUT = LOAD_TEMPLATE("sponsor_account_form", true, $content);
+			$GLOBALS['sponsor_output'] = loadTemplate('sponsor_account_form', true, $content);
 		}
 	} else {
 		// Locked or so?
-		$STATUS = SPONSOR_TRANSLATE_STATUS($content['status']);
-		$OUT = LOAD_TEMPLATE('admin_settings_saved', true, sprintf(getMessage('SPONSOR_ACCOUNT_FAILED'), $STATUS));
+		$STATUS = sponsorTranslateUserStatus($content['status']);
+		$GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS));
 	}
 } else {
 	// Sponsor account not found!
-	$OUT = LOAD_TEMPLATE('admin_settings_saved', true, sprintf(getMessage('SPONSOR_ACCOUNT_404'), get_session('sponsorid')));
+	$GLOBALS['sponsor_output'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id')));
 }
 
 // Free memory
 SQL_FREERESULT($result);
 
-//
+// [EOF]
 ?>