Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

[mailer.git] / inc / modules / member / what-unconfirmed.php

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 23502f4ed31d66eb1a5c98ecc1bf70fc9138e105..1da948a63c2c92ca0e4bac219464bded1e700596 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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 *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif (!isMember()) {
        redirectToIndexMemberOnlyModule();
 }
@@ -52,7 +52,7 @@ if (!isExtensionActive('mailid')) {
 } // END - if
 
 // Shall we display a mail?
-if ((isGetRequestParameterSet('bonusid')) && (isExtensionActive('bonus'))) {
+if ((isGetRequestElementSet('bonusid')) && (isExtensionActive('bonus'))) {
        // Display bonus mail by loading it's full data
        $result_data = SQL_QUERY_ESC("SELECT
        `id`,`subject`,`timestamp`,`cat_id`,`points`,`text`,`is_notify`,`data_type`,`time`,`url`
@@ -61,7 +61,7 @@ FROM
 WHERE
        `id`=%s
 LIMIT 1",
-               array(bigintval(getRequestParameter('bonusid'))), __FILE__, __LINE__);
+               array(bigintval(getRequestElement('bonusid'))), __FILE__, __LINE__);
 
        // Load data
        $content = SQL_FETCHARRAY($result_data);
@@ -91,25 +91,32 @@ LIMIT 1",
 
        // Free result
        SQL_FREERESULT($result_data);
-} elseif (isGetRequestParameterSet('mailid')) {
+} elseif (isGetRequestElementSet('mailid')) {
        // Display regular member mail by loading its full data
        $result_data = SQL_QUERY_ESC("SELECT
-       s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`,
-       s.cat_id, pay.price AS `points`, p.sender, pay.time, p.data_type
+       s.`id`,
+       s.`subject`,
+       p.`text`,
+       s.`timestamp_ordered` AS `timestamp`,
+       s.`cat_id`,
+       pay.`price` AS `points`,
+       p.`sender`,
+       pay.`time`,
+       p.`data_type`
 FROM
-       `{?_MYSQL_PREFIX?}_user_stats` AS s
+       `{?_MYSQL_PREFIX?}_user_stats` AS `s`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_pool` AS p
+       `{?_MYSQL_PREFIX?}_pool` AS `p`
 ON
        s.pool_id=p.id
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_payments` AS pay
+       `{?_MYSQL_PREFIX?}_payments` AS `pay`
 ON
-       p.payment_id=pay.id
+       p.`payment_id`=pay.`id`
 WHERE
-       s.id=%s
+       s.`id`=%s
 LIMIT 1",
-               array(bigintval(getRequestParameter('mailid'))), __FILE__, __LINE__);
+               array(bigintval(getRequestElement('mailid'))), __FILE__, __LINE__);
 
        // Load data
        $content = SQL_FETCHARRAY($result_data);
@@ -194,7 +201,7 @@ LIMIT 1",
                                break;
 
                        default: // Unknown type detected!
-                               debug_report_bug(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
+                               reportBug(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
                                break;
                }