From 26c2b865f004bf366690df9766f06faa2d713a34 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 30 Sep 2008 18:41:16 +0000 Subject: [PATCH] URL in email archive and details now displayed --- inc/databases.php | 2 +- inc/modules/admin/what-email_archiv.php | 3 +- inc/modules/admin/what-email_details.php | 1 + .../de/html/admin/admin_email_archiv_row.tpl | 140 ++++++++++-------- .../admin/admin_list_bonus_emails_row.tpl | 111 +++++++------- 5 files changed, 146 insertions(+), 111 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index dea7be4ebe..b8a723a3a2 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -113,7 +113,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "422"); +define('CURR_SVN_REVISION', "423"); // 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_archiv.php b/inc/modules/admin/what-email_archiv.php index 4644ae63bc..fb6df1836f 100644 --- a/inc/modules/admin/what-email_archiv.php +++ b/inc/modules/admin/what-email_archiv.php @@ -112,7 +112,8 @@ if (SQL_NUMROWS($result) > 0) 'unconfirmed' => $unconfirmed, 'type' => TRANSLATE_POOL_TYPE($pool[6]), 'tsend' => $pool[9], - 'url' => FRAMETESTER($pool[8]), + 'frametester' => FRAMETESTER($pool[8]), + 'url' => COMPILE_CODE($pool[8]), 'stamp' => MAKE_DATETIME($pool[7], "0"), 'mid' => $pool[0], ); diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php index 7e58510f76..6762cc915f 100644 --- a/inc/modules/admin/what-email_details.php +++ b/inc/modules/admin/what-email_details.php @@ -153,6 +153,7 @@ if (SQL_NUMROWS($result_list) > 0) { $content['receivers'] = str_replace(";", ", ", $pool['receivers']); $content['type'] = TRANSLATE_POOL_TYPE($pool['data_type']); $content['frametester'] = FRAMETESTER($pool['url']); + $content['url'] = COMPILE_CODE($pool['url']); $content['timestamp'] = MAKE_DATETIME($pool['timestamp'], "0"); // Load row template diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl index 57e8da6213..b83324dcc5 100644 --- a/templates/de/html/admin/admin_email_archiv_row.tpl +++ b/templates/de/html/admin/admin_email_archiv_row.tpl @@ -1,59 +1,81 @@ - - {--EMAIL_SENDER--}:
- $content[u_link] - {--EMAIL_SUBJECT--}:
- $content[subj] - {--EMAIL_TEXT--}:
- $content[text] - - -   - - - - {--EMAIL_PAYMENT--}:
- $content[pay] - - {--EMAIL_CATEGORY--}:
- $content[cat] - - -   - - - - {--EMAIL_RECEIVERS--}:
- $content[sent] ({--EMAIL_RUIDS--}: - $content[ruids]) - - {--USERS_LINKS--}:
- $content[unconfirmed] - - {--EMAIL_POOL_TYPE--}:
- $content[type] - - -   - - - - {--EMAIL_TSEND--}:
- $content[tsend] - - {--EMAIL_URL--}:
- {--ADMIN_TEST_URL--} - - {--EMAIL_TIMESTAMP--}:
- $content[stamp] - - - {--ADMIN_DELETE_NORMAL_MAIL--} - - + + + {--EMAIL_SENDER--}:
+ $content[u_link] + + + {--EMAIL_SUBJECT--}:
+ $content[subj] + + + {--EMAIL_TEXT--}:
+ $content[text] + + + +   + + + + {--EMAIL_PAYMENT--}:
+ $content[pay] + + + {--EMAIL_CATEGORY--}:
+ $content[cat] + + + +   + + + + {--EMAIL_RECEIVERS--}:
+ $content[sent] ({--EMAIL_RUIDS--}: + $content[ruids]) + + + {--USERS_LINKS--}:
+ $content[unconfirmed] + + + {--EMAIL_POOL_TYPE--}:
+ $content[type] + + + +   + + + + {--EMAIL_TSEND--}:
+ $content[tsend] + + + {--EMAIL_URL--}:
+ {--ADMIN_TEST_URL--} + + + {--EMAIL_TIMESTAMP--}:
+ $content[stamp] + + + +   + + + + {--EMAIL_URL--}:
+ $content[url] + + + {--__UNUSED--}:
+ --- + + + + + {--ADMIN_DELETE_NORMAL_MAIL--} + + diff --git a/templates/de/html/admin/admin_list_bonus_emails_row.tpl b/templates/de/html/admin/admin_list_bonus_emails_row.tpl index 6cd9ceaeeb..ce38dccf1c 100644 --- a/templates/de/html/admin/admin_list_bonus_emails_row.tpl +++ b/templates/de/html/admin/admin_list_bonus_emails_row.tpl @@ -1,61 +1,72 @@ - - + + {--EMAIL_SUBJECT--}:
- $content[subject] - - + $content[subject] + + {--EMAIL_TEXT--}:
- $content[text] - - - - - + $content[text] + + +  + + {--EMAIL_POINTS--}:
- $content[points] {--POINTS--} - - + $content[points] {!POINTS!} + + {--EMAIL_SECONDS--}:
- $content[time] - - + $content[time] + + {--EMAIL_CATEGORY--}:
- $content[category] - - - - - + $content[category] + + +  + + {--EMAIL_RECEIVERS--}:
- $content[mails_sent] - ({--EMAIL_RUIDS--}: $content[receivers]) - - + $content[mails_sent] + ({--EMAIL_RUIDS--}: $content[receivers]) + + {--USERS_LINKS--}:
- $content[unconfirmed] - - + $content[unconfirmed] + + {--EMAIL_POOL_TYPE--}:
- $content[type] - - - - - + $content[type] + + +  + + {--EMAIL_TSEND--}:
- $content[target_send] - - + $content[target_send] + + {--EMAIL_URL--}:
- {--ADMIN_TEST_URL--} - - + {--ADMIN_TEST_URL--} + + {--EMAIL_TIMESTAMP--}:
- $content[timestamp] - - - - - {--ADMIN_DELETE_BONUS_MAIL--} - - + $content[timestamp] + + +  + + + {--EMAIL_URL--}:
+ $content[url] + + + {--__UNUSED--}:
+ --- + + + + + {--ADMIN_DELETE_BONUS_MAIL--} + + -- 2.30.2