More fixes/missing language id added

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 8eb91a20cb08d6d4e0dbfd02d8243b6b91cbaf69..20d35c2ce7ea735a8b882016511ea22486a368a8 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -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
@@ -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);
 }
 
 //-----------------------------------------------------------------------------