Fixed logfile writing in installation phase, .revision is now ignored

[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 2ea5c6d34a34f602e48c76e20a8df721a0861f2f..4586eccadbc1ee86e4256bd08db16f4d5022d054 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Unbestaetigte Mails                              *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -45,12 +50,12 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Shall we display a mail?
-if ((isset($_GET['bonusid'])) && (EXT_IS_ACTIVE("bonus"))) {
+if ((REQUEST_ISSET_GET(('bonusid'))) && (EXT_IS_ACTIVE("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
 FROM `{!_MYSQL_PREFIX!}_bonus`
 WHERE id=%s LIMIT 1",
-               array(bigintval($_GET['bonusid'])), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('bonusid'))), __FILE__, __LINE__);
 
        // Load data
        $content = SQL_FETCHARRAY($result_data);
@@ -67,7 +72,7 @@ WHERE id=%s LIMIT 1",
        $content['uid']       = $GLOBALS['userid'];
 
        // Get timestamp from insert
-       $content['user_status'] = sprintf(MEMBER_MAIL_BONUS_CONFIRMED_ON,
+       $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON'),
                MAKE_DATETIME(USER_STATS_GET_TIMESTAMP("bonusid", $content['id']), "2")
        );
 
@@ -76,7 +81,7 @@ WHERE id=%s LIMIT 1",
 
        // Free result
        SQL_FREERESULT($result_data);
-} elseif (isset($_GET['mailid'])) {
+} elseif (REQUEST_ISSET_GET(('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
 FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
@@ -85,7 +90,7 @@ ON s.pool_id=p.id
 LEFT JOIN `{!_MYSQL_PREFIX!}_payments` AS pay
 ON p.payment_id=pay.id
 WHERE s.id=%s LIMIT 1",
-               array(bigintval($_GET['mailid'])), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('mailid'))), __FILE__, __LINE__);
 
        // Load data
        $content = SQL_FETCHARRAY($result_data);
@@ -100,7 +105,7 @@ WHERE s.id=%s LIMIT 1",
        $content['uid']       = $GLOBALS['userid'];
 
        // Get timestamp from insert
-       $content['user_status'] = sprintf(MEMBER_MAIL_NORMAL_CONFIRMED_ON,
+       $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
                MAKE_DATETIME(USER_STATS_GET_TIMESTAMP("mailid", $content['id']), "2")
        );
 
@@ -124,7 +129,9 @@ if (EXT_IS_ACTIVE("bonus")) {
 // Mails left for confirmation?
 if (SQL_NUMROWS($result) > 0) {
        // Please confirm these mails!
-       $sum = 0; $SW = 2; $OUT = "";
+       $sum = 0; $OUT = ""; $SW = 2;
+
+       // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
        while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
                // Load data from stats table...
                $cat = ""; $result_data = false;
@@ -138,13 +145,13 @@ ON s.pool_id=p.id
 WHERE s.id=%s
 LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
-                       $type = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM;
+                       $type = "mailid"; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
                        break;
 
                case "BONUS":
                        $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
                         array(bigintval($id2)), __FILE__, __LINE__);
-                       $type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;
+                       $type = "bonusid"; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
                        break;
 
                default: // Unknown type detected!
@@ -160,7 +167,7 @@ LIMIT 1",
                        // Subject line found?
                        if (empty($subject)) {
                                // No subject line!
-                               $subject = DEFAULT_SUBJECT_LINE;
+                               $subject = getMessage('DEFAULT_SUBJECT_LINE');
                        } else {
                                // Compile it
                                $subject = COMPILE_CODE($subject);
@@ -172,10 +179,10 @@ LIMIT 1",
                                $sender = bigintval($sender);
                        } elseif ($type == "bonusid") {
                                // Is admin
-                               $sender = _ADMIN_SHORT;
+                               $sender = getMessage('_ADMIN_SHORT');
                        } else {
                                // Deleted
-                               $sender = EMAIL_STATUS_DELETED;
+                               $sender = getMessage('EMAIL_STATUS_DELETED');
                        }
 
                        // Prepare data for template