X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=0b2fe94e44d0d9a6514b5accc1f2e8bd598656b1;hb=07612d2debcc78a93678db0deed050d82df432f1;hp=40161f3807d8cd5e1879c361cf2280c9fbc10609;hpb=d8148e3f1f3a6762b2e786dbe99ada269dcf2ea0;p=mailer.git
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 40161f3807..0b2fe94e44 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 *
@@ -43,42 +48,42 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
}
// Add description as navigation point
-ADD_DESCR("admin", __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
+$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 = "";
+$SQL2 = '';
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
+ $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'))."'
+ WHERE `id`='".bigintval(REQUEST_GET('mid'))."'
LIMIT 1";
$WHO = MAIL_ID.": ".REQUEST_GET('mid');
-} elseif (REQUEST_ISSET_GET(('uid'))) {
+} 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
+ $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)) {
+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
@@ -91,42 +96,56 @@ 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 (!REQUEST_ISSET_GET(('page'))) REQUEST_GET('page') = "1";
-if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_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 (!REQUEST_ISSET_GET(('mid'))) {
// Create limitation line
- $ADD = " LIMIT ".(bigintval(REQUEST_GET('offset')) * bigintval(REQUEST_GET('page')) - bigintval(REQUEST_GET('offset'))).", ".bigintval(REQUEST_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) / 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;
if (SQL_NUMROWS($result_list) > 0) {
// Init rows
- $OUT = ""; $content = array();
+ $OUT = ''; $content = array();
// 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['id'])), __FILE__, __LINE__);
+ array(bigintval($pool['id'])), __FILE__, __LINE__);
list($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon);
SQL_FREERESULT($result_uncon);
@@ -142,16 +161,16 @@ if (SQL_NUMROWS($result_list) > 0) {
// Prepare content
$content = $pool;
- $content['sender_link'] = ADMIN_USER_PROFILE_LINK($pool['sender']);
+ $content['sender_link'] = generateUserProfileLink($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'] = TRANSLATE_POOL_TYPE($pool['data_type']);
+ $content['payment'] = getPaymentTitlePrice($pool['payment_id']);
+ $content['category'] = getCategory($pool['cat_id']);
+ $content['receivers'] = str_replace(';', ", ", $pool['receivers']);
+ $content['type'] = translatePoolType($pool['data_type']);
$content['frametester'] = FRAMETESTER($pool['url']);
$content['url'] = COMPILE_CODE($pool['url']);
- $content['timestamp'] = MAKE_DATETIME($pool['timestamp'], "0");
+ $content['timestamp'] = generateDateTime($pool['timestamp'], '0');
// Load row template
$OUT .= LOAD_TEMPLATE("admin_list_emails_row", true, $content);
@@ -161,8 +180,8 @@ if (SQL_NUMROWS($result_list) > 0) {
SQL_FREERESULT($result_list);
// Add navigation (with change box and colspan=3)
- $content['nav'] = "";
- if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, getConfig('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;
@@ -172,20 +191,20 @@ if (SQL_NUMROWS($result_list) > 0) {
LOAD_TEMPLATE("admin_list_emails", false, $content);
$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) {
// Calculate pages
$PAGES = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
// List emails
- $OUT = ""; $content = array();
+ $OUT = ''; $content = array();
while ($bonus = SQL_FETCHARRAY($result_bonus)) {
// Calculate unconfirmed emails
$bonus['unconfirmed'] = $bonus['mails_sent'] - $bonus['clicks'];
@@ -198,20 +217,20 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
// 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'] = TRANSLATE_POOL_TYPE($content['data_type']);
+ $content['time'] = createFancyTime($content['time']);
+ $content['category'] = getCategory($content['cat_id']);
+ $content['receivers'] = str_replace(';', ", ", $content['receivers']);
+ $content['type'] = translatePoolType($content['data_type']);
$content['frametester'] = FRAMETESTER($content['url']);
- $content['timestamp'] = MAKE_DATETIME($content['timestamp'], "0");
+ $content['timestamp'] = generateDateTime($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)
- $content['nav'] = "";
- if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, getConfig('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;
@@ -224,7 +243,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
if (!$MAIL) {
// No mail orders fond
- LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+ LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
} // END - if
//