X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-email_archiv.php;h=1095da6e6570f595c87c17576f2c1f60f8f64ce4;hb=b8c86fa12322603c24a88ea2b0fd3dbeba612752;hp=449109d57437bceb09312456492e904c6b1abc45;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5;p=mailer.git

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 449109d574..1095da6e65 100644
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -41,11 +41,11 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 //             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='SEND' OR data_type='DELETED'
  ORDER BY timestamp DESC";
 
@@ -53,17 +53,17 @@ $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, time
 $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'] = $_CONFIG['mails_page'];
+if (!REQUEST_ISSET_GET(('page')))   REQUEST_GET('page')   = "1";
+if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', getConfig('mails_page'));
 
 // Add limitation to SQL string
-$SQL .= " LIMIT ".($_GET['offset'] * $_GET['page'] - $_GET['offset']).", ".$_GET['offset'];
+$SQL .= " LIMIT ".(REQUEST_GET('offset') * REQUEST_GET('page') - REQUEST_GET('offset')).", ".REQUEST_GET('offset');
 
 // Run SQL query for normal mails
 $result = SQL_QUERY($SQL, __FILE__, __LINE__);
 
 // Calculate pages
-$PAGES = round(SQL_NUMROWS($result_normal) / $_CONFIG['mails_page'] + 0.5);
+$PAGES = round(SQL_NUMROWS($result_normal) / getConfig('mails_page') + 0.5);
 SQL_FREERESULT($result_normal);
 
 if (SQL_NUMROWS($result) > 0)
@@ -73,8 +73,8 @@ if (SQL_NUMROWS($result) > 0)
 	// Add navigation table rows
 	if ($PAGES > 1)
 	{
-		define('__TOP_EMAIL_NAV'   , ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], true , "3", true));
-		define('__BOTTOM_EMAIL_NAV', ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true));
+		define('__TOP_EMAIL_NAV'   , ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), true , "3", true));
+		define('__BOTTOM_EMAIL_NAV', ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, "3", true));
 	}
 	 else
 	{
@@ -86,7 +86,7 @@ if (SQL_NUMROWS($result) > 0)
 	while ($pool = SQL_FETCHROW($result))
 	{
 		// Check sent mails and clicks
-		$result_mails = SQL_QUERY_ESC("SELECT max_rec, clicks FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s LIMIT 1",
+		$result_mails = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
 		 array(bigintval($pool[0])), __FILE__, __LINE__);
 		list($sent, $clicks) = SQL_FETCHROW($result_mails);
 		SQL_FREERESULT($result_mails);
@@ -96,7 +96,7 @@ if (SQL_NUMROWS($result) > 0)
 		if ($unconfirmed > 0)
 		{
 			// Add link to list_unconfirmed what-file
-			$unconfirmed = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool[0]."\">".$unconfirmed."</A></STRONG>";
+			$unconfirmed = "<strong><a href=\"{!URL!}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool[0]."\">".$unconfirmed."</a></strong>";
 		}
 
 		// Prepare data for the row template
@@ -110,9 +110,10 @@ if (SQL_NUMROWS($result) > 0)
 			'sent'        => $sent,
 			'ruids'       => str_replace(";", ", ", $pool[4]),
 			'unconfirmed' => $unconfirmed,
-			'type'        => GET_POOL_TYPE($pool[6]),
+			'type'        => TRANSLATE_POOL_TYPE($pool[6]),
 			'tsend'       => $pool[9],
-			'url'         => FRAMETESTER($pool[8]),
+			'frametester' => FRAMETESTER($pool[8]),
+			'url'         => COMPILE_CODE($pool[8]),
 			'stamp'       => MAKE_DATETIME($pool[7], "0"),
 			'mid'         => $pool[0],
 		);
@@ -128,11 +129,9 @@ if (SQL_NUMROWS($result) > 0)
 
 	// Load main template
 	LOAD_TEMPLATE("admin_email_archiv");
-}
- else
-{
+} else {
 	// No mail orders fond
-	OUTPUT_HTML("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
 }
 //
 ?>