Required fix for NULL vs. 0 in user_points

[mailer.git] / inc / libs / register_functions.php

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 85af2723d934b35d61c1673b0d626ba1bbadedaf..e98010cd6650e29d41e6d3f6477fa3ab2709b0cc 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -237,7 +237,7 @@ function isRegistrationDataComplete () {
 
        if ((postRequestParameter('email') != '!') && (isCheckDoubleEmailEnabled())) {
                // Does the email address already exists in our database?
-               if ((!isAdmin()) && (isEmailTaken(postRequestParameter('email')))) {
+               if ((isEmailTaken(postRequestParameter('email'))) && (!isAdmin())) {
                        setPostRequestParameter('email', '?');
                        $isOkay = false;
                } // END - if
@@ -305,7 +305,7 @@ function doRegistration () {
        } // END - if
 
        // Second: active rallye
-       if (!isBonusNewMemberNotifyEnabled()) {
+       if ((isExtensionActive('bonus')) && (!isBonusNewMemberNotifyEnabled())) {
                $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
                $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
        } // END - if
@@ -339,7 +339,7 @@ function doRegistration () {
                generateHash(postRequestParameter('pass1')),
                bigintval(postRequestParameter('max_mails')),
                bigintval(postRequestParameter('max_mails')),
-               makeDatabaseUserId(postRequestParameter('refid')),
+               makeZeroToNull(postRequestParameter('refid')),
                $hash,
                detectRemoteAddr(),
        ), __FUNCTION__, __LINE__);
@@ -369,11 +369,14 @@ function doRegistration () {
 
        // Write catgories
        if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {
-               foreach (postRequestParameter('cat') as $cat => $joined) {
+               foreach (postRequestParameter('cat') as $categoryId => $joined) {
                        if ($joined == 'Y') {
                                // Insert category entry
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`, `cat_id`) VALUES (%s, %s)",
-                                       array($userid, bigintval($cat)), __FUNCTION__, __LINE__);
+                                       array(
+                                               $userid,
+                                               bigintval($categoryId)
+                                       ), __FUNCTION__, __LINE__);
                        } // END - if
                } // END - foreach
        } // END - if
@@ -431,7 +434,7 @@ function doRegistration () {
        } // END - switch
 
        // Display information to the user that he got mail and send it away
-       $messageGuest = loadEmailTemplate('register-member', $content, $userid, false);
+       $messageGuest = loadEmailTemplate('guest_register_done', $content, $userid, false);
 
        // Send mail to user (confirmation link!)
        $email = $content['email'];
@@ -439,7 +442,7 @@ function doRegistration () {
        $content['email'] = $email;
 
        // Send mail to admin
-       sendAdminNotification('{--ADMIN_NEW_ACCOUNT_SUBJECT--}', 'register-admin', $content, $userid);
+       sendAdminNotification('{--ADMIN_NEW_ACCOUNT_SUBJECT--}', 'admin_register_done', $content, $userid);
 }
 
 //-----------------------------------------------------------------------------
@@ -482,30 +485,6 @@ function getIpTimeout () {
        return $GLOBALS[__FUNCTION__];
 }
 
-// Getter for 'check_double_email'
-function getCheckDoubleEmail () {
-       // Is the cache entry set?
-       if (!isset($GLOBALS[__FUNCTION__])) {
-               // No, so determine it
-               $GLOBALS[__FUNCTION__] = getConfig('check_double_email');
-       } // END - if
-
-       // Return cached entry
-       return $GLOBALS[__FUNCTION__];
-}
-
-// Checks wether 'check_double_email' is "YES"
-function isCheckDoubleEmailEnabled () {
-       // Is the cache entry set?
-       if (!isset($GLOBALS[__FUNCTION__])) {
-               // No, so determine it
-               $GLOBALS[__FUNCTION__] = (getCheckDoubleEmail() == 'Y');
-       } // END - if
-
-       // Return cached entry
-       return $GLOBALS[__FUNCTION__];
-}
-
 // Getter for 'register_default'
 function getRegisterDefault () {
        // Is the cache entry set?