--- loncom/auth/lonauth.pm	2002/03/21 18:54:47	1.28
+++ loncom/auth/lonauth.pm	2003/02/18 19:12:38	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.28 2002/03/21 18:54:47 www Exp $
+# $Id: lonauth.pm,v 1.38 2003/02/18 19:12:38 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,9 +30,7 @@
 # 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29,
 # 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10,
 # 05/28,05/29 Gerd Kortemeyer
-# 07/24 Scott Harrison
 # 07/28,08/03 Gerd Kortemeyer
-# 8/15 Scott Harrison
 # 8/20 Gerd Kortemeyer
 
 package Apache::lonauth;
@@ -47,6 +45,9 @@ use Crypt::DES;
 use Apache::lonnet();
 use Apache::lonmenu();
 use Fcntl qw(:flock);
+
+my %FORM;
+
 # ------------------------------------------------------------ Successful login
 
 sub success {
@@ -83,14 +84,16 @@ sub success {
     my $clientbrowser='unknown';
     my $clientversion='0';
     my $clientmathml='';
+    my $clientunicode='0';
     for ($i=0;$i<=$#browsertype;$i++) {
-        my ($bname,$match,$notmatch,$vreg,$minv)=split(/\:/,$browsertype[$i]);
+        my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\:/,$browsertype[$i]);
 	if (($httpbrowser=~/$match/i)  && ($httpbrowser!~/$notmatch/i)) {
 	    $clientbrowser=$bname;
             $httpbrowser=~/$vreg/i;
 	    $clientversion=$1;
             $clientmathml=($clientversion>=$minv);
-        }
+            $clientunicode=($clientversion>=$univ);
+	}
     }
     my $clientos='unknown';
     if (($httpbrowser=~/linux/i) ||
@@ -103,18 +106,20 @@ sub success {
     if (($httpbrowser=~/mac/i) ||
         ($httpbrowser=~/powerpc/i)) { $clientos='mac'; }
     if ($httpbrowser=~/win/i) { $clientos='win'; }
+    if ($httpbrowser=~/embed/i) { $clientos='pda'; }
 
 # ------------------------------------------------------------- Get environment
 
-    my $userenv=Apache::lonnet::reply("dump:$domain:$username:environment",
-                                      $authhost);
-    if (($userenv eq 'con_lost') || 
-        ($userenv =~ /^error\:/)) {
-        $userenv='';
+    my $userenv;
+    my %userenv=Apache::lonnet::dump('environment',$domain,$username);
+    my ($tmp) = keys(%userenv);
+    if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
+	foreach my $key (keys(%userenv)) {
+	    $userenv.="environment.$key=$userenv{$key}\n";
+	}
     }
-    $userenv=~s/\&/\nenvironment\./g;
-    if ($userenv ne '') {
-	$userenv='environment.'.$userenv;
+    if (($userenv{'interface'}) && (!$FORM{'interface'})) {
+	$FORM{'interface'}=$userenv{'interface'};
     }
 # --------------------------------------------------------- Write first profile
 
@@ -133,12 +138,25 @@ sub success {
             print $idf "browser.type=$clientbrowser\n";
             print $idf "browser.version=$clientversion\n";
             print $idf "browser.mathml=$clientmathml\n";
+            print $idf "browser.unicode=$clientunicode\n";
             print $idf "browser.os=$clientos\n";
             print $idf "request.course.fn=\n";
             print $idf "request.course.uri=\n";
             print $idf "request.course.sec=\n";
             print $idf "request.role=cm\n";
-            print $idf "request.host=$ENV{'HTTP_HOST'}\n"; 
+            print $idf "request.host=$ENV{'HTTP_HOST'}\n";
+            if ($FORM{'interface'}) {
+		$FORM{'interface'}=~s/\W//gs;
+                print $idf "browser.interface=$FORM{'interface'}\n";
+                $ENV{'browser.interface'}=$FORM{'interface'};
+            }
+            foreach 
+              ('imagesuppress','embedsuppress','fontenhance','blackwhite') {
+                if (($FORM{$_} eq 'on') ||
+                    ($userenv{$_} eq 'on')) {
+                   print $idf "browser.$_=on\n";
+		}
+            } 
             if ($userroles ne '') { print $idf "$userroles"; }
 	    $idf->close();
         }
@@ -162,9 +180,10 @@ sub success {
 
     $cookie="lonID=$cookie; path=/";
 # -------------------------------------------------------- Menu script and info
-    my $windowinfo=&Apache::lonmenu::open();
-# ------------------------------------------------------------- Info for Remote
-    my $configmenu=&Apache::lonmenu::rawconfig();
+    my $windowinfo=&Apache::lonmenu::open($clientos);
+    my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
+    my $setflags=&Apache::lonmenu::setflags();
+    my $maincall=&Apache::lonmenu::maincall();
 # ------------------------------------------------- Output for successful login
 
     $r->send_cgi_header(<<ENDHEADER);
@@ -176,48 +195,17 @@ ENDHEADER
 <html>
 <head>
 <title>Successful Login to the LearningOnline Network with CAPA</title>
-<script>
-
-// --------------------------------------------- Checks if server frame defined
-
-function checkdef() {
-   if ((menuloaded==0) && (tim==0)) { setTimeout('checkdef()',100); }
-}
-
-// ---------------------------------------------------------- The wait function
-
-function wait() {
-   if ((menuloaded==1) || (tim==1)) {
-      if (tim==0) {
-         clearTimeout(canceltim);
-         $configmenu
-         window.location='$lowerurl';  
-      } else {
-         alert("Remote Control Timed Out.");
-      }
-   } else {
-      setTimeout('wait();',100);
-   }
-}
-
-function main() {
-   canceltim=setTimeout('tim=1;',80000);
-   checkdef();
-   wait();
-}
-
-</script>
+$startupremote
 </head>
 <body bgcolor="#FFFFFF">
-<script>
-    menuloaded=0;
-    tim=0;
-</script>
+$setflags
 $windowinfo
 <h1>Welcome!</h1>
-<script>
-    main();
-</script>
+Welcome to the Learning<i>Online</i> Network with CAPA.
+Please wait while your session
+is being set up.<p>
+<a href="/adm/loginproblems.html">Problems?</a></p>
+$maincall
 </body>
 </html>
 ENDSUCCESS
@@ -253,7 +241,9 @@ sub handler {
     my $buffer;
     $r->read($buffer,$r->header_in('Content-length'));
     my @pairs=split(/&/,$buffer);
-    my $pair; my $name; my $value; my %FORM;
+    my $pair; my $name; my $value;
+    undef %FORM;
+    %FORM=();
     foreach $pair (@pairs) {
        ($name,$value) = split(/=/,$pair);
        $value =~ tr/+/ /;