First batch of fixed language ids (renamed, see ticket #219)

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index 7f684cef9b477d1afb5f2a58c44aca8a119bec7e..df684a7709718e62cd557057733cdbd0f022ba47 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -42,28 +42,29 @@ require('inc/libs/security_functions.php');
 $GLOBALS['startTime'] = microtime(true);
 
 // Tell everyone we are in this module
-$GLOBALS['module'] = 'mailid';
-$GLOBALS['output_mode'] = -1;
+$GLOBALS['__module'] = 'mailid';
+$GLOBALS['output_mode'] = '0';
 $errorCode = '';
 
 // Load the required file(s)
 require('inc/config-global.php');
 
-// Set content type
+// Set content type and HTTP status
 setContentType('text/html');
+setHttpStatus('404 NOT FOUND');
 
 // Is the extension active?
 redirectOnUninstalledExtension('mailid');
 
 // Init
-$userId = '0';
-$bonusId    = '0';
-$mailId    = '0';
+$userId  = '0';
+$bonusId = '0';
+$mailId  = '0';
 
 // Secure all data
-if (isGetRequestParameterSet('userid'))  $userId  = bigintval(getRequestParameter('userid'));
-if (isGetRequestParameterSet('mailid'))  $mailId  = bigintval(getRequestParameter('mailid'));
-if (isGetRequestParameterSet('bonusid')) $bonusId = bigintval(getRequestParameter('bonusid'));
+if (isGetRequestElementSet('userid'))  $userId  = bigintval(getRequestElement('userid'));
+if (isGetRequestElementSet('mailid'))  $mailId  = bigintval(getRequestElement('mailid'));
+if (isGetRequestElementSet('bonusid')) $bonusId = bigintval(getRequestElement('bonusid'));
 
 // 01           1        12            2    2            21    1                      2210
 if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalErrorsDetected())) {
@@ -72,13 +73,13 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
        // Maybe he wants to confirm an email?
        if ($mailId > 0) {
-               // Normal-Mails
+               // Member mail
                $result_link = SQL_QUERY_ESC("SELECT `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
                        array($mailId, $userId), __FILE__, __LINE__);
                $type = 'mailid';
                $urlId = $mailId;
        } elseif ($bonusId > 0) {
-               // Bonus-Mail
+               // Bonus mail
                $result_link = SQL_QUERY_ESC("SELECT `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
                        array($bonusId, $userId), __FILE__, __LINE__);
                $type = 'bonusid';
@@ -96,7 +97,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                switch ($ltype) {
                        case 'NORMAL':
                                // Is the stats id valid?
-                               $result = SQL_QUERY_ESC("SELECT `pool_id`, `url`, `subject` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT `pool_id`,`url`,`subject` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
                                        array($mailId), __FILE__, __LINE__);
                                break;
 
@@ -105,7 +106,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                redirectOnUninstalledExtension('bonus');
 
                                // Bonus-Mails
-                               $result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT `id`,`url`,`subject` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                        array($bonusId), __FILE__, __LINE__);
                                break;
 
@@ -116,7 +117,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
                if (SQL_NUMROWS($result) == 1) {
                        // Load data
-                       list($pool, $URL, $title) = SQL_FETCHROW($result);
+                       list($pool, $url, $title) = SQL_FETCHROW($result);
 
                        // Free result
                        SQL_FREERESULT($result);
@@ -129,7 +130,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                // Status must be CONFIRMED
                                if (getUserData('status') == 'CONFIRMED') {
                                        // Update last activity if not admin
-                                       if (!isAdmin()) {
+                                       if ((!isAdmin()) || (isDebugModeEnabled())) {
                                                // Is not admin, so update last activity
                                                updateLastActivity($userId);
                                        } // END - if
@@ -152,7 +153,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                        break;
 
                                                case 'BONUS':
-                                                       $result = SQL_QUERY_ESC("SELECT `points`, `time` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+                                                       $result = SQL_QUERY_ESC("SELECT `points`,`time` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                                                array($bonusId), __FILE__, __LINE__);
                                                        if (SQL_NUMROWS($result) == 1) {
                                                                list($points, $time) = SQL_FETCHROW($result);
@@ -176,17 +177,20 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                        if ($isValid === true) {
                                                // If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems
                                                if (($time == '0') && ($payment > 0)) { 
-                                                       $URL = getUrl();
+                                                       $url = getUrl();
                                                        $time = 1; 
                                                } // END - if
 
                                                if (($time > 0) && (($payment > 0) || ($points > 0))) {
+                                                       // Set HTTP status to okay
+                                                       setHttpStatus('200 OK');
+
                                                        // Export data into constants for the template
                                                        $content = array(
                                                                'userid'  => $userId,
                                                                'type'    => $type,
                                                                'data'    => $urlId,
-                                                               'url'     => $URL
+                                                               'url'     => $url
                                                        );
 
                                                        // Load template