X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_removeip.php;h=8b69aff5cfff7650f60a05d19aeebdc07f63bbd9;hp=45346f8facb439dda8ff79b7600d2c4323118e28;hb=e3934352dffa6eb9da59a137ae1a9414e5b4d80b;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594

diff --git a/inc/modules/admin/what-config_removeip.php b/inc/modules/admin/what-config_removeip.php
index 45346f8fac..8b69aff5cf 100644
--- a/inc/modules/admin/what-config_removeip.php
+++ b/inc/modules/admin/what-config_removeip.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/01/2008 *
- * ================                             Last change: 10/01/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 10/01/2008 *
+ * ===================                          Last change: 10/01/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-config_removeip.php                         *
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -37,137 +36,30 @@
  ************************************************************************/
 
 // 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 (IS_FORM_SENT()) {
+if (isFormSent()) {
 	// Save configuration
-	ADMIN_SAVE_SETTINGS_POST();
+	adminSaveSettingsFromPostData();
 } else {
-	// Prepare data
-	switch (getConfig('removeip_anon_ip')) {
-		case "Y":
-			define('__CFG_REMOVEIP_ANON_IP_Y', " checked=\"checked\"");
-			define('__CFG_REMOVEIP_ANON_IP_N', "");
-			break;
-
-		case "N":
-			define('__CFG_REMOVEIP_ANON_IP_Y', "");
-			define('__CFG_REMOVEIP_ANON_IP_N', " checked=\"checked\"");
-			break;
-	} // END - switch
-
-	switch (getConfig('removeip_anon_host')) {
-		case "Y":
-			define('__CFG_REMOVEIP_ANON_HOST_Y', " checked=\"checked\"");
-			define('__CFG_REMOVEIP_ANON_HOST_N', "");
-			break;
-
-		case "N":
-			define('__CFG_REMOVEIP_ANON_HOST_Y', "");
-			define('__CFG_REMOVEIP_ANON_HOST_N', " checked=\"checked\"");
-			break;
-	} // END - switch
-
-	switch (getConfig('removeip_anon_ua')) {
-		case "Y":
-			define('__CFG_REMOVEIP_ANON_UA_Y', " checked=\"checked\"");
-			define('__CFG_REMOVEIP_ANON_UA_N', "");
-			break;
-
-		case "N":
-			define('__CFG_REMOVEIP_ANON_UA_Y', "");
-			define('__CFG_REMOVEIP_ANON_UA_N', " checked=\"checked\"");
-			break;
-	} // END - switch
-
-	switch (getConfig('removeip_anon_ref')) {
-		case "Y":
-			define('__CFG_REMOVEIP_ANON_REF_Y', " checked=\"checked\"");
-			define('__CFG_REMOVEIP_ANON_REF_N', "");
-			break;
-
-		case "N":
-			define('__CFG_REMOVEIP_ANON_REF_Y', "");
-			define('__CFG_REMOVEIP_ANON_REF_N', " checked=\"checked\"");
-			break;
-	} // END - switch
-
-	switch (getConfig('removeip_admin_show')) {
-		case "Y":
-			define('__CFG_REMOVEIP_ADMIN_SHOW_Y', " checked=\"checked\"");
-			define('__CFG_REMOVEIP_ADMIN_SHOW_N', "");
-			break;
-
-		case "N":
-			define('__CFG_REMOVEIP_ADMIN_SHOW_Y', "");
-			define('__CFG_REMOVEIP_ADMIN_SHOW_N', " checked=\"checked\"");
-			break;
-	} // END - switch
+	// Prepare more entries
+	foreach (array('anonymous_ip_local','anonymous_ip_zero','anonymous_ip_random') as $entry) {
+		$content[$entry] =  '';
+	} // END - foreach
 
-	switch (getConfig('removeip_guest_show')) {
-		case "Y":
-			define('__CFG_REMOVEIP_GUEST_SHOW_Y', " checked=\"checked\"");
-			define('__CFG_REMOVEIP_GUEST_SHOW_N', "");
-			break;
-
-		case "N":
-			define('__CFG_REMOVEIP_GUEST_SHOW_Y', "");
-			define('__CFG_REMOVEIP_GUEST_SHOW_N', " checked=\"checked\"");
-			break;
-	} // END - switch
-
-	switch (getConfig('removeip_member_show')) {
-		case "Y":
-			define('__CFG_REMOVEIP_MEMBER_SHOW_Y', " checked=\"checked\"");
-			define('__CFG_REMOVEIP_MEMBER_SHOW_N', "");
-			break;
-
-		case "N":
-			define('__CFG_REMOVEIP_MEMBER_SHOW_Y', "");
-			define('__CFG_REMOVEIP_MEMBER_SHOW_N', " checked=\"checked\"");
-			break;
-	} // END - switch
-
-	switch (getConfig('removeip_sponsor_show')) {
-		case "Y":
-			define('__CFG_REMOVEIP_SPONSOR_SHOW_Y', " checked=\"checked\"");
-			define('__CFG_REMOVEIP_SPONSOR_SHOW_N', "");
-			break;
-
-		case "N":
-			define('__CFG_REMOVEIP_SPONSOR_SHOW_Y', "");
-			define('__CFG_REMOVEIP_SPONSOR_SHOW_N', " checked=\"checked\"");
-			break;
-	} // END - switch
-
-	switch (getConfig('anonymous_ip')) {
-		case "127.0.0.1":
-			define('__CFG_ANONYMOUS_IP_LOCAL' , " selected=\"selected\"");
-			define('__CFG_ANONYMOUS_IP_ZERO'  , "");
-			define('__CFG_ANONYMOUS_IP_RANDOM', "");
-			break;
-
-		case "0.0.0.0":
-			define('__CFG_ANONYMOUS_IP_LOCAL' , "");
-			define('__CFG_ANONYMOUS_IP_ZERO'  , " selected=\"selected\"");
-			define('__CFG_ANONYMOUS_IP_RANDOM', "");
-			break;
-
-		case "RANDOM":
-			define('__CFG_ANONYMOUS_IP_LOCAL' , "");
-			define('__CFG_ANONYMOUS_IP_ZERO'  , "");
-			define('__CFG_ANONYMOUS_IP_RANDOM', " selected=\"selected\"");
-			break;
-	} // END - switch
+	// Set default selections
+	foreach (array('anonymous_ip') as $entry) {
+		$content[$entry . '_' . strtolower(getConfig($entry))] = ' selected="selected"';
+	} // END - foreach
 
 	// Load template
-	LOAD_TEMPLATE("admin_config_removeip");
+	loadTemplate('admin_config_removeip', false, $content);
 }
-//
+
+// [EOF]
 ?>