--- loncom/auth/lonlogin.pm 2010/03/31 23:18:27 1.106.4.8 +++ loncom/auth/lonlogin.pm 2008/11/22 19:07:02 1.107 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.106.4.8 2010/03/31 23:18:27 raeburn Exp $ +# $Id: lonlogin.pm,v 1.107 2008/11/22 19:07:02 tempelho Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,7 +46,7 @@ sub handler { (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, $ENV{'REDIRECT_QUERY_STRING'}), ['interface','username','domain','firsturl','localpath','localres', - 'token','role','symb']); + 'token']); if (!defined($env{'form.firsturl'})) { &Apache::lonacc::get_posted_cgi($r,['firsturl']); } @@ -81,15 +81,11 @@ sub handler { &Apache::loncommon::start_page('Already logged in'); my $end_page = &Apache::loncommon::end_page(); - my $dest = '/adm/roles'; - if ($env{'form.firsturl'} ne '') { - $dest = $env{'form.firsturl'}; - } $r->print( $start_page .'

'.&mt('You are already logged in!').'

' - .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', - '','','','').'

' + .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].', + '','','','').'

' .'

'.&mt('Login problems?').'

' .$end_page ); @@ -106,30 +102,21 @@ sub handler { # ----------------------------------------------------------- Process Interface $env{'form.interface'}=~s/\W//g; - my $textbrowsers=$r->dir_config('lonTextBrowsers'); + # my $textbrowsers=$r->dir_config('lonTextBrowsers'); my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; - foreach (split(/\:/,$textbrowsers)) { - if ($httpbrowser=~/$_/i) { - $env{'form.interface'}='textual'; - } - } + # foreach (split(/\:/,$textbrowsers)) { +# if ($httpbrowser=~/$_/i) { +# $env{'form.interface'}='textual'; +# } +# } my $fullgraph=($env{'form.interface'} ne 'textual'); my $iconpath= &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); - my $lonhost = $r->dir_config('lonHostID'); my $domain = &Apache::lonnet::default_login_domain(); - if ($lonhost ne '') { - my $redirect = &check_loginvia($domain,$lonhost); - if ($redirect) { - $r->print($redirect); - return OK; - } - } - if (($env{'form.domain'}) && (&Apache::lonnet::domain($env{'form.domain'},'description'))) { $domain=$env{'form.domain'}; @@ -137,6 +124,7 @@ sub handler { my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); my $servadm = $r->dir_config('lonAdmEMail'); + my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); my $expire = $r->dir_config('lonExpire'); @@ -191,18 +179,8 @@ sub handler { if ($uextkey>2147483647) { $uextkey-=4294967296; } # -------------------------------------------------------- Store away log token - my $tokenextras; - if ($env{'form.role'}) { - $tokenextras = '&role='.&escape($env{'form.role'}); - } - if ($env{'form.symb'}) { - if (!$tokenextras) { - $tokenextras = '&'; - } - $tokenextras .= '&symb='.&escape($env{'form.symb'}); - } my $logtoken=Apache::lonnet::reply( - 'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, + 'tmpput:'.$ukey.$lkey.'&'.$firsturl, $lonhost); # ------------------- If we cannot talk to ourselves, we are in serious trouble @@ -226,209 +204,174 @@ sub handler { ' '.&mt('(preferred)').''.$/; $last=$hostname; } - $spares.= '
'; - my %all_hostnames = &Apache::lonnet::all_hostnames(); - foreach my $hostid (sort - { - &Apache::lonnet::hostname($a) cmp - &Apache::lonnet::hostname($b); - } - keys(%all_hostnames)) { - next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid}); - my $hostname = &Apache::lonnet::hostname($hostid); - next if ($last eq $hostname); - $spares.='
'. - $hostname.''; - $last=$hostname; - } - $r->print( - '' - .'' - .&mt('The LearningOnline Network with CAPA') - .'' - .'' - .'

'.&mt('The LearningOnline Network with CAPA').'

' - .'' - .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

' - .'

'.&mt('Please attempt to login to one of the following servers:').'

