X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=ee7f7de2dc73e9cd608e8f74e62910bd9d95c3fe;hb=62b4ef5bb0b63f7cac5f0dccd816246a108a5d83;hp=b53d0bdaedbb9d31c3163d716c566c41b02abd05;hpb=854fcac4ae5fe26e28e9d4d7b8361f2ab455aeb1;p=mailer.git

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index b53d0bdaed..ee7f7de2dc 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/10/2003 *
- * ===============                              Last change: 11/26/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/10/2003 *
+ * ===================                          Last change: 11/26/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-register.php                                *
@@ -55,19 +55,14 @@ if (!isExtensionActive('register')) {
 // Initialize variables
 $isOkay     = true;
 $shortPass  = false;
-$cats       = 0;
+$cats       = '0';
 $ipTimedOut = false;
 
 // Default refid is zero
 setRequestPostElement('refid', 0);
 if (determineReferalId() > 0) {
 	// Test if the refid is valid
-	$result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-		array(determineReferalId()), __FILE__, __LINE__);
-
-	// Userid found?
-	//* DEBUG: */ die("refid={determineReferalId()}/numRows=".SQL_NUMROWS($result)."");
-	if (SQL_NUMROWS($result) == 0) {
+	if (!fetchUserData(determineReferalId())) {
 		// Not found so we set your refid!
 		setRequestPostElement('refid', getConfig('def_refid'));
 		setSession('refid', getConfig('def_refid'));
@@ -145,8 +140,7 @@ if (isFormSent()) {
 
 	if ((postRequestElement('email') != '!') && (getConfig('check_double_email') == 'Y')) {
 		// Does the email address already exists in our database?
-		$CHK = isEmailTaken(postRequestElement('email'));
-		if ($CHK === true) {
+		if ((!isAdmin()) && (isEmailTaken(postRequestElement('email')))) {
 			setRequestPostElement('email', '?');
 			$isOkay = false;
 		} // END - if
@@ -198,7 +192,7 @@ if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
 	// @TODO Rewrite these all to a single filter
 	$ADD1 = '';
 	$ADD2 = '';
-	if (getExtensionVersion('theme') >= '0.0.8') {
+	if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
 		// Okay, add design here
 		$ADD1 = ', `curr_theme`';
 		$ADD2 = ", '".getCurrentTheme()."'";
@@ -207,7 +201,7 @@ if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
 	// Check if I shall disable sending mail to newly registered members out about active/begging rallye
 	//
 	// First comes first: begging rallye
-	if (getExtensionVersion('beg') >= '0.1.7') {
+	if (isExtensionInstalledAndNewer('beg', '0.1.7')) {
 		// Okay, shall I disable now?
 		if (getConfig('beg_new_mem_notify') != 'Y') {
 			$ADD1 .= ', `beg_ral_notify`, `beg_ral_en_notify`';
@@ -216,7 +210,7 @@ if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
 	} // END - if
 
 	// Second: active rallye
-	if (getExtensionVersion('bonus') >= '0.7.7') {
+	if (isExtensionInstalledAndNewer('bonus', '0.7.7')) {
 		// Okay, shall I disable now?
 		if (getConfig('bonus_new_mem_notify') != 'Y') {
 			$ADD1 .= ', `bonus_ral_notify`, `bonus_ral_en_notify`';
@@ -266,7 +260,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	$userid = SQL_INSERTID();
 
 	// Did this work?
-	if ($userid == 0) {
+	if ($userid == '0') {
 		// Something bad happened!
 		loadTemplate('admin_settings_saved', false, getMessage('USER_NOT_REGISTERED'));
 		return;
@@ -282,7 +276,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	// Write his welcome-points
 	$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) {
+	if (SQL_NUMROWS($result) == '0') {
 		// Add only when the line was not found (maybe some more secure?)
 		$locked = 'points';
 
@@ -294,7 +288,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 			array(bigintval($userid)), __FILE__, __LINE__);
 
 		// Update mediadata as well
-		if ((getExtensionVersion('mediadata') >= '0.0.4') && ($locked == 'points')) {
+		if ((isExtensionInstalledAndNewer('mediadata', '0.0.4')) && ($locked == 'points')) {
 			// Update database
 			updateMediadataEntry(array('total_points'), 'add', getConfig('points_register'));
 		} // END - if
@@ -314,8 +308,8 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	// Rewrite gender
 	$gender = translateGender(postRequestElement('gender'));
 
-	// ... rewrite a zero referal ID to the main title
-	if (postRequestElement('refid') == 0) setRequestPostElement('refid', getConfig('MAIN_TITLE'));
+	// ... rewrite a zero referal id to the main title
+	if (postRequestElement('refid') == '0') setRequestPostElement('refid', getConfig('MAIN_TITLE'));
 
 	// Is ZIP code set?
 	if (isPostRequestElementSet('zip')) {
@@ -409,7 +403,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	}
 
 	if ($shortPass === true) {
-		registerOutputFailedMessage('SHORT_PASS', ": ".getConfig('pass_len'));
+		registerOutputFailedMessage('SHORT_PASS', ': ' . getConfig('pass_len'));
 	} // END - if
 
 	if ($ipTimedOut === true) {
@@ -417,7 +411,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	} // END - if
 
 	if ((!empty($cats)) && ($cats < getConfig('least_cats'))) {
-		registerOutputFailedMessage(sprintf(getMessage('CATS_LEAST'), getConfig('least_cats')));
+		registerOutputFailedMessage('', sprintf(getMessage('CATS_LEAST'), getConfig('least_cats')));
 	} // END - if
 
 	// Generate birthday selection
@@ -453,9 +447,12 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 	$content['surname']   = SQL_ESCAPE(postRequestElement('surname'));
 	$content['family']    = SQL_ESCAPE(postRequestElement('family'));
 	$content['street_nr'] = SQL_ESCAPE(postRequestElement('street_nr'));
-	$content['zip']       = bigintval(postRequestElement('zip'));
+	$content['zip']       = '';
+	if (isPostRequestElementSet('zip')) {
+		$content['zip']       = bigintval(postRequestElement('zip'));
+	} // END - if
 	$content['city']      = SQL_ESCAPE(postRequestElement('city'));
-	$content['email']      = SQL_ESCAPE(postRequestElement('email'));
+	$content['email']     = SQL_ESCAPE(postRequestElement('email'));
 
 	// Prepare country selection box
 	$OUT  = "<select name=\"country_code\" class=\"guest_select\" size=\"1\">\n";