X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=modules.php;h=85703b5e056b5332a9a043b5ca6c4f3a41b44d76;hb=05e9ddd952a47d42b9970a9d2afef20d77d3aecf;hp=a56acc311ba784f7c096935c48150511515c9016;hpb=5deec33be1baf2135eefc2bbb0d1b63c6cbd2f9a;p=mailer.git
diff --git a/modules.php b/modules.php
index a56acc311b..85703b5e05 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 *
@@ -34,47 +39,46 @@
// XDEBUG call
//xdebug_start_trace();
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require("inc/libs/security_functions.php");
+// Load security stuff here
+require('inc/libs/security_functions.php');
// Init "action" and "what"
$GLOBALS['startTime'] = microtime(true);
$GLOBALS['output_mode'] = 0;
-$GLOBALS['what'] = "";
-$GLOBALS['action'] = "";
-$GLOBALS['userid'] = 0;
-$GLOBALS['module'] = "";
+$GLOBALS['what'] = '';
+$GLOBALS['action'] = '';
+$GLOBALS['module'] = '';
// Needed include files
-require("inc/config.php");
+require('inc/config.php');
-// Fix missing module to "index"
-if (!REQUEST_ISSET_GET(('module'))) REQUEST_SET_GET('module', "index");
+// 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);
- $username = $s." ".$f;
+ $username = $s.' '.$f;
// 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();
+ destroyUserSession();
// Kill userid
- $GLOBALS['userid'] = 0;
+ setUserId(0);
}
// Free memory
@@ -88,11 +92,11 @@ 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";
-if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
+$MOD_VALID = false; $check = 'failed';
+if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && ($GLOBALS['module'] != 'admin')) {
// Maintain mode is active and you are no admin
addFatalMessage(__FILE__, __LINE__, getMessage('LANG_DOWN_MAINTAINCE'));
} elseif ((SQL_IS_LINK_UP()) && (getTotalFatalErrors() == 0)) {
@@ -103,27 +107,27 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
$check = checkModulePermissions($GLOBALS['module']);
switch ($check)
{
- case "admin_only":
- case "mem_only":
- case "done":
+ case 'admin_only':
+ 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']));
}
break;
- case "404":
+ case '404':
addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
break;
- case "locked":
- if (!FILE_READABLE(constant('__MODULE'))) {
+ case 'locked':
+ if (!isFileReadable(constant('__MODULE'))) {
// Module does addionally not exists
addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
} // END - if
@@ -148,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');
//
?>