Updated acl_definitions

[gosa.git] / html / setup.php

diff --git a/html/setup.php b/html/setup.php
index 823994e4b397991b2f48e9efb5adac5a2e3fb374..61a18045f83b75de8eeea190b49872f440dceed9 100644 (file)
--- a/html/setup.php
+++ b/html/setup.php
@@ -54,17 +54,6 @@ ini_set("session.gc_maxlifetime",24*60*60);
 session_start ();
 $_SESSION['DEBUGLEVEL']= 1;
 
-/* Check for js */
-if (!isset($_GET['js']) && !isset($_SESSION['js'])){
-  echo '<script language="JavaScript" type="text/javascript">';
-  echo '  location = "setup.php?js=true";';
-  echo '</script>';
-
-  $_SESSION['js']= FALSE;
-} elseif(isset($_GET['js'])) {
-  $_SESSION['js']= TRUE;
-}
-
 /* Attribute initialization, reset errors */
 $_SESSION['errors']             = "";
 $_SESSION['errorsAlreadyPosted']= array();
@@ -91,7 +80,22 @@ if(isset($_POST['lang_selected'])){
   }
 }
 
+/* Check for js */
+if (!isset($_GET['js']) && !isset($_SESSION['js'])){
+  echo '<script language="JavaScript" type="text/javascript">';
+  echo '  location = "setup.php?js=true";';
+  echo '</script>';
+
+  $_SESSION['js']= FALSE;
+} elseif(isset($_GET['js'])) {
+  $_SESSION['js']= TRUE;
+}
+
 $lang = $_SESSION['lang'];
+/* Append .UTF-8 to language string if necessary */
+if(!preg_match("/utf(-)8$/i",$lang)){
+  $lang .= ".UTF-8";
+}
 putenv("LANGUAGE=");
 putenv("LANG=$lang");
 setlocale(LC_ALL, $lang);