Added dhcp plugin to general include list

[gosa.git] / include / accept-to-gettext.inc

diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index 6bf1950e6a1d863becd917306d4ee0cfd7042da7..52647c6606ece6f98932726eaa88c394c248a2b4 100644 (file)
--- a/include/accept-to-gettext.inc
+++ b/include/accept-to-gettext.inc
@@ -86,15 +86,6 @@ function find_match($curlscore,$curcscore,$curgtlang,$langval,$charval,
 
 function al2gt($gettextlangs, $mime) 
 {
-  error_reporting(0);
-
-  /* Try to use users primary language */
-  $ui= get_userinfo();
-  if ($ui != NULL){
-    if ($ui->language != ""){
-      return ($ui->language.".UTF-8");
-    }
-  }
 
   /* default to "everything is acceptable", as RFC2616 specifies */
   $acceptLang=(($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' :
@@ -158,6 +149,18 @@ function al2gt($gettextlangs, $mime)
     $gtcs=strtoupper($tmp2[1]);
     $noct=@preg_split("/-/",$allang);
 
+    if(!isset($alscores["*"])){
+      $alscores["*"] = "";
+    }
+
+    if(!isset($alscores[$allang])){
+      $alscores[$allang] = "";
+    }
+    
+    if(!isset($alscores[$noct[0]])){
+      $alscores[$noct[0]] = "";
+    }
+  
     $testvals=array(
         array($alscores[$allang], $acscores[$gtcs]),
         array($alscores[$noct[0]], $acscores[$gtcs]),
@@ -190,7 +193,6 @@ function al2gt($gettextlangs, $mime)
   header("Content-Language: $lang");
   header("Content-Type: $mime; charset=$charset");
 
-  error_reporting(E_ALL);
   return $curgtlang;
 }