--- loncom/auth/lonauth.pm	2006/06/02 20:22:26	1.78
+++ loncom/auth/lonauth.pm	2006/06/27 14:09:46	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.78 2006/06/02 20:22:26 albertel Exp $
+# $Id: lonauth.pm,v 1.80 2006/06/27 14:09:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,7 @@ my %FORM;
 # ------------------------------------------------------------ Successful login
 
 sub success {
-    my ($r, $username, $domain, $authhost,$lowerurl) = @_;
+    my ($r, $username, $domain, $authhost, $lowerurl, $extra_env) = @_;
     my $lonids=$r->dir_config('lonIDsDir');
 
     my $public=($username eq 'public' && $domain eq 'public');
@@ -88,7 +88,7 @@ sub success {
     
 # Initialize roles
 
-	$userroles=Apache::lonnet::rolesinit($domain,$username,$authhost);
+	$userroles=&Apache::lonnet::rolesinit($domain,$username,$authhost);
     }
 # ------------------------------------ Check browser type and MathML capability
 
@@ -182,9 +182,14 @@ sub success {
 	    print $idf (&escape($key).'='.&escape($value)."\n");
 	}
 	while (my ($key,$value) = each(%userenv)) {
+	    print $idf (&escape('environment.'.$key).'='.&escape($value)."\n");
+	}
+	while (my ($key,$value) = each(%{$userroles})) {
+	    print $idf (&escape($key).'='.&escape($value)."\n");
+	}
+	while (my ($key,$value) = each(%{$extra_env})) {
 	    print $idf (&escape($key).'='.&escape($value)."\n");
 	}
-	if ($userroles ne '') { print $idf "$userroles"; }
 	close($idf);
     }
     $env{'request.role'}='cm';