X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=47d33a45c224367c20401b6ed79b36171995a5a1;hp=14f7e44c506aef9eb95a1b4165e87e6e3f589dc0;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hpb=04b69ac9f33369cbf654396c4a42cb1fff710ff4
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 14f7e44c50..47d33a45c2 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -14,12 +14,10 @@
* $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 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -35,29 +33,37 @@
* along with this program; if not, write to the Free Software *
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, *
* MA 02110-1301 USA *
- * -------------------------------------------------------------------- *
- * Moded What-email_details.php / also Editet ! *
- * Auf langsammen Servern (wie mein z.B Dauert das Laden) *
- * enorm hoch zu lang. Jetzt werden nur auftraege aufgelistet die *
- * NEU sind ( DB NEW) oder ADMIN freischalten muss (DB ADMIN ) *
- * oder noch als TEMP gespecihert sind *
- * der rest der schon als SEND sich melden darf wird per *
- * what-email_archiv .php aufgerufen *
- * beste gruesse Robert Niedziela / www.personal-webserver.de *
- * oder auch www.mc-p.org *
************************************************************************/
// Some security stuff...
if ((!defined('__SECURITY')) || (!isAdmin())) {
die();
-}
+} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
+
+// Is 'sql_patches' updated?
+if (!isExtensionInstalledAndNewer('sql_patches', '0.7.4')) {
+ // No, abort here
+ displayMessage(generateExtensionOutdatedMessage('sql_patches', '0.7.4'));
+ return FALSE;
+} // END - if
// Normal mails ordered by your members
$sql = "SELECT
- `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+ `id`,
+ `sender`,
+ `subject`,
+ `text`,
+ `receivers`,
+ `payment_id`,
+ `data_type`,
+ `timestamp`,
+ `url`,
+ `target_send`,
+ `mails_sent`,
+ `cat_id`
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
@@ -65,39 +71,77 @@ WHERE
ORDER BY
`timestamp` DESC";
-$WHO = getMessage('_ALL');
+$WHO = '';
$SQL2 = '';
-if (isGetRequestParameterSet(('mid'))) {
+if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
// Only a specific mail shall be displayed
- $sql = "SELECT
- `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+ $sql = sprintf('SELECT
+ `id`,
+ `sender`,
+ `subject`,
+ `text`,
+ `receivers`,
+ `payment_id`,
+ `data_type`,
+ `timestamp`,
+ `url`,
+ `target_send`,
+ `mails_sent`,
+ `cat_id`
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
- `id`='".bigintval(getRequestParameter('mid'))."'
-LIMIT 1";
- $WHO = getMessage('MAIL_ID') . ': ' . getRequestParameter('mid');
-} elseif (isGetRequestParameterSet('userid')) {
+ `id`=%s
+LIMIT 1',
+ bigintval(getRequestElement('id'))
+ );
+ $WHO = '{--MAIL_ID--}' . ': ' . getRequestElement('id');
+} elseif (isGetRequestElementSet('userid')) {
// All mails by a specific member shall be displayed
- $sql = "SELECT
- `id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
+ $sql = sprintf('SELECT
+ `id`,
+ `sender`,
+ `subject`,
+ `text`,
+ `receivers`,
+ `payment_id`,
+ `data_type`,
+ `timestamp`,
+ `url`,
+ `target_send`,
+ `mails_sent`,
+ `cat_id`
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
- `sender`='".bigintval(getRequestParameter('userid'))."'
+ `sender`=%s
ORDER BY
- `timestamp` DESC";
- $WHO = getMessage('USER_ID') . ': ' . getRequestParameter('userid');
+ `timestamp` DESC',
+ bigintval(getRequestElement('userid'))
+ );
+ $WHO = '{--USER_ID--}' . ': ' . getRequestElement('userid');
}
// Init result_bonus
-$result_bonus = false;
+$result_bonus = FALSE;
-if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+if ((isExtensionActive('bonus')) && (empty($WHO))) {
// Check for maximum pages
- $result_bonus = SQL_QUERY("SELECT
- `id`, `subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `clicks`
+ $result_bonus = sqlQuery("SELECT
+ `id`,
+ `subject`,
+ `text`,
+ `receivers`,
+ `points`,
+ `time`,
+ `data_type`,
+ `timestamp`,
+ `url`,
+ `cat_id`,
+ `target_send`,
+ `mails_sent`,
+ `clicks`,
(`mails_sent` - `clicks`) AS `unconfirmed`
FROM
`{?_MYSQL_PREFIX?}_bonus`
@@ -105,28 +149,28 @@ WHERE
`is_notify`='N'
ORDER BY
`timestamp` DESC", __FILE__, __LINE__);
-}
+} // END - if
// Check for maximum pages
-$result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
+$result_normal = sqlQuery($sql, __FILE__, __LINE__);
// Set offset an current page to default values
-if (!isGetRequestParameterSet('page')) setGetRequestParameter('page', 1);
+if (!isGetRequestElementSet('page')) setGetRequestElement('page', 1);
-if (!isGetRequestParameterSet('offset')) {
+if (!isGetRequestElementSet('offset')) {
if (isConfigEntrySet('mails_page')) {
// Set config entry
- setGetRequestParameter('offset', getConfig('mails_page'));
+ setGetRequestElement('offset', getMailsPage());
} else {
// Set default one
- setGetRequestParameter('offset', 10);
+ setGetRequestElement('offset', 10);
}
} // END - if
// Add limitation to SQL string
-if (!isGetRequestParameterSet(('mid'))) {
+if (!(isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
// Create limitation line
- $add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))) . ', ' . bigintval(getRequestParameter('offset'));
+ $add = ' LIMIT ' . (bigintval(getRequestElement('offset')) * bigintval(getRequestElement('page')) - bigintval(getRequestElement('offset'))) . ', ' . bigintval(getRequestElement('offset'));
// For normal mails
$sql .= $add;
@@ -136,99 +180,101 @@ if (!isGetRequestParameterSet(('mid'))) {
} // END - if
// Run SQL query for normal mails
-$result_list = SQL_QUERY($sql, __FILE__, __LINE__);
-if ((!empty($SQL2)) && ($WHO == getMessage('_ALL'))) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+$result_list = sqlQuery($sql, __FILE__, __LINE__);
+if ((!empty($SQL2)) && (empty($WHO))) {
+ $result_bonus = sqlQuery($SQL2, __FILE__, __LINE__);
+} // END - if
// Calculate pages
$numPages = '0';
if (isConfigEntrySet('mails_page')) {
- $numPages = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
+ $numPages = round(sqlNumRows($result_normal) / getMailsPage() + 0.3);
} // END - if
// Free result
-SQL_FREERESULT($result_normal);
+sqlFreeResult($result_normal);
-$MAIL = false;
-if (SQL_NUMROWS($result_list) > 0) {
+$MAIL = FALSE;
+if (!ifSqlHasZeroNumRows($result_list)) {
// Init rows
$OUT = '';
// Walk through all entries
- while ($content = SQL_FETCHARRAY($result_list)) {
+ while ($content = sqlFetchArray($result_list)) {
// Unconfirmed mails and sent mails
- $result_uncon = SQL_QUERY_ESC("SELECT (`max_rec` - `clicks`) AS `unconfirmed` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
+ $result_uncon = sqlQueryEscaped("SELECT (`max_rec` - `clicks`) AS `unconfirmed` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
array(bigintval($content['id'])), __FILE__, __LINE__);
// Load and merge data
- $content = merge_array($content, SQL_FETCHARRAY($result_uncon));
+ $content = merge_array($content, sqlFetchArray($result_uncon));
// Free result
- SQL_FREERESULT($result_uncon);
+ sqlFreeResult($result_uncon);
// Unconfirmed mails
- $content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], ($content['unconfirmed']), 'mid');
+ $content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], ($content['unconfirmed']), 'normal');
// Prepare content
$content['timestamp'] = generateDateTime($content['timestamp'], 0);
// Load row template
- $OUT .= loadTemplate('admin_list_emails_row', true, $content);
+ $OUT .= loadTemplate('admin_list_emails_row', TRUE, $content);
} // END - while
// Free memory
- SQL_FREERESULT($result_list);
+ sqlFreeResult($result_list);
// Add navigation (with change box and colspan=3)
- $content['nav'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
+ $content['nav'] = addEmailNavigation($numPages, getMailsPage(), FALSE, 3, TRUE);
// Prepare content
$content['rows'] = $OUT;
$content['who'] = $WHO;
// Mail orders are in pool so we can display them
- loadTemplate('admin_list_emails', false, $content);
+ loadTemplate('admin_list_emails', FALSE, $content);
- $MAIL = true;
- if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+ $MAIL = TRUE;
+ if ((isExtensionActive('bonus')) && (empty($WHO))) {
// Only check if bonus extension is active
- if (SQL_NUMROWS($result_bonus) > 0) outputHtml('
');
+ if (!ifSqlHasZeroNumRows($result_bonus)) outputHtml('
');
} // END - if
-}
+} // END - if
-if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+if ((isExtensionActive('bonus')) && (empty($WHO))) {
// Load bonus mails only when extension is active
- if (SQL_NUMROWS($result_bonus) > 0) {
+ if (!ifSqlHasZeroNumRows($result_bonus)) {
// Calculate pages
- $numPages = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
+ $numPages = round(sqlNumRows($result_bonus) / getMailsPage() + 0.5);
// List emails
$OUT = '';
- while ($content = SQL_FETCHARRAY($result_bonus)) {
+ while ($content = sqlFetchArray($result_bonus)) {
// Add link to list_unconfirmed what-file
- $content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], $content['unconfirmed']);
+ $content['unconfirmed'] = generateUnconfirmedAdminLink($content['id'], $content['unconfirmed'], 'bonus');
// Prepare content
$content['timestamp'] = generateDateTime($content['timestamp'], 0);
// Load row template
- $OUT .= loadTemplate('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'] = addEmailNavigation($numPages, getConfig('mails_page'), false, 3, true);
+ $content['nav'] = addEmailNavigation($numPages, getMailsPage(), FALSE, 3, TRUE);
// Prepare content
$content['rows'] = $OUT;
// Load main template
- loadTemplate('admin_list_bonus_emails', false, $content);
- $MAIL = true;
+ loadTemplate('admin_list_bonus_emails', FALSE, $content);
+ $MAIL = TRUE;
} // END - if
} // END - if
-if ($MAIL === false) {
+if ($MAIL === FALSE) {
// No mail orders fond
- loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
+ displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
} // END - if
// [EOF]