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

[mailer.git] / index.php

diff --git a/index.php b/index.php
index 11e2b2f5c6db3931e4358d543efdc24edde2b5de..80da5beba5f4784b0a8ee04a6c0b4e798fc9f813 100644 (file)
--- a/index.php
+++ b/index.php
@@ -56,7 +56,7 @@ require('inc/config.php');
 // Is the script installed?
 if (isInstalled()) {
        // Header
-       LOAD_INC('inc/header.php');
+       loadInclude('inc/header.php');
 
        // Fix missing array elements here
        if (!isConfigEntrySet('index_delay'))  setConfigEntry('index_delay' , 0);
@@ -67,32 +67,32 @@ if (isInstalled()) {
                // Is the index page configured for redirect pr not?
                if (getConfig('index_cookie') > 0) {
                        // Set cookie and remeber it for specified time
-                       set_session('visited', 'true');
+                       setSession('visited', 'true');
                } elseif (isSessionVariableSet('visited')) {
                        // Remove cookie when admin set 0 in setup
-                       set_session('visited', '');
+                       setSession('visited', '');
                }
 
                // Template laden
-               LOAD_TEMPLATE('index', false, ADD_URL_DATA(''));
+               LOAD_TEMPLATE('index', false, addUrlData(''));
 
                // Shall I insert an automated forward?
                if (getConfig('index_delay') > 0) {
                        // This will be a JavaScript-redirect!
                        define('__DELAY_VALUE', (getConfig('index_delay') * 1000 + 500));
-                       define('__MOD_VALUE'  , ADD_URL_DATA('index'));
+                       define('__MOD_VALUE'  , addUrlData('index'));
                        LOAD_TEMPLATE('index_forward');
                } // END - if
        } else {
                // Redirect to main page
-               LOAD_URL('modules.php?module=index');
+               redirectToUrl('modules.php?module=index');
        }
 
        // Footer
-       LOAD_INC('inc/footer.php');
+       loadInclude('inc/footer.php');
 } else {
        // You have to install first!
-       LOAD_URL('install.php');
+       redirectToUrl('install.php');
 }
 
 // All done here...