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.107 and 1.130

version 1.107, 2008/11/22 19:07:02	version 1.130, 2009/12/01 14:23:49
Line 46 sub handler {	Line 46 sub handler {
(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
$ENV{'REDIRECT_QUERY_STRING'}),	$ENV{'REDIRECT_QUERY_STRING'}),
['interface','username','domain','firsturl','localpath','localres',	['interface','username','domain','firsturl','localpath','localres',
'token']);	'token','role','symb']);
if (!defined($env{'form.firsturl'})) {	if (!defined($env{'form.firsturl'})) {
&Apache::lonacc::get_posted_cgi($r,['firsturl']);	&Apache::lonacc::get_posted_cgi($r,['firsturl']);
}	}
Line 81 sub handler {	Line 81 sub handler {
&Apache::loncommon::start_page('Already logged in');	&Apache::loncommon::start_page('Already logged in');
my $end_page =	my $end_page =
&Apache::loncommon::end_page();	&Apache::loncommon::end_page();
	my $dest = '/adm/roles';
	if ($env{'form.firsturl'} ne '') {
	$dest = $env{'form.firsturl'};
	}
$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="'.$dest.'">','</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 106 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'));

	my $lonhost = $r->dir_config('lonHostID');
my $domain = &Apache::lonnet::default_login_domain();	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'}) &&	if (($env{'form.domain'}) &&
(&Apache::lonnet::domain($env{'form.domain'},'description'))) {	(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
$domain=$env{'form.domain'};	$domain=$env{'form.domain'};
Line 124 sub handler {	Line 131 sub handler {
my $role = $r->dir_config('lonRole');	my $role = $r->dir_config('lonRole');
my $loadlim = $r->dir_config('lonLoadLim');	my $loadlim = $r->dir_config('lonLoadLim');
my $servadm = $r->dir_config('lonAdmEMail');	my $servadm = $r->dir_config('lonAdmEMail');
my $lonhost = $r->dir_config('lonHostID');
my $tabdir = $r->dir_config('lonTabDir');	my $tabdir = $r->dir_config('lonTabDir');
my $include = $r->dir_config('lonIncludes');	my $include = $r->dir_config('lonIncludes');
my $expire = $r->dir_config('lonExpire');	my $expire = $r->dir_config('lonExpire');
Line 179 sub handler {	Line 185 sub handler {
if ($uextkey>2147483647) { $uextkey-=4294967296; }	if ($uextkey>2147483647) { $uextkey-=4294967296; }

# -------------------------------------------------------- Store away log token	# -------------------------------------------------------- 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(	my $logtoken=Apache::lonnet::reply(
'tmpput:'.$ukey.$lkey.'&'.$firsturl,	'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
$lonhost);	$lonhost);

# ------------------- If we cannot talk to ourselves, we are in serious trouble	# ------------------- If we cannot talk to ourselves, we are in serious trouble
Line 242 return OK;	Line 258 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 266 my $login=&Apache::loncommon::designparm	Line 271 my $login=&Apache::loncommon::designparm
if ($login eq '') {	if ($login eq '') {
$login = $iconpath.'/'.&mt('userauthentication.gif');	$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 $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
my $showcoursecat =	my $showcoursecat =
&Apache::loncommon::designparm('login.coursecatalog',$domain);	&Apache::loncommon::designparm('login.coursecatalog',$domain);
Line 275 my $shownewuserlink =	Line 288 my $shownewuserlink =
my $now=time;	my $now=time;
my $js = (<<ENDSCRIPT);	my $js = (<<ENDSCRIPT);

<script 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 301 this.document.client.elements.upass$now.	Line 315 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",	bgcolor => "$mainbg",
marginheight => "0",
marginwidth => "0",
bgcolor => "$pgbg",
text => "$font",	text => "$font",
link => "$link",	link => "$link",
vlink => "$vlink",	vlink => "$vlink",
Line 325 $r->print(&Apache::loncommon::start_page	Line 337 $r->print(&Apache::loncommon::start_page
# ----------------------------------------------------------------------- Texts	# ----------------------------------------------------------------------- Texts

my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'un' => 'Username',	'un' => 'Username',
'pw' => 'Password',	'pw' => 'Password',
'dom' => 'Domain',	'dom' => 'Domain',
'perc' => 'percent',	'perc' => 'percent',
'load' => 'Server Load',	'load' => 'Server Load',
'userload' => 'User Load',	'userload' => 'User Load',
'about' => 'About LON-CAPA',	'catalog' => 'Course/Community Catalog',
'catalog' => 'Course Catalog',	'log' => 'Log in',
'log' => 'Log in',	'help' => 'Log-in Help',
'help' => 'Log-in Help',	'serv' => 'Server',
'serv' => 'Server',	'servadm' => 'Server Administration',
'servadm' => 'Server Administration',	'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 358 $r->print(<$jsh>);	Line 363 $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 376 $r->print(<<ENDSERVERFORM);	Line 384 $r->print(<<ENDSERVERFORM);
<input type="hidden" name="localres" value="$env{'form.localres'}" />	<input type="hidden" name="localres" value="$env{'form.localres'}" />
</form>	</form>
ENDSERVERFORM	ENDSERVERFORM
my $coursecatalog;	my $coursecatalog;
if (($showcoursecat eq '') \|\| ($showcoursecat)) {	if (($showcoursecat eq '') \|\| ($showcoursecat)) {
$coursecatalog = &coursecatalog_link($lt{'catalog'});	$coursecatalog = &coursecatalog_link($lt{'catalog'});
}	}
my $newuserlink;	my $newuserlink;
if ($shownewuserlink) {	if ($shownewuserlink) {
$newuserlink = &newuser_link($lt{'newuser'});	$newuserlink = &newuser_link($lt{'newuser'});
}	}
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').'" />';
}	}

my $noscript_warning='<noscript>'	my $noscript_warning='<noscript><span class="LC_warning"><b>'
.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')	.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
.'</noscript>';	.'</b></span></noscript>';
my $helpdeskscript;	my $helpdeskscript;
my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,	my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
$version,$authdomain,\$helpdeskscript);	$version,$authdomain,\$helpdeskscript);

if ($fullgraph) {	my $loginform=(<<LFORM);
$r->print(<<ENDTOP);	<form name="client" action="" onsubmit="return(send())">
<!-- The LON-CAPA Header -->	<input type="hidden" name="lextkey" value="$lextkey" />
	<input type="hidden" name="uextkey" value="$uextkey" />
	<b><label for="uname">$lt{'un'}</label>:</b><br />
	<input type="text" name="uname" id="uname" size="15" value="$authusername" /><br />
	<b><label for="upass$now">$lt{'pw'}</label>:</b><br />
	<input type="password" name="upass$now" id="upass$now" size="15" /><br />
	<b><label for="udom">$lt{'dom'}</label>:</b><br />
	<input type="text" name="udom" id="udom" size="15" value="$authdomain" /><br />
	<input type="submit" value="$lt{'log'}" />
	</form>
	LFORM

	if ($showbanner) {
	$r->print(<<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"> <img src="$img" border=0 alt="The Learning Online Network with CAPA" /> </td>	<td align="left" valign="top" bgcolor="$pgbg">
</tr>	<img src="$img" border="0" alt="The Learning Online Network with CAPA" />
	</td>
	</tr>
</table>	</table>
	HEADER
<div class="LC_loginpage_space"> </div>	}
<img src="$logo" alt="" />	$r->print(<<ENDTOP);
<div class="LC_loginpage_loginContainer"><fieldset class="LC_loginpage_fieldset">	<div class="LC_loginpage_space"> </div>
<legend class="LC_loginpage_legend">$logintitle</legend>	<div class="LC_loginpage_floatLeft">
<table border="0" align="left" cellspacing="1" cellpadding="1" width="100%">	<div class="LC_loginpage_loginContainer">
<tr>	$logintitle
<td width="50%" align="center" valign="top">$domainlogo</td>	<table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
<td>	<tr>
ENDTOP	<td>
	$loginform
$r->print('<form name="client" onsubmit="return(send())">');	</td>
	</tr>
$r->print(<<ENDTOPP)	</table>
<input type="hidden" name="lextkey" value="$lextkey">	$noscript_warning
<input type="hidden" name="uextkey" value="$uextkey">	</div>
<b><label for="uname">$lt{'un'}</label>:</b><br />
<input type="text" name="uname" size="10" value="$authusername" /><br />
<b><label for="upass$now">$lt{'pw'}</label>:</b><br />
<input type="password" name="upass$now" size="10" /><br />
<b><label for="udom">$lt{'dom'}</label>:</b><br />
<input type="text" name="udom" size="10" value="$authdomain" /><br />
<input type="submit" value="$lt{'log'}" />
</form>
</td>
</tr>
</table>
$noscript_warning
</fieldset></div>

<div class="LC_loginpage_loginInfo">	<div class="LC_loginpage_loginInfo">
$loginhelp<br />	$loginhelp<br />
$forgotpw<br /><br />	$forgotpw<br />
$newuserlink<br />	<br />
$coursecatalog<br /><br />	$contactblock<br />
<a href="/adm/about.html"><b>$lt{'about'}</b></a><br />	<br />
$helpdeskscript	$newuserlink<br />
	$coursecatalog
</div>	</div>
<div class="LC_loginpage_space"> </div>	</div>
	ENDTOP
	if ($showmainlogo) {
	$r->print(' <img src="'.$logo.'" alt="" />'."\n");
	}
	$r->print(<<ENDTOP);
$announcements	$announcements
ENDTOPP	$domainlogo
}	<div class="LC_loginpage_space"> </div>
if($announcements){$r->print('<div class="LC_loginpage_space"> </div>');}	ENDTOP


if ($fullgraph) {

$r->print(<<ENDDOCUMENT);


<table border=0 cellspacing=0 cellpadding=0>	$r->print(<<ENDDOCUMENT);
	<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">
	// <![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;
}	}

	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 {	sub contactdisplay {
my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_;	my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_;
my $contactblock;	my $contactblock;
Line 518 sub contactdisplay {	Line 542 sub contactdisplay {
$showhelpdesk = 1;	$showhelpdesk = 1;
}	}
if ($servadm && $showadminmail) {	if ($servadm && $showadminmail) {
$contactblock .= '<b>   '.$$lt{'servadm'}.':</b><br />'.	$contactblock .= $$lt{'servadm'}.':<br />'.
'<tt>      '.$servadm.'</tt><br /> <br />';	'<tt>'.$servadm.'</tt><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">
	// <![CDATA[
function helpdesk() {	function helpdesk() {
var codedom = document.client.udom.value;	var codedom = document.client.udom.value;
if (codedom == '') {	if (codedom == '') {
Line 535 function helpdesk() {	Line 560 function helpdesk() {
document.location.href = "/adm/helpdesk?"+querystr;	document.location.href = "/adm/helpdesk?"+querystr;
return;	return;
}	}
	// ]]>
</script>	</script>
ENDSCRIPT	ENDSCRIPT
}	}
$contactblock .= <<"ENDBLOCK";	$contactblock .= $version;
$version
ENDBLOCK
return $contactblock;	return $contactblock;
}	}

Line 571 END	Line 595 END

sub newuser_link {	sub newuser_link {
my ($linkname) = @_;	my ($linkname) = @_;
return '   <a href="/adm/createaccount"><b>'.$linkname.'</b></a><br />';	return '<a href="/adm/createaccount">'.$linkname.'</a>';
}	}

1;	1;

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

Removed from v.1.107
changed lines
	Added in v.1.130