Extension 'yoomedia' now alpha status, some rewrites

[mailer.git] / inc / modules / admin / what-email_archiv.php

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 7ec5a8febddb028e9e170f6015429ca83d20cd6d..2eb11fb039d2312dfd82a3ae1daf3d282481d86d 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -35,13 +35,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // 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
@@ -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],
                );