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 f64f4d816db6fbcf02a00fe7cf4839d5a040a622..17eefbfadd88ccdf250846ed162c5a038c05be67 100644 (file)
--- a/inc/modules/loader.php
+++ b/inc/modules/loader.php
@@ -38,28 +38,28 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
-if (REQUEST_ISSET_GET(('url'))) {
+if (REQUEST_ISSET_GET('url')) {
        // Decode URL
-       $url = decodeString(str_replace(" ", "+", compileUriCode(urldecode(REQUEST_GET('url')))));
+       $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(REQUEST_GET('url')))));
 
        // Validate the URL
-       if (VALIDATE_URL($url)) {
+       if (isUrlValid($url)) {
                // Prepare data for the template
                define('__URL', $url);
 
                // Generate a JavaScript that redirects us
-               LOAD_TEMPLATE("loader");
+               LOAD_TEMPLATE('loader');
        } else {
                // URL invalid
-               LOAD_URL("index.php");
+               redirectToUrl('index.php');
        }
 } else {
        // Invalid or no URL entered!
-       LOAD_URL("index.php");
+       redirectToUrl('index.php');
 }
 
 //