Index: /trunk/NEWS
===================================================================
--- /trunk/NEWS (revision 901)
+++ /trunk/NEWS (revision 902)
@@ -2,4 +2,5 @@
========
* improve stability
+ * admin/ config changed. please update accordingly
2.0.0 2012-04-20
Index: /trunk/ChangeLog
===================================================================
--- /trunk/ChangeLog (revision 901)
+++ /trunk/ChangeLog (revision 902)
@@ -3,4 +3,5 @@
========
* fixed #279: segv when cache is full (since 2.0)
+ * admin/ config changed. please update accordingly
2.0.0 2012-04-20
Index: /trunk/admin/common-en.lang.php
===================================================================
--- /trunk/admin/common-en.lang.php (revision 605)
+++ /trunk/admin/common-en.lang.php (revision 902)
@@ -1,5 +1,5 @@
Index: /trunk/admin/edit.php
===================================================================
--- /trunk/admin/edit.php (revision 605)
+++ /trunk/admin/edit.php (revision 902)
@@ -12,5 +12,5 @@
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- if ($enable_eval) {
+ if (!empty($config['enable_eval'])) {
eval('$value = ' . $_POST['value']);
}
@@ -23,5 +23,5 @@
}
$value = xcache_get($name);
-if ($enable_eval) {
+if (!empty($enable['enable_eval'])) {
$value = var_export($value, true);
$editable = true;
Index: /trunk/admin/header.tpl.php
===================================================================
--- /trunk/admin/header.tpl.php (revision 605)
+++ /trunk/admin/header.tpl.php (revision 902)
@@ -4,7 +4,7 @@
-
-
+
+
+
HEAD;
?>
Index: /trunk/admin/common.php
===================================================================
--- /trunk/admin/common.php (revision 783)
+++ /trunk/admin/common.php (revision 902)
@@ -41,8 +41,8 @@
function get_language_file($name)
{
- global $charset, $lang;
- $s = strtolower($charset);
- if (isset($lang)) {
- $l = strtolower($lang);
+ global $config;
+ $s = strtolower($config['charset']);
+ if (!empty($config['lang'])) {
+ $l = strtolower($config['lang']);
$file = get_language_file_ex($name, $l, $s);
if (!isset($file)) {
@@ -56,5 +56,5 @@
$file = get_language_file_ex($name, $l, $s);
if (isset($file)) {
- $lang = $l;
+ $config['lang'] = $l;
break;
}
@@ -63,5 +63,5 @@
$file = get_language_file_ex($name, $ll, $s);
if (isset($file)) {
- $lang = $l;
+ $config['lang'] = $l;
break;
}
@@ -77,5 +77,5 @@
return $GLOBALS['strings'][$str];
}
- if (!empty($GLOBALS['show_todo_strings'])) {
+ if (!empty($GLOBALS['config']['show_todo_strings'])) {
return '' . htmlspecialchars($str) . '';
}
@@ -96,4 +96,18 @@
}
+function ob_filter_path_nicer_default($list_html)
+{
+ $sep = DIRECTORY_SEPARATOR;
+ $docRoot = $_SERVER['DOCUMENT_ROOT'];
+ $list_html = str_replace($docRoot, "{DOCROOT}" . (substr($docRoot, -1) == $sep ? $sep : ""), $list_html);
+ $xcachedir = realpath(dirname(__FILE__) . "$sep..$sep");
+ $list_html = str_replace($xcachedir . $sep, "{XCache}$sep", $list_html);
+ if ($sep == '/') {
+ $list_html = str_replace("/home/", "{H}/", $list_html);
+ }
+ return $list_html;
+}
+
+
error_reporting(E_ALL);
ini_set('display_errors', 'On');
@@ -105,8 +119,10 @@
$_POST = stripaddslashes_array($_POST, $mqs);
$_REQUEST = stripaddslashes_array($_REQUEST, $mqs);
+ unset($mqs);
}
ini_set('magic_quotes_runtime', '0');
-$charset = "UTF-8";
+$config = array();
+include("./config.default.php");
if (file_exists("./config.php")) {
include("./config.php");
@@ -114,11 +130,7 @@
include(get_language_file("common"));
-if (!isset($lang)) {
- $lang = 'en-us';
+if (empty($config['lang'])) {
+ $config['lang'] = 'en-us';
}
-if (!isset($usage_graph_width) && !isset($free_graph_width)) {
- $usage_graph_width = 120;
-}
-$graph_width = isset($free_graph_width) ? $free_graph_width : $usage_graph_width;
?>
Index: /trunk/admin/config.default.php
===================================================================
--- /trunk/admin/config.default.php (revision 902)
+++ /trunk/admin/config.default.php (revision 902)
@@ -0,0 +1,71 @@
+
Index: /trunk/admin/help.php
===================================================================
--- /trunk/admin/help.php (revision 605)
+++ /trunk/admin/help.php (revision 902)
@@ -7,7 +7,7 @@
-
-
+
+
+
HEAD;
?>
Index: /trunk/admin/xcache.tpl.php
===================================================================
--- /trunk/admin/xcache.tpl.php (revision 868)
+++ /trunk/admin/xcache.tpl.php (revision 902)
@@ -33,5 +33,5 @@
|
|
- |
+ |
|
|
@@ -58,5 +58,5 @@
$pvalue = (int) ($ci['avail'] / $ci['size'] * 100);
$pempty = 100 - $pvalue;
- if (!isset($free_graph_width)) {
+ if ($config['percent_graph_type'] == 'used') {
// swap
$tmp = $pvalue;
@@ -65,5 +65,5 @@
}
- $w = $graph_width;
+ $w = $config['percent_graph_width'];
if (empty($ci['istotal'])) {
$graph = freeblock_to_graph($ci['free_blocks'], $ci['size']);
@@ -135,7 +135,7 @@
-
+
-
+
@@ -145,7 +145,5 @@
if ($cachelist) {
$isphp = $cachelist['type'] == $type_php;
- if (function_exists("ob_filter_path_nicer")) {
- ob_start("ob_filter_path_nicer");
- }
+ ob_start($config['path_nicer']);
foreach (array('Cached' => $cachelist['cache_list'], 'Deleted' => $cachelist['deleted_list']) as $listname => $entries) {
$a->reset();
@@ -261,7 +259,5 @@
$v) {
- if (!isset($free_graph_width)) {
+ if ($config['percent_graph_type'] != 'free') {
$v = 1 - $v;
}
Index: /unk/admin/config.php.example
===================================================================
--- /trunk/admin/config.php.example (revision 647)
+++ (revision )
@@ -1,69 +1,0 @@
-