mailer project continued:

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

diff --git a/inc/modules/loader.php b/inc/modules/loader.php
index f64f4d816db6fbcf02a00fe7cf4839d5a040a622..294abf4d8378cc648e75c5e468b277f433d4626d 100644 (file)
--- a/inc/modules/loader.php
+++ b/inc/modules/loader.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/29/2003 *
- * ===============                              Last change: 04/17/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/29/2003 *
+ * ===================                          Last change: 04/17/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : loader.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 - 2012 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 *
@@ -38,29 +37,26 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
-}
+       exit();
+} // END - if
 
-if (REQUEST_ISSET_GET(('url'))) {
+// Is an URL specified?
+if (isGetRequestElementSet('url')) {
        // Decode URL
-       $url = decodeString(str_replace(" ", "+", compileUriCode(urldecode(REQUEST_GET('url')))));
+       $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestElement('url')))));
 
        // Validate the URL
-       if (VALIDATE_URL($url)) {
-               // Prepare data for the template
-               define('__URL', $url);
-
+       if (isUrlValid($url)) {
                // Generate a JavaScript that redirects us
-               LOAD_TEMPLATE("loader");
+               loadTemplate('loader', false, $url);
        } else {
                // URL invalid
-               LOAD_URL("index.php");
+               redirectToUrl('modules.php?module=index');
        }
 } else {
        // Invalid or no URL entered!
-       LOAD_URL("index.php");
+       redirectToUrl('modules.php?module=index');
 }
 
-//
+// [EOF]
 ?>