diff --git a/admin/common-en.lang.php b/admin/common-en.lang.php index 64786a9..e745c5d 100644 --- a/admin/common-en.lang.php +++ b/admin/common-en.lang.php @@ -1,5 +1,5 @@ diff --git a/admin/common.php b/admin/common.php index 46d5269..78bd064 100644 --- a/admin/common.php +++ b/admin/common.php @@ -32,12 +32,14 @@ function get_language_file($name) $l = strtok($l, ';'); $file = get_language_file_ex($name, $l, $s); if (isset($file)) { + $lang = $l; break; } if (strpos($l, '-') !== false) { - $l = strtok($l, '-'); - $file = get_language_file_ex($name, $l, $s); + $ll = strtok($l, '-'); + $file = get_language_file_ex($name, $ll, $s); if (isset($file)) { + $lang = $l; break; } } @@ -66,5 +68,8 @@ if (file_exists("./config.php")) { } include(get_language_file("common")); +if (!isset($lang)) { + $lang = 'en-us'; +} ?> diff --git a/admin/config.php.example b/admin/config.php.example index 0ff88ad..a288d5f 100644 --- a/admin/config.php.example +++ b/admin/config.php.example @@ -16,6 +16,8 @@ $show_todo_strings = false; function ob_filter_path_nicer($o) { $o = str_replace($_SERVER['DOCUMENT_ROOT'], "{DOCROOT}/", $o); + $xcachedir = realpath(dirname(__FILE__) . "/../"); + $o = str_replace($xcachedir . "/", "{XCache}/", $o); $o = str_replace("/home/", "{H}/", $o); return $o; } diff --git a/admin/help.php b/admin/help.php index 2e317d2..ef4e3de 100644 --- a/admin/help.php +++ b/admin/help.php @@ -4,11 +4,10 @@ include("./common.php"); - - + HEAD; ?> diff --git a/admin/xcache.css b/admin/xcache.css index 08bffca..c5afa85 100644 --- a/admin/xcache.css +++ b/admin/xcache.css @@ -3,7 +3,7 @@ table.cycles { border: 1px solid black; background: white; margin-top: 5px; marg table.cycles .col1 { background-color: #f5f5f5; } table.cycles .col2 { background-color: #e0e0e0; } table.cycles th, table.cycles td { border-top: 1px solid white; border-left: 1px solid white; } -table.cycles th { background-color: #707090; color: white; font-weight: bold; height: 20px; line-height: 16px; font-family: serif; } +table.cycles th { background-color: #707090; color: white; font-weight: bold; height: 20px; line-height: 20px; font-family: serif; } th a { color: white; font-weight: bold; display: block; width: 100%; height: 100%; } .button { } span.sortarrow { color: white; text-decoration: none; } diff --git a/admin/xcache.tpl.php b/admin/xcache.tpl.php index 9c58f93..6f709a1 100644 --- a/admin/xcache.tpl.php +++ b/admin/xcache.tpl.php @@ -1,10 +1,10 @@ - + HEAD; ?>