# HG changeset patch # User Tom Fredrik "BFG" Klaussen # Date 1348076402 -7200 # Node ID 5c4d7c758fdab3aeb71c98396284b896ddf2c513 # Parent 814296ea84a92556b753d1d84391c444ad2b4b46 Remove name as hardcoded attribute. diff -r 814296ea84a9 -r 5c4d7c758fda accept-language.inc --- a/accept-language.inc Wed Sep 19 18:23:10 2012 +0200 +++ b/accept-language.inc Wed Sep 19 19:40:02 2012 +0200 @@ -21,4 +21,19 @@ } return $langs; } + +function preferLanguage($prefer) +{ + $language = $prefer; + $langs = acceptedLanguages(); + if ($langs) { + foreach ($langs as $l => $val) { + if (file_exists($l)) { + $language = $l; + break; + } + } + } + return $language; +} ?> \ No newline at end of file diff -r 814296ea84a9 -r 5c4d7c758fda index.php --- a/index.php Wed Sep 19 18:23:10 2012 +0200 +++ b/index.php Wed Sep 19 19:40:02 2012 +0200 @@ -29,27 +29,23 @@ $name = $_GET['name']; $lang = $_GET['lang']; -if(!$name) { - $name="home"; -} +$master = new DOMDocument(); +$master->load("master.xml"); -if(!$lang) { - $lang="no"; - $langs=acceptedLanguages(); - if ($langs) { - foreach ($langs as $l => $val) { - if (file_exists($l)) { - $lang = $l; - break; - } +$params = $master->getElementsByTagName("param"); +foreach ($params as $param) { + if ($param->getAttribute("type") == "option") { + if ($param->getAttribute("id") == "lang") { + $defaultLang = $param->getAttribute("default"); } } } -$master = new DOMDocument(); -$master->load("master.xml"); +if (!$lang) { + $lang = preferLanguage($defaultLang); +} -$params = $master->getElementsByTagName("param"); + foreach ($params as $param) { if ($param->getAttribute("type") == "input") { $doc = getInput($master, $param);