X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=07603834339cd12041d411bb2b255283e37d19c0;hp=60e8badbde48326589a15d8d1edd3ac9a8918983;hb=116f17077ae6fa32c7373ccd6aaf94044bb6c276;hpb=aa63aed07428a99ea09002c8d072990677700080

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 60e8badbde..0760383433 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -41,9 +41,9 @@ if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } elseif (!IS_MEMBER()) {
-	LOAD_URL('modules.php?module=index');
+	redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('mydata')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'mydata');
+	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'mydata'));
 	return;
 }
 
@@ -53,45 +53,45 @@ ADD_DESCR('member', __FILE__);
 define('UID_VALUE', getUserId()); $URL = '';
 
 // Detect what the member wants to do
-$mode = "show"; // Show his data
-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
+$mode = 'show'; // Show his data
+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
+case 'show': // Show his data
 	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__);
+			array(getUserId()), __FILE__, __LINE__);
 	} else {
 		// Old 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, 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__);
+			array(getUserId()), __FILE__, __LINE__);
 	}
 	$DATA = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
 	// Translate / add some things
-	$DATA[10] = TRANSLATE_GENDER($DATA[10]);
-	$DATA[13] = MAKE_DATETIME($DATA[13], "0");
+	$DATA[10] = translateGender($DATA[10]);
+	$DATA[13] = generateDateTime($DATA[13], '0');
 
 	// How far is last change on his profile away from now?
 	if ((($DATA[13] + getConfig('profile_lock')) > time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0)) {
 		// You cannot change your account
-		define('CHANGE', "<div class=\"member_failed\">".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), MAKE_DATETIME($DATA[13] + getConfig('profile_lock'), "0"))."</div>");
+		define('CHANGE', "<div class=\"member_failed\">".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($DATA[13] + getConfig('profile_lock'), '0'))."</div>");
 	} else {
 		// He is allowed to change his profile
 		define('CHANGE', LOAD_TEMPLATE("member_mydata_button", true));
 	}
 
-	if (strlen($DATA[7]) == 1) $DATA[7] = "0".$DATA[7];
-	if (strlen($DATA[8]) == 1) $DATA[8] = "0".$DATA[8];
+	if (strlen($DATA[7]) == 1) $DATA[7] = '0'.$DATA[7];
+	if (strlen($DATA[8]) == 1) $DATA[8] = '0'.$DATA[8];
 
