version 1.109, 2008/12/01 15:03:43
|
version 1.121, 2009/05/16 01:19:29
|
Line 84 sub handler {
|
Line 84 sub handler {
|
$r->print( |
$r->print( |
$start_page |
$start_page |
.'<h1>'.&mt('You are already logged in!').'</h1>' |
.'<h1>'.&mt('You are already logged in!').'</h1>' |
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].', |
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', |
'<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>' |
'<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>' |
.'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>' |
.'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>' |
.$end_page |
.$end_page |
Line 102 sub handler {
|
Line 102 sub handler {
|
# ----------------------------------------------------------- Process Interface |
# ----------------------------------------------------------- Process Interface |
$env{'form.interface'}=~s/\W//g; |
$env{'form.interface'}=~s/\W//g; |
|
|
# my $textbrowsers=$r->dir_config('lonTextBrowsers'); |
|
my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; |
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= |
my $iconpath= |
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
Line 242 return OK;
|
Line 233 return OK;
|
$servadm=~s/\,/\<br \/\>/g; |
$servadm=~s/\,/\<br \/\>/g; |
|
|
# ----------------------------------------------------------- Front page design |
# ----------------------------------------------------------- Front page design |
my $pgbg= |
my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain); |
($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF'); |
my $font=&Apache::loncommon::designparm('login.font',$domain); |
my $font= |
my $link=&Apache::loncommon::designparm('login.link',$domain); |
($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000'); |
my $vlink=&Apache::loncommon::designparm('login.vlink',$domain); |
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 $alink=&Apache::loncommon::designparm('login.alink',$domain); |
my $mainbg= |
my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain); |
($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 $logo=&Apache::loncommon::designparm('login.logo',$domain); |
my $img=&Apache::loncommon::designparm('login.img',$domain); |
my $img=&Apache::loncommon::designparm('login.img',$domain); |
my $domainlogo=&Apache::loncommon::domainlogo($domain); |
my $domainlogo=&Apache::loncommon::domainlogo($domain); |
Line 283 my $shownewuserlink =
|
Line 263 my $shownewuserlink =
|
my $now=time; |
my $now=time; |
my $js = (<<ENDSCRIPT); |
my $js = (<<ENDSCRIPT); |
|
|
<script language="JavaScript"> |
<script type="text/javascript" language="JavaScript"> |
function send() |
function send() |
{ |
{ |
this.document.server.elements.uname.value |
this.document.server.elements.uname.value |
Line 315 ENDSCRIPT
|
Line 295 ENDSCRIPT
|
|
|
# --------------------------------------------------- Print login screen header |
# --------------------------------------------------- Print login screen header |
|
|
my %add_entries = (topmargin => "0", |
my %add_entries = ( |
leftmargin => "0", |
|
marginheight => "0", |
|
marginwidth => "0", |
|
bgcolor => "$mainbg", |
bgcolor => "$mainbg", |
text => "$font", |
text => "$font", |
link => "$link", |
link => "$link", |
Line 339 my %lt=&Apache::lonlocal::texthash(
|
Line 316 my %lt=&Apache::lonlocal::texthash(
|
'perc' => 'percent', |
'perc' => 'percent', |
'load' => 'Server Load', |
'load' => 'Server Load', |
'userload' => 'User Load', |
'userload' => 'User Load', |
'about' => 'About LON-CAPA', |
|
'catalog' => 'Course Catalog', |
'catalog' => 'Course Catalog', |
'log' => 'Log in', |
'log' => 'Log in', |
'help' => 'Log-in Help', |
'help' => 'Log-in Help', |
Line 348 my %lt=&Apache::lonlocal::texthash(
|
Line 324 my %lt=&Apache::lonlocal::texthash(
|
'helpdesk' => 'Contact Helpdesk', |
'helpdesk' => 'Contact Helpdesk', |
'forgotpw' => 'Forgot password?', |
'forgotpw' => 'Forgot password?', |
'newuser' => 'New User?', |
'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 |
# -------------------------------------------------- Change password field name |
my $forgotpw = &forgotpwdisplay(%lt); |
my $forgotpw = &forgotpwdisplay(%lt); |
my $loginhelp = &loginhelpdisplay(%lt); |
my $loginhelp = &loginhelpdisplay(%lt); |
Line 366 $r->print(<$jsh>);
|
Line 336 $r->print(<$jsh>);
|
} |
} |
# ---------------------------------------------------------- Serve rest of page |
# ---------------------------------------------------------- Serve rest of page |
|
|
if ($fullgraph) { |
|
$r->print( |
$r->print( |
'<div class="LC_loginpage_container">'); |
'<div class="LC_loginpage_container">'); |
} |
|
|
# |
|
# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing? |
|
# then just us a relative link to authenticate: |
|
# |
|
|
$r->print(<<ENDSERVERFORM); |
$r->print(<<ENDSERVERFORM); |
<form name="server" action="$otherserver/adm/authenticate" method="post" target="_top"> |
<form name="server" action="$otherserver/adm/authenticate" method="post" target="_top"> |
Line 390 if (($showcoursecat eq '') || ($showcour
|
Line 363 if (($showcoursecat eq '') || ($showcour
|
} |
} |
my $newuserlink; |
my $newuserlink; |
if ($shownewuserlink) { |
if ($shownewuserlink) { |
$newuserlink = &newuser_link($lt{'newuser'}); |
$newuserlink = &newuser_link($lt{'newuser'}).'<br />'; |
} |
} |
my $logintitle; |
my $logintitle; |
if ($loginheader eq 'text') { |
if ($loginheader eq 'text') { |
$logintitle = $lt{'log'}; |
$logintitle ='<h2>'.$lt{'log'}.'</h2>'; |
} else { |
} else { |
$logintitle = '<img src="'.$login.'" alt="'. |
$logintitle = '<img src="'.$login.'" alt="'. |
&mt('User Authentication').'" />'; |
&mt('User Authentication').'" />'; |
Line 409 my $contactblock = &contactdisplay(\%lt,
|
Line 382 my $contactblock = &contactdisplay(\%lt,
|
|
|
my $loginform=(<<LFORM); |
my $loginform=(<<LFORM); |
<form name="client" onsubmit="return(send())"> |
<form name="client" onsubmit="return(send())"> |
<input type="hidden" name="lextkey" value="$lextkey"> |
<input type="hidden" name="lextkey" value="$lextkey" /> |
<input type="hidden" name="uextkey" value="$uextkey"> |
<input type="hidden" name="uextkey" value="$uextkey" /> |
<b><label for="uname">$lt{'un'}</label>:</b><br /> |
<b><label for="uname">$lt{'un'}</label>:</b><br /> |
<input type="text" name="uname" size="10" value="$authusername" /><br /> |
<input type="text" name="uname" size="15" value="$authusername" /><br /> |
<b><label for="upass$now">$lt{'pw'}</label>:</b><br /> |
<b><label for="upass$now">$lt{'pw'}</label>:</b><br /> |
<input type="password" name="upass$now" size="10" /><br /> |
<input type="password" name="upass$now" size="15" /><br /> |
<b><label for="udom">$lt{'dom'}</label>:</b><br /> |
<b><label for="udom">$lt{'dom'}</label>:</b><br /> |
<input type="text" name="udom" size="10" value="$authdomain" /><br /> |
<input type="text" name="udom" size="15" value="$authdomain" /><br /> |
<input type="submit" value="$lt{'log'}" /> |
<input type="submit" value="$lt{'log'}" /> |
</form> |
</form> |
LFORM |
LFORM |
|
|
if ($fullgraph) { |
|
if ($showbanner) { |
if ($showbanner) { |
$r->print(<<HEADER); |
$r->print(<<HEADER); |
<!-- The LON-CAPA Header --> |
<!-- The LON-CAPA Header --> |
<table border="0" align="left" width="100%" cellspacing="0" cellpadding="1"> |
<table border="0" align="left" width="100%" cellspacing="0" cellpadding="1"> |
<tr> |
<tr> |
<td align="left" valign="top" bgcolor="$pgbg"> |
<td align="left" valign="top" bgcolor="$pgbg"> |
<img src="$img" border=0 alt="The Learning Online Network with CAPA" /> |
<img src="$img" border="0" alt="The Learning Online Network with CAPA" /> |
</td> |
</td> |
</tr> |
</tr> |
</table> |
</table> |
HEADER |
HEADER |
} |
} |
if ($showmainlogo) { |
|
$r->print('<div class="LC_loginpage_space"> </div>'."\n". |
|
' <img src="'.$logo.'" alt="" />'."\n"); |
|
} |
|
$r->print(<<ENDTOP); |
$r->print(<<ENDTOP); |
|
<div class="LC_loginpage_space"> </div> |
|
<div class="LC_loginpage_floatLeft"> |
<div class="LC_loginpage_loginContainer"> |
<div class="LC_loginpage_loginContainer"> |
<fieldset class="LC_loginpage_fieldset"> |
$logintitle |
<legend class="LC_loginpage_legend">$logintitle</legend> |
<table border="0" align="left" cellspacing="1" cellpadding="2" width="100%"> |
<table border="0" align="left" cellspacing="1" cellpadding="1" width="100%"> |
|
<tr> |
<tr> |
<td width="50%" align="center" valign="top"> |
|
$domainlogo |
|
</td> |
|
<td> |
<td> |
$loginform |
$loginform |
</td> |
</td> |
</tr> |
</tr> |
</table> |
</table> |
$noscript_warning |
$noscript_warning |
</fieldset> |
|
</div> |
</div> |
|
|
<div class="LC_loginpage_loginInfo"> |
<div class="LC_loginpage_loginInfo"> |
$loginhelp<br /> |
$loginhelp<br /> |
$forgotpw<br /><br /> |
$forgotpw<br /> |
$newuserlink<br /> |
$contactblock<br /> |
$coursecatalog<br /><br /> |
$newuserlink |
<a href="/adm/about.html"><b>$lt{'about'}</b></a><br /> |
$coursecatalog |
$helpdeskscript |
|
</div> |
</div> |
|
</div> |
<div class="LC_loginpage_space"> </div> |
ENDTOP |
|
if ($showmainlogo) { |
|
$r->print(' <img src="'.$logo.'" alt="" />'."\n"); |
|
} |
|
$r->print(<<ENDTOP); |
$announcements |
$announcements |
|
$domainlogo |
|
<div class="LC_loginpage_space"> </div> |
ENDTOP |
ENDTOP |
} |
|
|
|
if($announcements){$r->print('<div class="LC_loginpage_space"> </div>');} |
|
|
|
if ($fullgraph) { |
|
$r->print(<<ENDDOCUMENT); |
$r->print(<<ENDDOCUMENT); |
<table border=0 cellspacing=0 cellpadding=0> |
<table border="0" cellspacing="0" cellpadding="0"> |
<tr> |
<tr> |
<td bgcolor="$sidebg" align="left" valign="top"> |
<td align="left" valign="top"> |
<small><b> $lt{'dom'}: </b></small> |
<small><b> $lt{'dom'}: </b></small> |
</td> |
</td> |
<td bgcolor="$sidebg" align="left" valign="top"> |
<td align="left" valign="top"> |
<small><tt> $domain</tt></small> |
<small><tt> $domain</tt></small> |
</td> |
</td> |
</tr> |
</tr> |
<tr> |
<tr> |
<td bgcolor="$sidebg" align="left" valign="top"> |
<td align="left" valign="top"> |
<small><b> $lt{'serv'}: </b></small> |
<small><b> $lt{'serv'}: </b></small> |
</td> |
</td> |
<td bgcolor="$sidebg" align="left" valign="top"> |
<td align="left" valign="top"> |
<small><tt> $lonhost ($role)</tt></small> |
<small><tt> $lonhost ($role)</tt></small> |
</td> |
</td> |
</tr> |
</tr> |
<tr> |
<tr> |
<td bgcolor="$sidebg" align="left" valign="top"> |
<td align="left" valign="top"> |
<small><b> $lt{'load'}: </b></small> |
<small><b> $lt{'load'}: </b></small> |
</td> |
</td> |
<td bgcolor="$sidebg" align="left" valign="top"> |
<td align="left" valign="top"> |
<small><tt> $loadpercent $lt{'perc'}</tt></small> |
<small><tt> $loadpercent $lt{'perc'}</tt></small> |
</td> |
</td> |
</tr> |
</tr> |
<tr> |
<tr> |
<td bgcolor="$sidebg" align="left" valign="top"> |
<td align="left" valign="top"> |
<small><b> $lt{'userload'}: </b></small> |
<small><b> $lt{'userload'}: </b></small> |
</td> |
</td> |
<td bgcolor="$sidebg" align="left" valign="top"> |
<td align="left" valign="top"> |
<small><tt> $userloadpercent $lt{'perc'}</tt></small> |
<small><tt> $userloadpercent $lt{'perc'}</tt></small> |
</td> |
</td> |
</tr> |
</tr> |
</table> |
</table> |
|
|
$contactblock |
|
|
|
</div> |
</div> |
|
|
<script type="text/javascript"> |
<script type="text/javascript"> |
Line 520 if ( document.client.uname ) { document.
|
Line 483 if ( document.client.uname ) { document.
|
$helpdeskscript |
$helpdeskscript |
|
|
ENDDOCUMENT |
ENDDOCUMENT |
} |
|
my %endargs = ( 'noredirectlink' => 1, ); |
my %endargs = ( 'noredirectlink' => 1, ); |
$r->print(&Apache::loncommon::end_page(\%endargs)); |
$r->print(&Apache::loncommon::end_page(\%endargs)); |
return OK; |
return OK; |
Line 539 sub contactdisplay {
|
Line 501 sub contactdisplay {
|
'<tt> '.$servadm.'</tt><br /> <br />'; |
'<tt> '.$servadm.'</tt><br /> <br />'; |
} |
} |
if ($showhelpdesk) { |
if ($showhelpdesk) { |
$contactblock .= '<b> <a href="javascript:helpdesk()"><font size="+1">'.$lt->{'helpdesk'}.'</font></a></b><br />'; |
$contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />'; |
my $thisurl = &escape('/adm/login'); |
my $thisurl = &escape('/adm/login'); |
$$helpdeskscript = <<"ENDSCRIPT"; |
$$helpdeskscript = <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |