Changeset 2411

Timestamp:

Jul 1, 2008, 12:08:27 PM (16 years ago)

Author:

rvelices

Message:

• put back browser language (deleted by error during my last commit - was working on an old version)

File:

• trunk/include/functions_user.inc.php (modified) (4 diffs)

trunk/include/functions_user.inc.php

@@ -839 +839 @@
 function get_default_language()
 {
-  return get_default_user_value('language', PHPWG_DEFAULT_LANGUAGE);
+  global $conf;
+  if (isset($conf['browser_language']) and $conf['browser_language'])
+  {
+    return get_browser_language();
+  }
+  else
+  {
+    return get_default_user_value('language', PHPWG_DEFAULT_LANGUAGE);
+  }
+}
+
+/**
+  * Returns the browser language value
+  *
+  */
+function get_browser_language()
+{
+  $browser_language = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
+  foreach (get_languages() as $language_code => $language_name)
+  {
+    if (substr($language_code, 0, 2) == $browser_language)
+    {
+      return $language_code;
+    }
+  }
+  return PHPWG_DEFAULT_LANGUAGE;
 }
 
@@ -899 +924 @@
         $status = 'normal';
       }
+      $default_user['language'] = get_default_language();
 
       $insert = array_merge(
@@ -949 +975 @@
  * returns the auto login key or false on error
  * @param int user_id
- * @param time_t time 
+ * @param time_t time
  * @param string [out] username
 */
@@ -1027 +1053 @@
   {
     $cookie = explode('-', stripslashes($_COOKIE[$conf['remember_me_name']]));
-    if ( count($cookie)===3 
+    if ( count($cookie)===3
         and is_numeric(@$cookie[0]) /*user id*/
         and is_numeric(@$cookie[1]) /*time*/