--- loncom/auth/lonlogin.pm 2006/09/28 00:59:02 1.81 +++ loncom/auth/lonlogin.pm 2007/01/13 20:39:57 1.86 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.81 2006/09/28 00:59:02 albertel Exp $ +# $Id: lonlogin.pm,v 1.86 2007/01/13 20:39:57 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -84,8 +84,7 @@ sub handler { my $lonid=$cookies{'lonID'}; my $cookie; if ($lonid) { - my $handle=$lonid->value; - $handle=~s/\W//g; + my $handle=&LONCAPA::clean_handle($lonid->value); my $lonidsdir=$r->dir_config('lonIDsDir'); if (-e "$lonidsdir/$handle.id") { # Is there an existing token file? @@ -150,8 +149,6 @@ ENDFAILED } my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); - my $servadm = $r->dir_config('lonAdmEMail'); - my $sysadm = $r->dir_config('lonSysEMail'); my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); @@ -254,7 +251,6 @@ ENDFAILED

This LON-CAPA server is temporarily not available for login

Please attempt to login to one of the following servers:

$spares -

If the problem persists, please contact $servadm.

ENDTROUBLE @@ -264,8 +260,6 @@ ENDTROUBLE # ----------------------------------------------- Apparently we are in business my $domainlogo=&Apache::loncommon::domainlogo($domain); - $servadm=~s/\,/\
/g; - $sysadm=~s/\,/\
/g; # --------------------------------------------------- Print login screen header $r->print(< 'percent', 'load' => 'Load', 'userload' => 'User Load', - 'about' => 'aboutlon.gif', - 'access' => 'accessbutton.gif', + 'about' => 'About LON-CAPA', + 'access' => 'Accessibility Options', + 'catalog' => 'Course Catalog', 'auth' => 'userauthentication.gif', 'log' => 'Log in', - 'help' => 'Help', + 'help' => 'Log-in Help', 'serv' => 'Server', - 'servadm' => 'Server Administration', - 'sysadm' => 'System Administration', - 'helpdesk' => 'Contact Helpdesk'); + 'helpdesk' => 'Contact Helpdesk', + 'forgotpw' => 'Forgot password?'); # -------------------------------------------------- Change password field name my $now=time; + my $forgotpw = &forgotpwdisplay(%lt); + my $loginhelp = &loginhelpdisplay(%lt); # ---------------------------------------------------------- Serve rest of page $r->print(< - + - - Accessibility Options -
- About LON-CAPA + + + + + + + + + + + + + + + + + +
 $lt{'access'}
 $lt{'about'}
 $lt{'catalog'}
 
- @@ -462,9 +471,6 @@ ENDTOP


-

If you have accessibility needs that are not addressed by this interface, -please -contact the system administrator at $sysadm.


Remember these settings for next login
ENDACCESSOPTIONS } else { @@ -497,19 +503,25 @@ ENDNOOPT -    $lt{'help'} +  
+ + + $loginhelp + $forgotpw + + ENDLOGIN if ($fullgraph) { my $helpdeskscript; - my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript); + my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript); $r->print(< @@ -605,25 +617,15 @@ ENDDOCUMENT } sub contactdisplay { - my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_; + my ($lt,$version,$authdomain,$helpdeskscript) = @_; my $contactblock; - my $showsysadm = 1; - my $showservadm = 1; my $showhelpdesk = 0; my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $showhelpdesk = 1; } - if ($showsysadm) { - $contactblock .= '   '.$$lt{'sysadm'}.':
'. - '      '.$sysadm.'
'; - } - if ($showservadm) { - $contactblock .= '   '.$$lt{'servadm'}.':
'. - '      '.$servadm.'
 
'; - } if ($showhelpdesk) { - $contactblock .= '   '.$$lt{'helpdesk'}.'
'; + $contactblock .= '   '.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT";