Template improved, old lost code removed, some fixes

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index 26a90bae141d36d122444dd58ec0d6314a1f6cac..33ee4cf417de3f1a16368994b5c5519318d48715 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/14/2003 *
- * ===============                              Last change: 11/25/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 11/14/2003 *
+ * ===================                          Last change: 11/25/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : mailid.php                                       *
@@ -57,17 +57,17 @@ setContentType('text/html');
 redirectOnUninstalledExtension('mailid');
 
 // Init
-$url_userid = 0;
-$url_bid = 0;
-$url_mid = 0;
+$url_userid = '0';
+$url_bid = '0';
+$url_mid = '0';
 
 // Secure all data
-if (isGetRequestElementSet('userid'))  $url_userid = bigintval(getRequestElement('userid'));
-if (isGetRequestElementSet('mailid'))  $url_mid    = bigintval(getRequestElement('mailid'));
-if (isGetRequestElementSet('bonusid')) $url_bid    = bigintval(getRequestElement('bonusid'));
+if (isGetRequestParameterSet('userid'))  $url_userid = bigintval(getRequestParameter('userid'));
+if (isGetRequestParameterSet('mailid'))  $url_mid    = bigintval(getRequestParameter('mailid'));
+if (isGetRequestParameterSet('bonusid')) $url_bid    = bigintval(getRequestParameter('bonusid'));
 
 // 01           1        12            2    2            21    1                   22     10
-if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {
+if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == '0')) {
        // Init result
        $result_link = false;
 
@@ -84,7 +84,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                $type = 'bonusid'; $urlId = $url_bid;
        } else {
                // Problem: No id entered
-               redirectToUrl('index.php');
+               redirectToUrl('modules.php?module=index');
        }
 
        if (SQL_NUMROWS($result_link) == 1) {
@@ -111,7 +111,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                        default: // Invalid mail type
                                debug_report_bug('Invalid mail type ' . $ltype . ' detected.');
                                break;
-               }
+               } // END - switch
 
                if (SQL_NUMROWS($result) == 1) {
                        // Load data
@@ -127,7 +127,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                        if (fetchUserData($url_userid)) {
                                // Status must be CONFIRMED
                                if (getUserData('status') == 'CONFIRMED') {
-                                       // Update last activity
+                                       // Update last activity if not admin
                                        updateLastActivity($url_userid);
 
                                        // User has confirmed his account so we can procede...
@@ -154,7 +154,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                                                list($points, $time) = SQL_FETCHROW($result);
                                                                $payment = '0.00000';
                                                                $isValid = true;
-                                                       }
+                                                       } // END - if
 
                                                        // Free memory
                                                        SQL_FREERESULT($result);
@@ -171,14 +171,14 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                        // Was that mail a valid one?
                                        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 = getConfig('URL'); $time = 1; }
+                                               if (($time == '0') && ($payment > 0)) { $URL = getConfig('URL'); $time = 1; }
                                                if (($time > 0) && (($payment > 0) || ($points > 0))) {
                                                        // Export data into constants for the template
                                                        $content = array(
                                                                'userid'  => $url_userid,
-                                                               'type' => $type,
-                                                               'data' => $urlId,
-                                                               'url'  => generateDerefererUrl($URL)
+                                                               'type'    => $type,
+                                                               'data'    => $urlId,
+                                                               'url'     => generateDerefererUrl($URL)
                                                        );
 
                                                        // Load template
@@ -223,7 +223,7 @@ if (!empty($errorCode)) {
                                redirectToConfiguredUrl('reject_url');
                        } else {
                                // Redirect to index
-                               redirectToUrl('index.php');
+                               redirectToUrl('modules.php?module=index');
                        }
                        break;