--- loncom/auth/lonlogin.pm 2010/02/09 17:49:15 1.106.4.5 +++ loncom/auth/lonlogin.pm 2009/07/22 21:51:03 1.124 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.106.4.5 2010/02/09 17:49:15 raeburn Exp $ +# $Id: lonlogin.pm,v 1.124 2009/07/22 21:51:03 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -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('Login problems?').'

' .$end_page ); @@ -106,16 +102,7 @@ sub handler { # ----------------------------------------------------------- Process Interface $env{'form.interface'}=~s/\W//g; - my $textbrowsers=$r->dir_config('lonTextBrowsers'); my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; - - 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')); @@ -218,461 +205,288 @@ 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 = (< - // +// - +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 = ( + bgcolor => "$mainbg", + 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', + 'catalog' => 'Course Catalog', + 'log' => 'Log in', + 'help' => 'Log-in Help', + 'serv' => 'Server', + 'servadm' => 'Server Administration', + 'helpdesk' => 'Contact Helpdesk', + 'forgotpw' => 'Forgot password?', + 'newuser' => 'New User?', + ); # -------------------------------------------------- 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( - ''); - } +$r->print( + '
'); - $r->print(< +# +# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing? +# then just us a relative link to authenticate: +# + +$r->print(< - - - - - - - ENDSERVERFORM - my $coursecatalog; - if (($showcoursecat eq '') || ($showcoursecat)) { - $coursecatalog = &coursecatalog_link($lt{'catalog'}); - } - my $newuserlink; - if ($shownewuserlink) { - $newuserlink = &newuser_link($lt{'newuser'}); - } - if ($fullgraph) { - $r->print(< -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - '; - } else { - $logintitle = ''; - } - my $noscript_warning=''; - $r->print(< - +my $noscript_warning=''; +my $helpdeskscript; +my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, + $version,$authdomain,\$helpdeskscript); + +my $loginform=(< + + + :
+
+ :
+
+ :
+
+ + +LFORM - -
-HEADER - if ($showbanner) { - $r->print(< -ENDBANNER - } - $r->print(< -
 
- - - - - - - - - $coursecatalog - - - -
 $lt{'access'}
 $lt{'about'}
 
- 		-ENDSTART - if ($showmainlogo) { - $r->print(< - - -ENDLOGO - } - $r->print(< +my $coursecatalog; +if (($showcoursecat eq '') || ($showcoursecat)) { + $coursecatalog = &coursecatalog_link($lt{'catalog'}); +} +my $newuserlink; +if ($shownewuserlink) { + $newuserlink = &newuser_link($lt{'newuser'}).'
'; +} +my $logintitle; +if ($loginheader eq 'text') { + $logintitle ='

'.$lt{'log'}.'

'; +} else { + $logintitle = ''. + &mt('User Authentication').''; +} - -
-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 - - - - - - - - - - - - + if ($showbanner) { + $r->print(< +

   :
   :
   :
+ + + +
+ The Learning Online Network with CAPA +
+HEADER + } + $r->print(<  +
+
+ $logintitle + - - + - -
  -
- - 		+ $loginform +
- $loginhelp - $forgotpw +
+ $noscript_warning +
+ +
+ $loginhelp
+ $forgotpw
+ $contactblock
$newuserlink -
- - - - - -ENDLOGIN - if ($fullgraph) { - my $helpdeskscript; - my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $version,$authdomain,\$helpdeskscript); - $r->print(< - - - - - -$announcements - - - - - - - - -
+ $coursecatalog +
+
+ENDTOP + if ($showmainlogo) { + $r->print(' '."\n"); + } +$r->print(<  +ENDTOP + +$r->print(< - +    $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 - - - - - - - - -   - - - - - - - - - - - +