-	switch (GET_LANGUAGE()) {
-		case "de": define('DOB', $DATA[7].".".$DATA[8].".".$DATA[9]); break;
-		default  : define('DOB', $DATA[8]."-".$DATA[7]."-".$DATA[9]); break;
+	switch (getLanguage()) {
+		case 'de': define('DOB', $DATA[7].'.'.$DATA[8].'.'.$DATA[9]); break;
+		default  : define('DOB', $DATA[8].'-'.$DATA[7].'-'.$DATA[9]); break;
 	}
 
 	if (EXT_IS_ACTIVE('country')) {
@@ -100,10 +100,10 @@ case "show": // Show his data
 	}
 
 	// Load template
-	LOAD_TEMPLATE("member_mydata_overview");
+	LOAD_TEMPLATE('member_mydata_overview');
 	break;
 
-case "edit": // Edit data
+case 'edit': // Edit data
 	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
@@ -122,43 +122,43 @@ FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 
 	// How far is last change on his profile away from now?
 	if (($DATA[13] > time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0)) {
-		$DATA[13] = MAKE_DATETIME($DATA[13] + getConfig('profile_lock'), "0");
+		$DATA[13] = generateDateTime($DATA[13] + getConfig('profile_lock'), '0');
 		// You cannot change your account
-		LOAD_TEMPLATE("member_mydata_locked");
+		LOAD_TEMPLATE('member_mydata_locked');
 	} else {
 		// He is allowed to change his profile
 		switch ($DATA[10])
 		{
-		case "M":
+		case 'M':
 			define('M_DEFAULT', ' selected="selected"');
 			define('F_DEFAULT', '');
 			define('C_DEFAULT', '');
 			break;
 
-		case "F":
+		case 'F':
 			define('M_DEFAULT', '');
 			define('F_DEFAULT', ' selected="selected"');
 			define('C_DEFAULT', '');
 			break;
 
-		case "C":
+		case 'C':
 			define('M_DEFAULT', '');
 			define('F_DEFAULT', '');
 			define('C_DEFAULT', ' selected="selected"');
 			break;
 		}
 		$DOB = '';
-		switch (GET_LANGUAGE())
+		switch (getLanguage())
 		{
-		case "de": // German date format
+		case 'de': // German date format
 			// Day
-			$DOB .= ADD_SELECTION("day", $DATA[7]);
+			$DOB .= ADD_SELECTION('day', $DATA[7]);
 
 			// Month
-			$DOB .= ADD_SELECTION("month", $DATA[8]);
+			$DOB .= ADD_SELECTION('month', $DATA[8]);
 
 			// Year
-			$DOB .= ADD_SELECTION("year", $DATA[9]);
+			$DOB .= ADD_SELECTION('year', $DATA[9]);
 			break;
 
 		default: // Default is the US date format... :)
@@ -166,14 +166,14 @@ 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', addMaxReceiveList('member', $DATA[11], true));
 
 		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 = '';
-			$OUT .= ADD_OPTION_LINES("countries", "id", "descr", $DATA[3], "code", $whereStatement);
+			$OUT .= generateOptionList("countries", "id", "descr", $DATA[3], "code", $whereStatement);
 			$OUT .= "</select>";
 			define('__COUNTRY_CONTENT', $OUT);
 		} else {
@@ -182,24 +182,24 @@ FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 		}
 
 		// Load template
-		LOAD_TEMPLATE("member_mydata_edit");
+		LOAD_TEMPLATE('member_mydata_edit');
 	}
 	break;
 
-case "save": // Save entered data
+case 'save': // Save entered data
 	// Load old email / password:      0        1          2
 	$result = SQL_QUERY_ESC("SELECT email, password, last_update FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-	 array(UID_VALUE), __FILE__, __LINE__);
+		array(getUserId()), __FILE__, __LINE__);
 	$DATA = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 	$DATA[3] = $DATA[2] + getConfig('profile_lock');
 
 	// How far is last change on his profile away from now?
 	if (($DATA[3] > time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0)) {
-		$DATA[3] = MAKE_DATETIME($DATA[3] + getConfig('profile_lock'), "0");
+		$DATA[3] = generateDateTime($DATA[3] + getConfig('profile_lock'), '0');
 		// You cannot change your account
 		LOAD_TEMPLATE("member_mydata_locked");
-	} elseif (!VALIDATE_EMAIL(REQUEST_POST('addy'))) {
+	} elseif (!isEmailValid(REQUEST_POST('addy'))) {
 		// Invalid email address!
 		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED'));
 	} else {
@@ -247,7 +247,7 @@ array(
  	bigintval(REQUEST_POST('year')),
  	bigintval(REQUEST_POST('max_mails')),
  	UID_VALUE,
- 	get_session('u_hash')
+ 	getSession('u_hash')
  ), __FILE__, __LINE__);
 			} else {
 				// Old way
@@ -276,7 +276,7 @@ array(
 	bigintval(REQUEST_POST('year')),
 	bigintval(REQUEST_POST('max_mails')),
 	UID_VALUE,
-	get_session('u_hash')
+	getSession('u_hash')
  ), __FILE__, __LINE__);
 			}
 
@@ -284,7 +284,7 @@ array(
 			$modes = explode(';', $mode);
 
 			// ... and run them through
-			SEND_MODE_MAILS ('mydata', $modes);
+			sendModeMails ('mydata', $modes);
 		} else {
 			// Entered wrong pass for updating profile
 			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEBER_UPDATE_PWD_WRONG'));
@@ -292,7 +292,7 @@ array(
 	}
 	break;
 
-case "notify": // Switch off notfication
+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(getUserId()), __FILE__, __LINE__);
 	$URL = 'modules.php?module=login&amp;what=welcome&amp;msg=' . urlencode(getMessage('PROFILE_UPDATED'));
@@ -301,7 +301,7 @@ case "notify": // Switch off notfication
 
 if (!empty($URL)) {
 	// Load generated URL
-	LOAD_URL($URL);
+	redirectToUrl($URL);
 }
 
 //