aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_php_info.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-12-06 15:47:50 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-12-06 15:47:50 +0000
commitdaeef71d813b68524e0630e2aadbf0870bb06800 (patch)
treea2412ef750f51184f94e5e3c2cedf2cfcad732ba /phpBB/includes/acp/acp_php_info.php
parentcb505ce4b08d3ec1de1184474a673886dfdb212b (diff)
downloadforums-daeef71d813b68524e0630e2aadbf0870bb06800.tar
forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.gz
forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.bz2
forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.xz
forums-daeef71d813b68524e0630e2aadbf0870bb06800.zip
some updater changes as well as tiny bugfixes
git-svn-id: file:///svn/phpbb/trunk@6714 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_php_info.php')
-rw-r--r--phpBB/includes/acp/acp_php_info.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_php_info.php b/phpBB/includes/acp/acp_php_info.php
index fe223b623e..3816285953 100644
--- a/phpBB/includes/acp/acp_php_info.php
+++ b/phpBB/includes/acp/acp_php_info.php
@@ -29,15 +29,22 @@ class acp_php_info
$this->page_title = 'ACP_PHP_INFO';
ob_start();
- phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES);
+ @phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES);
$phpinfo = ob_get_contents();
ob_end_clean();
+ $phpinfo = trim($phpinfo);
+
// Here we play around a little with the PHP Info HTML to try and stylise
// it along phpBB's lines ... hopefully without breaking anything. The idea
// for this was nabbed from the PHP annotated manual
preg_match_all('#<body[^>]*>(.*)</body>#si', $phpinfo, $output);
+ if (empty($phpinfo) || empty($output))
+ {
+ trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING);
+ }
+
$output = $output[1][0];
$output = preg_replace('#<tr class="v"><td>(.*?<a[^>]*><img[^>]*></a>)(.*?)</td></tr>#s', '<tr class="row1"><td><table class="type2"><tr><td>\2</td><td>\1</td></tr></table></td></tr>', $output);
$output = preg_replace('#<table[^>]+>#i', '<table>', $output);