X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=7e4de55fe15521c0fbf85a161a832a1e9810644e;hp=5f90d77c1d21d66be3e61d265a945313a57764eb;hb=2b388c21a07e07317ccb065d42ef7304cfca7718;hpb=cca98f57dff720b174d21d071cee8303462485d7
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 5f90d77c1d..7e4de55fe1 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:: 856 $ *
+ * $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 *
@@ -52,37 +57,37 @@ 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`
+$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'])."'
+ $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.": ".$_GET['u_id'];
+ $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`
+FROM `{!_MYSQL_PREFIX!}_bonus`
WHERE is_notify='N'
ORDER BY timestamp DESC";
@@ -91,30 +96,44 @@ ORDER BY timestamp DESC";
}
// 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'] = getConfig('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;
} // 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) / getConfig('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;
@@ -125,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);
@@ -134,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;
@@ -193,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
@@ -224,7 +243,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
if (!$MAIL) {
// No mail orders fond
- LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MAILS_IN_POOL);
+ LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
} // END - if
//