--- loncom/auth/lonauth.pm	2000/10/30 22:41:55	1.16
+++ loncom/auth/lonauth.pm	2002/03/21 18:54:47	1.28
@@ -1,20 +1,52 @@
 # The LearningOnline Network
 # User Authentication Module
+#
+# $Id: lonauth.pm,v 1.28 2002/03/21 18:54:47 www Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 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,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 Gerd Kortemeyer
+# 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;
 
+use strict;
 use Apache::Constants qw(:common);
 use Apache::File;
 use CGI qw(:standard);
 use CGI::Cookie();
+use DynaLoader; # for Crypt::DES version
 use Crypt::DES;
 use Apache::lonnet();
 use Apache::lonmenu();
-
+use Fcntl qw(:flock);
 # ------------------------------------------------------------ Successful login
 
 sub success {
@@ -22,13 +54,19 @@ sub success {
     my $lonids=$r->dir_config('lonIDsDir');
 
 # See if old ID present, if so, remove
-    my $cookie;
-    while ($cookie=<$lonids/$username\_*\_$domain\_$authhost.id>) {
-	unlink($cookie);
+
+    my $filename;
+    opendir(DIR,$lonids);
+    while ($filename=readdir(DIR)) {
+       if ($filename=~/^$username\_\d+\_$domain\_$authhost\.id$/) {
+	  unlink($lonids.'/'.$filename);
+       }
     }
+    closedir(DIR);
 
 # Give them a new cookie
 
+    my $cookie;
     my $now=time;
     $cookie="$username\_$now\_$domain\_$authhost";
 
@@ -82,6 +120,12 @@ sub success {
 
        {
 	    my $idf=Apache::File->new(">$lonids/$cookie.id");
+	    unless (flock($idf,LOCK_EX)) {
+	      &Apache::lonnet::logthis("<font color=blue>WARNING: ".
+			    'Could not obtain exclusive lock in lonauth: '.$!);
+	      $idf->close();
+	      return 'error: '.$!;
+	    }
             if ($userenv ne '') { print $idf "$userenv\n"; }
             print $idf "user.name=$username\n";
             print $idf "user.domain=$domain\n";
@@ -96,8 +140,10 @@ sub success {
             print $idf "request.role=cm\n";
             print $idf "request.host=$ENV{'HTTP_HOST'}\n"; 
             if ($userroles ne '') { print $idf "$userroles"; }
+	    $idf->close();
         }
-
+         $ENV{'request.role'}='cm';
+         $ENV{'browser.type'}=$clientbrowser;
 # -------------------------------------------------------------------- Log this
 
     &Apache::lonnet::log($domain,$username,$authhost,
@@ -105,10 +151,10 @@ sub success {
 
 # ------------------------------------------------- Check for critical messages
 
-    my @what=&Apache::lonnet::dump('critical');
+    my @what=&Apache::lonnet::dump('critical',$domain,$username);
     if ($what[0]) {
-	if ($what[0] ne 'con_lost') {
-	    $lowerurl='/adm/email/critical/'.$what[0];
+	if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
+	    $lowerurl='/adm/email?critical=display';
         }
     }
 
@@ -116,8 +162,9 @@ sub success {
 
     $cookie="lonID=$cookie; path=/";
 # -------------------------------------------------------- Menu script and info
-
     my $windowinfo=&Apache::lonmenu::open();
+# ------------------------------------------------------------- Info for Remote
+    my $configmenu=&Apache::lonmenu::rawconfig();
 # ------------------------------------------------- Output for successful login
 
     $r->send_cgi_header(<<ENDHEADER);
@@ -129,11 +176,48 @@ ENDHEADER
 <html>
 <head>
 <title>Successful Login to the LearningOnline Network with CAPA</title>
-<meta HTTP-EQUIV="Refresh" CONTENT="1; url=$lowerurl">
+<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>
 </head>
 <body bgcolor="#FFFFFF">
-    $windowinfo
+<script>
+    menuloaded=0;
+    tim=0;
+</script>
+$windowinfo
 <h1>Welcome!</h1>
+<script>
+    main();
+</script>
 </body>
 </html>
 ENDSUCCESS
@@ -202,7 +286,13 @@ sub handler {
 
     my $keybin=pack("H16",$key);
 
-    my $cipher=new DES $keybin;
+    my $cipher;
+    if ($Crypt::DES::VERSION>=2.03) {
+	$cipher=new Crypt::DES $keybin;
+    }
+    else {
+	$cipher=new DES $keybin;
+    }
 
     my $upass=$cipher->decrypt(
        unpack("a8",pack("H16",substr($FORM{'upass'},0,16))));
@@ -225,7 +315,7 @@ sub handler {
     }
 
     if (($firsturl eq '') || ($firsturl eq '/adm/logout')) {
-	$firsturl='/res/adm/pages/index.html';
+	$firsturl='/adm/roles';
     }
 
     success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);