--- loncom/auth/lonlogin.pm 2004/11/11 22:18:23 1.60
+++ loncom/auth/lonlogin.pm 2005/02/21 18:29:25 1.62.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.60 2004/11/11 22:18:23 raeburn Exp $
+# $Id: lonlogin.pm,v 1.62.2.1 2005/02/21 18:29:25 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -141,6 +141,7 @@ ENDFAILED
my $otherserver='http://'.$ENV{'SERVER_NAME'};
my $firsturl=
($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
+ my $escfirsturl=&Apache::lonnet::escape($firsturl);
# ---------------------------------------- Are we access server and overloaded?
if (($role eq 'access') &&
(($userloadpercent>100.0)||($loadpercent>100.0))) {
@@ -340,7 +341,7 @@ ENDSERVERFORM
- |
+ Welcome to the LON-CAPA NSDL GatewaySign up for a Guest Login |
@@ -447,7 +448,8 @@ ENDNOOPT
ENDLOGIN
if ($fullgraph) {
- my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version);
+ my $helpdeskscript;
+ my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript);
$r->print(<
@@ -534,6 +536,7 @@ $domainlogo
// the if prevents the script error if the browser can not handle this
if ( document.client.uname ) { document.client.uname.focus(); }
+$helpdeskscript
ENDDOCUMENT
}
@@ -542,11 +545,15 @@ ENDDOCUMENT
}
sub contactdisplay {
- my ($lt,$sysadm,$servadm,$version) = @_;
+ my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_;
my $contactblock;
my $showsysadm = 1;
my $showservadm = 1;
- my $showhelpdesk = 1;
+ my $showhelpdesk = 0;
+ my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
+ if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
+ $showhelpdesk = 1;
+ }
if ($showsysadm) {
$contactblock .= ' '.$$lt{'sysadm'}.':
'.
' '.$sysadm.'
';
@@ -556,7 +563,21 @@ sub contactdisplay {
' '.$servadm.'
';
}
if ($showhelpdesk) {
- $contactblock .= ' '.$$lt{'helpdesk'}.'
';
+ $contactblock .= ' '.$$lt{'helpdesk'}.'
';
+ my $thisurl = &Apache::lonnet::escape('/adm/login');
+ $$helpdeskscript = <<"ENDSCRIPT";
+
+ENDSCRIPT
}
$contactblock .= <<"ENDBLOCK";
$version