' - .$spares - .'' - .'' - ); - return OK; - } +$spares.= '
'; +my %all_hostnames = &Apache::lonnet::all_hostnames(); +foreach my $hostid (sort + { + &Apache::lonnet::hostname($a) cmp + &Apache::lonnet::hostname($b); + } + keys(%all_hostnames)) { + next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid}); + my $hostname = &Apache::lonnet::hostname($hostid); + next if ($last eq $hostname); + $spares.='
'. + $hostname.''; + $last=$hostname; +} +$r->print( + '' + .'' + .&mt('The LearningOnline Network with CAPA') + .'' + .'' + .'

'.&mt('The LearningOnline Network with CAPA').'

' + .'' + .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

' + .'

'.&mt('Please attempt to login to one of the following servers:').'

' + .$spares + .'' + .'' +); +return OK; +} # ----------------------------------------------- Apparently we are in business - $servadm=~s/\,/\
/g; +$servadm=~s/\,/\
/g; # ----------------------------------------------------------- Front page design - my $pgbg= - ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF'); - my $font= - ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000'); - my $link= - ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF'); - my $vlink= - ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF'); - my $alink=&Apache::loncommon::designparm('login.alink',$domain); - my $mainbg= - ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF'); - my $sidebg= - ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF'); - my $textcol = - ($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000'); - my $bgcol = - ($fullgraph?&Apache::loncommon::designparm('login.bgcol',$domain):'#FFFFFF'); - my $logo=&Apache::loncommon::designparm('login.logo',$domain); - my $img=&Apache::loncommon::designparm('login.img',$domain); - my $domainlogo=&Apache::loncommon::domainlogo($domain); - my $login=&Apache::loncommon::designparm('login.login',$domain); - if ($login eq '') { - $login = $iconpath.'/'.&mt('userauthentication.gif'); - } - my $showbanner = 1; - my $showmainlogo = 1; - if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) { - $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain); - } - if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) { - $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain); - } - my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain); - my $showcoursecat = - &Apache::loncommon::designparm('login.coursecatalog',$domain); - my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain); - my $shownewuserlink = - &Apache::loncommon::designparm('login.newuser',$domain); - my $now=time; - my $js = (< - // +function send() +{ +this.document.server.elements.uname.value +=this.document.client.elements.uname.value; + +this.document.server.elements.udom.value +=this.document.client.elements.udom.value; + +uextkey=this.document.client.elements.uextkey.value; +lextkey=this.document.client.elements.lextkey.value; +initkeys(); + +this.document.server.elements.upass0.value + =crypted(this.document.client.elements.upass$now.value.substr(0,15)); +this.document.server.elements.upass1.value + =crypted(this.document.client.elements.upass$now.value.substr(15,15)); +this.document.server.elements.upass2.value + =crypted(this.document.client.elements.upass$now.value.substr(30,15)); - this.document.client.elements.uname.value=''; - this.document.client.elements.upass$now.value=''; +this.document.client.elements.uname.value=''; +this.document.client.elements.upass$now.value=''; - this.document.server.submit(); - return false; - } - // ]]> - +this.document.server.submit(); +return false; +} + ENDSCRIPT # --------------------------------------------------- Print login screen header - my %add_entries = (topmargin => "0", - leftmargin => "0", - marginheight => "0", - marginwidth => "0", - bgcolor => "$pgbg", - text => "$font", - link => "$link", - vlink => "$vlink", - alink => "$alink",); - - $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, - { 'redirect' => [$expire,'/adm/roles'], - 'add_entries' => \%add_entries, - 'only_body' => 1,})); +my %add_entries = (topmargin => "0", + leftmargin => "0", + marginheight => "0", + marginwidth => "0", + bgcolor => "$pgbg", + text => "$font", + link => "$link", + vlink => "$vlink", + alink => "$alink",); + +$r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, + { 'redirect' => [$expire,'/adm/roles'], + 'add_entries' => \%add_entries, + 'only_body' => 1,})); # ----------------------------------------------------------------------- Texts my %lt=&Apache::lonlocal::texthash( - 'un' => 'Username', - 'pw' => 'Password', - 'dom' => 'Domain', - 'load' => 'Server Load', - 'userload' => 'User Load', - 'about' => 'About LON-CAPA', - 'access' => 'Accessibility Options', - 'catalog' => 'Course/Community Catalog', - 'log' => 'Log in', - 'help' => 'Log-in Help', - 'serv' => 'Server', - 'servadm' => 'Server Administration', - 'helpdesk' => 'Contact Helpdesk', - 'forgotpw' => 'Forgot password?', - 'newuser' => 'New User?', - 'options_headline' => 'Select Accessibility Options', - 'sprs_img' => 'Suppress rendering of images', - 'sprs_applet' => 'Suppress Java applets', - 'sprs_embed' => 'Suppress rendering of embedded multimedia', - 'sprs_font' => 'Increase font size', - 'sprs_blackwhite' => 'Switch to black and white mode', - 'remember' => 'Remember these settings for next login'); + 'un' => 'Username', + 'pw' => 'Password', + 'dom' => 'Domain', + 'perc' => 'percent', + 'load' => 'Server Load', + 'userload' => 'User Load', + 'about' => 'About LON-CAPA', + 'catalog' => 'Course Catalog', + 'log' => 'Log in', + 'help' => 'Log-in Help', + 'serv' => 'Server', + 'servadm' => 'Server Administration', + 'helpdesk' => 'Contact Helpdesk', + 'forgotpw' => 'Forgot password?', + 'newuser' => 'New User?', + 'options_headline' => 'Select Accessibility Options', + 'sprs_img' => 'Suppress rendering of images', + 'sprs_applet' => 'Suppress Java applets', + 'sprs_embed' => 'Suppress rendering of embedded multimedia', + 'sprs_font' => 'Increase font size', + 'sprs_blackwhite' => 'Switch to black and white mode', + 'remember' => 'Remember these settings for next login'); # -------------------------------------------------- Change password field name - my $forgotpw = &forgotpwdisplay(%lt); - my $loginhelp = &loginhelpdisplay(%lt); +my $forgotpw = &forgotpwdisplay(%lt); +my $loginhelp = &loginhelpdisplay(%lt); # ---------------------------------------------------- Serve out DES JavaScript - { - my $jsh=Apache::File->new($include."/londes.js"); - $r->print(<$jsh>); - } +{ +my $jsh=Apache::File->new($include."/londes.js"); +$r->print(<$jsh>); +} # ---------------------------------------------------------- Serve rest of page - if ($fullgraph) { - $r->print( - ''); - } +if ($fullgraph) { +$r->print( + '
'); +} - $r->print(< +$r->print(< - - - - - - - @@ -441,188 +384,85 @@ ENDSERVERFORM if ($shownewuserlink) { $newuserlink = &newuser_link($lt{'newuser'}); } - if ($fullgraph) { - $r->print(< -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - '; + $logintitle = $lt{'log'}; } else { - $logintitle = ''; + $logintitle = ''. + &mt('User Authentication').''; } - my $noscript_warning=''; - $r->print(< - - - -
-HEADER - if ($showbanner) { - $r->print(< -ENDBANNER - } - $r->print(< -
 
- - - - - - - - - $coursecatalog - - - -
 $lt{'access'}
 $lt{'about'}
 
- 		-ENDSTART - if ($showmainlogo) { - $r->print(< - - -ENDLOGO - } - $r->print(< - - -
-ENDTOP - } else { - $r->print('

The LearningOnline Network with CAPA

' - .'

'.&mt('Text-based Interface Login').'

' - .$announcements); - } - $r->print('
'); - unless ($fullgraph) { - $r->print(<$lt{'options_headline'} -
-
-
-
-
-
- $lt{'remember'}
-ENDACCESSOPTIONS - } else { - $r->print(< - - - - - -ENDNOOPT - } my $logintitle; if ($loginheader eq 'text') { - $logintitle = '
   '.$lt{'log'}.''. - &mt('User Authentication').'' - .'
- $logintitle - $noscript_warning - - - - - - - - - - - - - - - - - - - -

   :
   :
   :
  -
- -
- $loginhelp - $forgotpw - $newuserlink -
-
- - -ENDLOGIN - if ($fullgraph) { - my $helpdeskscript; - my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, + .''; + my $helpdeskscript; + my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, $version,$authdomain,\$helpdeskscript); - $r->print(< + + if ($fullgraph) { + $r->print(< + + + + +
The Learning Online Network with CAPA
+ +
 
+ +
+$logintitle + + + + +$r->print(< + + :
+
+ :
+
+ :
+
+ + + + +
$domainlogo +ENDTOP + +$r->print('
'); - -
+$noscript_warning +
+ +
+ $loginhelp
+ $forgotpw

+ $newuserlink
+ $coursecatalog

+ $lt{'about'}
+ $helpdeskscript +
+
 
+$announcements +ENDTOPP +} +if($announcements){$r->print('
 
');} - -$announcements - - - - - - - -
- + if ($fullgraph) { + + $r->print(< - @@ -630,63 +470,35 @@ ENDLOGIN - - - - -
   $lt{'dom'}:  +  $domain
   $lt{'serv'}:  +  $lonhost ($role)
-    $lt{'load'}:  + +    $lt{'load'}:  -  $loadpercent% + +  $loadpercent $lt{'perc'}
-    $lt{'userload'}:  + +    $lt{'userload'}:  -  $userloadpercent% + +  $userloadpercent $lt{'perc'}
-
+ $contactblock - - - - - - -$domainlogo - - - - - - - - -   - - - - - - - - - - - + $helpdeskscript @@ -697,62 +509,6 @@ ENDDOCUMENT return OK; } -sub check_loginvia { - my ($domain,$lonhost) = @_; - if ($domain eq '' || $lonhost eq '') { - return; - } - my %domconfhash = &Apache::loncommon::get_domainconf($domain); - my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost}; - my $loginvia_exempt = $domconfhash{$domain.'.login.loginvia_exempt_'.$lonhost}; - my $output; - if ($loginvia ne '') { - my $noredirect; - my $ip = $ENV{'REMOTE_ADDR'}; - if ($ip eq '127.0.0.1') { - $noredirect = 1; - } else { - if ($loginvia_exempt ne '') { - my @exempt = split(',',$loginvia_exempt); - if (grep(/^\Q$ip\E$/,@exempt)) { - $noredirect = 1; - } - } - } - unless ($noredirect) { - my ($newhost,$path); - if ($loginvia =~ /:/) { - ($newhost,$path) = split(':',$loginvia); - } else { - $newhost = $loginvia; - } - if ($newhost ne $lonhost) { - if (&Apache::lonnet::hostname($newhost) ne '') { - $output = &redirect_page($newhost,$path); - } - } - } - } - return $output; -} - -sub redirect_page { - my ($desthost,$path) = @_; - my $protocol = $Apache::lonnet::protocol{$desthost}; - $protocol = 'http' if ($protocol ne 'https'); - unless ($path =~ m{^/}) { - $path = '/'.$path; - } - my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).$path; - if ($env{'form.firsturl'} ne '') { - $url .='?firsturl='.$env{'form.firsturl'}; - } - my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef, - {'redirect' => [0,$url],}); - my $end_page = &Apache::loncommon::end_page(); - return $start_page.$end_page; -} - sub contactdisplay { my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; my $contactblock; @@ -770,7 +526,6 @@ sub contactdisplay { my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT } @@ -794,7 +548,7 @@ sub forgotpwdisplay { my (%lt) = @_; my $prompt_for_resetpw = 1; if ($prompt_for_resetpw) { - return '
   '.$lt{'forgotpw'}.'
'; + return ''.$lt{'forgotpw'}.''; } return; } @@ -803,7 +557,7 @@ sub loginhelpdisplay { my (%lt) = @_; my $login_help = 1; if ($login_help) { - return '   '.$lt{'help'}.''; + return ''.$lt{'help'}.''; } return; } @@ -811,10 +565,7 @@ sub loginhelpdisplay { sub coursecatalog_link { my ($linkname) = @_; return <<"END"; - -   - $linkname - + $linkname END }