Changeset 1041 for trunk/mod_cacher/htdocs/xcache.php

Timestamp:

2012-07-25T06:24:02+02:00 (11 months ago)

Author:

moo

Message:

cacher/admin: adds more phpinfo when XCache is not loaded. improve looking in module info

File:

• trunk/mod_cacher/htdocs/xcache.php (modified) (4 diffs)

trunk/mod_cacher/htdocs/xcache.php

@@ -207 +207 @@
 }
 
+$php_version = phpversion();
+$xcache_version = XCACHE_VERSION;
+$xcache_modules = XCACHE_MODULES;
+
 if (!extension_loaded('XCache')) {
+    include("header.tpl.php");
     echo '<h1>XCache is not loaded</h1>';
     ob_start();
-    phpinfo();
+    phpinfo(INFO_GENERAL);
     $info = ob_get_clean();
-    if (preg_match('!<td class="v">(.*\\.ini)!', $info, $m)) {
+    if (preg_match_all("!<tr>[^<]*<td[^>]*>[^<]*(?:Configuration|ini|Server API)[^<]*</td>[^<]*<td[^>]*>[^<]*</td>[^<]*</tr>!s", $info, $m)) {
+        echo '<div class="phpinfo">';
+        echo 'PHP Info';
+        echo '<table>';
+        echo implode('', $m[0]);
+        echo '</table>';
+        echo '</div>';
+    }
+    if (preg_match('!<td class="v">(.*?\\.ini)!', $info, $m)) {
         echo "Please check $m[1]";
     }
@@ -221 +234 @@
         echo "You don't even have a php.ini yet?";
     }
+    echo "(See above)";
+    include("footer.tpl.php");
     exit;
 }
@@ -369 +384 @@
     phpinfo(INFO_MODULES);
     $moduleinfo = ob_get_clean();
-    if (preg_match_all('!XCache[^<]*</a></h2>(.*?)<h2>!is', $moduleinfo, $m)) {
-        $moduleinfo = implode('', $m[1]);
+    if (preg_match_all('!(XCache[^<>]*)</a></h2>(.*?)<h2>!is', $moduleinfo, $m)) {
+        $moduleinfo = array();
+        foreach ($m[1] as $i => $dummy) {
+            $moduleinfo[] = '<h3>' . trim($m[1][$i]) . '</h3>';
+            $moduleinfo[] = str_replace('<br />', '', trim($m[2][$i]));
+        }
+        $moduleinfo = implode('', $moduleinfo);
     }
     else {
@@ -382 +402 @@
 $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");