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 '<span style="color:red">' . htmlspecialchars($str) . '</span>';
 	}
@@ -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;
 
 ?>