Wrapper getMtWord2() added

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index eff588330e67242a4e93435612586fb22e485e5e..d0c4dbf7d7483c0516780422793a2734eb05d4a9 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -68,7 +68,7 @@ if (isGetRequestParameterSet('mailid'))  $url_mid    = bigintval(getRequestParam
 if (isGetRequestParameterSet('bonusid')) $url_bid    = bigintval(getRequestParameter('bonusid'));
 
 // 01           1        12            2    2            21    1                      2210
-if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
+if ((isValidUserId($url_userid)) && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
        // Init result
        $result_link = false;
 
@@ -129,7 +129,10 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                // Status must be CONFIRMED
                                if (getUserData('status') == 'CONFIRMED') {
                                        // Update last activity if not admin
-                                       updateLastActivity($url_userid);
+                                       if (!isAdmin()) {
+                                               // Is not admin, so update last activity
+                                               updateLastActivity($url_userid);
+                                       } // END - if
 
                                        // User has confirmed his account so we can procede...
                                        // @TODO Rewrite this to a filter
@@ -172,14 +175,14 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
                                        // 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 = getUrl(); $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)
+                                                               'url'     => $URL
                                                        );
 
                                                        // Load template