More constant rewrites

[mailer.git] / inc / modules / loader.php

diff --git a/inc/modules/loader.php b/inc/modules/loader.php
index 96e1bc8a3ae42ef25b01957d47026bad6b1f432a..6d5b5a37d203f859e5ac556ec0870dc2cd4c9e19 100644 (file)
--- a/inc/modules/loader.php
+++ b/inc/modules/loader.php
@@ -32,33 +32,30 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
-if (!empty($_GET['url']))
-{
-       $url = base64_decode(urldecode(COMPILE_CODE($_GET['url'])));
-       if (VALIDATE_URL($url))
-       {
+if (REQUEST_ISSET_GET(('url'))) {
+       // Decode URL
+       $url = decodeString(str_replace(" ", "+", compileUriCode(urldecode(REQUEST_GET('url')))));
+
+       // Validate the URL
+       if (VALIDATE_URL($url)) {
                // Prepare data for the template
                define('__URL', $url);
 
                // Generate a JavaScript that redirects us
                LOAD_TEMPLATE("loader");
-       }
-        else
-       {
+       } else {
                // URL invalid
                LOAD_URL("index.php");
        }
-}
- else
-{
+} else {
        // Invalid or no URL entered!
        LOAD_URL("index.php");
 }
+
 //
 ?>