New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/modules/loader.php b/inc/modules/loader.php
index 1c63c0aabb1d47e84b217660ef8c1e7f84cdcf87..7a1f7cc08634fb320914f6bb7c7f7b3c83aa7540 100644 (file)
--- a/inc/modules/loader.php
+++ b/inc/modules/loader.php
@@ -44,22 +44,22 @@ if (!defined('__SECURITY')) {
 
 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');
 }
 
 //