From 255696fe065d35b951f66168c35296b10fdde060 Mon Sep 17 00:00:00 2001 From: quix0r Date: Tue, 31 Aug 2010 10:09:16 +0000 Subject: [PATCH] Fixed EL code inside EL code seems to be broken: - Removed EL code inside EL code due to broken engine - Rewritten SQL_FETCHROW() to SQL_FETCHARRAY() which closes an internal TODO - Renamed some array elements to honor the naming convention - TODOs.txt updated --- DOCS/TODOs.txt | 1 + inc/modules/member/what-unconfirmed.php | 46 ++++++++++--------- .../de/html/member/member_unconfirmed_404.tpl | 3 +- .../member_unconfirmed_404_nopoints.tpl | 3 +- .../de/html/member/member_unconfirmed_row.tpl | 4 +- .../member_unconfirmed_row_nopoints.tpl | 4 +- 6 files changed, 33 insertions(+), 28 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 57dfcf1dea..174e1480ee 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -172,6 +172,7 @@ ./inc/modules/member/what-transfer.php:310: // @TODO Rewrite: tid->trans_id,stamp->time_trans ./inc/modules/member/what-transfer.php:94: // @TODO Rewrite this to a filter ./inc/modules/member/what-unconfirmed.php:143: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() +./inc/modules/member/what-unconfirmed.php:208: // @TODO This 'userid' cannot be saved because of encapsulated EL code ./inc/modules/order.php:76: // @TODO Unused: 2,4 ./inc/monthly/monthly_bonus.php:69: // @TODO Rewrite this to a filter ./inc/mysql-manager.php:1174: // @TODO Rewrite this to a filter diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php index 88baece6e6..8e7874f111 100644 --- a/inc/modules/member/what-unconfirmed.php +++ b/inc/modules/member/what-unconfirmed.php @@ -127,8 +127,8 @@ if (isExtensionActive('bonus')) { $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", + // 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__); } @@ -141,13 +141,13 @@ if (!SQL_HASZERONUMS($result)) { $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; - $PROBLEM = '{--MEMBER_GENERAL_MAIL_PROBLEM--}'; - $DATA = $id . '/' . $id2 . '/' . $type; - switch ($type) { + $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 @@ -160,27 +160,27 @@ ON WHERE s.id=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - $type = 'mailid'; - $DATA = $id; - $PROBLEM = '{--NORMAL_MAIL_PROBLEM--}'; + 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($id2)), __FILE__, __LINE__); - $type = 'bonusid'; - $DATA = $id2; - $PROBLEM = '{--BONUS_MAIL_PROBLEM--}'; + array(bigintval($row['bonus_id'])), __FILE__, __LINE__); + $row['link_type'] = 'bonusid'; + $data = $row['bonus_id']; + $message = '{--BONUS_MAIL_PROBLEM--}'; break; default: // Unknown type detected! - logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type)); + logDebugMessage(__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'))) { + 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); @@ -191,10 +191,10 @@ LIMIT 1", } // 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 = '{--USERNAME_ADMIN_SHORT--}'; } else { @@ -204,8 +204,10 @@ LIMIT 1", // Prepare data for template $content = array( - 'data' => bigintval($DATA), - 'type' => $type, + '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), @@ -224,8 +226,8 @@ LIMIT 1", } else { // Prepare data for template $content = array( - 'data' => $DATA, - 'probl' => $PROBLEM, + 'data' => $data, + 'message' => $message, ); // Display points or not? diff --git a/templates/de/html/member/member_unconfirmed_404.tpl b/templates/de/html/member/member_unconfirmed_404.tpl index b53aba1485..20d712cc71 100644 --- a/templates/de/html/member/member_unconfirmed_404.tpl +++ b/templates/de/html/member/member_unconfirmed_404.tpl @@ -1,5 +1,6 @@ - $content[probl]: $content[data] + $content[message]: + $content[data] diff --git a/templates/de/html/member/member_unconfirmed_404_nopoints.tpl b/templates/de/html/member/member_unconfirmed_404_nopoints.tpl index c665906ac1..780550e7af 100644 --- a/templates/de/html/member/member_unconfirmed_404_nopoints.tpl +++ b/templates/de/html/member/member_unconfirmed_404_nopoints.tpl @@ -1,5 +1,6 @@ - $content[probl]: $content[data] + $content[message]: + $content[data] diff --git a/templates/de/html/member/member_unconfirmed_row.tpl b/templates/de/html/member/member_unconfirmed_row.tpl index bc4b09422f..6766718276 100644 --- a/templates/de/html/member/member_unconfirmed_row.tpl +++ b/templates/de/html/member/member_unconfirmed_row.tpl @@ -1,12 +1,12 @@ - [$content[data]] + [$content[data]] $content[sender] - [{--EMAIL_DETAILS_LINK--}] + [{--EMAIL_DETAILS_LINK--}] $content[timestamp] diff --git a/templates/de/html/member/member_unconfirmed_row_nopoints.tpl b/templates/de/html/member/member_unconfirmed_row_nopoints.tpl index 699d0e6b87..24ef8c00ad 100644 --- a/templates/de/html/member/member_unconfirmed_row_nopoints.tpl +++ b/templates/de/html/member/member_unconfirmed_row_nopoints.tpl @@ -1,13 +1,13 @@ - [$content[data]] $content[sender] - [{--EMAIL_DETAILS_LINK--}] + [{--EMAIL_DETAILS_LINK--}] $content[timestamp] -- 2.39.5