diff options
| -rw-r--r-- | doku.php | 9 | ||||
| -rw-r--r-- | inc/html.php | 12 | ||||
| -rw-r--r-- | inc/infoutils.php | 19 |
3 files changed, 14 insertions, 26 deletions
@@ -46,15 +46,15 @@ //set default #FIXME not needed here? done in actions? if(empty($ACT)) $ACT = 'show'; + //make infos about the selected page available + $INFO = pageinfo(); + // handle debugging if($conf['allowdebug'] && $ACT == 'debug'){ html_debug(); exit; } - //make infos about the selected page available - $INFO = pageinfo(); - //send 404 for missing pages if configured if($conf['send404'] && !$INFO['exists']){ header('HTTP/1.0 404 Not Found'); @@ -76,8 +76,5 @@ trigger_event('DOKUWIKI_DONE', $tmp=array()); - //handle metadebug request - debug_meta($ID); - // xdebug_dump_function_profile(1); ?> diff --git a/inc/html.php b/inc/html.php index 25478c280..793a0d08f 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1170,11 +1170,17 @@ function html_debug(){ global $conf; global $lang; global $auth; + global $INFO; + //remove sensitive data $cnf = $conf; $cnf['auth']='***'; $cnf['notify']='***'; $cnf['ftp']='***'; + $nfo = $INFO; + $nfo['userinfo'] = '***'; + $ses = $_SESSION; + $ses[$conf['title']]['auth'] = '***'; print '<html><body>'; @@ -1182,6 +1188,10 @@ function html_debug(){ print 'output as a mail to andi@splitbrain.org '; print 'The best way to do this is to save this page in your browser</p>'; + print '<b>$INFO:</b><pre>'; + print_r($nfo); + print '</pre>'; + print '<b>$_SERVER:</b><pre>'; print_r($_SERVER); print '</pre>'; @@ -1221,7 +1231,7 @@ function html_debug(){ } print '<b>$_SESSION:</b><pre>'; - print_r($_SESSION); + print_r($ses); print '</pre>'; print '<b>Environment:</b><pre>'; diff --git a/inc/infoutils.php b/inc/infoutils.php index ab8bc8deb..3c7ba96a5 100644 --- a/inc/infoutils.php +++ b/inc/infoutils.php @@ -247,22 +247,3 @@ function dbglog($msg){ } } -/** - * Prints the metadata of a given page - * - * Only prints when debugging is allowed and the metadebug request - * parameter is set - * - * The data is dumped after tpl_action and thus after the template's - * closing html tag. This makes the HTML invalid, but this is for - * debugging only anyway. - * - * @author Andreas Gohr <andi@splitbrain.org> - */ -function debug_meta($id){ - global $conf; - if(!$conf['allowdebug']) return; - if(!$_REQUEST['metadebug']) return; - - dbg(p_get_metadata($id)); -} |