--- loncom/auth/lonauth.pm 2001/06/02 16:10:04 1.19 +++ loncom/auth/lonauth.pm 2002/05/29 14:51:42 1.31 @@ -1,10 +1,39 @@ # The LearningOnline Network # User Authentication Module +# +# $Id: lonauth.pm,v 1.31 2002/05/29 14:51:42 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,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; @@ -13,6 +42,7 @@ 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(); @@ -73,6 +103,7 @@ 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 @@ -113,6 +144,7 @@ sub success { $idf->close(); } $ENV{'request.role'}='cm'; + $ENV{'browser.type'}=$clientbrowser; # -------------------------------------------------------------------- Log this &Apache::lonnet::log($domain,$username,$authhost, @@ -120,10 +152,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'; } } @@ -131,9 +163,9 @@ sub success { $cookie="lonID=$cookie; path=/"; # -------------------------------------------------------- Menu script and info - my $windowinfo=&Apache::lonmenu::open(); + my $windowinfo=&Apache::lonmenu::open($clientos); # ------------------------------------------------------------- Info for Remote - my $configmenu=&Apache::lonmenu::rawconfig(); + my $configmenu=&Apache::lonmenu::rawconfig($r); # ------------------------------------------------- Output for successful login $r->send_cgi_header(< - + $windowinfo

Welcome!

+ ENDSUCCESS @@ -252,7 +287,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)))); @@ -275,7 +316,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);