Added dhcp plugin to general include list

[gosa.git] / include / functions.inc

diff --git a/include/functions.inc b/include/functions.inc
index e9e3622ac726f45629a4e2cd2bcef4c907f4784a..05bdfd5632cb4c979f0801f340ef37802f52f2d1 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -39,12 +39,14 @@ require_once ("class_ldap.inc");
 require_once ("class_config.inc");
 require_once ("class_userinfo.inc");
 require_once ("class_plugin.inc");
+require_once ("class_dhcpPlugin.inc");
 require_once ("class_pluglist.inc");
 require_once ("class_tabs.inc");
 require_once ("class_mail-methods.inc");
 require_once("class_password-methods.inc");
 require_once ("functions_debug.inc");
 require_once ("functions_dns.inc");
+require_once ("accept-to-gettext.inc");
 require_once ("class_MultiSelectWindow.inc");
 
 /* Define constants for debugging */
@@ -146,54 +148,35 @@ function DEBUG($level, $line, $function, $file, $data, $info="")
 }
 
 
-/* Simple function to get browser language and convert it to
-   xx_XY needed by locales. Ignores sublanguages and weights. */
 function get_browser_language()
 {
-  global $BASE_DIR;
-
   /* Try to use users primary language */
+  global $config;
   $ui= get_userinfo();
   if ($ui != NULL){
     if ($ui->language != ""){
-      return ($ui->language);
+      return ($ui->language.".UTF-8");
     }
   }
 
-  /* Get list of languages */
-  if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])){
-    $lang= preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-    $languages= split (',', $lang);
-    $languages[]= "C";
-  } else {
-    $languages= array("C");
-  }
-
-  /* Walk through languages and get first supported */
-  foreach ($languages as $val){
-
-    /* Strip off weight */
-    $lang= preg_replace("/;q=.*$/i", "", $val);
-
-    /* Simplify sub language handling */
-    $lang= preg_replace("/-.*$/", "", $lang);
-
-    /* Cancel loop if available in GOsa, or the last
-       entry has been reached */
-    if (is_dir("$BASE_DIR/locale/$lang")){
-      break;
+  /* Try to use users primary language */
+  if ($ui != NULL){
+    if ($ui->language != ""){
+      return ($ui->language.".UTF-8");
     }
   }
 
-  /* We've just one zh variation. Fix code... */
-  if (preg_match('/zh/', $lang)){
-    return ("zh_CN");
-  }
-  if (preg_match('/sv/', $lang)){
-    return ("sv_SE");
+  /* Load supported languages */
+  $gosa_languages= get_languages();
+
+  /* Move supported languages to flat list */
+  $langs= array();
+  foreach($gosa_languages as $lang => $dummy){
+    $langs[]= $lang.'.UTF-8';
   }
 
-  return (strtolower($lang)."_".strtoupper($lang));
+  /* Return gettext based string */
+  return (al2gt($langs, 'text/html'));
 }
 
 
@@ -2540,17 +2523,30 @@ function get_languages($languages_in_own_language = FALSE,$strip_region_tag = FA
         "sv_SE" => "Swedish",
         "zh_CN" => "Chinese",
         "ru_RU" => "Russian");
+  
+  $tmp2= array(
+        "de_DE" => _("German"),
+        "fr_FR" => _("French"),
+        "it_IT" => _("Italian"),
+        "es_ES" => _("Spanish"),
+        "en_US" => _("English"),
+        "nl_NL" => _("Dutch"),
+        "pl_PL" => _("Polish"),
+        "sv_SE" => _("Swedish"),
+        "zh_CN" => _("Chinese"),
+        "ru_RU" => _("Russian"));
 
   $ret = array();
   if($languages_in_own_language){
+
     $old_lang = setlocale(LC_ALL, 0);
     foreach($tmp as $key => $name){
       $lang = $key.".UTF-8";
       setlocale(LC_ALL, $lang);
       if($strip_region_tag){
-        $ret[preg_replace("/^([^_]*).*$/","\\1",$key)] = _($name)." (".$name.")";
+        $ret[preg_replace("/^([^_]*).*$/","\\1",$key)] = _($name)." (".$tmp2[$key].")";
       }else{
-        $ret[$key] = _($name)."  (".$name.")";
+        $ret[$key] = _($name)."  (".$tmp2[$key].")";
       }
     }
     setlocale(LC_ALL, $old_lang);