From 199db88bf11bedd3d6c1dac997f942228ccb34d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 13 Sep 2008 19:13:32 +0000 Subject: [PATCH] Email details and bonus mails in admin swapped out to template --- .gitattributes | 4 + inc/databases.php | 2 +- inc/modules/admin/what-email_details.php | 255 +++++------------- .../de/html/admin/admin_list_bonus_emails.tpl | 12 + .../admin/admin_list_bonus_emails_row.tpl | 61 +++++ templates/de/html/admin/admin_list_emails.tpl | 12 + .../de/html/admin/admin_list_emails_row.tpl | 61 +++++ 7 files changed, 220 insertions(+), 187 deletions(-) create mode 100644 templates/de/html/admin/admin_list_bonus_emails.tpl create mode 100644 templates/de/html/admin/admin_list_bonus_emails_row.tpl create mode 100644 templates/de/html/admin/admin_list_emails.tpl create mode 100644 templates/de/html/admin/admin_list_emails_row.tpl diff --git a/.gitattributes b/.gitattributes index ab19be6dcd..c757d3301a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -899,6 +899,8 @@ templates/de/html/admin/admin_list_beg.tpl -text templates/de/html/admin/admin_list_beg_form.tpl -text templates/de/html/admin/admin_list_beg_rows.tpl -text templates/de/html/admin/admin_list_bonus.tpl -text +templates/de/html/admin/admin_list_bonus_emails.tpl -text +templates/de/html/admin/admin_list_bonus_emails_row.tpl -text templates/de/html/admin/admin_list_bonus_form.tpl -text templates/de/html/admin/admin_list_bonus_rows.tpl -text templates/de/html/admin/admin_list_cats.tpl -text @@ -913,6 +915,8 @@ templates/de/html/admin/admin_list_country_row.tpl -text templates/de/html/admin/admin_list_doubler_already.tpl -text templates/de/html/admin/admin_list_doubler_overview.tpl -text templates/de/html/admin/admin_list_doubler_waiting.tpl -text +templates/de/html/admin/admin_list_emails.tpl -text +templates/de/html/admin/admin_list_emails_row.tpl -text templates/de/html/admin/admin_list_extensions.tpl -text templates/de/html/admin/admin_list_extensions_row.tpl -text templates/de/html/admin/admin_list_holiday.tpl -text diff --git a/inc/databases.php b/inc/databases.php index 4405b66707..5672e0ce18 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "321"); +define('CURR_SVN_REVISION', "322"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php index afe6ac4543..3971bb56ed 100644 --- a/inc/modules/admin/what-email_details.php +++ b/inc/modules/admin/what-email_details.php @@ -81,8 +81,7 @@ if (!empty($_GET['mid'])) $WHO = USER_ID.": ".$_GET['u_id']; } -if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) -{ +if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) { // Bonus mails sent by you // 0 1 2 3 4 5 6 7 8 9 10 11 12 $SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks @@ -122,227 +121,111 @@ $PAGES = round(SQL_NUMROWS($result_normal) / $_CONFIG['mails_page'] + 0.3); SQL_FREERESULT($result_normal); $MAIL = false; -if (SQL_NUMROWS($result_list) > 0) -{ - // Mail orders are in pool so we can display them - OUTPUT_HTML("
- - - -"); - - // Add navigation (with change box and colspan=3) - if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3"); +if (SQL_NUMROWS($result_list) > 0) { + // Init rows + $OUT = ""; $content = array(); - while ($pool = SQL_FETCHROW($result_list)) - { + // Walk through all entries + while ($pool = SQL_FETCHARRAY($result_list)) { // Unconfirmed mails and sent mails $result_uncon = SQL_QUERY_ESC("SELECT max_rec, clicks FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s LIMIT 1", - array(bigintval($pool[0])), __FILE__, __LINE__); - list($sent, $clicks) = SQL_FETCHROW($result_uncon); + array(bigintval($pool['id'])), __FILE__, __LINE__); + list($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon); SQL_FREERESULT($result_uncon); // Unconfirmed mails - $unconfirmed = $sent - $clicks; - if ($unconfirmed > 0) - { + $pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks']; + if ($pool['unconfirmed'] > 0) { // Add link to list_unconfirmed what-file - $unconfirmed = "".$unconfirmed.""; - } - elseif ($unconfirmed < 0) - { + $pool['unconfirmed'] = "".$pool['unconfirmed'].""; + } elseif ($pool['unconfirmed'] < 0) { // Sometimes rarely displayed minus values will be "fixed" to zero - $unconfirmed = 0; + $pool['unconfirmed'] = 0; } - // List mail - OUTPUT_HTML(" - - - - - - - - - - - - - - - - - - - - - - - -"); - } + // Prepare content + $content = $pool; + $content['sender_link'] = ADMIN_USER_PROFILE_LINK($pool['sender']); + $content['subject'] = COMPILE_CODE($pool['subject']); + $content['text'] = COMPILE_CODE($pool['text']); + $content['payment'] = GET_PAYMENT($pool['payment_id']); + $content['category'] = GET_CATEGORY($pool['cat_id']); + $content['receivers'] = str_replace(";", ", ", $pool['receivers']); + $content['type'] = GET_POOL_TYPE($pool['data_type']); + $content['frametester'] = FRAMETESTER($pool['url']); + $content['timestamp'] = MAKE_DATETIME($pool['timestamp'], "0"); + + // Load row template + $OUT .= LOAD_TEMPLATE("admin_list_emails_row", true, $content); + } // END - while // Free memory SQL_FREERESULT($result_list); - // Add navigation (without change box but with colspan=3) - if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3"); + // Add navigation (with change box and colspan=3) + if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true); + + // Prepare content + $content['rows'] = $OUT; + $content['who'] = $WHO; + + // Mail orders are in pool so we can display them + LOAD_TEMPLATE("admin_list_emails", false, $content); - // Output footer - OUTPUT_HTML("
- ".ADMIN_POOL_CONTENT." (".$WHO.") -
- ".EMAIL_SENDER.":
- ".ADMIN_USER_PROFILE_LINK($pool[1])." - 		- ".EMAIL_SUBJECT.":
- ".COMPILE_CODE($pool[2])." - 		- ".EMAIL_TEXT.":
- ".COMPILE_CODE($pool[3])." -
- ".EMAIL_PAYMENT.":
- ".GET_PAYMENT($pool[5])." - 		- ".EMAIL_CATEGORY.":
- ".GET_CATEGORY($pool[10])." -
- ".EMAIL_RECEIVERS.":
- ".$sent." (".EMAIL_RUIDS.": ".str_replace(";", ", ", $pool[4]).") - 		- ".USERS_LINKS.":
- ".$unconfirmed." - 		- ".EMAIL_POOL_TYPE.":
- ".GET_POOL_TYPE($pool[6])." -
- ".EMAIL_TSEND.":
- ".$pool[9]." - 		- ".EMAIL_URL.":
- ".ADMIN_TEST_URL." - 		- ".EMAIL_TIMESTAMP.":
- ".MAKE_DATETIME($pool[7], "0")." -
- ".ADMIN_DELETE_NORMAL_MAIL." -
-
"); $MAIL = true; - if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) - { + if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) { // Check only if bonus extension is active if (SQL_NUMROWS($result_bonus) > 0) OUTPUT_HTML("

"); } } -if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) -{ +if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) { // Load bonus mails only when extension is active - if (SQL_NUMROWS($result_bonus) > 0) - { - // Mail orders are in pool so we can display them - OUTPUT_HTML("
- - - -"); + if (SQL_NUMROWS($result_bonus) > 0) { // Calculate pages $PAGES = round(SQL_NUMROWS($result_bonus) / $_CONFIG['mails_page'] + 0.5); - // Add navigation (with change box and colspan=3) - if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], true, "3"); - // List emails - while ($bonus = SQL_FETCHROW($result_bonus)) - { - // Unconfirmed mails - $unconfirmed = $bonus[11] - $bonus[12]; - if ($unconfirmed > 0) - { + $OUT = ""; $content = array(); + while ($bonus = SQL_FETCHARRAY($result_bonus)) { + // Calculate unconfirmed emails + $bonus['unconfirmed'] = $bonus['mails_sent'] - $bonus['clicks']; + + // Add link? + if ($bonus['unconfirmed'] > 0) { // Add link to list_unconfirmed what-file - $unconfirmed = "".$unconfirmed.""; - } - - OUTPUT_HTML(" - - - - - - - - - - - - - - - - - - - - - - - -"); + $bonus['unconfirmed'] = "".$bonus['unconfirmed'].""; + } // END - if + + // Prepare content + $content = $bonus; + $content['time'] = CREATE_FANCY_TIME($content['time']); + $content['category'] = GET_CATEGORY($content['cat_id']); + $content['receivers'] = str_replace(";", ", ", $content['receivers']); + $content['type'] = GET_POOL_TYPE($content['data_type']); + $content['frametester'] = FRAMETESTER($content['url']); + $content['timestamp'] = MAKE_DATETIME($content['timestamp'], "0"); + + // Load row template + $OUT .= LOAD_TEMPLATE("admin_list_bonus_emails_row", true, $content); } // Add navigation (without change box but with colspan=3) - if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3"); + if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true); + + // Prepare content + $content['rows'] = $OUT; - // Output footer - OUTPUT_HTML("
- ".ADMIN_BONUS_CONTENT." -
- ".EMAIL_SUBJECT.":
- ".$bonus[1]." - 		- ".EMAIL_TEXT.":
- ".$bonus[2]." -
- ".EMAIL_POINTS.":
- ".$bonus[4]." ".POINTS." - 		- ".EMAIL_SECONDS.":
- ".$bonus[5]." "._SECONDS." - 		- ".EMAIL_CATEGORY.":
- ".GET_CATEGORY($bonus[9])." -
- ".EMAIL_RECEIVERS.":
- ".$bonus[11]." (".EMAIL_RUIDS.": ".str_replace(";", ", ", $bonus[3]).") - 		- ".USERS_LINKS.":
- ".$unconfirmed." - 		- ".EMAIL_POOL_TYPE.":
- ".GET_POOL_TYPE($bonus[6])." -
- ".EMAIL_TSEND.":
- ".$bonus[10]." - 		- ".EMAIL_URL.":
- ".ADMIN_TEST_URL." - 		- ".EMAIL_TIMESTAMP.":
- ".MAKE_DATETIME($bonus[7], "0")." -
- ".ADMIN_DELETE_BONUS_MAIL." -
-
"); + // Load main template + LOAD_TEMPLATE("admin_list_bonus_emails", false, $content); $MAIL = true; } } -if (!$MAIL) -{ +if (!$MAIL) { // No mail orders fond OUTPUT_HTML("".ADMIN_NO_MAILS_IN_POOL.""); } + // ?> diff --git a/templates/de/html/admin/admin_list_bonus_emails.tpl b/templates/de/html/admin/admin_list_bonus_emails.tpl new file mode 100644 index 0000000000..2f57864037 --- /dev/null +++ b/templates/de/html/admin/admin_list_bonus_emails.tpl @@ -0,0 +1,12 @@ +
+ + + + +$content[nav] +$content[rows] +$content[nav] +
+ {--ADMIN_BONUS_CONTENT--} +
+
diff --git a/templates/de/html/admin/admin_list_bonus_emails_row.tpl b/templates/de/html/admin/admin_list_bonus_emails_row.tpl new file mode 100644 index 0000000000..6cd9ceaeeb --- /dev/null +++ b/templates/de/html/admin/admin_list_bonus_emails_row.tpl @@ -0,0 +1,61 @@ + + + {--EMAIL_SUBJECT--}:
+ $content[subject] + + + {--EMAIL_TEXT--}:
+ $content[text] + + + + + + {--EMAIL_POINTS--}:
+ $content[points] {--POINTS--} + + + {--EMAIL_SECONDS--}:
+ $content[time] + + + {--EMAIL_CATEGORY--}:
+ $content[category] + + + + + + {--EMAIL_RECEIVERS--}:
+ $content[mails_sent] + ({--EMAIL_RUIDS--}: $content[receivers]) + + + {--USERS_LINKS--}:
+ $content[unconfirmed] + + + {--EMAIL_POOL_TYPE--}:
+ $content[type] + + + + + + {--EMAIL_TSEND--}:
+ $content[target_send] + + + {--EMAIL_URL--}:
+ {--ADMIN_TEST_URL--} + + + {--EMAIL_TIMESTAMP--}:
+ $content[timestamp] + + + + + {--ADMIN_DELETE_BONUS_MAIL--} + + diff --git a/templates/de/html/admin/admin_list_emails.tpl b/templates/de/html/admin/admin_list_emails.tpl new file mode 100644 index 0000000000..ab2bc06f4f --- /dev/null +++ b/templates/de/html/admin/admin_list_emails.tpl @@ -0,0 +1,12 @@ +
+ + + + +$content[nav] +$content[rows] +$content[nav] +
+ {--ADMIN_POOL_CONTENT--} ($content[who]) +
+
diff --git a/templates/de/html/admin/admin_list_emails_row.tpl b/templates/de/html/admin/admin_list_emails_row.tpl new file mode 100644 index 0000000000..68ab750bde --- /dev/null +++ b/templates/de/html/admin/admin_list_emails_row.tpl @@ -0,0 +1,61 @@ + + + {--EMAIL_SENDER--}:
+ $content[sender_link] + + + {--EMAIL_SUBJECT--}:
+ $content[subject] + + + {--EMAIL_TEXT--}:
+ $content[text] + + + + + + {--EMAIL_PAYMENT--}:
+ $content[payment] + + + {--EMAIL_CATEGORY--}:
+ $content[category] + + + + + + {--EMAIL_RECEIVERS--}:
+ $content[sent_email] + ({--EMAIL_RUIDS--}: $content[receivers]) + + + {--USERS_LINKS--}:
+ $content[unconfirmed] + + + {--EMAIL_POOL_TYPE--}:
+ $content[type] + + + + + + {--EMAIL_TSEND--}:
+ $content[target_send] + + + {--EMAIL_URL--}:
+ {--ADMIN_TEST_URL--} + + + {--EMAIL_TIMESTAMP--}:
+ $content[timestamp] + + + + + {--ADMIN_DELETE_NORMAL_MAIL--} + + -- 2.30.2