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

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index f079d6e11a47819e032cad62f379c14bbffc82a9..47fa7a3c0ad58eec9388f935812e2bbb68f33985 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -75,7 +75,7 @@ if (IS_MEMBER()) {
                $username = '<em>{--_UNKNOWN--}</em>';
 
                // Destroy session
-               destroy_user_session();
+               destroyUserSession();
 
                // Kill userid
                setUserId(0);
@@ -92,7 +92,7 @@ if (IS_MEMBER()) {
 }
 
 // The header file
-LOAD_INC_ONCE('inc/header.php');
+loadIncludeOnce('inc/header.php');
 
 // Modules are by default not valid!
 $MOD_VALID = false; $check = 'failed';
@@ -111,12 +111,12 @@ if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && ($GLOBALS['module'] !=
        case 'mem_only':
        case 'done':
                // Does the module exists on local file system?
-               if ((FILE_READABLE(constant('__MODULE'))) && (getTotalFatalErrors() == 0)) {
+               if ((isFileReadable(constant('__MODULE'))) && (getTotalFatalErrors() == 0)) {
                        // Module is valid, active and located on the local disc...
                        $MOD_VALID = true;
                } elseif (!empty($URL)) {
                        // An URL was specified so we load the de-referrer module
-                       LOAD_URL(DEREFERER($URL));
+                       redirectToUrl(DEREFERER($URL));
                } elseif (getTotalFatalErrors() == 0) {
                        addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
                }
@@ -127,7 +127,7 @@ if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && ($GLOBALS['module'] !=
                break;
 
        case 'locked':
-               if (!FILE_READABLE(constant('__MODULE'))) {
+               if (!isFileReadable(constant('__MODULE'))) {
                        // Module does addionally not exists
                        addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
                } // END - if
@@ -152,11 +152,11 @@ if (($MOD_VALID) && (defined('__MODULE'))) {
        /////////////////////////////////////////////
        //
        // Everything is okay so we can load the module
-       LOAD_INC_ONCE(constant('__MODULE'));
+       loadIncludeOnce(constant('__MODULE'));
 } // END - if
 
 // Next-to-end add the footer
-LOAD_INC_ONCE('inc/footer.php');
+loadIncludeOnce('inc/footer.php');
 
 //
 ?>