--- loncom/auth/lonlogin.pm 2008/09/24 17:05:37 1.105 +++ loncom/auth/lonlogin.pm 2009/12/04 13:50:48 1.131 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.105 2008/09/24 17:05:37 bisitz Exp $ +# $Id: lonlogin.pm,v 1.131 2009/12/04 13:50:48 jms 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']); + 'token','role','symb']); if (!defined($env{'form.firsturl'})) { &Apache::lonacc::get_posted_cgi($r,['firsturl']); } @@ -81,13 +81,25 @@ 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'}; + } + + my $dom = &Apache::lonnet::default_login_domain(); + my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); + + my $loginhelp_page = $helpconfig{'helpsettings'}{'loginhelpurl'}; + if ($loginhelp_page eq '') { + $loginhelp_page = '/adm/loginproblems.html'; + } $r->print( $start_page .'

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

' - .'

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

' - .'

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

' - .$end_page + .'

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

' + .'

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

' + .$dom.' '.$end_page ); return OK; } @@ -102,21 +114,24 @@ 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')); + my $lonhost = $r->dir_config('lonHostID'); my $domain = &Apache::lonnet::default_login_domain(); + my %domconfhash = &Apache::loncommon::get_domainconf($domain); + if ($lonhost ne '') { + my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost}; + if (($loginvia ne '') && ($loginvia ne $lonhost)) { + if (&Apache::lonnet::hostname($loginvia) ne '') { + $r->print(&redirect_page($loginvia)); + return OK; + } + } + } + if (($env{'form.domain'}) && (&Apache::lonnet::domain($env{'form.domain'},'description'))) { $domain=$env{'form.domain'}; @@ -124,7 +139,6 @@ 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'); @@ -179,8 +193,18 @@ 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, + 'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, $lonhost); # ------------------- If we cannot talk to ourselves, we are in serious trouble @@ -201,454 +225,323 @@ sub handler { $hostname. '/adm/login?domain='.$authdomain.'">'. $hostname.''. - ' (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.''; + ' '.&mt('(preferred)').''.$/; $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 $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; - - this.document.server.elements.imagesuppress.value - =this.document.client.elements.imagesuppress.checked; - - this.document.server.elements.embedsuppress.value - =this.document.client.elements.embedsuppress.checked; - - this.document.server.elements.appletsuppress.value - =this.document.client.elements.appletsuppress.checked; - - this.document.server.elements.fontenhance.value - =this.document.client.elements.fontenhance.checked; - - this.document.server.elements.blackwhite.value - =this.document.client.elements.blackwhite.checked; - - this.document.server.elements.remember.value - =this.document.client.elements.remember.checked; - - 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)); +my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain); +my $font=&Apache::loncommon::designparm('login.font',$domain); +my $link=&Apache::loncommon::designparm('login.link',$domain); +my $vlink=&Apache::loncommon::designparm('login.vlink',$domain); +my $alink=&Apache::loncommon::designparm('login.alink',$domain); +my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain); +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', - 'perc' => 'percent', - 'load' => 'Server Load', - 'userload' => 'User Load', - 'about' => 'About LON-CAPA', - 'access' => 'Accessibility Options', - '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'); + 'un' => 'Username', + 'pw' => 'Password', + 'dom' => 'Domain', + 'perc' => 'percent', + 'load' => 'Server Load', + 'userload' => 'User Load', + '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?', + ); # -------------------------------------------------- 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(< - - - -
The Learning Online Network with CAPA
 
- - - - - - - - - $coursecatalog - - - -
 $lt{'access'}
 $lt{'about'}
 
- 		-
- -
-
-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 +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 { - $r->print(< - - - - - -ENDNOOPT -} - my $logintitle; - if ($loginheader eq 'text') { - $logintitle = '
   '.$lt{'log'}.''. - &mt('User Authentication').'' - .'
- $logintitle - $noscript_warning - - - - - - - - - - - - - - - - + $logintitle = ''. + &mt('User Authentication').''; +} + +my $noscript_warning=''; +my $helpdeskscript; +my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, + $version,$authdomain,\$helpdeskscript); + +my $loginform=(< + + + :
+
+ :
+
+ :
+
+ + +LFORM + + if ($showbanner) { + $r->print(< +

   :
   :
   :
  -
- -
+ + + +
+ The Learning Online Network with CAPA +
+HEADER + } + $r->print(<  +
+
+ $logintitle + - + -
- $loginhelp - $forgotpw - $newuserlink -
- 		+ $loginform +
- - -ENDLOGIN - if ($fullgraph) { - my $helpdeskscript; - my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $version,$authdomain,\$helpdeskscript); - $r->print(< - - - - - -$announcements - - - - - - - - -
- +
+ $noscript_warning +
+ +
+ $loginhelp
+ $forgotpw
+
+ $contactblock
+
+ $newuserlink
+ $coursecatalog +
+
+ENDTOP + if ($showmainlogo) { + $r->print(' '."\n"); + } +$r->print(<  +ENDTOP + +$r->print(< - +    $lt{'dom'}:  - +  $domain - +    $lt{'serv'}:  - +  $lonhost ($role) - +    $lt{'load'}:  - +  $loadpercent $lt{'perc'} - +    $lt{'userload'}:  - +  $userloadpercent $lt{'perc'} -
- $contactblock - - - - - - - -$domainlogo - - - - - - - - -   - - - - - - - - - - - + $helpdeskscript ENDDOCUMENT -} my %endargs = ( 'noredirectlink' => 1, ); $r->print(&Apache::loncommon::end_page(\%endargs)); return OK; } +sub redirect_page { + my ($desthost) = @_; + my $protocol = $Apache::lonnet::protocol{$desthost}; + $protocol = 'http' if ($protocol ne 'https'); + my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).'/'; + 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; @@ -658,14 +551,15 @@ sub contactdisplay { $showhelpdesk = 1; } if ($servadm && $showadminmail) { - $contactblock .= '   '.$$lt{'servadm'}.':
'. - '      '.$servadm.'
 
'; + $contactblock .= $$lt{'servadm'}.':
'. + ''.$servadm.'
'; } if ($showhelpdesk) { - $contactblock .= '   '.$lt->{'helpdesk'}.'
'; + $contactblock .= ''.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT } - $contactblock .= <<"ENDBLOCK"; -    $version -ENDBLOCK + $contactblock .= $version; return $contactblock; } @@ -688,7 +581,7 @@ sub forgotpwdisplay { my (%lt) = @_; my $prompt_for_resetpw = 1; if ($prompt_for_resetpw) { - return '
   '.$lt{'forgotpw'}.'
'; + return ''.$lt{'forgotpw'}.''; } return; } @@ -697,7 +590,14 @@ sub loginhelpdisplay { my (%lt) = @_; my $login_help = 1; if ($login_help) { - return '   '.$lt{'help'}.''; + my $dom = &Apache::lonnet::default_login_domain(); + my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); + my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'}; + if ($loginhelp_url ne '') { + return ''.$lt{'help'}.''; + } else { + return ''.$lt{'help'}.''; + } } return; } @@ -705,16 +605,13 @@ sub loginhelpdisplay { sub coursecatalog_link { my ($linkname) = @_; return <<"END"; - -   - $linkname - + $linkname END } sub newuser_link { my ($linkname) = @_; - return '   '.$linkname.'
'; + return ''.$linkname.''; } 1;