X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=5505c9dbb7e2a8c1a1bec1b5f730a05e0ab02c52;hb=180f978ebe21d5fcec3a51be8405028e7523e6a9;hp=79e8551f68effe54a3ce7e95f9c07be87f3acdd7;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php index 79e8551f68..5505c9dbb7 100644 --- a/inc/modules/member/what-unconfirmed.php +++ b/inc/modules/member/what-unconfirmed.php @@ -16,7 +16,7 @@ * $Author:: $ * * -------------------------------------------------------------------- * * 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 * @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -addMenuDescription('member', __FILE__); +addYouAreHereLink('member', __FILE__); // Shall we display a mail? if ((isGetRequestParameterSet('bonusid')) && (isExtensionActive('bonus'))) { @@ -69,19 +69,20 @@ LIMIT 1", if (isExtensionInstalled('user')) { // Get timestamp from insert $content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON', - generateDateTime(getTimestampFromUserStats('bonusid', $content['id']), 2) + generateDateTime(getEpocheTimeFromUserStats('bonusid', $content['id']), 2) ); } // END - if // Display it depending on mail (data) type - loadTemplate('member_mail_bonus_'.strtolower($content['data_type']), false, $content); + loadTemplate('member_mail_bonus_' . strtolower($content['data_type']), false, $content); // Free result SQL_FREERESULT($result_data); } elseif (isGetRequestParameterSet('mailid')) { // Display regular member mail by loading its full data $result_data = SQL_QUERY_ESC("SELECT - s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id, pay.price AS points, p.sender, pay.time, p.data_type + s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, + s.cat_id, pay.price AS `points`, p.sender, pay.time, p.data_type FROM `{?_MYSQL_PREFIX?}_user_stats` AS s LEFT JOIN @@ -109,7 +110,7 @@ LIMIT 1", if (isExtensionInstalled('user')) { // Get timestamp from insert $content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON', - generateDateTime(getTimestampFromUserStats('mailid', $content['id']), 2) + generateDateTime(getEpocheTimeFromUserStats('mailid', $content['id']), 2) ); } // END - if @@ -165,7 +166,7 @@ LIMIT 1", break; case 'BONUS': - $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1", + $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id`, `points`, 0 FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1", array(bigintval($row['bonus_id'])), __FILE__, __LINE__); $row['link_type'] = 'bonusid'; $data = $row['bonus_id']; @@ -179,7 +180,7 @@ LIMIT 1", // Data found to this mail? if ((SQL_NUMROWS($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) { - // Mail was found! + // Mail was found list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data); // Subject line found? @@ -257,7 +258,7 @@ LIMIT 1", } } else { // No mails left to confirm... :) - loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_MAILS_TO_CONFIRM--}'); + displayMessage('{--MEMBER_NO_MAILS_TO_CONFIRM--}'); } // [EOF]