Mercurial > SimpleWebPresenter

changeset 24:5c4d7c758fda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove name as hardcoded attribute.
author Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
date Wed, 19 Sep 2012 19:40:02 +0200
parents 814296ea84a9
children da86ec2814e2
files accept-language.inc index.php
diffstat 2 files changed, 26 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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);