New (template) wrapper function fixEmptyContentToDashes() introduced, EL rewrites:

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index 0649da1e8386a79129c614d0d4ae046bf63e74be..b7447325826d6cec8971dd3ab737fb681676cd61 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -58,16 +59,16 @@ redirectOnUninstalledExtension('mailid');
 
 // Init
 $url_userid = '0';
-$url_bid = '0';
-$url_mid = '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')) {
+// 01           1        12            2    2            21    1                      2210
+if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
        // Init result
        $result_link = false;
 
@@ -84,7 +85,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) {
@@ -109,9 +110,9 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                break;
 
                        default: // Invalid mail type
-                               debug_report_bug('Invalid mail type ' . $ltype . ' detected.');
+                               debug_report_bug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
                                break;
-               }
+               } // END - switch
 
                if (SQL_NUMROWS($result) == 1) {
                        // Load data
@@ -128,7 +129,10 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                // 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
@@ -154,14 +158,14 @@ 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);
                                                        break;
 
                                                default: // Invalid mail type
-                                                       debug_report_bug('Invalid mail type ' . $ltype . ' detected.');
+                                                       debug_report_bug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
                                                        break;
                                        }
 
@@ -176,9 +180,9 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                                        // 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
@@ -210,29 +214,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 }
 
 // Error code is set?
-if (!empty($errorCode)) {
-       // @TODO Rewrite this to a dynamic include or so
-       switch (getConfig('mailid_error_redirect')) {
-               case 'INDEX': // Redirect to index page
-                       redirectToUrl('modules.php?module=index&code=' . $errorCode . '&ext=mailid');
-                       break;
-
-               case 'REJECT': // Redirect to rejection page
-                       if (isExtensionActive('other')) {
-                               // Redirect to configured URL
-                               redirectToConfiguredUrl('reject_url');
-                       } else {
-                               // Redirect to index
-                               redirectToUrl('index.php');
-                       }
-                       break;
-
-               default:
-                       logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", getConfig('mailid_error_redirect')));
-                       redirectToUrl('modules.php?module=index&code=' . getCode('UNKNOWN_STATUS') . '&ext=mailid');
-                       break;
-       } // END - switch
-} // END - if
+handleMailIdErrorCode($errorCode);
 
 // Include footer
 loadIncludeOnce('inc/footer.php');