Laurent Opprecht 13 years ago
parent
commit
701090cd0e

+ 6 - 1
main/auth/shibboleth/app/lib/shibboleth_session.class.php

@@ -75,10 +75,15 @@ class ShibbolethSession
         $uidReset = true;
 
         $gidReset = true;
-        $cidReset = true;
+        $cidReset = false; //FALSE !!      
 
         $mainDbName = Database :: get_main_database();
         $includePath = api_get_path(INCLUDE_PATH);
+        
+        global $is_platformAdmin; 
+        /* This must be set for local.inc.php to set up correctly the platform admin
+         * This is BAD.
+         */
 
         require("$includePath/local.inc.php");
 

+ 6 - 0
main/auth/shibboleth/app/model/user.class.php

@@ -67,6 +67,12 @@ class UserStore extends _UserStore
     {
         $object->username = $object->username ? $object->username : $this->generate_username();
         $object->password = $object->password ? $object->password : api_generate_password();
+        $object->language = $object->language ? $object->language : $this->default_language();
+    }
+    
+    function default_language()
+    {
+        return api_get_setting('platformLanguage');
     }
 
     function generate_username()