X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=f06e9ee66f391b88623d09c432b36ba1501b20c7;hp=59ffc72e760046b2cddf5d194575dcf238e4fba4;hb=963e55ca1ea79e255f235e359cde9f7862191dc5;hpb=180646e7ce31e2772267540bb813f4798fc88c06

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 59ffc72e76..f06e9ee66f 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -32,13 +32,10 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-}
- elseif ((!EXT_IS_ACTIVE("register")))
-{
+} elseif ((!EXT_IS_ACTIVE("register"))) {
 	if (IS_ADMIN()) {
 		ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "register"));
 	} else {
@@ -50,7 +47,6 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 // Add description as navigation point
 ADD_DESCR("guest", basename(__FILE__));
 
-OPEN_TABLE("100%", "guest_content_align", "");
 global $_CONFIG, $DATA;
 
 // Initialize variables
@@ -77,7 +73,7 @@ if (isset($_POST['ok']))
 	// First we only check the submitted data then we continue... :)
 	//
 	// Did he agree to our Terms Of Usage?
-	if ($_POST['agree'] != 'Y')
+	if ($_POST['agree'] != "Y")
 	{
 		$_POST['agree'] = "!";
 		$FAILED = true;
@@ -131,9 +127,9 @@ if (isset($_POST['ok']))
 	if (!IS_ADMIN())
 	{
 		// Do this check only when no admin is logged in
-		foreach ($_POST['cat'] as $id=>$answer)
+		foreach ($_POST['cat'] as $id => $answer)
 		{
-			if ($answer == 'Y') $cats++;
+			if ($answer == "Y") $cats++;
 		}
 		if ($cats < $_CONFIG['least_cats'])
 		{
@@ -141,7 +137,7 @@ if (isset($_POST['ok']))
 			$FAILED = true;
 		}
 	}
-	if (($_POST['addy'] != "!") && ($_CONFIG['check_double_email'] == 'Y') && (!IS_ADMIN()))
+	if (($_POST['addy'] != "!") && ($_CONFIG['check_double_email'] == "Y") && (!IS_ADMIN()))
 	{
 		// Does the email address already exists in our database?
 		$CHK = SEARCH_EMAIL_USERTAB($_POST['addy']);
@@ -161,7 +157,7 @@ if (isset($_POST['ok']))
 	}
 
 	// Test the refid (because some strange hackers... :-P)
-	$result = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
 	 array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 0)
 	{
@@ -198,7 +194,7 @@ if ((isset($_POST['ok'])) && (!$FAILED))
 	if (GET_EXT_VERSION("beg") >= "0.1.7")
 	{
 		// Okay, shall I disable now?
-		if ($_CONFIG['beg_new_mem_notify'] == 'N')
+		if ($_CONFIG['beg_new_mem_notify'] == "N")
 		{
 			$ADD1 .= ", beg_ral_notify, beg_ral_en_notify";
 			$ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
@@ -209,7 +205,7 @@ if ((isset($_POST['ok'])) && (!$FAILED))
 	if (GET_EXT_VERSION("bonus") >= "0.7.7")
 	{
 		// Okay, shall I disable now?
-		if ($_CONFIG['bonus_new_mem_notify'] == 'N')
+		if ($_CONFIG['bonus_new_mem_notify'] == "N")
 		{
 			$ADD1 .= ", bonus_ral_notify, bonus_ral_en_notify";
 			$ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
@@ -234,11 +230,11 @@ if ((isset($_POST['ok'])) && (!$FAILED))
 	// Create user's account... //
 	//////////////////////////////
 	//
-	$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_data (sex, 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', %d, '%s', '%s', %d, %d, %d, '%s', %d, %d, %d, 'UNCONFIRMED', '%s', '%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",
+	$result = 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,
-	SQL_ESCAPE(substr($_POST['sex'], 0, 1)),
+	SQL_ESCAPE(substr($_POST['gender'], 0, 1)),
 	SQL_ESCAPE($_POST['surname']),
 	SQL_ESCAPE($_POST['family_name']),
 	SQL_ESCAPE($_POST['street_nr']),
@@ -266,14 +262,14 @@ array(
 	$userid = bigintval($userid);
 
 	// Write his welcome-points
-	$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_points WHERE userid=%d 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 ($_CONFIG['ref_payout'] > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails!
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES(%d, 0, '%s')",
+		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid, ref_depth, ".$locked.") VALUES(%s, 0, '%s')",
 		 array(bigintval($userid), $_CONFIG['points_register']), __FILE__, __LINE__);
 
 		// Update mediadata as well
@@ -285,27 +281,27 @@ array(
 
 	// Write catgories
 	if ((is_array($_POST['cat'])) && (count($_POST['cat']))) {
-		foreach ($_POST['cat'] as $cat=>$joined) {
-			if ($joined == 'Y') {
+		foreach ($_POST['cat'] as $cat => $joined) {
+			if ($joined == "Y") {
 				// Insert category entry
-				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES (%d, %d)",
+				$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES (%s, %s)",
 				 array(bigintval($userid), bigintval($cat)), __FILE__, __LINE__);
 			}
 		}
 	}
 
-	// Rewrite sex
-	$sex = TRANSLATE_SEX($_POST['sex']);
+	// Rewrite gender
+	$gender = TRANSLATE_GENDER($_POST['gender']);
 
 	// ... rewrite a zero referral ID to the main title
 	if ($_POST['refid'] == "0") $_POST['refid'] = MAIN_TITLE;
 
 	// Prepare data array for the email template
-	// Start with the salutation...
+	// Start with the gender...
 	$DATA = array(
 		'hash'    => $hash,
 		'uid'     => $userid,
-		'salut'   => $sex,
+		'gender'   => $gender,
 		'surname' => SQL_ESCAPE($_POST['surname']),
 		'family'  => SQL_ESCAPE($_POST['family_name']),
 		'email'   => SQL_ESCAPE($_POST['addy']),
@@ -338,17 +334,7 @@ array(
 	$DATA['email'] = $EMAIL;
 
 	// Send mail to admin
-	if (GET_EXT_VERSION("admins") >= "0.4.1")
-	{
-		// Use new system
-		SEND_ADMIN_EMAILS_PRO(ADMIN_NEW_ACCOUNT, "register-admin", $DATA, $userid);
-	}
-	 else
-	{
-		// Use old system
-		$msg_admin = LOAD_EMAIL_TEMPLATE("register-admin", $DATA, $userid);
-		SEND_ADMIN_EMAILS (ADMIN_NEW_ACCOUNT, $msg_admin);
-	}
+	SEND_ADMIN_NOTIFICATION(ADMIN_NEW_ACCOUNT, "register-admin", $DATA, $userid);
 
 	// Output success registration
 	LOAD_TEMPLATE("admin_settings_saved", false, REGISTRATION_DONE);
@@ -438,7 +424,7 @@ array(
 	}
 
 	// Shall I display the refid or shall I make it editable?
-	if ($_CONFIG['display_refid'] == 'Y') {
+	if ($_CONFIG['display_refid'] == "Y") {
 		// Load template to enter it
 		define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid", true, $GLOBALS['refid']));
 	} else {
@@ -481,6 +467,6 @@ array(
 	// Display registration form
 	LOAD_TEMPLATE("guest_register");
 }
-CLOSE_TABLE();
+
 //
 ?>