X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=23502f4ed31d66eb1a5c98ecc1bf70fc9138e105;hp=2c4f10bef5412746b29a2cb24fc5f2d4ca9152b7;hb=0f3a135204757cc8750262871c8e62c42300acb4;hpb=a090e351c49fe021fb3064325694da03402332e0;ds=sidebyside diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php index 2c4f10bef5..23502f4ed3 100644 --- a/inc/modules/member/what-unconfirmed.php +++ b/inc/modules/member/what-unconfirmed.php @@ -1,7 +1,7 @@ 0) { + // Get timestamp from insert + $content['user_mail_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_ON=' . generateDateTime($confirmedStamp, '2') . '%}'; + } // END - if + } // END - if // Display it depending on mail (data) type - LOAD_TEMPLATE("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 (REQUEST_ISSET_GET(('mailid'))) { +} 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 -FROM `{!_MYSQL_PREFIX!}_user_stats` AS s -LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p -ON s.pool_id=p.id -LEFT JOIN `{!_MYSQL_PREFIX!}_payments` AS pay -ON p.payment_id=pay.id -WHERE s.id=%s LIMIT 1", - array(bigintval(REQUEST_GET('mailid'))), __FILE__, __LINE__); + $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 +FROM + `{?_MYSQL_PREFIX?}_user_stats` AS s +LEFT JOIN + `{?_MYSQL_PREFIX?}_pool` AS p +ON + s.pool_id=p.id +LEFT JOIN + `{?_MYSQL_PREFIX?}_payments` AS pay +ON + p.payment_id=pay.id +WHERE + s.id=%s +LIMIT 1", + array(bigintval(getRequestParameter('mailid'))), __FILE__, __LINE__); // Load data $content = SQL_FETCHARRAY($result_data); - // "Translate some data - $content['subject'] = COMPILE_CODE($content['subject']); - $content['text'] = COMPILE_CODE($content['text']); - $content['timestamp'] = MAKE_DATETIME($content['timestamp'], "2"); - $content['category'] = GET_CATEGORY($content['cat_id']); - $content['points'] = TRANSLATE_COMMA($content['points']); - $content['time'] = CREATE_FANCY_TIME($content['time']); - $content['uid'] = getUserId(); + // Translate some data + $content['timestamp'] = generateDateTime($content['timestamp'], '2'); + $content['userid'] = getMemberId(); + $content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN=' . $content['id'] . '%}'; - // Get timestamp from insert - $content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'), - MAKE_DATETIME(USER_STATS_GET_TIMESTAMP('mailid', $content['id']), "2") - ); + // Is ext-user active? + if (isExtensionActive('user')) { + // Default is never confirmed + $content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_NEVER_CONFIRMED=' . $content['id'] . '%}'; + + // Get the timestamp from the mail + $confirmedStamp = getEpocheTimeFromUserStats('mailid', $content['id']); + + // Have confirmed it? + if ($confirmedStamp > 0) { + // Get timestamp from insert + $content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_ON=' . generateDateTime($confirmedStamp, '2') . '%}'; + } // END - if + } // END - if // Display it depending on mail (data) type - LOAD_TEMPLATE("member_mail_normal_".strtolower($content['data_type']), false, $content); + loadTemplate('member_mail_normal_' . strtolower($content['data_type']), false, $content); // Free result SQL_FREERESULT($result_data); } -if (EXT_IS_ACTIVE('bonus')) { - // Load bonus ID - $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY bonus_id DESC, stats_id DESC", - array(getUserId()), __FILE__, __LINE__); +if (isExtensionActive('bonus')) { + // Load bonus id + $result = SQL_QUERY_ESC("SELECT `stats_id`,`bonus_id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `bonus_id` DESC, stats_id DESC", + array(getMemberId()), __FILE__, __LINE__); } else { - // Don't load bonus ID - $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY stats_id DESC", - array(getUserId()), __FILE__, __LINE__); + // Don't load bonus id if ext-bonus is not installed + $result = SQL_QUERY_ESC("SELECT `stats_id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `stats_id` DESC", + array(getMemberId()), __FILE__, __LINE__); } // Mails left for confirmation? -if (SQL_NUMROWS($result) > 0) { +if (!SQL_HASZERONUMS($result)) { // Please confirm these mails! - $sum = 0; $OUT = ''; $SW = 2; + $sum = '0'; $OUT = ''; + + // Init content + $content = array(); // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() - while (list($id, $id2, $type) = SQL_FETCHROW($result)) { + while ($row = SQL_FETCHARRAY($result)) { // Load data from stats table... - $cat = ''; $result_data = false; - switch ($type) - { - case "NORMAL": - $result_data = SQL_QUERY_ESC("SELECT s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender -FROM `{!_MYSQL_PREFIX!}_user_stats` AS s -LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p -ON s.pool_id=p.id -WHERE s.id=%s + $cat = ''; + $result_data = false; + $message = '{--MEMBER_GENERAL_MAIL_PROBLEM--}'; + $data = $row['stats_id'] . '/' . $row['bonus_id'] . '/' . $row['link_type']; + switch ($row['link_type']) { + case 'NORMAL': + $result_data = SQL_QUERY_ESC("SELECT + s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender +FROM + `{?_MYSQL_PREFIX?}_user_stats` AS s +LEFT JOIN + `{?_MYSQL_PREFIX?}_pool` AS p +ON + s.pool_id=p.id +WHERE + s.id=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - $type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM'); - break; - - case "BONUS": - $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1", - array(bigintval($id2)), __FILE__, __LINE__); - $type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM'); - break; - - default: // Unknown type detected! - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type)); - break; + array(bigintval($row['stats_id'])), __FILE__, __LINE__); + $row['link_type'] = 'mailid'; + $data = $row['stats_id']; + $message = '{--NORMAL_MAIL_PROBLEM--}'; + break; + + case 'BONUS': + $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']; + $message = '{--BONUS_MAIL_PROBLEM--}'; + break; + + default: // Unknown type detected! + debug_report_bug(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type'])); + break; } // Data found to this mail? - if ((SQL_NUMROWS($result_data) == 1) && (($type == 'mailid') || ($type == 'bonusid'))) { - // Mail was found! + if ((SQL_NUMROWS($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) { + // Mail was found list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data); // Subject line found? if (empty($subject)) { // No subject line! - $subject = getMessage('DEFAULT_SUBJECT_LINE'); - } else { - // Compile it - $subject = COMPILE_CODE($subject); - } + $subject = '{--DEFAULT_SUBJECT_LINE--}'; + } // END - if // Prepare sender id - if (($sender > 0) && ($type == 'mailid')) { + if ((isValidUserId($sender)) && ($row['link_type'] == 'mailid')) { // Sender id $sender = bigintval($sender); - } elseif ($type == 'bonusid') { + } elseif ($row['link_type'] == 'bonusid') { // Is admin - $sender = getMessage('_ADMIN_SHORT'); + $sender = '{--USERNAME_ADMIN_SHORT--}'; } else { // Deleted - $sender = getMessage('EMAIL_STATUS_DELETED'); + $sender = '{--EMAIL_STATUS_DELETED--}'; } // Prepare data for template $content = array( - 'sw' => $SW, - 'uid' => getUserId(), - 'data' => bigintval($DATA), - 'type' => $type, - 'subject' => $subject, - 'sender' => $sender, - 'stamp' => MAKE_DATETIME($timestamp, "2"), - 'cat' => GET_CATEGORY($cat), - 'points' => TRANSLATE_COMMA($pay), + 'data' => bigintval($data), + // @TODO This 'userid' cannot be saved because of encapsulated EL code + 'userid' => getMemberId(), + 'link_type' => $row['link_type'], + 'subject' => $subject, + 'sender' => $sender, + 'timestamp' => generateDateTime($timestamp, 2), + 'points' => $pay, ); // Load row template if (getConfig('show_points_unconfirmed') == 'Y') { - $OUT .= LOAD_TEMPLATE("member_unconfirmed_row", true, $content); + $OUT .= loadTemplate('member_unconfirmed_row', true, $content); } else { - $OUT .= LOAD_TEMPLATE("member_unconfirmed_row_nopoints", true, $content); + $OUT .= loadTemplate('member_unconfirmed_row_nopoints', true, $content); } // Count points @@ -210,45 +245,41 @@ LIMIT 1", } else { // Prepare data for template $content = array( - 'sw' => $SW, - 'data' => $DATA, - 'probl' => $PROBLEM, + 'data' => $data, + 'message' => $message, ); // Display points or not? if (getConfig('show_points_unconfirmed') == 'Y') { - $OUT .= LOAD_TEMPLATE("member_unconfirmed_404", true, $content); + $OUT .= loadTemplate('member_unconfirmed_404', true, $content); } else { - $OUT .= LOAD_TEMPLATE("member_unconfirmed_404_nopoints", true, $content); + $OUT .= loadTemplate('member_unconfirmed_404_nopoints', true, $content); } } // Free result SQL_FREERESULT($result_data); - - // Switch color - $SW = 3 - $SW; } // END - while // Free memory SQL_FREERESULT($result); // Remember total points - define('__TOTAL_POINTS', TRANSLATE_COMMA($sum)); + $content['total_points'] = $sum; // Remember all generated rows in constant for the template - define('__UNCONFIRMED_ROWS', $OUT); + $content['rows'] = $OUT; // Load main template if (getConfig('show_points_unconfirmed') == 'Y') { - LOAD_TEMPLATE("member_unconfirmed_table"); + loadTemplate('member_unconfirmed_table', false, $content); } else { - LOAD_TEMPLATE("member_unconfirmed_table_nopoints"); + loadTemplate('member_unconfirmed_table_nopoints', false, $content); } } else { // No mails left to confirm... :) - LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM')); + displayMessage('{--MEMBER_NO_MAILS_TO_CONFIRM--}'); } -// +// [EOF] ?>