Index: /trunk/mod_cacher/htdocs/xcache.css
===================================================================
--- /trunk/mod_cacher/htdocs/xcache.css (revision 1040)
+++ /trunk/mod_cacher/htdocs/xcache.css (revision 1041)
@@ -1,6 +1,7 @@
input, table { font-family: sans-serif; }
input { font-size: 12px; }
-table { border-collapse: collapse; font-size: 11px; margin: 0; margin-bottom: 10px; }
-table caption, h2 { font-size: 16px; font-weight: bold; text-align: left; padding-top: 20px; margin-bottom: 2px; }
+table { border-collapse: collapse; font-size: 11px; margin: 0; }
+table caption, h2, h3 { font-size: 16px; font-weight: bold; text-align: left; padding-top: 20px; margin-bottom: 2px; }
+h3 { font-size: 14px; padding-top: 2px; margin-bottom: 0px; }
td, th { white-space: pre; }
table.cycles { border: 1px solid black; margin-top: 5px; margin-bottom: 5px; }
@@ -11,10 +12,10 @@
th a { color: black; font-weight: bold; display: block; width: 100%; height: 100%; }
th { font-size: 12px; }
-.moduleinfo table { border: 1px solid black; }
-.moduleinfo table th, .moduleinfo table td { border: 1px solid black; }
-.moduleinfo table th { font-weight: bold; }
-.moduleinfo .e {background-color: #ccccff; font-weight: bold; color: #000000;}
-.moduleinfo .h {background-color: #9999cc; font-weight: bold; color: #000000;}
-.moduleinfo .v {background-color: #cccccc; color: #000000;}
+.phpinfo table { border: 1px solid black; margin-bottom: 1px; }
+.phpinfo table th, .phpinfo table td { border: 1px solid black; }
+.phpinfo table th { font-weight: bold; }
+.phpinfo .e {background-color: #ccccff; font-weight: bold; color: #000000;}
+.phpinfo .h {background-color: #9999cc; font-weight: bold; color: #000000;}
+.phpinfo .v {background-color: #cccccc; color: #000000;}
.button { }
span.sortarrow { color: white; text-decoration: none; }
Index: /trunk/mod_cacher/htdocs/xcache.php
===================================================================
--- /trunk/mod_cacher/htdocs/xcache.php (revision 1040)
+++ /trunk/mod_cacher/htdocs/xcache.php (revision 1041)
@@ -207,10 +207,23 @@
}
+$php_version = phpversion();
+$xcache_version = XCACHE_VERSION;
+$xcache_modules = XCACHE_MODULES;
+
if (!extension_loaded('XCache')) {
+ include("header.tpl.php");
echo 'XCache is not loaded
';
ob_start();
- phpinfo();
+ phpinfo(INFO_GENERAL);
$info = ob_get_clean();
- if (preg_match('!(.*\\.ini)!', $info, $m)) {
+ if (preg_match_all("! | [^<]*]*>[^<]*(?:Configuration|ini|Server API)[^<]*[^<]*]*>[^<]*[^<]*
!s", $info, $m)) {
+ echo '';
+ echo 'PHP Info';
+ echo '
';
+ echo implode('', $m[0]);
+ echo '
';
+ echo '
(.*?\\.ini)!', $info, $m)) {
echo "Please check $m[1]";
}
@@ -221,4 +234,6 @@
echo "You don't even have a php.ini yet?";
}
+ echo "(See above)";
+ include("footer.tpl.php");
exit;
}
@@ -369,6 +384,11 @@
phpinfo(INFO_MODULES);
$moduleinfo = ob_get_clean();
- if (preg_match_all('!XCache[^<]*(.*?)!is', $moduleinfo, $m)) {
- $moduleinfo = implode('', $m[1]);
+ if (preg_match_all('!(XCache[^<>]*)(.*?)!is', $moduleinfo, $m)) {
+ $moduleinfo = array();
+ foreach ($m[1] as $i => $dummy) {
+ $moduleinfo[] = '' . trim($m[1][$i]) . '';
+ $moduleinfo[] = str_replace('
', '', trim($m[2][$i]));
+ }
+ $moduleinfo = implode('', $moduleinfo);
}
else {
@@ -382,7 +402,4 @@
$type_var = XC_TYPE_VAR;
$types = array($type_none => _('Statistics'), $type_php => _('List PHP'), $type_var => _('List Var Data'));
-$php_version = phpversion();
-$xcache_version = XCACHE_VERSION;
-$xcache_modules = XCACHE_MODULES;
include("xcache.tpl.php");
Index: /trunk/mod_cacher/htdocs/xcache.tpl.php
===================================================================
--- /trunk/mod_cacher/htdocs/xcache.tpl.php (revision 1040)
+++ /trunk/mod_cacher/htdocs/xcache.tpl.php (revision 1041)
@@ -295,5 +295,5 @@
echo <<$t_moduleinfo
-$moduleinfo
+$moduleinfo
HTML;
}
|