Checking for 'cache' in it's own filters is obsolete->removed

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 323b0d91894ab940d0c05ef4c5f82146d637205b..a5f7420f61710ef98ad14bcc6d3a421a4e7fce04 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Hauptladedatei. Laedt alle benoetigten Dateien   *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -64,11 +69,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 +105,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":