X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=a71abbac3a4310215734e548f823e6821402a4b8;hp=ed59720397b2651765d159daec2f0d3128cd344a;hb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;hpb=50b91687d7e7201f6c596a9ad40e8ff35c995074
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index ed59720397..a71abbac3a 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -17,7 +17,7 @@
* 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 *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -47,47 +47,46 @@
************************************************************************/
// Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
- require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+ die();
}
// Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('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`
+FROM `{?_MYSQL_PREFIX?}_pool`
WHERE data_type IN('ADMIN','TEMP','NEW','ACTIVE')
ORDER BY timestamp DESC";
-$WHO = _ALL;
+$WHO = getMessage('_ALL');
$SQL2 = '';
-if (REQUEST_ISSET_GET(('mid'))) {
+if (isGetRequestElementSet(('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(REQUEST_GET('mid'))."'
+ FROM `{?_MYSQL_PREFIX?}_pool`
+ WHERE `id`='".bigintval(getRequestElement('mid'))."'
LIMIT 1";
- $WHO = MAIL_ID.": ".REQUEST_GET('mid');
-} elseif (REQUEST_ISSET_GET('uid')) {
+ $WHO = getMessage('MAIL_ID').": ".getRequestElement('mid');
+} elseif (isGetRequestElementSet('userid')) {
// 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(REQUEST_GET('uid'))."'
+FROM `{?_MYSQL_PREFIX?}_pool`
+WHERE sender='".bigintval(getRequestElement('userid'))."'
ORDER by timestamp DESC";
- $WHO = USER_ID.": ".REQUEST_GET('uid');
+ $WHO = getMessage('USER_ID').": ".getRequestElement('userid');
}
-if ((EXT_IS_ACTIVE('bonus')) && ($WHO == _ALL)) {
+if ((isExtensionActive('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";
@@ -99,22 +98,22 @@ ORDER BY timestamp DESC";
$result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
// Set offset an current page to default values
-if (!REQUEST_ISSET_GET('page')) REQUEST_SET_GET('page', '1');
+if (!isGetRequestElementSet('page')) setRequestGetElement('page', '1');
-if (!REQUEST_ISSET_GET('offset')) {
+if (!isGetRequestElementSet('offset')) {
if (isConfigEntrySet('mails_page')) {
// Set config entry
- REQUEST_SET_GET('offset', getConfig('mails_page'));
+ setRequestGetElement('offset', getConfig('mails_page'));
} else {
// Set default one
- REQUEST_SET_GET('offset', 10);
+ setRequestGetElement('offset', 10);
}
} // END - if
// Add limitation to SQL string
-if (!REQUEST_ISSET_GET(('mid'))) {
+if (!isGetRequestElementSet(('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(getRequestElement('offset')) * bigintval(getRequestElement('page')) - bigintval(getRequestElement('offset'))).", ".bigintval(getRequestElement('offset'));
// For normal mails
$sql .= $add;
@@ -144,7 +143,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);
@@ -162,18 +161,15 @@ if (SQL_NUMROWS($result_list) > 0) {
// Prepare content
$content = $pool;
$content['sender_link'] = generateUserProfileLink($pool['sender']);
- $content['subject'] = COMPILE_CODE($pool['subject']);
- $content['text'] = COMPILE_CODE($pool['text']);
$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['frametester'] = generateFrametesterUrl($pool['url']);
$content['timestamp'] = generateDateTime($pool['timestamp'], '0');
// Load row template
- $OUT .= LOAD_TEMPLATE("admin_list_emails_row", true, $content);
+ $OUT .= loadTemplate('admin_list_emails_row', true, $content);
} // END - while
// Free memory
@@ -181,23 +177,23 @@ if (SQL_NUMROWS($result_list) > 0) {
// 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);
+ if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('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);
+ loadTemplate('admin_list_emails', false, $content);
$MAIL = true;
- if ((EXT_IS_ACTIVE('bonus')) && ($WHO == _ALL)) {
+ if ((isExtensionActive('bonus')) && ($WHO == _ALL)) {
// Check only if bonus extension is active
- if (SQL_NUMROWS($result_bonus) > 0) OUTPUT_HTML("
");
+ if (SQL_NUMROWS($result_bonus) > 0) outputHtml('
');
}
}
-if ((EXT_IS_ACTIVE('bonus')) && ($WHO == _ALL)) {
+if ((isExtensionActive('bonus')) && ($WHO == _ALL)) {
// Load bonus mails only when extension is active
if (SQL_NUMROWS($result_bonus) > 0) {
// Calculate pages
@@ -221,29 +217,29 @@ if ((EXT_IS_ACTIVE('bonus')) && ($WHO == _ALL)) {
$content['category'] = getCategory($content['cat_id']);
$content['receivers'] = str_replace(';', ", ", $content['receivers']);
$content['type'] = translatePoolType($content['data_type']);
- $content['frametester'] = FRAMETESTER($content['url']);
+ $content['frametester'] = generateFrametesterUrl($content['url']);
$content['timestamp'] = generateDateTime($content['timestamp'], '0');
// Load row template
- $OUT .= LOAD_TEMPLATE("admin_list_bonus_emails_row", true, $content);
+ $OUT .= loadTemplate('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);
+ if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, '3', true);
// Prepare content
$content['rows'] = $OUT;
// Load main template
- LOAD_TEMPLATE("admin_list_bonus_emails", false, $content);
+ loadTemplate('admin_list_bonus_emails', false, $content);
$MAIL = true;
} // END - if
} // END - if
-if (!$MAIL) {
+if ($MAIL === false) {
// No mail orders fond
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+ loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
} // END - if
//