loncom/auth/lonlogin.pm - diff

Return to lonlogin.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonlogin.pm between versions 1.15 and 1.26

version 1.15, 2002/03/23 21:06:54	version 1.26, 2002/10/29 20:57:31
Line 30	Line 30
# 1/17/01 Gerd Kortemeyer	# 1/17/01 Gerd Kortemeyer
#	#
# 2/7/02,2/8,2/12,2/14,2/15,2/19 Josh Brunskole	# 2/7/02,2/8,2/12,2/14,2/15,2/19 Josh Brunskole
	#
	# 7/10/02 Jeremy Bowers

package Apache::lonlogin;	package Apache::lonlogin;

Line 46 sub handler {	Line 48 sub handler {
$r->send_http_header;	$r->send_http_header;
return OK if $r->header_only;	return OK if $r->header_only;

my $iconpath= $r->dir_config('lonIconsURL');
	&Apache::loncommon::get_unprocessed_cgi
	($ENV{'QUERY_STRING'},['interface']);

	$ENV{'form.interface'}=~s/\W//g;

	my $fullgraph=($ENV{'form.interface'} ne 'textual');

	my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'.
	$r->dir_config('lonIconsURL');
my $domain = $r->dir_config('lonDefDomain');	my $domain = $r->dir_config('lonDefDomain');
my $role = $r->dir_config('lonRole');	my $role = $r->dir_config('lonRole');
my $loadlim = $r->dir_config('lonLoadLim');	my $loadlim = $r->dir_config('lonLoadLim');
Line 68 sub handler {	Line 79 sub handler {
my $firsturl=$ENV{'request.firsturl'};	my $firsturl=$ENV{'request.firsturl'};
# ---------------------------------------- Are we access server and overloaded?	# ---------------------------------------- Are we access server and overloaded?
if (($role eq 'access') && ($loadpercent>100.0)) {	if (($role eq 'access') && ($loadpercent>100.0)) {
$otherserver=Apache::lonnet::spareserver();	$otherserver=Apache::lonnet::spareserver($loadpercent);
}	}

# -------------------------------------------------------- Set login parameters	# -------------------------------------------------------- Set login parameters
Line 94 sub handler {	Line 105 sub handler {
my $logtoken=Apache::lonnet::reply(	my $logtoken=Apache::lonnet::reply(
'tmpput:'.$ukey.$lkey.'&'.$firsturl,	'tmpput:'.$ukey.$lkey.'&'.$firsturl,
$lonhost);	$lonhost);
	my $domainlogo=&Apache::loncommon::domainlogo();
# --------------------------------------------------- Print login screen header	# --------------------------------------------------- Print login screen header
$r->print(<<ENDHEADER);	$r->print(<<ENDHEADER);
<html>	<html>
Line 107 ENDHEADER	Line 118 ENDHEADER
my $jsh=Apache::File->new($include."/londes.js");	my $jsh=Apache::File->new($include."/londes.js");
$r->print(<$jsh>);	$r->print(<$jsh>);
}	}

	# ----------------------------------------------------------- Front page design
	my $pgbg=&Apache::loncommon::designparm('login.pgbg');
	my $font=&Apache::loncommon::designparm('login.font');
	my $link=&Apache::loncommon::designparm('login.link');
	my $vlink=&Apache::loncommon::designparm('login.vlink');
	my $alink=&Apache::loncommon::designparm('login.alink');
	my $mainbg=&Apache::loncommon::designparm('login.mainbg');
	my $sidebg=&Apache::loncommon::designparm('login.sidebg');
	my $logo=&Apache::loncommon::designparm('login.logo');
	my $img=&Apache::loncommon::designparm('login.img');


# ---------------------------------------------------------- Serve rest of page	# ---------------------------------------------------------- Serve rest of page
$r->print(<<ENDDOCUMENT);	$r->print(<<ENDSCRIPT);

<body bgcolor="#006600" text="#000000" link="#999999" vlink="#999999"	<body bgcolor="$pgbg" text="$font" link="$link" vlink="$vlink" alink="$alink"
onLoad="init();" topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>	onLoad="init();" topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>

<script language="JavaScript">	<script language="JavaScript">
Line 130 ENDHEADER	Line 154 ENDHEADER
=crypted(this.document.client.elements.upass.value);	=crypted(this.document.client.elements.upass.value);

this.document.server.submit();	this.document.server.submit();
	return false;
}	}
</script>	</script>
	ENDSCRIPT

<!-- The Main Table -->	if ($fullgraph) {
<table width="100%" cellpadding=0 cellspacing=0 border=0>	$r->print(
	'<table width="100%" cellpadding=0 cellspacing=0 border=0>');
	}

	$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">
<input type=hidden name=logtoken value="$logtoken">	<input type=hidden name=logtoken value="$logtoken">
<input type=hidden name=serverid value="$lonhost">	<input type=hidden name=serverid value="$lonhost">
	<input type=hidden name=interface value="$ENV{'form.interface'}">
<input type=hidden name=uname value="">	<input type=hidden name=uname value="">
<input type=hidden name=upass value="">	<input type=hidden name=upass value="">
<input type=hidden name=udom value="">	<input type=hidden name=udom value="">
</form>	</form>
	ENDSERVERFORM
	if ($fullgraph) { $r->print(<<ENDTOP);
<!-- The LON-CAPA Header -->	<!-- The LON-CAPA Header -->
<tr>	<tr>

<!-- Row 1 Columns 2-4 -->	<!-- Row 1 Columns 2-4 -->
<td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="#006600"><img src="$iconpath/header.gif" border=0 /></td>	<td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="#006600"><img src="$img" border=0 alt="The Learning Online Network with CAPA" /></td>
</tr>	</tr>

<!-- The gray bar that starts the two table frames -->	<!-- The gray bar that starts the two table frames -->
<tr>	<tr>

<!-- Row 2 Column 1 -->	<!-- Row 2 Column 1 -->
<td width=182 height=27 bgcolor="#cccccc"> </td>	<td width=182 height=27 bgcolor="$sidebg"> </td>

<!-- Row 2 Column 2 -->	<!-- Row 2 Column 2 -->
<td width=27 height=27 align="left" background="$iconpath/filltop.gif"><img src="$iconpath/upperleft.gif" border=0 /></td>	<td width=27 height=27 align="left" background="$iconpath/filltop.gif"><img src="$iconpath/upperleft.gif" border=0 alt="" /></td>

<!-- Row 2 Column 3 -->	<!-- Row 2 Column 3 -->
<td height=27 background="$iconpath/filltop.gif"><img src="$iconpath/filltop.gif" /></td>	<td height=27 background="$iconpath/filltop.gif"><img src="$iconpath/filltop.gif" alt="" /></td>

<!-- Row 2 Column 4 -->	<!-- Row 2 Column 4 -->
<td width=27 height=27 align="right" background="$iconpath/filltop.gif"><img src="$iconpath/upperright.gif" border=0 /></td>	<td width=27 height=27 align="right" background="$iconpath/filltop.gif"><img src="$iconpath/upperright.gif" border=0 alt="" /></td>
</tr>	</tr>
<tr>	<tr>

<!-- A cell that will hold the 'access' and 'about' buttons -->	<!-- A cell that will hold the 'access' and 'about' buttons -->
<!-- Row 3 Column 1 -->	<!-- Row 3 Column 1 -->
<td valign="top" height=60 align="center" bgcolor="#cccccc">	<td valign="top" height=60 align="center" bgcolor="$sidebg">
<a href="/adm/accessibility.html"><img src="$iconpath/accessbutton.gif" border=0 /></a>	<a href="/adm/login?interface=textual"><img src="$iconpath/accessbutton.gif" border=0 alt="Accessibility Options" /></a>
<br />	<br />
<a href="/adm/about.html"><img src="$iconpath/aboutlon.gif" border=0 /></a>	<a href="/adm/about.html"><img src="$iconpath/aboutlon.gif" border=0 alt="About LON-CAPA" /></a>
</td>	</td>

<!-- The shaded space between the two main columns -->	<!-- The shaded space between the two main columns -->
<!-- Row 3 Column 2 -->	<!-- Row 3 Column 2 -->
<td width=27 height=60 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" /></td>	<td width=27 height=60 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>

<!-- The right main column holding the large LON-CAPA logo-->	<!-- The right main column holding the large LON-CAPA logo-->
<!-- Rows 3-4 Column 3 -->	<!-- Rows 3-4 Column 3 -->
<td align="center" valign="top" width="100%" height="100%" rowspan=2 bgcolor="#ffffff">	<td align="center" valign="top" width="100%" height="100%" rowspan=2 bgcolor="$mainbg">
<center>	<center>
<img src="$iconpath/loncapalogo.gif" />	<img src="$logo" alt="" />
</center>	</center>
</td>	</td>

<!-- Row 3 Column 4 -->	<!-- Row 3 Column 4 -->
<td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" /></td>	<td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
</tr>	</tr>
<tr>	<tr>

<!-- The entry form -->	<!-- The entry form -->
<!-- Row 4 Column 1 -->	<!-- Row 4 Column 1 -->
<td align="center" valign="middle" bgcolor="#cccccc">	<td align="center" valign="middle" bgcolor="$sidebg">
<form name="client">	ENDTOP
	}
	$r->print(<<ENDLOGIN);
	<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">

<!-- Start the sub-table for text and input alignment -->	<!-- Start the sub-table for text and input alignment -->
<table border=0 cellspacing=0 cellpadding=0>	<table border=0 cellspacing=0 cellpadding=0>
<tr><td bgcolor="#cccccc" colspan=2><img src="$iconpath/userauthentication.gif" /></td></tr>	<tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>
<tr>	<tr>
<td bgcolor="#ffffff"><br /><font size=-1><b>   User Name:</b></font></td>	<td bgcolor="$mainbg"><br /><font size=-1><b>   User Name:</b></font></td>
<td bgcolor="#ffffff"><br /><input type="text" name="uname" size="10" /></td>	<td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" /></td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="#ffffff"><font size=-1><b>   Password:</b></font></td>	<td bgcolor="$mainbg"><font size=-1><b>   Password:</b></font></td>
<td bgcolor="#ffffff"><input type="password" name="upass" size="10" /></td>	<td bgcolor="$mainbg"><input type="password" name="upass" size="10" /></td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="#ffffff"><font size=-1><b>   Domain:</b></font></td>	<td bgcolor="$mainbg"><font size=-1><b>   Domain:</b></font></td>
<td bgcolor="#ffffff"><input type="text" name="udom" size="10" value=$domain /></td>	<td bgcolor="$mainbg"><input type="text" name="udom" size="10" value=$domain /></td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="#ffffff" valign="bottom" align="center" colspan=2>	<td bgcolor="$mainbg" valign="bottom" align="center" colspan=2>
<br />	<br />
<input type="button" value="Log In" onClick="send();" />	<input type="submit" value="Log In" />
</td>	</td>
</tr>	</tr>
</table>	</table>
<!-- End sub-table -->	<!-- End sub-table -->

</form>	</form>
	ENDLOGIN
	if ($fullgraph) {
	$r->print(<<ENDDOCUMENT);
</td>	</td>

<!-- Row 4 Column 2 -->	<!-- Row 4 Column 2 -->
<td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" /></td>	<td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>

<!-- Row 4 Column 4 -->	<!-- Row 4 Column 4 -->
<td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" /></td>	<td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
</tr>	</tr>
<tr>	<tr>

<!-- Row 5 Column 1 -->	<!-- Row 5 Column 1 -->
<td bgcolor="#cccccc" valign="middle" align="left">	<td bgcolor="$sidebg" valign="middle" align="left">
<br />	<br />
<table border=0 cellspacing=0 cellpadding=0>	<table border=0 cellspacing=0 cellpadding=0>
<tr>	<tr>
<td bgcolor="#cccccc" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><b>   Domain: </b></small>	<small><b>   Domain: </b></small>
</td>	</td>
<td bgcolor="#cccccc" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><tt> $domain</tt></small>	<small><tt> $domain</tt></small>
</td>	</td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="#cccccc" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><b>   Server: </b></small>	<small><b>   Server: </b></small>
</td>	</td>
<td bgcolor="#cccccc" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><tt> $lonhost ($role)</tt></small>	<small><tt> $lonhost ($role)</tt></small>
</td>	</td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="#cccccc" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><b>   Load: </b></small>	<small><b>   Load: </b></small>
</td>	</td>
<td bgcolor="#cccccc" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><tt> $loadpercent percent</tt></small>	<small><tt> $loadpercent percent</tt></small>
</td>	</td>
</tr>	</tr>
Line 269 ENDHEADER	Line 305 ENDHEADER
<b>   System Administration:</b><br />	<b>   System Administration:</b><br />
<tt>      $sysadm</tt><br />	<tt>      $sysadm</tt><br />
<b>   Server Administration:</b><br />	<b>   Server Administration:</b><br />
<tt>      $servadm</tt>	<tt>      $servadm<br /> </tt>
</small>	</small>
</td>	</td>

<!-- Row 5 Column 2 -->	<!-- Row 5 Column 2 -->
<td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" /></td>	<td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>

<!-- Row 5 Column 3 -->	<!-- Row 5 Column 3 -->
<td width="100%" valign="bottom" bgcolor="#ffffff"><img src="$iconpath/litetext.gif" /><img src="$iconpath/lite.gif" /></td>	<td width="100%" valign="bottom" bgcolor="$mainbg">
	$domainlogo
	</td>

<!-- Row 5 Column 4 -->	<!-- Row 5 Column 4 -->
<td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" /></td>	<td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
</tr>	</tr>
<tr>	<tr>

<!-- Row 6 Column 1 -->	<!-- Row 6 Column 1 -->
<td bgcolor="#cccccc"> </td>	<td bgcolor="$sidebg"> </td>

<!-- Row 6 Column 2 -->	<!-- Row 6 Column 2 -->
<td align="left" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerleft.gif" /></td>	<td align="left" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerleft.gif" alt="" /></td>

<!-- Row 6 Column 3 -->	<!-- Row 6 Column 3 -->
<td background="$iconpath/fillbottom.gif"><img src="$iconpath/fillbottom.gif" /></td>	<td background="$iconpath/fillbottom.gif"><img src="$iconpath/fillbottom.gif" alt="" /></td>

<!-- Row 6 Column 4 -->	<!-- Row 6 Column 4 -->
<td align="right" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerright.gif" /></td>	<td align="right" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerright.gif" alt="" /></td>
</tr>	</tr>
</table>	</table>
</body>
</html>	<script>
	// the if prevents the script error if the browser can't handle this
	if ( document.client.uname ) { document.client.uname.focus(); }
	</script>

ENDDOCUMENT	ENDDOCUMENT
	}
	$r->print('</body></html>');
return OK;	return OK;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.15
changed lines
	Added in v.1.26