projects
/
mailer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for extension problems while installing/removing (still double-registration...
[mailer.git]
/
debug.php
diff --git
a/debug.php
b/debug.php
index 59a1c0e0aa9db02351679a0529318ce5c9a64a2a..8dfc9d42c3907b98c78bb9face4d506a3abc46ea 100644
(file)
--- a/
debug.php
+++ b/
debug.php
@@
-36,24
+36,20
@@
* MA 02110-1301 USA *
************************************************************************/
* MA 02110-1301 USA *
************************************************************************/
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require("inc/libs/security_functions.php");
-
-// Init "action" and "what"
-$GLOBALS['what'] = "";
-$GLOBALS['action'] = "";
+// Load security stuff here
+require('inc/libs/security_functions.php');
// Set module and fake "CSS mode"
// Set module and fake "CSS mode"
-$GLOBALS['module'] =
"debug"
;
+$GLOBALS['module'] =
'debug'
;
$GLOBALS['output_mode'] = -1;
// Load the required file(s)
$GLOBALS['output_mode'] = -1;
// Load the required file(s)
-require(
"inc/config.php"
);
+require(
'inc/config-global.php'
);
// Redirect only to registration page when this script is installed
if ((isInstalled()) && (getTotalFatalErrors() == 0)) {
// Is the extension installed?
// Redirect only to registration page when this script is installed
if ((isInstalled()) && (getTotalFatalErrors() == 0)) {
// Is the extension installed?
- if (!EXT_IS_ACTIVE(
"debug"
)) {
+ if (!EXT_IS_ACTIVE(
'debug'
)) {
// Then abort here
shutdown();
} // END - if
// Then abort here
shutdown();
} // END - if
@@
-64,29
+60,29
@@
if ((isInstalled()) && (getTotalFatalErrors() == 0)) {
if (DEBUG_HANDLE_REQUEST(REQUEST_POST('request'))) {
// Construct FQFN for the module
$INC = sprintf("inc/debug/%s/request_%s",
if (DEBUG_HANDLE_REQUEST(REQUEST_POST('request'))) {
// Construct FQFN for the module
$INC = sprintf("inc/debug/%s/request_%s",
-
getConfig('debug_mode'),
-
SQL_ESCAPE(REQUEST_POST('request'))
+ getConfig('debug_mode'),
+ SQL_ESCAPE(REQUEST_POST('request'))
);
// Is the module there? Else we log it!
);
// Is the module there? Else we log it!
- if (
INCLUDE_READABLE
($INC)) {
+ if (
isIncludeReadable
($INC)) {
// Load the request module
// Load the request module
-
LOAD_INC
($INC);
+
loadInclude
($INC);
} else {
// Missing request file, may happen while development
} else {
// Missing request file, may happen while development
- DEBUG_ABUSE_LOG(__FILE__, __LINE__,
"request_404"
, REQUEST_POST('request'));
+ DEBUG_ABUSE_LOG(__FILE__, __LINE__,
'request_404'
, REQUEST_POST('request'));
}
} else {
// Unhandled request detected
}
} else {
// Unhandled request detected
- DEBUG_ABUSE_LOG(__FILE__, __LINE__,
"request_unhandled"
, REQUEST_POST('request'));
+ DEBUG_ABUSE_LOG(__FILE__, __LINE__,
'request_unhandled'
, REQUEST_POST('request'));
}
} else {
// Empty request
}
} else {
// Empty request
- DEBUG_ABUSE_LOG(__FILE__, __LINE__,
"request_empty", ""
);
+ DEBUG_ABUSE_LOG(__FILE__, __LINE__,
'request_empty', ''
);
}
} else {
// Not installed or fatal errors
}
} else {
// Not installed or fatal errors
- DEBUG_ABUSE_LOG(__FILE__, __LINE__,
"request_fatal"
, getTotalFatalErrors());
+ DEBUG_ABUSE_LOG(__FILE__, __LINE__,
'request_fatal'
, getTotalFatalErrors());
} // END - if
// Really all done here... ;-)
} // END - if
// Really all done here... ;-)