Complete rewrite of and , wrapper functions added, see bug #101

[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 c6341ea4f1bef92d40e9ab0081f8256d73827147..65e1f69cdf1aaf554eb76db3091332bf0b00d5af 100644 (file)
--- a/inc/modules/admin/what-admins_contct.php
+++ b/inc/modules/admin/what-admins_contct.php
@@ -40,26 +40,26 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
-if ((isset($_POST['ok'])) && (!empty($_GET['admin']))) {
+if ((IS_FORM_SENT()) && (REQUEST_ISSET_GET(('admin')))) {
        // Send mail or message
-       if ((EXT_IS_ACTIVE("msg")) && ($_POST['type'] == "msg")) {
+       if ((EXT_IS_ACTIVE("msg")) && (REQUEST_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);
+               $msg = LOAD_EMAIL_TEMPLATE("admins_msg_contct_admin", REQUEST_POST('text'), "0");
+               SEND_ADMIN_MESSAGE(REQUEST_GET('admin'), ADMINS_MSG_FROM_ADMIN, $msg);
        } else {
                // Load admin's email address
-               $email = GET_ADMIN_EMAIL(bigintval($_GET['admin']));
+               $email = GET_ADMIN_EMAIL(bigintval(REQUEST_GET('admin')));
 
                // Load email template and send the mail to the admin
-               $msg = LOAD_EMAIL_TEMPLATE("admins_mail_contct_admin", $_POST['text'], "0");
+               $msg = LOAD_EMAIL_TEMPLATE("admins_mail_contct_admin", REQUEST_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 (REQUEST_ISSET_GET(('admin'))) {
        // Load contact form template
-       define('__ADMIN', $_GET['admin']);
+       define('__ADMIN', REQUEST_GET('admin'));
        if (EXT_IS_ACTIVE("msg")) {
                // Add option to select between mail and message
                define('ADMINS_MESSAGING_SELECTION', LOAD_TEMPLATE("admin_admins_contct_select", true));