Suppress "PHP error "Non-static method LDAP::fix() should not be called statically...

[gosa.git] / html / setup.php

diff --git a/html/setup.php b/html/setup.php
index 5ba7e4a5bbb974b0c867bc655f563dcb4dd28cce..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,10 +80,21 @@ if(isset($_POST['lang_selected'])){
   }
 }
 
-$lang = $_SESSION['lang'];
+/* 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>';
 
-if(!preg_match("/utf8/i",$lang)){
-  $lang .= ".UTF8";
+  $_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");