--- loncom/auth/lonauth.pm	2000/01/14 21:12:40	1.4
+++ loncom/auth/lonauth.pm	2000/06/05 20:28:17	1.7
@@ -2,7 +2,7 @@
 # User Authentication Module
 # 5/21/99,5/22,5/25,5/26,5/27,5/29,6/2,6/11,6/14,6/15
 # 16/11,12/16,
-# 1/14 Gerd Kortemeyer
+# 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5 Gerd Kortemeyer
 
 package Apache::lonauth;
 
@@ -15,7 +15,7 @@ use Apache::lonnet();
 # ------------------------------------------------------------ Successful login
 
 sub success {
-    my ($r, $username, $domain, $authhost) = @_;
+    my ($r, $username, $domain, $authhost,$lowerurl) = @_;
     my $lonids=$r->dir_config('lonIDsDir');
 
 # See if old ID present, if so, remove
@@ -26,41 +26,67 @@ sub success {
 
 # Give them a new cookie
 
-        my $now=time;
-        $cookie="$username\_$now\_$domain\_$authhost";
-        my $rolesdump=Apache::lonnet::reply("dump:$domain:$username:roles",
-                                            $authhost);
-        my $userroles='';
-        if ($rolesdump ne '') {
-            map {
-               my ($area,$role)=split(/=/,$_);
-               my ($trole,$tend,$tstart)=split(/_/,$role);
-               if ($tend!=0) {
-		   if ($tend<$now) {
-		       my $localtime=localtime($tend);
-                       $trole="Role expired $localtime";
-                   } 
-               }
-               if ($tstart!=0) {
-                   if ($tstart>$now) {
-                      my $localtime=localtime($tend);
-                      $trole="Role becomes active $localtime";        
-                   }
-               }
-               if ($area ne '') {
-		   $userroles.="user.role.$area=$trole\n";
-               }
-            } split(/&/,$rolesdump);            
-        }  
-        {
+    my $now=time;
+    $cookie="$username\_$now\_$domain\_$authhost";
+
+# Initialize roles
+
+    my $userroles=Apache::lonnet::rolesinit($domain,$username,$authhost);
+
+# ------------------------------------ Check browser type and MathML capability
+
+    my @browsertype=split(/\&/,$r->dir_config("lonBrowsDet"));
+    my %mathcap=split(/\&/,$r->dir_config("lonMathML"));
+    my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
+    my $i;
+    my $clientbrowser='unknown';
+    my $clientversion='0';
+    my $clientmathml='';
+    for ($i=0;$i<=$#browsertype;$i++) {
+        my ($bname,$match,$notmatch,$vreg,$minv)=split(/\:/,$browsertype[$i]);
+	if (($httpbrowser=~/$match/i)  && ($httpbrowser!~/$notmatch/i)) {
+	    $clientbrowser=$bname;
+            $httpbrowser=~/$vreg/i;
+	    $clientversion=$1;
+            $clientmathml=($clientversion>=$minv);
+        }
+    }
+    my $clientos='unknown';
+    if (($httpbrowser=~/linux/i) ||
+        ($httpbrowser=~/unix/i) ||
+        ($httpbrowser=~/ux/i) ||
+        ($httpbrowser=~/solaris/i)) { $clientos='unix'; }
+    if (($httpbrowser=~/vax/i) ||
+        ($httpbrowser=~/vms/i)) { $clientos='vms'; }
+    if ($httpbrowser=~/next/i) { $clientos='next'; }
+    if (($httpbrowser=~/mac/i) ||
+        ($httpbrowser=~/powerpc/i)) { $clientos='mac'; }
+    if ($httpbrowser=~/win/) { $clientos='win'; }
+
+# --------------------------------------------------------- Write first profile
+
+       {
 	    my $idf=Apache::File->new(">$lonids/$cookie.id");
             print $idf "user.name=$username\n";
             print $idf "user.domain=$domain\n";
             print $idf "user.home=$authhost\n";
+            print $idf "browser.type=$clientbrowser\n";
+            print $idf "browser.version=$clientversion\n";
+            print $idf "browser.mathml=$clientmathml\n";
+            print $idf "browser.os=$clientos\n";
             if ($userroles ne '') { print $idf "$userroles" };
         }
+# -------------------------------------------------------------------- Log this
+
+    &Apache::lonnet::log($domain,$username,$authhost,
+                         "Login $ENV{'REMOTE_ADDR'}");
+
+# ------------------------------------------------------------ Get cookie ready
 
     $cookie="lonID=$cookie; path=/";
+
+# ------------------------------------------------- Output for successful login
+
     $r->send_cgi_header(<<ENDHEADER);
 Content-type: text/html
 Set-cookie: $cookie
@@ -70,11 +96,15 @@ ENDHEADER
 <html>
 <head>
 <title>Successful Login to the LearningOnline Network with CAPA</title>
+<meta HTTP-EQUIV="Refresh" CONTENT="1; url=$lowerurl">
 </head>
-<frameset rows="80,*" border=0>
-<frame scrolling="no" name="loncontrol" src="/adm/menu">
-<frame name="loncontent" src="/adm/roles">
-</frameset>
+<body bgcolor="#FFFFFF">
+<script>
+menu=window.open("/res/adm/pages/menu.html","LONCAPAmenu",
+                 "height=350,width=150,scrollbars=no,menubar=no");
+</script>
+<h1>Welcome!</h1>
+</body>
 </html>
 ENDSUCCESS
 }
@@ -112,6 +142,8 @@ sub handler {
     my $pair; my $name; my $value; my %FORM;
     foreach $pair (@pairs) {
        ($name,$value) = split(/=/,$pair);
+       $value =~ tr/+/ /;
+       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
        $FORM{$name}=$value;
     } 
 
@@ -120,7 +152,6 @@ sub handler {
         return OK;
     }
     $FORM{'uname'} =~ s/\W//g;
-    $FORM{'upass'} =~ s/\W//g;
     $FORM{'udom'}  =~ s/\W//g;
 
     my $role   = $r->dir_config('lonRole');
@@ -139,14 +170,15 @@ sub handler {
         return OK;
     }
 
-    my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
-    my $lonurl=$cookies{'lonURL'};
-    if (!$lonurl) { failed($r,'Cookies need to be activated'); return OK; }
-    my $lowerurl=$lonurl->value;
+    if ($FORM{'firsturl'} eq '') {
+	$FORM{'firsturl'}='/res/index.html';
+    }
 
-    success($r,$FORM{'uname'},$FORM{'udom'},$authhost);
+    success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$FORM{'firsturl'});
     return OK;
 }
 
 1;
 __END__
+
+