Rewrite of all mail templates with user data to new 'tag-like' functionality

[mailer.git] / inc / modules / guest / what-register.php

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index e93efba270e560c1a6b4d036268a787ccff77b5b..ee7f7de2dc73e9cd608e8f74e62910bd9d95c3fe 100644 (file)
--- 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,7 +55,7 @@ if (!isExtensionActive('register')) {
 // Initialize variables
 $isOkay     = true;
 $shortPass  = false;
-$cats       = 0;
+$cats       = '0';
 $ipTimedOut = false;
 
 // Default refid is zero
@@ -140,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
@@ -261,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;
@@ -277,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';
 
@@ -310,7 +309,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        $gender = translateGender(postRequestElement('gender'));
 
        // ... rewrite a zero referal id to the main title
-       if (postRequestElement('refid') == 0) setRequestPostElement('refid', getConfig('MAIN_TITLE'));
+       if (postRequestElement('refid') == '0') setRequestPostElement('refid', getConfig('MAIN_TITLE'));
 
        // Is ZIP code set?
        if (isPostRequestElementSet('zip')) {
@@ -404,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) {
@@ -412,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
@@ -448,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";