Fixes for stripped HTML tags, and false warnings in debug log

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

diff --git a/inc/modules/admin/what-config_proxy.php b/inc/modules/admin/what-config_proxy.php
index 75cd3f38e8bb8bebe9f54a21166cbc425193a2aa..b01ace10700f9156ceac6f66d37c9967702664ea 100644 (file)
--- a/inc/modules/admin/what-config_proxy.php
+++ b/inc/modules/admin/what-config_proxy.php
@@ -8,7 +8,7 @@
  * -------------------------------------------------------------------- *
  * Short description : Proxy settings                                   *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Proxy-Einstellungenent                           *
+ * Kurzbeschreibung  : Proxy-Einstellungen                              *
  * -------------------------------------------------------------------- *
  *                                                                      *
  * -------------------------------------------------------------------- *
@@ -32,30 +32,30 @@
  ************************************************************************/
 
 // 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'])) {
+if (IS_FORM_SENT()) {
        // Test proxy settings
-       if (ADMIN_TEST_PROXY_SETTINGS($_POST)) {
+       if (ADMIN_TEST_PROXY_SETTINGS(REQUEST_POST_ARRAY())) {
                // Save configuration
-               ADMIN_SAVE_SETTINGS($_POST);
+               ADMIN_SAVE_SETTINGS_POST();
        } else {
                // Invalid!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_PROXY_SETTINGS_INVALID);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_PROXY_SETTINGS_INVALID'));
        }
 } else {
        // Prepare content
        $content = array(
-               'proxy_host'     => $_CONFIG['proxy_host'],
-               'proxy_port'     => $_CONFIG['proxy_port'],
-               'proxy_username' => $_CONFIG['proxy_username'],
-               'proxy_password' => $_CONFIG['proxy_password'],
+               'proxy_host'     => getConfig('proxy_host'),
+               'proxy_port'     => getConfig('proxy_port'),
+               'proxy_username' => getConfig('proxy_username'),
+               'proxy_password' => getConfig('proxy_password'),
        );
 
        // Load template