X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=12ecfd5da861333b2b2eda5a701fd4ddd9f8c860;hp=114276f7abdb9902572fad44bf81c31e9ac18436;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=ae80e170b5d25a4782af90a7c3d81fbb176fa293 diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php index 114276f7ab..12ecfd5da8 100644 --- a/inc/modules/member/what-unconfirmed.php +++ b/inc/modules/member/what-unconfirmed.php @@ -1,7 +1,7 @@ 0) -{ +// Mails left for confirmation? +if (SQL_NUMROWS($result) > 0) { // Please confirm these mails! - $sum = "0"; $SW = 2; $OUT = ""; - while (list($id, $id2, $type) = SQL_FETCHROW($result)) - { + $sum = '0'; $OUT = ''; $SW = 2; + + // Init content + $content = array(); + + // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() + while (list($id, $id2, $type) = SQL_FETCHROW($result)) { // Load data from stats table... - $cat = ""; - switch ($type) - { - case "NORMAL": - $result_data = SQL_QUERY_ESC("SELECT subject, subject, timestamp_ordered, cat_id, payment_id, pool_id FROM "._MYSQL_PREFIX."_user_stats WHERE id=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - $type = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM; - break; - - case "BONUS": - $result_data = SQL_QUERY_ESC("SELECT subject, text, timestamp, cat_id, points, id FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1", - array(bigintval($id2)), __FILE__, __LINE__); - $type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM; - break; + $cat = ''; + $result_data = false; + $PROBLEM = getMessage('MEMBER_GENERAL_MAIL_PROBLEM'); + $DATA = $id . '/' . $id2 . '/' . $type; + 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 +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! + logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type)); + break; } - if (SQL_NUMROWS($result_data) == 1) - { + // Data found to this mail? + if ((SQL_NUMROWS($result_data) == 1) && (($type == 'mailid') || ($type == 'bonusid'))) { // Mail was found! - list($subject, $text, $timestamp, $cat, $pay, $pool) = SQL_FETCHROW($result_data); - SQL_FREERESULT($result_data); - if ($type == "NORMAL") - { - $pay = GET_PAY_POINTS($pay, "payment"); - $result_text = SQL_QUERY_ESC("SELECT text FROM "._MYSQL_PREFIX."_pool WHERE id=%s LIMIT 1", - array(bigintval($pool)), __FILE__, __LINE__); - list($text) = SQL_FETCHROW($result_text); - SQL_FREERESULT($result_text); + list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data); + + // Subject line found? + if (empty($subject)) { + // No subject line! + $subject = getMessage('DEFAULT_SUBJECT_LINE'); + } // END - if + + // Prepare sender id + if (($sender > 0) && ($type == 'mailid')) { + // Sender id + $sender = bigintval($sender); + } elseif ($type == 'bonusid') { + // Is admin + $sender = getMessage('USERNAME_ADMIN_SHORT'); + } else { + // Deleted + $sender = getMessage('EMAIL_STATUS_DELETED'); } - if (empty($subject)) $subject = DEFAULT_SUBJECT_LINE; - if (empty($text)) $text = "---"; - $subject = COMPILE_CODE($subject); // Prepare data for template $content = array( - 'sw' => $SW, - 'uid' => $GLOBALS['userid'], - 'data' => $DATA, - 'type' => $type, - 'subj' => $subject, - 'text' => COMPILE_CODE($text), - 'stamp' => MAKE_DATETIME($timestamp, "0"), - 'cat' => GET_CATEGORY($cat), - 'points' => TRANSLATE_COMMA($pay), + 'sw' => $SW, + 'userid' => getMemberId(), + 'data' => bigintval($DATA), + 'type' => $type, + 'subject' => $subject, + 'sender' => $sender, + 'timestamp' => generateDateTime($timestamp, 2), + 'points' => $pay, ); - // Load row template and count points - $OUT .= LOAD_TEMPLATE("member_unconfirmed_row", true, $content); + // Load row template + if (getConfig('show_points_unconfirmed') == 'Y') { + $OUT .= loadTemplate('member_unconfirmed_row', true, $content); + } else { + $OUT .= loadTemplate('member_unconfirmed_row_nopoints', true, $content); + } + + // Count points $sum += $pay; - } - else - { + } else { // Prepare data for template $content = array( 'sw' => $SW, @@ -120,29 +231,40 @@ if (SQL_NUMROWS($result) > 0) 'probl' => $PROBLEM, ); - // Problem with mail detected - $OUT .= LOAD_TEMPLATE("member_unconfirmed_404", true, $content); + // Display points or not? + if (getConfig('show_points_unconfirmed') == 'Y') { + $OUT .= loadTemplate('member_unconfirmed_404', true, $content); + } else { + $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 - LOAD_TEMPLATE("member_unconfirmed_table"); -} - else -{ + if (getConfig('show_points_unconfirmed') == 'Y') { + loadTemplate('member_unconfirmed_table', false, $content); + } else { + loadTemplate('member_unconfirmed_table_nopoints', false, $content); + } +} else { // No mails left to confirm... :) - LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_NO_MAILS_TO_CONFIRM); + loadTemplate('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM')); } -// +// [EOF] ?>