More language constants rewritten ({--LANGUAGE--} is for constants)

[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 7cf8158ed9e3f97b5002ebb5e427cbbf22a624ac..d3b89af49830e66516aa64ebb1fc5a67ec804428 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -195,11 +195,12 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) {
        } // END - if
 
        // Check if I shall disable sending mail to newly registered members out about active/begging rallye
+       // @TODO Rewrite this to a single filter
        //
        // First comes first: begging rallye
        if (GET_EXT_VERSION("beg") >= "0.1.7") {
                // Okay, shall I disable now?
-               if (getConfig('beg_new_mem_notify') == "N") {
+               if (getConfig('beg_new_mem_notify') != "Y") {
                        $ADD1 .= ", beg_ral_notify, beg_ral_en_notify";
                        $ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
                } // END - if
@@ -208,7 +209,7 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) {
        // Second: active rallye
        if (GET_EXT_VERSION("bonus") >= "0.7.7") {
                // Okay, shall I disable now?
-               if (getConfig('bonus_new_mem_notify') == "N") {
+               if (getConfig('bonus_new_mem_notify') != "Y") {
                        $ADD1 .= ", bonus_ral_notify, bonus_ral_en_notify";
                        $ADD2 .= ", UNIX_TIMESTAMP(), UNIX_TIMESTAMP()";
                } // END - if
@@ -258,7 +259,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        // Did this work?
        if ($userid == 0) {
                // Something bad happened!
-               LOAD_TEMPLATE("admin_settings_saved", false, USER_NOT_REGISTERED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('USER_NOT_REGISTERED'));
                return;
        } // END - if
 
@@ -362,48 +363,48 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_ACCOUNT'), "register-admin", $DATA, $userid);
 
        // Output success registration
-       LOAD_TEMPLATE("admin_settings_saved", false, REGISTRATION_DONE);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('REGISTRATION_DONE'));
 } else {
        if ($_POST['agree'] == "!") {
-               OUTPUT_HTML("<div class=\"register_failed\">".HAVE_TO_AGREE."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{--HAVE_TO_AGREE--}</div>");
        } // END - if
 
        if ($_POST['addy'] == "!") {
-               OUTPUT_HTML("<div class=\"register_failed\">".ENTER_EMAIL."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{--ENTER_EMAIL--}</div>");
                $_POST['addy'] = "";
        } elseif ($_POST['addy'] == "?") {
-               OUTPUT_HTML("<div class=\"register_failed\">".EMAIL_ALREADY_DB."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{--EMAIL_ALREADY_DB--}</div>");
                $_POST['addy'] = "";
        }
 
        if ($_POST['surname'] == "!") {
-               OUTPUT_HTML("<div class=\"register_failed\">".ENTER_SURNAME."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{--ENTER_SURNAME--}</div>");
                $_POST['surname'] = "";
        } // END - if
 
        if ($_POST['family_name'] == "!") {
-               OUTPUT_HTML("<div class=\"register_failed\">".ENTER_FAMILY."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{--ENTER_FAMILY--}</div>");
                $_POST['family_name'] = "";
        } // END - if
 
        if (($_POST['pass1'] == "!") && ($_POST['pass2'] == "!")) {
-               OUTPUT_HTML("<div class=\"register_failed\">".ENTER_BOTH_PASSWORDS."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{--ENTER_BOTH_PASSWORDS--}</div>");
        } elseif ($_POST['pass1'] == "!") {
-               OUTPUT_HTML("<div class=\"register_failed\">".ENTER_PASS1."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{--ENTER_PASS1--}</div>");
        } elseif ($_POST['pass2'] == "!") {
-               OUTPUT_HTML("<div class=\"register_failed\">".ENTER_PASS2."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{--ENTER_PASS2--}</div>");
        }
 
-       if ($SHORT_PASS) {
-               OUTPUT_HTML("<div class=\"register_failed\">{!SHORT_PASS!}: ".getConfig('pass_len')."</div>");
+       if ($SHORT_PASS === true) {
+               OUTPUT_HTML("<div class=\"register_failed\">{--SHORT_PASS--}: ".getConfig('pass_len')."</div>");
        } // END - if
 
-       if ($IP_TIMEOUT) {
-               OUTPUT_HTML("<div class=\"register_failed\">{!REMOTE_ADDR_TIMEOUT!}</div>");
+       if ($IP_TIMEOUT === true) {
+               OUTPUT_HTML("<div class=\"register_failed\">{--REMOTE_ADDR_TIMEOUT--}</div>");
        } // END - if
 
        if ((!empty($cats)) && ($cats < getConfig('least_cats'))) {
-               OUTPUT_HTML("<div class=\"register_failed\">{!CATS_LEAST!}: ".getConfig('least_cats')."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{--CATS_LEAST--}: ".getConfig('least_cats')."</div>");
        } // END - if
 
        // Generate birthday selection