X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid_top.php;h=b88616de73d9260a7cfacbda1ad7d02c96937989;hb=7c9e517bf51f378ac98fd868aacf8ac7d0fb9808;hp=ceb720dce3cf1c463a8eabd459c084dd60a89bd9;hpb=c744215dba419b52b84291622179c5e3a6ab17e2;p=mailer.git

diff --git a/mailid_top.php b/mailid_top.php
index ceb720dce3..b88616de73 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -15,8 +15,10 @@
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
+ * @TODO Merge this script with mailid.php                              *
+ * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -48,8 +50,9 @@ $GLOBALS['output_mode'] = -1;
 // Load the required file(s)
 require('inc/config-global.php');
 
-// Set content type
+// Set content type and HTTP status
 setContentType('text/html');
+setHttpStatus('404 NOT FOUND');
 
 // Is the extension mailid active?
 redirectOnUninstalledExtension('mailid');
@@ -176,7 +179,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 							$img_code = '0';
 							if (!empty($code)) {
 								// Generate code
-								$img_code = generateRandomCode(getConfig('code_length'), $code, $userId, $urlId);
+								$img_code = generateRandomCode(getCodeLength(), $code, $userId, $urlId);
 							} // END - if
 
 							// @TODO Rewrite this to a filter
@@ -240,6 +243,9 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
 									// Right code entered?
 									if (bigintval(postRequestParameter('gfx_check')) == $img_code) {
+										// Set HTTP status to okay
+										setHttpStatus('200 OK');
+
 										// Add points over referal system is the default
 										$template = 'mailid_points_done';
 
@@ -254,8 +260,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 											array($userId), __FILE__, __LINE__);
 
 										// Add points
-										// @TODO Try to rewrite the following unset()
-										unset($GLOBALS['ref_level']);
+										initReferalSystem();
 										addPointsThroughReferalSystem('mailid_okay', $userId, $payment);
 
 										// Shall I add bonus points for "turbo clickers" ?
@@ -263,7 +268,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 											// Is an active-rallye running and this is not a notification mail?
 											if ((isBonusRallyeActive()) && ($notify != 'Y')) {
 												// Shall I exclude the webmaster's own userid from the active-rallye?
-												if ((((getBonusUserId() == $userId) && (getConfig('bonus_include_own') == 'Y')) || (getBonusUserId() != $userId)) && (getDefRefid() != $userId)) {
+												if ((((getBonusUserid() == $userId) && (getConfig('bonus_include_own') == 'Y')) || (getBonusUserid() != $userId)) && (getDefRefid() != $userId)) {
 													// Add points and remember ranking are done in this function....
 													addTurboBonus($urlId, $userId, $type);
 
@@ -284,7 +289,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										} // END - if
 
 										// Load total points
-										$content['total']  = getTotalPoints($userId);
+										$content['total_points']  = getTotalPoints($userId);
 
 										// Add payment points
 										$content['points'] = $payment;
@@ -293,7 +298,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										loadTemplate($template, false, $content);
 									} elseif (isValidUserId($sender)) {
 										// Wrong image code! So add points to sender's account
-										addPointsDirectly('mailid_payback', $sender, $payment);
+										addPointsThroughReferalSystem('mailid_payback', $sender, $payment);
 
 										// Load template
 										loadTemplate('mailid_points_failed', false, $content);
@@ -316,7 +321,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 										$content['type']   = $type;
 										$content['data']   = $urlId;
 										$content['banner'] = loadTemplate('mailid_banner', true);
-										if (getConfig('code_length') > 0) {
+										if (getCodeLength() > 0) {
 											// Generate Code
 											$content['image'] = generateCaptchaCode($code, $type, $urlId, $userId);
 											$templ = 'mailid_enter_code';