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

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 37715eccb3..d742a4fbee 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
 	LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("mydata")) && (!IS_ADMIN())) {
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "mydata");
+	addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "mydata");
 	return;
 }
 
@@ -56,16 +56,13 @@ if (!empty($_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",
+		$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__);
-	}
-	 else
-	{
+	} 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",
+		$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__);
 	}
 	$DATA = SQL_FETCHROW($result);
@@ -76,26 +73,23 @@ case "show": // Show his data
 	$DATA[13] = MAKE_DATETIME($DATA[13], "0");
 
 	// How far is last change on his profile away from now?
-	if ((($DATA[13] + $_CONFIG['profile_lock']) > time()) && (!IS_ADMIN()) && ($_CONFIG['profile_lock'] > 0))
-	{
+	if ((($DATA[13] + getConfig('profile_lock')) > time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0)) {
 		// You cannot change your account
-		define('CHANGE', "<FONT class=\"member_failed\">".MEMBER_PROFILE_LOCKED_1.MAKE_DATETIME($DATA[13] + $_CONFIG['profile_lock'], "0").MEMBER_PROFILE_LOCKED_2."</FONT>");
-	}
-	 else
-	{
+		define('CHANGE', "<div class=\"member_failed\">".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), MAKE_DATETIME($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];
-	switch (GET_LANGUAGE())
-	{
+
+	switch (GET_LANGUAGE()) {
 		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"))
-	{
+	if (EXT_IS_ACTIVE("country")) {
 		// Load country's description and code
 		$DATA[3] = COUNTRY_GENERATE_INFO($DATA[3]);
 	}
@@ -108,28 +102,25 @@ 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
-FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
-		 array(UID_VALUE), __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+		 array(constant('UID_VALUE')), __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__);
+FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+		 array(constant('UID_VALUE')), __FILE__, __LINE__);
 	}
 
 	$DATA = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
-	$DATA[13] = $DATA[12] + $_CONFIG['profile_lock'];
+	$DATA[13] = $DATA[12] + getConfig('profile_lock');
 
 	// How far is last change on his profile away from now?
-	if (($DATA[13] > time()) && (!IS_ADMIN()) && ($_CONFIG['profile_lock'] > 0))
-	{
-		$DATA[13] = MAKE_DATETIME($DATA[13] + $_CONFIG['profile_lock'], "0");
+	if (($DATA[13] > time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0)) {
+		$DATA[13] = MAKE_DATETIME($DATA[13] + getConfig('profile_lock'), "0");
 		// You cannot change your account
 		LOAD_TEMPLATE("member_mydata_locked");
-	}
-	 else
-	{
+	} else {
 		// He is allowed to change his profile
 		switch ($DATA[10])
 		{
@@ -174,15 +165,15 @@ FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
 
 		if (EXT_IS_ACTIVE("country")) {
 			// Generate selection box
-			$OUT  = "<SELECT name=\"country_code\" class=\"member_select\" size=\"1\">\n";
+			$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 .= "</SELECT>";
+			$OUT .= "</select>";
 			define('__COUNTRY_CONTENT', $OUT);
 		} else {
 			// Ouput default input box
-			define('__COUNTRY_CONTENT', "<INPUT type=\"text\" name=\"cntry\" class=\"member_normal\" size=\"2\" maxlength=\"3\" value=\"".$DATA[3]."\">");
+			define('__COUNTRY_CONTENT', "<input type=\"text\" name=\"cntry\" class=\"member_normal\" size=\"2\" maxlength=\"3\" value=\"".$DATA[3]."\" />");
 		}
 
 		// Load template
@@ -192,25 +183,24 @@ FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
 
 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",
+	$result = SQL_QUERY_ESC("SELECT email, password, last_update FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 	 array(UID_VALUE), __FILE__, __LINE__);
 	$DATA = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
-	$DATA[3] = $DATA[2] + $_CONFIG['profile_lock'];
+	$DATA[3] = $DATA[2] + getConfig('profile_lock');
 
 	// How far is last change on his profile away from now?
-	if (($DATA[3] > time()) && (!IS_ADMIN()) && ($_CONFIG['profile_lock'] > 0)) {
-		$DATA[3] = MAKE_DATETIME($DATA[3] + $_CONFIG['profile_lock'], "0");
+	if (($DATA[3] > time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0)) {
+		$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'])) {
 		// Invalid email address!
-		LOAD_TEMPLATE("admin_settings_saved", false, 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'])))
-		{
+		if ((($hash == $DATA[1]) || ($_POST['pass1'] == $_POST['pass2'])) && (!empty($_POST['pass1']))) {
 			// Only on simple changes normal mode is active = no email or password changed
 			$MODE = "normal"; $AND = "";
 
@@ -218,18 +208,16 @@ case "save": // Save entered data
 			if ($hash != $DATA[1]) { $AND = ", password='".$hash."'"; $MODE = "pass"; }
 
 			// Or did he changed his password?
-			if ($_POST['addy'] != $DATA[0])
-			{
+			if ($_POST['addy'] != $DATA[0]) {
 				// Jupp
 				if ($MODE == "normal") { $MODE = "email"; } else { $MODE .= ";email"; }
 				$_POST['old_addy'] = $DATA[0];
 			}
 
 			// Update member's profile
-			if (EXT_IS_ACTIVE("country"))
-			{
+			if (EXT_IS_ACTIVE("country")) {
 				// New way
-				$result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET
+				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET
 gender='%s', surname='%s', family='%s',
 street_nr='%s',
 country_code=%s, zip=%s, city='%s',
@@ -256,11 +244,9 @@ array(
  	UID_VALUE,
  	get_session('u_hash')
  ), __FILE__, __LINE__);
-			}
-			 else
-			{
+			} else {
 				// Old way
-				$result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET
+				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET
 gender='%s', surname='%s', family='%s',
 street_nr='%s',
 country='%s', zip=%s, city='%s',
@@ -294,19 +280,17 @@ array(
 
 			// ... and run them through
 			SEND_MODE_MAILS ("mydata", $modes);
-		}
-		 else
-		{
+		} else {
 			// Entered wrong pass for updating profile
-			LOAD_TEMPLATE("admin_settings_saved", false, MEBER_UPDATE_PWD_WRONG);
+			LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEBER_UPDATE_PWD_WRONG'));
 		}
 	}
 	break;
 
 case "notify": // Switch off notfication
-	$result = 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 = URL."/modules.php?module=login&amp;what=welcome&msg=".urlencode(PROFILE_UPDATED);
+	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'));
 	break;
 }