* 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 *
// Init
$url_userid = '0';
-$url_bid = '0';
-$url_mid = '0';
+$url_bid = '0';
+$url_mid = '0';
// Secure all data
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 ((isValidUserId($url_userid)) && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
// Init result
$result_link = false;
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
// 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
break;
default: // Invalid mail type
- debug_report_bug('Invalid mail type ' . $ltype . ' detected.');
+ debug_report_bug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
break;
}
// 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
}
// 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('modules.php?module=index');
- }
- 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');