Previous fix fixed, a lot constants rewritten (unfinished)

[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 56c347f2d15f8c9d00b4bf825dfcefdc3b76a3ac..07be03e56d9c709fb446f50ebb890234cc157f21 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -72,7 +72,7 @@ if (empty($_POST['country_code'])) $_POST['country_code'] = "1";
 $_POST['refid'] = 0;
 if ($GLOBALS['refid'] > 0) {
        // Test if the refid is valid
-       $result = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
 
        // Userid found?
@@ -156,7 +156,7 @@ if (isset($_POST['ok'])) {
        // Check for IP timeout?
        if (getConfig('ip_timeout') > 0) {
                // Check his IP number
-               $result = SQL_QUERY_ESC("SELECT joined, last_update FROM `{!MYSQL_PREFIX!}_user_data` WHERE REMOTE_ADDR='%s' AND (joined > (UNIX_TIMESTAMP() - %s) OR last_update > (UNIX_TIMESTAMP() - %s)) LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT joined, last_update FROM `{!_MYSQL_PREFIX!}_user_data` WHERE REMOTE_ADDR='%s' AND (joined > (UNIX_TIMESTAMP() - %s) OR last_update > (UNIX_TIMESTAMP() - %s)) LIMIT 1",
                        array(GET_REMOTE_ADDR(), getConfig('ip_timeout'), getConfig('ip_timeout')), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Same IP in timeout range and different email address entered... Eat this, faker! ;-)
@@ -229,7 +229,7 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) {
        // Create user's account... //
        //////////////////////////////
        //
-       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")
+       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")
 VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",
        array(
                $countryRow,
@@ -269,13 +269,13 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        } // END - if
 
        // Write his welcome-points
-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_points` WHERE userid=%s AND ref_depth=0 LIMIT 1",
+       $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) {
                // Add only when the line was not found (maybe some more secure?)
                $locked = "points";
                if (getConfig('ref_payout') > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails!
-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_points` (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_points` (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')",
                 array(bigintval($userid), getConfig('points_register')), __FILE__, __LINE__);
 
                // Update mediadata as well
@@ -290,7 +290,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                foreach ($_POST['cat'] as $cat => $joined) {
                        if ($joined == "Y") {
                                // Insert category entry
-                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_cats` (userid, cat_id) VALUES (%s, %s)",
+                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_cats` (userid, cat_id) VALUES (%s, %s)",
                                 array(bigintval($userid), bigintval($cat)), __FILE__, __LINE__);
                        } // END - if
                } // END - foreach
@@ -355,11 +355,11 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 
        // Send mail to user (confirmation link!)
        $EMAIL = $DATA['email'];
-       SEND_EMAIL ($DATA['email'], GUEST_CONFIRM_LINK, $msg_guest);
+       SEND_EMAIL ($DATA['email'], getMessage('GUEST_CONFIRM_LINK'), $msg_guest);
        $DATA['email'] = $EMAIL;
 
        // Send mail to admin
-       SEND_ADMIN_NOTIFICATION(ADMIN_NEW_ACCOUNT, "register-admin", $DATA, $userid);
+       SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_ACCOUNT'), "register-admin", $DATA, $userid);
 
        // Output success registration
        LOAD_TEMPLATE("admin_settings_saved", false, REGISTRATION_DONE);
@@ -395,15 +395,15 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        }
 
        if ($SHORT_PASS) {
-               OUTPUT_HTML("<div class=\"register_failed\">".SHORT_PASS.": ".getConfig('pass_len')."</div>");
+               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>");
+               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