X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-email_details.php;h=dd35fd9979ac405f937cf5c2e1e15cfc7684c5c0;hp=effc1b8c72885a342de235389fb8b4d54e193616;hb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;hpb=9270eabb4c34f6fe04d56e7e702cf000849358d3

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index effc1b8c72..dd35fd9979 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * 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                           *
+ * 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 *
@@ -42,91 +47,104 @@
  ************************************************************************/
 
 // 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
+$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 = "";
+$WHO = getMessage('_ALL');
+$SQL2 = '';
 
-if (!empty($_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($_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(getRequestElement('mid'))."'
 	 LIMIT 1";
-	$WHO = MAIL_ID.": ".$_GET['mid'];
-} elseif (!empty($_GET['u_id'])) {
+	$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($_GET['u_id'])."'
-	 ORDER by timestamp DESC";
-	$WHO = USER_ID.": ".$_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(getRequestElement('userid'))."'
+ORDER by timestamp DESC";
+	$WHO = getMessage('USER_ID').": ".getRequestElement('userid');
 }
 
-if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
+if ((isExtensionActive('bonus')) && ($WHO == getMessage('_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
-	WHERE is_notify='N'
-	ORDER BY timestamp DESC";
+FROM `{?_MYSQL_PREFIX?}_bonus`
+WHERE is_notify='N'
+ORDER BY timestamp DESC";
 
 	// Check for maximum pages
 	$result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
 }
 
 // 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 (!isGetRequestElementSet('page')) setRequestGetElement('page', 1);
+
+if (!isGetRequestElementSet('offset')) {
+	if (isConfigEntrySet('mails_page')) {
+		// Set config entry
+		setRequestGetElement('offset', getConfig('mails_page'));
+	} else {
+		// Set default one
+		setRequestGetElement('offset', 10);
+	}
+} // END - if
 
 // Add limitation to SQL string
-if (empty($_GET['mid'])) {
+if (!isGetRequestElementSet(('mid'))) {
 	// Create limitation line
-	$ADD = " LIMIT ".(bigintval($_GET['offset']) * bigintval($_GET['page']) - bigintval($_GET['offset'])).", ".bigintval($_GET['offset']);
+	$add = " LIMIT ".(bigintval(getRequestElement('offset')) * bigintval(getRequestElement('page')) - bigintval(getRequestElement('offset'))).", ".bigintval(getRequestElement('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__);
-if ((!empty($SQL2)) && ($WHO == _ALL)) $result_bonus = SQL_QUERY($SQL2, __FILE__, __LINE__);
+$result_list = SQL_QUERY($sql, __FILE__, __LINE__);
+if ((!empty($SQL2)) && ($WHO == getMessage('_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__);
+		$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,58 +152,55 @@ 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'] = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$pool['unconfirmed']."</A></STRONG>";
+			$pool['unconfirmed'] = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$pool['unconfirmed']."</a></strong>";
 		} elseif ($pool['unconfirmed'] < 0) {
 			// Sometimes rarely displayed minus values will be "fixed" to zero
-			$pool['unconfirmed'] = 0;
+			$pool['unconfirmed'] = '0';
 		}
 
 		// Prepare content
 		$content = $pool;
-		$content['sender_link'] = ADMIN_USER_PROFILE_LINK($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['frametester'] = FRAMETESTER($pool['url']);
-		$content['url']         = COMPILE_CODE($pool['url']);
-		$content['timestamp']   = MAKE_DATETIME($pool['timestamp'], "0");
+		$content['sender_link'] = generateUserProfileLink($pool['sender']);
+		$content['payment']     = getPaymentTitlePrice($pool['payment_id']);
+		$content['category']    = getCategory($pool['cat_id']);
+		$content['receivers']   = convertReceivers($pool['receivers']);
+		$content['type']        = translatePoolType($pool['data_type']);
+		$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
 	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'] = 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 == getMessage('_ALL'))) {
 		// Check only if bonus extension is active
-		if (SQL_NUMROWS($result_bonus) > 0) OUTPUT_HTML("<br /><br />");
-	}
+		if (SQL_NUMROWS($result_bonus) > 0) outputHtml('<br /><br />');
+	} // END - if
 }
 
-if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
+if ((isExtensionActive('bonus')) && ($WHO == getMessage('_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'];
@@ -193,38 +208,38 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
 			// Add link?
 			if ($bonus['unconfirmed'] > 0) {
 				// Add link to list_unconfirmed what-file
-				$bonus['unconfirmed'] = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</A></STRONG>";
+				$bonus['unconfirmed'] = "<strong><a href=\"{?URL?}/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";
 			} // END - if
 
 			// 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['frametester'] = FRAMETESTER($content['url']);
-			$content['timestamp']   = MAKE_DATETIME($content['timestamp'], "0");
+			$content['time']        = createFancyTime($content['time']);
+			$content['category']    = getCategory($content['cat_id']);
+			$content['receivers']   = convertReceivers($content['receivers']);
+			$content['type']        = translatePoolType($content['data_type']);
+			$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);
+		$content['nav'] = '';
+		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, ADMIN_NO_MAILS_IN_POOL);
+	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
 } // END - if
 
 //