X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_proxy.php;h=8061e4ccb0249218d7b686fa22203527e18af366;hb=64ad7e20acdc9b16363e25cecc3e7f2a0f435a37;hp=619b30f55b0fd77d8bdbc851ebe456780c60519a;hpb=676c458f9f3e30063482733ab42f4e9fb06d0a2b;p=mailer.git

diff --git a/inc/modules/admin/what-config_proxy.php b/inc/modules/admin/what-config_proxy.php
index 619b30f55b..8061e4ccb0 100644
--- a/inc/modules/admin/what-config_proxy.php
+++ b/inc/modules/admin/what-config_proxy.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/27/2008 *
- * ================                             Last change: 08/27/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 08/27/2008 *
+ * ===================                          Last change: 08/27/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-config_proxy.php                            *
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,34 +36,25 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (isFormSent()) {
 	// Test proxy settings
-	if (ADMIN_TEST_PROXY_SETTINGS(REQUEST_POST_ARRAY())) {
+	if (adminTestProxySettings(postRequestArray())) {
 		// Save configuration
-		ADMIN_SAVE_SETTINGS_POST();
+		adminSaveSettingsFromPostData();
 	} else {
 		// Invalid!
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_PROXY_SETTINGS_INVALID'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_PROXY_SETTINGS_INVALID--}');
 	}
 } else {
-	// Prepare content
-	$content = array(
-		'proxy_host'     => getConfig('proxy_host'),
-		'proxy_port'     => getConfig('proxy_port'),
-		'proxy_username' => getConfig('proxy_username'),
-		'proxy_password' => getConfig('proxy_password'),
-	);
-
 	// Load template
-	LOAD_TEMPLATE('admin_config_proxy', false, $content);
+	loadTemplate('admin_config_proxy');
 }
 
 // [EOF]