X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=7f1746bdfb4204ba4de49f9974df7815e3717e33;hp=6a028dee56048c23c5c919c1fa13e959bf2aeada;hb=e0ebc4d305c2647a9cbce54602439987d7b103f4;hpb=d4cff9c73632a8d93428a80dcf54b3a8daa80a24 diff --git a/mailid.php b/mailid.php index 6a028dee56..7f1746bdfb 100644 --- a/mailid.php +++ b/mailid.php @@ -14,11 +14,9 @@ * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * - * Needs to be in all Files and every File needs "svn propset * - * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * 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 * @@ -51,8 +49,9 @@ $errorCode = ''; // 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 active? redirectOnUninstalledExtension('mailid'); @@ -74,13 +73,13 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr // Maybe he wants to confirm an email? if ($mailId > 0) { - // Normal-Mails + // Member mail $result_link = SQL_QUERY_ESC("SELECT `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1", array($mailId, $userId), __FILE__, __LINE__); $type = 'mailid'; $urlId = $mailId; } elseif ($bonusId > 0) { - // Bonus-Mail + // Bonus mail $result_link = SQL_QUERY_ESC("SELECT `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1", array($bonusId, $userId), __FILE__, __LINE__); $type = 'bonusid'; @@ -118,7 +117,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr if (SQL_NUMROWS($result) == 1) { // Load data - list($pool, $URL, $title) = SQL_FETCHROW($result); + list($pool, $url, $title) = SQL_FETCHROW($result); // Free result SQL_FREERESULT($result); @@ -178,17 +177,20 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr 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 = getUrl(); + $url = getUrl(); $time = 1; } // END - if if (($time > 0) && (($payment > 0) || ($points > 0))) { + // Set HTTP status to okay + setHttpStatus('200 OK'); + // Export data into constants for the template $content = array( 'userid' => $userId, 'type' => $type, 'data' => $urlId, - 'url' => $URL + 'url' => $url ); // Load template