X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=cc051262cb8a80d7888c6a1467f699a3ecb5aba4;hb=6e008d188bf9c7f8d4edc2a8799c61940eee48e7;hp=d742a4fbeeb3c9fa3d2d75d6a085e9797bdecbeb;hpb=1cf72a9c1a5e737509af79d49f0731da2eb6a218;p=mailer.git

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index d742a4fbee..cc051262cb 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mitglieder koennen hier ihre Profildaten aendern *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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,30 +38,30 @@
 
 // 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 (!IS_MEMBER()) {
-	LOAD_URL("modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("mydata")) && (!IS_ADMIN())) {
-	addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "mydata");
+	LOAD_URL('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('mydata')) && (!IS_ADMIN())) {
+	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'mydata');
 	return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 
-define('UID_VALUE', $GLOBALS['userid']); $URL = "";
+define('UID_VALUE', getUserId()); $URL = '';
 
 // Detect what the member wants to do
 $MODE = "show"; // Show his data
-if (!empty($_POST['save']))   $MODE = "save";   // Save entered data
-if (isset($_POST['edit']))   $MODE = "edit";   // Edit data
-if (!empty($_POST['notify'])) $MODE = "notify"; // Switch off notification
+if (REQUEST_ISSET_POST(('save')))   $MODE = "save";   // Save entered data
+if (REQUEST_ISSET_POST('edit'))    $MODE = "edit";   // Edit data
+if (REQUEST_ISSET_POST(('notify'))) $MODE = "notify"; // Switch off notification
 
 switch ($MODE)
 {
 case "show": // Show his data
-	if (EXT_IS_ACTIVE("country", true)) {
+	if (EXT_IS_ACTIVE('country', true)) {
 		// New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
 		$result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 		 array(UID_VALUE), __FILE__, __LINE__);
@@ -89,7 +94,7 @@ case "show": // Show his data
 		default  : define('DOB', $DATA[8]."-".$DATA[7]."-".$DATA[9]); break;
 	}
 
-	if (EXT_IS_ACTIVE("country")) {
+	if (EXT_IS_ACTIVE('country')) {
 		// Load country's description and code
 		$DATA[3] = COUNTRY_GENERATE_INFO($DATA[3]);
 	}
@@ -99,7 +104,7 @@ case "show": // Show his data
 	break;
 
 case "edit": // Edit data
-	if (EXT_IS_ACTIVE("country", true)) {
+	if (EXT_IS_ACTIVE('country', true)) {
 		// New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
 		$result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update
 FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
@@ -125,24 +130,24 @@ FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 		switch ($DATA[10])
 		{
 		case "M":
-			define('M_DEFAULT', " selected=\"selected\"");
-			define('F_DEFAULT', "");
-			define('C_DEFAULT', "");
+			define('M_DEFAULT', ' selected="selected"');
+			define('F_DEFAULT', '');
+			define('C_DEFAULT', '');
 			break;
 
 		case "F":
-			define('M_DEFAULT', "");
-			define('F_DEFAULT', " selected=\"selected\"");
-			define('C_DEFAULT', "");
+			define('M_DEFAULT', '');
+			define('F_DEFAULT', ' selected="selected"');
+			define('C_DEFAULT', '');
 			break;
 
 		case "C":
-			define('M_DEFAULT', "");
-			define('F_DEFAULT', "");
-			define('C_DEFAULT', " selected=\"selected\"");
+			define('M_DEFAULT', '');
+			define('F_DEFAULT', '');
+			define('C_DEFAULT', ' selected="selected"');
 			break;
 		}
-		$DOB = "";
+		$DOB = '';
 		switch (GET_LANGUAGE())
 		{
 		case "de": // German date format
@@ -161,13 +166,13 @@ FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 		}
 
 		define('DOB', $DOB);
-		define('MAX_REC_LIST', ADD_MAX_RECEIVE_LIST("member", $DATA[11], true));
+		define('MAX_REC_LIST', ADD_MAX_RECEIVE_LIST('member', $DATA[11], true));
 
-		if (EXT_IS_ACTIVE("country")) {
+		if (EXT_IS_ACTIVE('country')) {
 			// Generate selection box
 			$OUT  = "<select name=\"country_code\" class=\"member_select\" size=\"1\">\n";
 			$whereStatement = "WHERE is_active='Y'";
-			if (IS_ADMIN()) $whereStatement = "";
+			if (IS_ADMIN()) $whereStatement = '';
 			$OUT .= ADD_OPTION_LINES("countries", "id", "descr", $DATA[3], "code", $whereStatement);
 			$OUT .= "</select>";
 			define('__COUNTRY_CONTENT', $OUT);
@@ -194,28 +199,28 @@ case "save": // Save entered data
 		$DATA[3] = MAKE_DATETIME($DATA[3] + getConfig('profile_lock'), "0");
 		// You cannot change your account
 		LOAD_TEMPLATE("member_mydata_locked");
-	} elseif (!VALIDATE_EMAIL($_POST['addy'])) {
+	} elseif (!VALIDATE_EMAIL(REQUEST_POST('addy'))) {
 		// Invalid email address!
-		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED'));
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED'));
 	} else {
 		// Generate hash
-		$hash = generateHash($_POST['pass1'], substr($DATA[1], 0, -40));
-		if ((($hash == $DATA[1]) || ($_POST['pass1'] == $_POST['pass2'])) && (!empty($_POST['pass1']))) {
+		$hash = generateHash(REQUEST_POST('pass1'), substr($DATA[1], 0, -40));
+		if ((($hash == $DATA[1]) || (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) && (REQUEST_ISSET_POST(('pass1')))) {
 			// Only on simple changes normal mode is active = no email or password changed
-			$MODE = "normal"; $AND = "";
+			$MODE = 'normal'; $AND = '';
 
 			// Did the user changed the password?
-			if ($hash != $DATA[1]) { $AND = ", password='".$hash."'"; $MODE = "pass"; }
+			if ($hash != $DATA[1]) { $AND = ", password='".$hash."'"; $MODE = 'pass'; }
 
 			// Or did he changed his password?
-			if ($_POST['addy'] != $DATA[0]) {
+			if (REQUEST_POST('addy') != $DATA[0]) {
 				// Jupp
-				if ($MODE == "normal") { $MODE = "email"; } else { $MODE .= ";email"; }
-				$_POST['old_addy'] = $DATA[0];
+				if ($MODE == 'normal') { $MODE = 'email'; } else { $MODE .= ";email"; }
+				REQUEST_SET_POST('old_addy', $DATA[0]);
 			}
 
 			// Update member's profile
-			if (EXT_IS_ACTIVE("country")) {
+			if (EXT_IS_ACTIVE('country')) {
 				// New way
 				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET
 gender='%s', surname='%s', family='%s',
@@ -229,18 +234,18 @@ notified='N',
 last_profile_sent=UNIX_TIMESTAMP()
 WHERE userid=%s AND password='%s' LIMIT 1",
 array(
- 	$_POST['gender'],
- 	$_POST['surname'],
- 	$_POST['family_name'],
- 	$_POST['street_nr'],
- 	bigintval($_POST['country_code']),
- 	bigintval($_POST['zip']),
- 	$_POST['city'],
- 	$_POST['addy'],
- 	bigintval($_POST['day']),
- 	bigintval($_POST['month']),
- 	bigintval($_POST['year']),
- 	bigintval($_POST['max_mails']),
+ 	REQUEST_POST('gender'),
+ 	REQUEST_POST('surname'),
+ 	REQUEST_POST('family'),
+ 	REQUEST_POST('street_nr'),
+ 	bigintval(REQUEST_POST('country_code')),
+ 	bigintval(REQUEST_POST('zip')),
+ 	REQUEST_POST('city'),
+ 	REQUEST_POST('addy'),
+ 	bigintval(REQUEST_POST('day')),
+ 	bigintval(REQUEST_POST('month')),
+ 	bigintval(REQUEST_POST('year')),
+ 	bigintval(REQUEST_POST('max_mails')),
  	UID_VALUE,
  	get_session('u_hash')
  ), __FILE__, __LINE__);
@@ -258,39 +263,39 @@ notified='N',
 last_profile_sent=UNIX_TIMESTAMP()
 WHERE userid=%s AND password='%s' LIMIT 1",
 array(
-	$_POST['gender'],
-	$_POST['surname'],
-	$_POST['family_name'],
-	$_POST['street_nr'],
-	$_POST['cntry'],
-	bigintval($_POST['zip']),
-	$_POST['city'],
-	$_POST['addy'],
-	bigintval($_POST['day']),
-	bigintval($_POST['month']),
-	bigintval($_POST['year']),
-	bigintval($_POST['max_mails']),
+	REQUEST_POST('gender'),
+	REQUEST_POST('surname'),
+	REQUEST_POST('family'),
+	REQUEST_POST('street_nr'),
+	REQUEST_POST('cntry'),
+	bigintval(REQUEST_POST('zip')),
+	REQUEST_POST('city'),
+	REQUEST_POST('addy'),
+	bigintval(REQUEST_POST('day')),
+	bigintval(REQUEST_POST('month')),
+	bigintval(REQUEST_POST('year')),
+	bigintval(REQUEST_POST('max_mails')),
 	UID_VALUE,
 	get_session('u_hash')
  ), __FILE__, __LINE__);
 			}
 
 			// Get all modes ...
-			$modes = explode(";", $MODE);
+			$modes = explode(';', $MODE);
 
 			// ... and run them through
-			SEND_MODE_MAILS ("mydata", $modes);
+			SEND_MODE_MAILS ('mydata', $modes);
 		} else {
 			// Entered wrong pass for updating profile
-			LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEBER_UPDATE_PWD_WRONG'));
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEBER_UPDATE_PWD_WRONG'));
 		}
 	}
 	break;
 
 case "notify": // Switch off notfication
 	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET notified='N', last_update=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
-		array($GLOBALS['userid']), __FILE__, __LINE__);
-	$URL = "modules.php?module=login&amp;what=welcome&amp;msg=".urlencode(getMessage('PROFILE_UPDATED'));
+		array(getUserId()), __FILE__, __LINE__);
+	$URL = 'modules.php?module=login&amp;what=welcome&amp;msg=' . urlencode(getMessage('PROFILE_UPDATED'));
 	break;
 }