X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=ba46619ea6ffce593dabf7fdd7e5ba8d92c6b898;hb=cc7c700143bca2420ff0497e648d31a18cc9add2;hp=f17a36cb826b60950ad7be1251b1e4b03ad1c404;hpb=3daede4c904e23905c3e48dd6749019deca0a0e0;p=mailer.git

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index f17a36cb82..ba46619ea6 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -72,7 +72,7 @@ if (empty($_POST['country_code'])) $_POST['country_code'] = "1";
 $_POST['refid'] = 0;
 if ($GLOBALS['refid'] > 0) {
 	// Test if the refid is valid
-	$result = SQL_QUERY_ESC("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 		array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
 
 	// Userid found?
@@ -156,7 +156,7 @@ if (isset($_POST['ok'])) {
 	// Check for IP timeout?
 	if (getConfig('ip_timeout') > 0) {
 		// Check his IP number
-		$result = SQL_QUERY_ESC("SELECT joined, last_update FROM `"._MYSQL_PREFIX."_user_data` WHERE REMOTE_ADDR='%s' AND (joined > (UNIX_TIMESTAMP() - %s) OR last_update > (UNIX_TIMESTAMP() - %s)) LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT joined, last_update FROM `{!_MYSQL_PREFIX!}_user_data` WHERE REMOTE_ADDR='%s' AND (joined > (UNIX_TIMESTAMP() - %s) OR last_update > (UNIX_TIMESTAMP() - %s)) LIMIT 1",
 			array(GET_REMOTE_ADDR(), getConfig('ip_timeout'), getConfig('ip_timeout')), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Same IP in timeout range and different email address entered... Eat this, faker! ;-)
@@ -195,11 +195,12 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) {
 	} // END - if
 
 	// Check if I shall disable sending mail to newly registered members out about active/begging rallye
+	// @TODO Rewrite this to a single filter
 	//
 	// First comes first: begging rallye
 	if (GET_EXT_VERSION("beg") >= "0.1.7") {
 		// Okay, shall I disable now?
-		if (getConfig('beg_new_mem_notify') == "N") {
+		if (getConfig('beg_new_mem_notify') != "Y") {
 			$ADD1 .= ", beg_ral_notify, beg_ral_en_notify";
 			$ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
 		} // END - if
@@ -208,7 +209,7 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) {
 	// Second: active rallye
 	if (GET_EXT_VERSION("bonus") >= "0.7.7") {
 		// Okay, shall I disable now?
-		if (getConfig('bonus_new_mem_notify') == "N") {
+		if (getConfig('bonus_new_mem_notify') != "Y") {
 			$ADD1 .= ", bonus_ral_notify, bonus_ral_en_notify";
 			$ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
 		} // END - if
@@ -229,7 +230,7 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) {
 	// Create user's account... //
 	//////////////////////////////
 	//
-	SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")
+	SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")
 VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",
 	array(
 		$countryRow,
@@ -269,13 +270,13 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	} // END - if
 
 	// Write his welcome-points
-	$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_points WHERE userid=%s AND ref_depth=0 LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s AND ref_depth=0 LIMIT 1",
 	 array(bigintval($userid)), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 0) {
 		// Add only when the line was not found (maybe some more secure?)
 		$locked = "points";
 		if (getConfig('ref_payout') > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails!
-		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')",
+		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_points` (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')",
 		 array(bigintval($userid), getConfig('points_register')), __FILE__, __LINE__);
 
 		// Update mediadata as well
@@ -290,7 +291,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 		foreach ($_POST['cat'] as $cat => $joined) {
 			if ($joined == "Y") {
 				// Insert category entry
-				SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES (%s, %s)",
+				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_cats` (userid, cat_id) VALUES (%s, %s)",
 				 array(bigintval($userid), bigintval($cat)), __FILE__, __LINE__);
 			} // END - if
 		} // END - foreach
@@ -300,7 +301,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	$gender = TRANSLATE_GENDER($_POST['gender']);
 
 	// ... rewrite a zero referal ID to the main title
-	if ($_POST['refid'] == "0") $_POST['refid'] = MAIN_TITLE;
+	if ($_POST['refid'] == "0") $_POST['refid'] = constant('MAIN_TITLE');
 
 	// Is ZIP code set?
 	if (!empty($_POST['zip'])) {
@@ -355,55 +356,55 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 
 	// Send mail to user (confirmation link!)
 	$EMAIL = $DATA['email'];
-	SEND_EMAIL ($DATA['email'], GUEST_CONFIRM_LINK, $msg_guest);
+	SEND_EMAIL ($DATA['email'], getMessage('GUEST_CONFIRM_LINK'), $msg_guest);
 	$DATA['email'] = $EMAIL;
 
 	// Send mail to admin
-	SEND_ADMIN_NOTIFICATION(ADMIN_NEW_ACCOUNT, "register-admin", $DATA, $userid);
+	SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_ACCOUNT'), "register-admin", $DATA, $userid);
 
 	// Output success registration
 	LOAD_TEMPLATE("admin_settings_saved", false, REGISTRATION_DONE);
 } else {
 	if ($_POST['agree'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".HAVE_TO_AGREE."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<div class=\"register_failed\">".HAVE_TO_AGREE."</div>");
 	} // END - if
 
 	if ($_POST['addy'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_EMAIL."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<div class=\"register_failed\">".ENTER_EMAIL."</div>");
 		$_POST['addy'] = "";
 	} elseif ($_POST['addy'] == "?") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".EMAIL_ALREADY_DB."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<div class=\"register_failed\">".EMAIL_ALREADY_DB."</div>");
 		$_POST['addy'] = "";
 	}
 
 	if ($_POST['surname'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_SURNAME."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<div class=\"register_failed\">".ENTER_SURNAME."</div>");
 		$_POST['surname'] = "";
 	} // END - if
 
 	if ($_POST['family_name'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_FAMILY."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<div class=\"register_failed\">".ENTER_FAMILY."</div>");
 		$_POST['family_name'] = "";
 	} // END - if
 
 	if (($_POST['pass1'] == "!") && ($_POST['pass2'] == "!")) {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_BOTH_PASSWORDS."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<div class=\"register_failed\">".ENTER_BOTH_PASSWORDS."</div>");
 	} elseif ($_POST['pass1'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS1."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<div class=\"register_failed\">".ENTER_PASS1."</div>");
 	} elseif ($_POST['pass2'] == "!") {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".ENTER_PASS2."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<div class=\"register_failed\">".ENTER_PASS2."</div>");
 	}
 
 	if ($SHORT_PASS) {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".SHORT_PASS.": ".getConfig('pass_len')."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<div class=\"register_failed\">{!SHORT_PASS!}: ".getConfig('pass_len')."</div>");
 	} // END - if
 
 	if ($IP_TIMEOUT) {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".REMOTE_ADDR_TIMEOUT."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<div class=\"register_failed\">{!REMOTE_ADDR_TIMEOUT!}</div>");
 	} // END - if
 
 	if ((!empty($cats)) && ($cats < getConfig('least_cats'))) {
-		OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".CATS_LEAST.": ".getConfig('least_cats')."</SPAN></STRONG><br /><br />");
+		OUTPUT_HTML("<div class=\"register_failed\">{!CATS_LEAST!}: ".getConfig('least_cats')."</div>");
 	} // END - if
 
 	// Generate birthday selection
@@ -463,7 +464,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 		define('__COUNTRY_CONTENT', $OUT);
 	} else {
 		// Old out-dated variant
-		define('__COUNTRY_CONTENT', "<INPUT type=\"text\" name=\"cntry\" class=\"guest_normal\" size=\"2\" maxlength=\"3\" value=\"".__COUNTRY."\">");
+		define('__COUNTRY_CONTENT', "<input type=\"text\" name=\"cntry\" class=\"guest_normal\" size=\"2\" maxlength=\"3\" value=\"{!__COUNTRY!}\" />");
 	}
 
 	// Set MUST_??? constants