More language strings renamed, TODOs.txt updated:

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index cae47656e679cfbb7fb20b4719725843afbdfe95..8a3880c9405cd47ad2824b634de5d82f69e42eba 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -294,28 +294,22 @@ function doRegistration () {
        $GLOBALS['register_sql_data'] = '';
        if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
                // Okay, add design here
-               $GLOBALS['register_sql_columns'] = ', `curr_theme`';
-               $GLOBALS['register_sql_data'] = ", '" . getCurrentTheme() . "'";
+               $GLOBALS['register_sql_columns'] .= ', `curr_theme`';
+               $GLOBALS['register_sql_data']    .= ", '" . getCurrentTheme() . "'";
        } // END - if
 
        // Check if I shall disable sending mail to newly registered members out about active/begging rallye
        //
        // First comes first: begging rallye
-       if (isExtensionInstalledAndNewer('beg', '0.2.8')) {
-               // Okay, shall I disable now?
-               if (getConfig('beg_new_member_notify') != 'Y') {
-                       $GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`, `beg_rallye_disable_notify`';
-                       $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
-               } // END - if
+       if (!isBegNewMemberNotifyEnabled()) {
+               $GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`, `beg_rallye_disable_notify`';
+               $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
        } // END - if
 
        // Second: active rallye
-       if (isExtensionInstalledAndNewer('bonus', '0.9.2')) {
-               // Okay, shall I disable now?
-               if (getConfig('bonus_new_member_notify') != 'Y') {
-                       $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
-                       $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
-               } // END - if
+       if (!isBonusNewMemberNotifyEnabled()) {
+               $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
+               $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
        } // END - if
 
        // Write user data to table