More queries now depends on UNIX_TIMESTAMP() SQL function, wrong index in autopurge...

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

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index ff86a369e1928aa44075ee31ff2565c734171537..29218423723ccbc1aad027b001f5d41a3bd0aaf6 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -32,19 +32,15 @@
  ************************************************************************/
 
 // 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__));
 
-OPEN_TABLE("100%", "admin_content admin_content_align", "");
-global $link;
-
-if ((isset($_POST['ok'])) && (empty($_POST['id'])))
-{
+if ((isset($_POST['ok'])) && (empty($_POST['id']))) {
        unset($_POST['ok']);
 }
 
@@ -82,7 +78,7 @@ WHERE id=%s LIMIT 1",
        addslashes($_POST['url']),
        bigintval($_POST['id']),
 ), __FILE__, __LINE__);
-                       if (SQL_AFFECTEDROWS($link, __FILE__, __LINE__) == 1)
+                       if (SQL_AFFECTEDROWS() == 1)
                        {
                                $content = "<SPAN class=\"admin_done\">".SETTINGS_SAVED."</SPAN>";
                        }
@@ -127,12 +123,10 @@ WHERE id=%s LIMIT 1",
                // Load email template
                LOAD_TEMPLATE("admin_edit_email_select");
        }
-}
- else
-{
+} else {
        // No mail orders left in pool
        OUTPUT_HTML("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
 }
-CLOSE_TABLE();
+
 //
 ?>