Rewrite of language strings

[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 9f5fa62f353fb268aa8e7b01072b0cbc3fc33a92..dc271286bfa0667c53db25de1a80843f05493050 100644 (file)
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/13/2003 *
- * ===============                              Last change: 08/23/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/13/2003 *
+ * ===================                          Last change: 08/23/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-confirm.php                                 *
@@ -52,20 +52,32 @@ $content = array(
 
 if (isGetRequestElementSet('hash')) {
        // Initialize the user id
-       $userid = 0;
+       $userid = '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`,`gender` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
                array(getRequestElement('hash')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Ok, he want's to confirm now so we load some data
-               list($userid, $email, $rid) = SQL_FETCHROW($result);
+               list($userid, $email, $rid, $gender) = SQL_FETCHROW($result);
+
+               // Fetch user data
+               if (!fetchUserData($userid)) {
+                       // Not found, should not happen
+                       debug_report_bug('User account ' . $userid . ' not found.');
+               } // END - if
+
+               // Load all data and add points
+               $content = getUserDataArray();
+               $content['gender'] = translateGender($content['gender']);
+               $content['points'] = getConfig('points_register');
 
                // Unlock his account (but only when it is on UNCONFIRMED!)
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `status`='CONFIRMED', ref_payout={?ref_payout?}, `user_hash`=NULL WHERE `user_hash`='%s' AND `status`='UNCONFIRMED' LIMIT 1",
                        array(getRequestElement('hash')), __FILE__, __LINE__);
                if (SQL_AFFECTEDROWS() == 1) {
-                       $message = loadEmailTemplate('confirm-member', array('points' => getConfig('points_register')), bigintval($userid));
+                       // Send email if updated
+                       $message = loadEmailTemplate('confirm-member', $content, bigintval($userid));
 
                        // And send him right away the confirmation mail
                        sendEmail($email, getMessage('GUEST_THANX_CONFIRM'), $message);
@@ -78,7 +90,7 @@ if (isGetRequestElementSet('hash')) {
                                        updateReferalCounter($rid);
 
                                        // Shall I 'pay' the referal points imidiately?
-                                       if (getConfig('ref_payout') == 0) {
+                                       if (getConfig('ref_payout') == '0') {
                                                // Yes, 'pay' it now
                                                $locked = false;
                                        } else {
@@ -135,7 +147,7 @@ if (isGetRequestElementSet('hash')) {
        }
 
        // Load template
-       loadTemplate('guest_confirm_table', false, $content);
+       loadTemplate('admin_settings_saved', false, $content['message']);
 } elseif ((isFormSent()) && (isPostRequestElementSet('email'))) {
        // Confirmation link requested      0         1          2
        if (fetchUserData(postRequestElement('email'), 'email')) {
@@ -165,7 +177,7 @@ if (isGetRequestElementSet('hash')) {
                } // END - switch
        } else {
                // Email address not registered
-               $content['message'] = getMessage('EMAIL_ADDRESS_404');
+               $content['message'] = getMessage('EMAIL_404');
        }
 
        // Load template