diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2006-09-25 22:10:52 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2006-09-25 22:10:52 +0200 |
| commit | 100a97e3f1501dd634d1e398f564902dcaf2b3fb (patch) | |
| tree | 54973cba8a0500cb6366a32eb1a1bfc69dfb0ec5 /inc | |
| parent | c1b9dbaf11fd4b48e8c70aa0613cc81c82cc81cc (diff) | |
| download | rpg-100a97e3f1501dd634d1e398f564902dcaf2b3fb.tar.gz rpg-100a97e3f1501dd634d1e398f564902dcaf2b3fb.tar.bz2 | |
remove metadebug again, improve doÞbug instead
This adds the complete $INFO array (contains the metadata) to the usual
debug output and removes the metadebug parameter again.
darcs-hash:20060925201052-7ad00-c9a15b921466803b3f2bd50b0d72211cf68658c5.gz
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/html.php | 12 | ||||
| -rw-r--r-- | inc/infoutils.php | 19 |
2 files changed, 11 insertions, 20 deletions
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)); -} |