X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=9fb44ceaabd744870be10c48bad5e68176e1f4ec;hp=3971bb56eda85cfc445f1d86a92d79b1ab27aa86;hb=f03cb5d87e69bb2efc885b5c5f5f3026b24c06f6;hpb=199db88bf11bedd3d6c1dac997f942228ccb34d1
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 3971bb56ed..9fb44ceaab 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Alle Details einer gebuchten Mail ansehen *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -42,82 +47,93 @@
************************************************************************/
// Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
// Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
// Normal mails ordered by your members
// 0 1 2 3 4 5 6 7 8 9 10
-$SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
- FROM "._MYSQL_PREFIX."_pool
- WHERE data_type IN('ADMIN', 'TEMP', 'NEW', 'ACTIVE')
- ORDER BY timestamp DESC";
+$sql = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
+FROM `{!_MYSQL_PREFIX!}_pool`
+WHERE data_type IN('ADMIN','TEMP','NEW','ACTIVE')
+ORDER BY timestamp DESC";
+
$WHO = _ALL;
$SQL2 = "";
-if (!empty($_GET['mid']))
-{
+if (REQUEST_ISSET_GET(('mid'))) {
// Only a specific mail shall be displayed
// 0 1 2 3 4 5 6 7 8 9 10
- $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
- FROM "._MYSQL_PREFIX."_pool
- WHERE id='".bigintval($_GET['mid'])."'
+ $sql = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
+ FROM `{!_MYSQL_PREFIX!}_pool`
+ WHERE id='".bigintval(REQUEST_GET('mid'))."'
LIMIT 1";
- $WHO = MAIL_ID.": ".$_GET['mid'];
-}
- elseif (!empty($_GET['u_id']))
-{
+ $WHO = MAIL_ID.": ".REQUEST_GET('mid');
+} elseif (REQUEST_ISSET_GET(('uid'))) {
// All mails by a specific member shall be displayed
// 0 1 2 3 4 5 6 7 8 9 10
- $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
- FROM "._MYSQL_PREFIX."_pool
- WHERE sender='".bigintval($_GET['u_id'])."'
- ORDER by timestamp DESC";
- $WHO = USER_ID.": ".$_GET['u_id'];
+ $sql = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
+FROM `{!_MYSQL_PREFIX!}_pool`
+WHERE sender='".bigintval(REQUEST_GET('uid'))."'
+ORDER by timestamp DESC";
+ $WHO = USER_ID.": ".REQUEST_GET('uid');
}
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
- FROM "._MYSQL_PREFIX."_bonus
- ORDER BY timestamp DESC";
+FROM `{!_MYSQL_PREFIX!}_bonus`
+WHERE is_notify='N'
+ORDER BY timestamp DESC";
// Check for maximum pages
$result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
}
// Check for maximum pages
-$result_normal = SQL_QUERY($SQL, __FILE__, __LINE__);
+$result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
// Set offset an current page to default values
-if (empty($_GET['page'])) $_GET['page'] = "1";
-if (empty($_GET['offset'])) $_GET['offset'] = $_CONFIG['mails_page'];
+if (!REQUEST_ISSET_GET('page')) REQUEST_SET_GET('page', "1");
+
+if (!REQUEST_ISSET_GET('offset')) {
+ if (isConfigEntrySet('mails_page')) {
+ // Set config entry
+ REQUEST_SET_GET('offset', getConfig('mails_page'));
+ } else {
+ // Set default one
+ REQUEST_SET_GET('offset', 10);
+ }
+} // END - if
// Add limitation to SQL string
-if (empty($_GET['mid']))
-{
+if (!REQUEST_ISSET_GET(('mid'))) {
// Create limitation line
- $ADD = " LIMIT ".(bigintval($_GET['offset']) * bigintval($_GET['page']) - bigintval($_GET['offset'])).", ".bigintval($_GET['offset']);
+ $add = " LIMIT ".(bigintval(REQUEST_GET('offset')) * bigintval(REQUEST_GET('page')) - bigintval(REQUEST_GET('offset'))).", ".bigintval(REQUEST_GET('offset'));
// For normal mails
- $SQL .= $ADD;
+ $sql .= $add;
// For bonus mails
- if (!empty($SQL2)) $SQL2 .= $ADD;
-}
+ if (!empty($SQL2)) $SQL2 .= $add;
+} // END - if
// Run SQL query for normal mails
-$result_list = SQL_QUERY($SQL, __FILE__, __LINE__);
+$result_list = SQL_QUERY($sql, __FILE__, __LINE__);
if ((!empty($SQL2)) && ($WHO == _ALL)) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
// Calculate pages
-$PAGES = round(SQL_NUMROWS($result_normal) / $_CONFIG['mails_page'] + 0.3);
+$PAGES = 0;
+if (isConfigEntrySet('mails_page')) {
+ $PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
+} // END - if
+
+// Free result
SQL_FREERESULT($result_normal);
$MAIL = false;
@@ -128,7 +144,7 @@ if (SQL_NUMROWS($result_list) > 0) {
// 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",
+ $result_uncon = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
array(bigintval($pool['id'])), __FILE__, __LINE__);
list($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon);
SQL_FREERESULT($result_uncon);
@@ -137,7 +153,7 @@ if (SQL_NUMROWS($result_list) > 0) {
$pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks'];
if ($pool['unconfirmed'] > 0) {
// Add link to list_unconfirmed what-file
- $pool['unconfirmed'] = "".$pool['unconfirmed']."";
+ $pool['unconfirmed'] = "".$pool['unconfirmed']."";
} elseif ($pool['unconfirmed'] < 0) {
// Sometimes rarely displayed minus values will be "fixed" to zero
$pool['unconfirmed'] = 0;
@@ -151,8 +167,9 @@ if (SQL_NUMROWS($result_list) > 0) {
$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['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
@@ -163,7 +180,8 @@ if (SQL_NUMROWS($result_list) > 0) {
SQL_FREERESULT($result_list);
// Add navigation (with change box and colspan=3)
- if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true);
+ $content['nav'] = "";
+ if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, "3", true);
// Prepare content
$content['rows'] = $OUT;
@@ -183,7 +201,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
// Load bonus mails only when extension is active
if (SQL_NUMROWS($result_bonus) > 0) {
// Calculate pages
- $PAGES = round(SQL_NUMROWS($result_bonus) / $_CONFIG['mails_page'] + 0.5);
+ $PAGES = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
// List emails
$OUT = ""; $content = array();
@@ -194,7 +212,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
// Add link?
if ($bonus['unconfirmed'] > 0) {
// Add link to list_unconfirmed what-file
- $bonus['unconfirmed'] = "".$bonus['unconfirmed']."";
+ $bonus['unconfirmed'] = "".$bonus['unconfirmed']."";
} // END - if
// Prepare content
@@ -202,16 +220,17 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
$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['type'] = TRANSLATE_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);
- }
+ } // END - while
// Add navigation (without change box but with colspan=3)
- if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true);
+ $content['nav'] = "";
+ if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, "3", true);
// Prepare content
$content['rows'] = $OUT;
@@ -219,13 +238,13 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
// Load main template
LOAD_TEMPLATE("admin_list_bonus_emails", false, $content);
$MAIL = true;
- }
-}
+ } // END - if
+} // END - if
if (!$MAIL) {
// No mail orders fond
- OUTPUT_HTML("".ADMIN_NO_MAILS_IN_POOL."");
-}
+ LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+} // END - if
//
?>