Several rewrites/renames, fixes for installation. Resolves #104

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 323b0d91894ab940d0c05ef4c5f82146d637205b..a56acc311ba784f7c096935c48150511515c9016 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -64,11 +64,11 @@ if (IS_MEMBER()) {
                // Additionally admin?
                if (IS_ADMIN()) {
                        // Add it
-                       $username .= " ({!_ADMIN_SHORT!})";
+                       $username .= " ({--_ADMIN_SHORT--})";
                } // END - if
        } else {
                // Hmmm, logged in and no valid userid?
-               $username = "<em>{!_UNKNOWN!}</em>";
+               $username = "<em>{--_UNKNOWN--}</em>";
 
                // Destroy session
                destroy_user_session();
@@ -100,7 +100,7 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
        define('__MODULE', sprintf("inc/modules/%s.php", SQL_ESCAPE($GLOBALS['module'])));
 
        // Did we found the module listed in allowed modules and are we successfully connected?
-       $check = CHECK_MODULE($GLOBALS['module']);
+       $check = checkModulePermissions($GLOBALS['module']);
        switch ($check)
        {
        case "admin_only":