X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=182525c71aa87708d772c24d1ffac8bd32457eba;hb=34b1f5b69205b08c760d6dcc87ef6a2d1c291261;hp=22ca7fb20afb36c6be8a91286566656502f3e4a0;hpb=76fd13e5938a334f08e43893eb9a4ff49f72bf07;p=mailer.git
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 22ca7fb20a..182525c71a 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -14,11 +14,9 @@
* $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 *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -35,29 +33,26 @@
* 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,36 +60,43 @@ WHERE
ORDER BY
`timestamp` DESC";
-$WHO = getMessage('_ALL');
+$WHO = '';
$SQL2 = '';
-if (isGetRequestParameterSet(('mid'))) {
+if (isGetRequestParameterSet('mid')) {
// Only a specific mail shall be displayed
- $sql = "SELECT
+ $sql = sprintf("SELECT
`id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
- `id`='".bigintval(getRequestParameter('mid'))."'
-LIMIT 1";
- $WHO = getMessage('MAIL_ID') . ': ' . getRequestParameter('mid');
+ `id`=%s
+LIMIT 1",
+ bigintval(getRequestParameter('mid'))
+ );
+ $WHO = '{--MAIL_ID--}' . ': ' . getRequestParameter('mid');
} elseif (isGetRequestParameterSet('userid')) {
// All mails by a specific member shall be displayed
- $sql = "SELECT
+ $sql = sprintf("SELECT
`id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `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(getRequestParameter('userid'))
+ );
+ $WHO = '{--USER_ID--}' . ': ' . getRequestParameter('userid');
}
-if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
+// Init result_bonus
+$result_bonus = false;
+
+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`
+ `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`
@@ -102,7 +104,7 @@ WHERE
`is_notify`='N'
ORDER BY
`timestamp` DESC", __FILE__, __LINE__);
-}
+} // END - if
// Check for maximum pages
$result_normal = SQL_QUERY($sql, __FILE__, __LINE__);
@@ -113,7 +115,7 @@ if (!isGetRequestParameterSet('page')) setGetRequestParameter('page', 1);
if (!isGetRequestParameterSet('offset')) {
if (isConfigEntrySet('mails_page')) {
// Set config entry
- setGetRequestParameter('offset', getConfig('mails_page'));
+ setGetRequestParameter('offset', getMailsPage());
} else {
// Set default one
setGetRequestParameter('offset', 10);
@@ -121,7 +123,7 @@ if (!isGetRequestParameterSet('offset')) {
} // END - if
// Add limitation to SQL string
-if (!isGetRequestParameterSet(('mid'))) {
+if (!isGetRequestParameterSet('mid')) {
// Create limitation line
$add = ' LIMIT ' . (bigintval(getRequestParameter('offset')) * bigintval(getRequestParameter('page')) - bigintval(getRequestParameter('offset'))) . ', ' . bigintval(getRequestParameter('offset'));
@@ -134,19 +136,21 @@ if (!isGetRequestParameterSet(('mid'))) {
// 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__);
+if ((!empty($SQL2)) && (empty($WHO))) {
+ $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+} // END - if
// Calculate pages
-$PAGES = '0';
+$numPages = '0';
if (isConfigEntrySet('mails_page')) {
- $PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.3);
+ $numPages = round(SQL_NUMROWS($result_normal) / getMailsPage() + 0.3);
} // END - if
// Free result
SQL_FREERESULT($result_normal);
$MAIL = false;
-if (SQL_NUMROWS($result_list) > 0) {
+if (!SQL_HASZERONUMS($result_list)) {
// Init rows
$OUT = '';
@@ -176,8 +180,7 @@ 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'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
+ $content['nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
// Prepare content
$content['rows'] = $OUT;
@@ -187,17 +190,17 @@ if (SQL_NUMROWS($result_list) > 0) {
loadTemplate('admin_list_emails', false, $content);
$MAIL = true;
- if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
- // Check only if bonus extension is active
- if (SQL_NUMROWS($result_bonus) > 0) outputHtml('
');
+ if ((isExtensionActive('bonus')) && (empty($WHO))) {
+ // Only check if bonus extension is active
+ if (!SQL_HASZERONUMS($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 (!SQL_HASZERONUMS($result_bonus)) {
// Calculate pages
- $PAGES = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
+ $numPages = round(SQL_NUMROWS($result_bonus) / getMailsPage() + 0.5);
// List emails
$OUT = '';
@@ -213,8 +216,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
} // END - while
// Add navigation (without change box but with colspan=3)
- $content['nav'] = '';
- if ($PAGES > 1) $content['nav'] = addEmailNavigation($PAGES, getConfig('mails_page'), false, 3, true);
+ $content['nav'] = addEmailNavigation($numPages, getMailsPage(), false, 3, true);
// Prepare content
$content['rows'] = $OUT;
@@ -227,7 +229,7 @@ if ((isExtensionActive('bonus')) && ($WHO == getMessage('_ALL'))) {
if ($MAIL === false) {
// No mail orders fond
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+ displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
} // END - if
// [EOF]