Previous fix fixed, a lot constants rewritten (unfinished)

[mailer.git] / inc / modules / guest / what-confirm.php

diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 9f3120e7496ba8e98ffb026ad58d5c843a71067a..33ebc71eb2b9f2613788925fd3dc827dad69ee35 100644 (file)
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -45,25 +45,25 @@ if (!empty($_GET['hash'])) {
        $uid = 0;
 
        // Search for an unconfirmed or confirmed account
-       $result = SQL_QUERY_ESC("SELECT userid, email, refid FROM `{!MYSQL_PREFIX!}_user_data` WHERE user_hash='%s' AND (status='UNCONFIRMED' OR status='CONFIRMED') LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT userid, email, refid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE user_hash='%s' AND (status='UNCONFIRMED' OR status='CONFIRMED') LIMIT 1",
                array($_GET['hash']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Ok, he want's to confirm now so we load some data
                list ($uid, $email, $rid) = SQL_FETCHROW($result);
 
                // Unlock his account (but only when it is on UNCONFIRMED!)
-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET status='CONFIRMED', ref_payout=%s, user_hash=NULL WHERE user_hash='%s' AND status='UNCONFIRMED' LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET status='CONFIRMED', ref_payout=%s, user_hash=NULL WHERE user_hash='%s' AND status='UNCONFIRMED' LIMIT 1",
                        array(getConfig('ref_payout'), $_GET['hash']), __FILE__, __LINE__);
                if (SQL_AFFECTEDROWS() == 1) {
                        $msg = LOAD_EMAIL_TEMPLATE("confirm-member", array('points' => getConfig('points_register')), bigintval($uid));
 
                        // And send him right away the confirmation mail
-                       SEND_EMAIL($email, GUEST_THANX_CONFIRM, $msg);
+                       SEND_EMAIL($email, getMessage('GUEST_THANX_CONFIRM'), $msg);
 
                        // Maybe he got "referaled"?
                        if (($rid > 0) && ($rid != $uid)) {
                                // Select the referal userid
-                               $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($rid)), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
                                        // Update ref counter...
@@ -84,7 +84,7 @@ if (!empty($_GET['hash'])) {
                                        // If version matches add ref bonus to refid's account
                                        if ((GET_EXT_VERSION("bonus") >= "0.4.4") && (getConfig('bonus_active') == "Y")) {
                                                // Add points (directly only!)
-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET bonus_ref=bonus_ref+%s WHERE userid=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET bonus_ref=bonus_ref+%s WHERE userid=%s LIMIT 1",
                                                        array(getConfig('bonus_ref'), bigintval($rid)), __FILE__, __LINE__);
 
                                                // Subtract points from system
@@ -110,7 +110,7 @@ if (!empty($_GET['hash'])) {
                                // Lead-Code mode enabled
                                LOAD_URL("lead-confirm.php");
                        } else {
-                               define('__CONFIRM_MSG', GUEST_CONFIRMED_DONE);
+                               define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_DONE'));
                                define('__UID', bigintval($uid));
                                LOAD_TEMPLATE("guest_confirm_table");
                        }
@@ -122,19 +122,19 @@ if (!empty($_GET['hash'])) {
                        LOAD_URL("lead-confirm.php");
                } else {
                        // Nobody was found unter this hash key... or our new member want's to confirm twice?
-                       define('__CONFIRM_MSG', GUEST_CONFIRMED_TWICE);
+                       define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_TWICE'));
                        define('__UID', "0");
                        LOAD_TEMPLATE("guest_confirm_table");
                }
        } else {
                // Nobody was found unter this hash key... or our new member want's to confirm twice?
-               define('__CONFIRM_MSG', GUEST_CONFIRMED_TWICE);
+               define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_TWICE'));
                define('__UID', "0");
                LOAD_TEMPLATE("guest_confirm_table");
        }
 } elseif ((isset($_POST['ok'])) && (!empty($_POST['email']))) {
        // Confirmation link requested      0     1         2
-       $result = SQL_QUERY_ESC("SELECT userid, status, user_hash FROM `{!MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT userid, status, user_hash FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
                array($_POST['email']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Email address found
@@ -143,30 +143,26 @@ if (!empty($_GET['hash'])) {
                {
                case "UNCONFIRMED": // Account not confirmed
                        $msg = LOAD_EMAIL_TEMPLATE("guest_request_confirm", array('hash' => $DATA[2]), $DATA[0]);
-                       SEND_EMAIL($_POST['email'], REQUEST_CONFIRM_LINK_SUBJ, $msg);
-                       $content = CONFIRM_LINK_SENT;
+                       SEND_EMAIL($_POST['email'], getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $msg);
+                       $content = getMessage('CONFIRM_LINK_SENT');
                        break;
 
                case "CONFIRMED": // Account already confirmed
-                       $content = LOGIN_ID_CONFIRMED;
+                       $content = getMessage('LOGIN_ID_CONFIRMED');
                        break;
 
                case "LOCKED": // Account is locked
-                       $content = LOGIN_ID_LOCKED;
+                       $content = getMessage('LOGIN_ID_LOCKED');
                        break;
                }
-       }
-        else
-       {
+       } else {
                // Email address not registered
-               $content = EMAIL_ADDY_404;
+               $content = getMessage('EMAIL_ADDY_404');
        }
 
        define('__CONFIRM_MSG', $content);
        LOAD_TEMPLATE("guest_confirm_table");
-}
- else
-{
+} else {
        // No hash found, the guest may want to enter his email address to re-get his confirmation link?
        LOAD_TEMPLATE("guest_confirm_link");
 }