--- loncom/auth/lonlogin.pm 2007/10/02 01:09:59 1.96 +++ loncom/auth/lonlogin.pm 2008/02/24 23:18:37 1.101 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.96 2007/10/02 01:09:59 albertel Exp $ +# $Id: lonlogin.pm,v 1.101 2008/02/24 23:18:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -78,15 +78,14 @@ sub handler { &Apache::loncommon::start_page('Already logged in'); my $end_page = &Apache::loncommon::end_page(); - $r->print(<You are already logged in -

Please either continue the current session or -logout.

-

-Problems?

-$end_page -ENDFAILED + $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 + ); return OK; } @@ -148,9 +147,8 @@ ENDFAILED my $otherserver= &Apache::lonnet::absolute_url($host_name); my $firsturl= ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'}); -# ---------------------------------------- Are we access server and overloaded? - if (($role eq 'access') && - (($userloadpercent>100.0)||($loadpercent>100.0))) { +# ---------------------------------------------------------- Are we overloaded? + if ((($userloadpercent>100.0)||($loadpercent>100.0))) { my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent); if ($unloaded) { $otherserver=$unloaded; } } @@ -236,20 +234,6 @@ ENDTROUBLE # ----------------------------------------------- Apparently we are in business $servadm=~s/\,/\
/g; -# --------------------------------------------------- Print login screen header - $r->print(< - - -The LearningOnline Network with CAPA Login - -ENDHEADER -# ---------------------------------------------------- Serve out DES JavaScript - { - my $jsh=Apache::File->new($include."/londes.js"); - $r->print(<$jsh>); - } - # ----------------------------------------------------------- Front page design my $pgbg= ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF'); @@ -264,47 +248,30 @@ ENDHEADER ($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 $showadminmail=&Apache::loncommon::designparm('login.adminmail', $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); - - -# ----------------------------------------------------------------------- Texts - -my %lt=&Apache::lonlocal::texthash( - 'un' => 'Username', - 'pw' => 'Password', - 'dom' => 'Domain', - 'perc' => 'percent', - 'load' => 'Load', - 'userload' => 'User Load', - 'about' => 'About LON-CAPA', - 'access' => 'Accessibility Options', - 'catalog' => 'Course Catalog', - 'auth' => 'userauthentication.gif', - 'log' => 'Log in', - 'help' => 'Log-in Help', - 'serv' => 'Server', - 'servadm' => 'Server Administration', - 'helpdesk' => 'Contact Helpdesk', - 'forgotpw' => 'Forgot password?'); -# -------------------------------------------------- Change password field name + my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain); + my $shownewuserlink = + &Apache::loncommon::designparm('login.newuser',$domain); my $now=time; - my $forgotpw = &forgotpwdisplay(%lt); - my $loginhelp = &loginhelpdisplay(%lt); -# ---------------------------------------------------------- Serve rest of page - $r->print(< + my $js = (< function send() { - this.document.server.elements.uname.value + this.document.server.elements.uname.value =this.document.client.elements.uname.value; this.document.server.elements.udom.value @@ -333,21 +300,76 @@ my %lt=&Apache::lonlocal::texthash( 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)); + =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.server.submit(); - return false; + 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,})); + +# ----------------------------------------------------------------------- Texts + +my %lt=&Apache::lonlocal::texthash( + 'un' => 'Username', + 'pw' => 'Password', + 'dom' => 'Domain', + 'perc' => 'percent', + 'load' => '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'); +# -------------------------------------------------- Change password field name + my $forgotpw = &forgotpwdisplay(%lt); + my $loginhelp = &loginhelpdisplay(%lt); + +# ---------------------------------------------------- Serve out DES JavaScript + { + my $jsh=Apache::File->new($include."/londes.js"); + $r->print(<$jsh>); + } +# ---------------------------------------------------------- Serve rest of page + if ($fullgraph) { $r->print( ''); @@ -377,6 +399,10 @@ ENDSERVERFORM if (($showcoursecat eq '') || ($showcoursecat)) { $coursecatalog = &coursecatalog_link($lt{'catalog'}); } + my $newuserlink; + if ($shownewuserlink) { + $newuserlink = &newuser_link($lt{'newuser'}); + } if ($fullgraph) { $r->print(< @@ -441,18 +467,21 @@ ENDSERVERFORM '; + } else { + $logintitle = ''; + } $r->print(<
ENDTOP } else { - $r->print('

The LearningOnline Network with CAPA

Text-based Interface Login

'.$announcements); + $r->print('

The LearningOnline Network with CAPA

' + .'

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

' + .$announcements); } $r->print('
'); unless ($fullgraph) { $r->print(<Select Accessibility Options -
-
-
-
-
- Remember these settings for next login
+

$lt{'options_headline'}

+
+
+
+
+
+
+ $lt{'remember'}
ENDACCESSOPTIONS } else { $r->print(< ENDNOOPT } + my $logintitle; + if ($loginheader eq 'text') { + $logintitle = '
   '.$lt{'log'}.''. + &mt('User Authentication').'
- + $logintitle @@ -494,6 +530,8 @@ ENDNOOPT
User Authentication

   :
$loginhelp $forgotpw + $newuserlink +
@@ -594,7 +632,8 @@ $helpdeskscript ENDDOCUMENT } - $r->print(''); + my %endargs = ( 'noredirectlink' => 1, ); + $r->print(&Apache::loncommon::end_page(\%endargs)); return OK; } @@ -637,7 +676,7 @@ sub forgotpwdisplay { my (%lt) = @_; my $prompt_for_resetpw = 1; if ($prompt_for_resetpw) { - return '
   '.$lt{'forgotpw'}.'

'; + return '
   '.$lt{'forgotpw'}.'
'; } return; } @@ -661,5 +700,10 @@ sub coursecatalog_link { END } +sub newuser_link { + my ($linkname) = @_; + return '   '.$linkname.'
'; +} + 1; __END__