X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=modules.php;h=ae7948fe925fecc02de1fd34cbee5d45cf6cb9ab;hb=8909b514419a080128b6f38b01857c21e4dc49a4;hp=0b111174af4508e3aaa7040b9fd4e310e3154a5e;hpb=5ae157f2010b3aae3c6f2ecdc6ec7c30b305be4a;p=mailer.git
diff --git a/modules.php b/modules.php
index 0b111174af..ae7948fe92 100644
--- a/modules.php
+++ b/modules.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Hauptladedatei. Laedt alle benoetigten Dateien *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * 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 *
@@ -38,30 +43,23 @@
require("inc/libs/security_functions.php");
// Init "action" and "what"
-global $what, $action, $startTime;
$GLOBALS['startTime'] = microtime(true);
$GLOBALS['output_mode'] = 0;
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-$GLOBALS['userid'] = 0;
-
-// Fix missing module to "index"
-if (empty($_GET['module'])) $_GET['module'] = "index";
-
-// Secure action/what if present
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
-
-// Secure the module name (very important line!)
-$GLOBALS['module'] = secureString($_GET['module']);
+$GLOBALS['what'] = "";
+$GLOBALS['action'] = "";
+$GLOBALS['module'] = "";
// Needed include files
require("inc/config.php");
+// Fix missing module to "index"
+if (!REQUEST_ISSET_GET(('module'))) REQUEST_SET_GET('module', "index");
+
// Check if logged in
if (IS_MEMBER()) {
// Is still logged in so we welcome him with his name
$result = SQL_QUERY_ESC("SELECT surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+ array(getUserId()), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load surname and family's name and build the username
list($s, $f) = SQL_FETCHROW($result);
@@ -70,17 +68,17 @@ 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 = "{!_UNKNOWN!}";
+ $username = "{--_UNKNOWN--}";
// Destroy session
destroy_user_session();
// Kill userid
- $GLOBALS['userid'] = 0;
+ setUserId(0);
}
// Free memory
@@ -100,13 +98,13 @@ LOAD_INC_ONCE("inc/header.php");
$MOD_VALID = false; $check = "failed";
if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
// Maintain mode is active and you are no admin
- addFatalMessage(getMessage('LANG_DOWN_MAINTAINCE'));
+ addFatalMessage(__FILE__, __LINE__, getMessage('LANG_DOWN_MAINTAINCE'));
} elseif ((SQL_IS_LINK_UP()) && (getTotalFatalErrors() == 0)) {
// Construct module name
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":
@@ -120,32 +118,32 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
// An URL was specified so we load the de-referrer module
LOAD_URL(DEREFERER($URL));
} elseif (getTotalFatalErrors() == 0) {
- addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
+ addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
}
break;
case "404":
- addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
+ addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
break;
case "locked":
if (!FILE_READABLE(constant('__MODULE'))) {
// Module does addionally not exists
- addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
+ addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
} // END - if
// Add fatal message
- addFatalMessage(sprintf(getMessage('LANG_MOD_REG_LOCKED'), $GLOBALS['module']));
+ addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_LOCKED'), $GLOBALS['module']));
break;
default:
DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, $GLOBALS['module']));
- addFatalMessage(sprintf(getMessage('LANG_MOD_REG_UNKNOWN'), $check));
+ addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_UNKNOWN'), $check));
break;
}
} elseif (getTotalFatalErrors() == 0) {
// MySQL problems!
- addFatalMessage(getMessage('MYSQL_ERRORS'));
+ addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
}
if (($MOD_VALID) && (defined('__MODULE'))) {