A lot calls saved, expression language rewritten:

[mailer.git] / inc / libs / removeip_functions.php

diff --git a/inc/libs/removeip_functions.php b/inc/libs/removeip_functions.php
index 8e908dad35e10905448736d5a1d616e25da283bc..0ad68ef3e7baf317f30918f87182d6085caf284f 100644 (file)
--- a/inc/libs/removeip_functions.php
+++ b/inc/libs/removeip_functions.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              : removeip_functions.php                           *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * 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 *
@@ -39,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // "Getter" for anonymous remote IP number
 function getAnonymousRemoteAddress ($remoteAddr) {
@@ -104,7 +105,7 @@ function getAnonymousReferer ($referer) {
 // Adds informations about anonymity/privacy to the menu
 function addAnonymityLevel () {
        // "Base-privacy" is by default low (we add more later)
-       $anonymity = 0;
+       $anonymity = '0';
 
        // Is some data anonymized?
        if (getConfig('removeip_anon_ip')   == 'Y') $anonymity++;
@@ -118,34 +119,25 @@ function addAnonymityLevel () {
        // Set constant name suffix depending on that level
        $suffix = 'unsupported_' . $level;
        switch ($level) {
-               case 0:
+               case '0':
                        $suffix = 'none';
                        break;
 
-               case 1:
+               case '1':
                        $suffix = 'low';
                        break;
 
-               case 2:
+               case '2':
                        $suffix = 'medium';
                        break;
 
-               case 3: // High level
+               case '3': // High level
                        $suffix = 'high';
                        break;
        } // END - while
 
-       // Construct constant name
-       $constantName = sprintf("REMOVEIP_LEVEL_%s", strtoupper($suffix));
-
        // Default message
-       $message = sprintf(getMessage('REMOVEIP_UNKNOWN_LEVEL'), $suffix);
-
-       // Is that constant there?
-       if (isMessageIdValid($constantName)) {
-               // Use that string
-               $message = getMessage($constantName);
-       } // END - if
+       $message = sprintf("{--REMOVEIP_LEVEL_%s--}", strtoupper($suffix));
 
        // Output message in template
        return loadTemplate('removeip_level', true, $message);