diff options
Diffstat (limited to 'inc/dictionary.inc.php')
| -rw-r--r-- | inc/dictionary.inc.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/inc/dictionary.inc.php b/inc/dictionary.inc.php index ee196f59..935d1f4e 100644 --- a/inc/dictionary.inc.php +++ b/inc/dictionary.inc.php @@ -17,6 +17,8 @@ class Dictionary { self::$languages = array(); foreach (glob('lang/??', GLOB_ONLYDIR) as $lang) { + if (!file_exists($lang . '/name.txt') && !file_exists($lang . '/flag.png')) + continue; $lang = basename($lang); if ($lang === '..') continue; @@ -28,10 +30,15 @@ class Dictionary if ($lang !== false && in_array($lang, self::$languages)) { setcookie('lang', $lang, time() + 60 * 60 * 24 * 30 * 12); $url = Request::get('url'); - if ($url === false && isset($_SERVER['HTTP_REFERER'])) + if ($url === false && isset($_SERVER['HTTP_REFERER'])) { $url = $_SERVER['HTTP_REFERER']; - if ($url === false) - $url = '?do=Main'; + } + $parts = parse_url($url); + if ($url === false || $parts === false || empty($parts['query'])) { + $url = '?do=main'; + } else { + $url = '?' . $parts['query']; + } Util::redirect($url); } @@ -191,6 +198,8 @@ class Dictionary foreach (self::$languages as $lang) { if (file_exists("lang/$lang/name.txt")) { $name = file_get_contents("lang/$lang/name.txt"); + } else { + $name = false; } if (!isset($name) || $name === false) { $name = $lang; |