version 1.117, 2009/04/01 14:43:19
|
version 1.122, 2009/05/22 17:01:28
|
Line 103 sub handler {
|
Line 103 sub handler {
|
$env{'form.interface'}=~s/\W//g; |
$env{'form.interface'}=~s/\W//g; |
|
|
my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; |
my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; |
|
|
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 235 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 $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 271 my $now=time;
|
Line 264 my $now=time;
|
my $js = (<<ENDSCRIPT); |
my $js = (<<ENDSCRIPT); |
|
|
<script type="text/javascript" language="JavaScript"> |
<script type="text/javascript" language="JavaScript"> |
|
// <![CDATA[ |
function send() |
function send() |
{ |
{ |
this.document.server.elements.uname.value |
this.document.server.elements.uname.value |
Line 296 this.document.client.elements.upass$now.
|
Line 290 this.document.client.elements.upass$now.
|
this.document.server.submit(); |
this.document.server.submit(); |
return false; |
return false; |
} |
} |
|
// ]]> |
</script> |
</script> |
|
|
ENDSCRIPT |
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 326 my %lt=&Apache::lonlocal::texthash(
|
Line 318 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 347 $r->print(<$jsh>);
|
Line 338 $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 389 my $contactblock = &contactdisplay(\%lt,
|
Line 383 my $contactblock = &contactdisplay(\%lt,
|
$version,$authdomain,\$helpdeskscript); |
$version,$authdomain,\$helpdeskscript); |
|
|
my $loginform=(<<LFORM); |
my $loginform=(<<LFORM); |
<form name="client" onsubmit="return(send())"> |
<form name="client" action="" 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 /> |
Line 402 my $loginform=(<<LFORM);
|
Line 396 my $loginform=(<<LFORM);
|
</form> |
</form> |
LFORM |
LFORM |
|
|
if ($fullgraph) { |
|
if ($showbanner) { |
if ($showbanner) { |
$r->print(<<HEADER); |
$r->print(<<HEADER); |
<!-- The LON-CAPA Header --> |
<!-- The LON-CAPA Header --> |
Line 415 if ($fullgraph) {
|
Line 408 if ($fullgraph) {
|
</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_loginDomain">$domainlogo</div> |
<div class="LC_loginpage_space"> </div> |
|
<div class="LC_loginpage_floatLeft"> |
<div class="LC_loginpage_loginContainer"> |
<div class="LC_loginpage_loginContainer"> |
$logintitle |
$logintitle |
<table border="0" align="left" cellspacing="1" cellpadding="2" width="100%"> |
<table border="0" align="left" cellspacing="1" cellpadding="2" width="100%"> |
Line 438 HEADER
|
Line 428 HEADER
|
$forgotpw<br /> |
$forgotpw<br /> |
$contactblock<br /> |
$contactblock<br /> |
$newuserlink |
$newuserlink |
$coursecatalog<br /><br /> |
$coursecatalog |
<a href="/adm/about.html"><b>$lt{'about'}</b></a> |
|
</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> |
Line 488 $r->print(<<ENDDOCUMENT);
|
Line 479 $r->print(<<ENDDOCUMENT);
|
</div> |
</div> |
|
|
<script type="text/javascript"> |
<script type="text/javascript"> |
|
// <![CDATA[ |
// the if prevents the script error if the browser can not handle this |
// the if prevents the script error if the browser can not handle this |
if ( document.client.uname ) { document.client.uname.focus(); } |
if ( document.client.uname ) { document.client.uname.focus(); } |
|
// ]]> |
</script> |
</script> |
$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 517 sub contactdisplay {
|
Line 509 sub contactdisplay {
|
my $thisurl = &escape('/adm/login'); |
my $thisurl = &escape('/adm/login'); |
$$helpdeskscript = <<"ENDSCRIPT"; |
$$helpdeskscript = <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
|
// <![CDATA[ |
function helpdesk() { |
function helpdesk() { |
var codedom = document.client.udom.value; |
var codedom = document.client.udom.value; |
if (codedom == '') { |
if (codedom == '') { |
Line 526 function helpdesk() {
|
Line 519 function helpdesk() {
|
document.location.href = "/adm/helpdesk?"+querystr; |
document.location.href = "/adm/helpdesk?"+querystr; |
return; |
return; |
} |
} |
|
// ]]> |
</script> |
</script> |
ENDSCRIPT |
ENDSCRIPT |
} |
} |