Changeset 2425

Timestamp:

Jul 6, 2008, 12:36:39 AM (16 years ago)

Author:

rvelices

Message:

• fix some side effects with browser language (wrong display/user creation in admin and mails to admin in user browser language)

Location:

trunk/include

Files:

• functions_user.inc.php (modified) (4 diffs)
• user.inc.php (modified) (1 diff)

trunk/include/functions_user.inc.php

@@ -152 +152 @@
     }
 
-    create_user_infos($next_id);
+    $override = null;
+    if ($with_notification and $conf['browser_language'])
+    {
+      if ( !get_browser_language($override['language']) )
+        $override=null;
+    }
+    create_user_infos($next_id, $override);
 
     if ($with_notification and $conf['email_admin_on_new_user'])
@@ -839 +845 @@
 function get_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);
-  }
+  return get_default_user_value('language', PHPWG_DEFAULT_LANGUAGE);
 }
 
 /**
-  * Returns the browser language value
+  * Returns true if the browser language value is set into param $lang
   *
   */
-function get_browser_language()
+function get_browser_language(&$lang)
 {
   $browser_language = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
@@ -861 +859 @@
     if (substr($language_code, 0, 2) == $browser_language)
     {
-      return $language_code;
-    }
-  }
-  return PHPWG_DEFAULT_LANGUAGE;
+      $lang = $language_code;
+      return true;
+    }
+  }
+  return false;
 }
 
@@ -924 +923 @@
         $status = 'normal';
       }
-      $default_user['language'] = get_default_language();
 
       $insert = array_merge(

trunk/include/user.inc.php

@@ -70 +70 @@
           ( defined('IN_ADMIN') and IN_ADMIN ) ? false : true // use cache ?
          );
-if (is_a_guest() or is_generic())
+if ($conf['browser_language'] and (is_a_guest() or is_generic()) )
 {
-  $user['language'] = get_default_language();
+  get_browser_language($user['language']);
 }
 trigger_action('user_init', $user);