More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/modules/loader.php b/inc/modules/loader.php
index 96e1bc8a3ae42ef25b01957d47026bad6b1f432a..17eefbfadd88ccdf250846ed162c5a038c05be67 100644 (file)
--- a/inc/modules/loader.php
+++ b/inc/modules/loader.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Referrer neu setzen                              *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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                  *
@@ -32,33 +37,30 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+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 (isUrlValid($url)) {
                // Prepare data for the template
                define('__URL', $url);
 
                // Generate a JavaScript that redirects us
-               LOAD_TEMPLATE("loader");
-       }
-        else
-       {
+               LOAD_TEMPLATE('loader');
+       } else {
                // URL invalid
-               LOAD_URL("index.php");
+               redirectToUrl('index.php');
        }
-}
- else
-{
+} else {
        // Invalid or no URL entered!
-       LOAD_URL("index.php");
+       redirectToUrl('index.php');
 }
+
 //
 ?>