Fix in CREATE_EXTENSION_DEACTIVATION_TASK() and coding-style updated

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

diff --git a/inc/modules/admin/what-admins_contct.php b/inc/modules/admin/what-admins_contct.php
index 31d92eaf701373a37bdab08dde42ff3dced41f1b..c6341ea4f1bef92d40e9ab0081f8256d73827147 100644 (file)
--- a/inc/modules/admin/what-admins_contct.php
+++ b/inc/modules/admin/what-admins_contct.php
@@ -32,58 +32,46 @@
  ************************************************************************/
 
 // 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__);
 
-if ((isset($_POST['ok'])) && (!empty($_GET['admin'])))
-{
+if ((isset($_POST['ok'])) && (!empty($_GET['admin']))) {
        // Send mail or message
-       if ((EXT_IS_ACTIVE("msg")) && ($_POST['type'] == "msg"))
-       {
+       if ((EXT_IS_ACTIVE("msg")) && ($_POST['type'] == "msg")) {
                // Add message
                $msg = LOAD_EMAIL_TEMPLATE("admins_msg_contct_admin", $_POST['text'], "0");
                SEND_ADMIN_MESSAGE($_GET['admin'], ADMINS_MSG_FROM_ADMIN, $msg);
-       }
-        else
-       {
+       } else {
                // Load admin's email address
-               $result = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
-                array(bigintval($_GET['admin'])), __FILE__, __LINE__);
-               list($email) = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
+               $email = GET_ADMIN_EMAIL(bigintval($_GET['admin']));
 
                // Load email template and send the mail to the admin
                $msg = LOAD_EMAIL_TEMPLATE("admins_mail_contct_admin", $_POST['text'], "0");
                SEND_EMAIL($email, ADMINS_MSG_FROM_ADMIN, $msg);
        }
+
        // Mail / message dropped
        LOAD_TEMPLATE("admin_settings_saved", false, ADMINS_ADMIN_CONTACTED);
-}
- elseif (!empty($_GET['admin']))
-{
+} elseif (!empty($_GET['admin'])) {
        // Load contact form template
        define('__ADMIN', $_GET['admin']);
-       if (EXT_IS_ACTIVE("msg"))
-       {
+       if (EXT_IS_ACTIVE("msg")) {
                // Add option to select between mail and message
                define('ADMINS_MESSAGING_SELECTION', LOAD_TEMPLATE("admin_admins_contct_select", true));
-       }
-        else
-       {
+       } else {
                // Outout hidden input
                define('ADMINS_MESSAGING_SELECTION', LOAD_TEMPLATE("admin_admins_contct_default", true));
        }
        LOAD_TEMPLATE("admin_admins_contct_form");
-}
- else
-{
+} else {
        // Please select an admin!
        LOAD_TEMPLATE("admin_settings_saved", false, ADMINS_SELECT_ADMIN);
 }
+
 //
 ?>