--- loncom/auth/lonlogin.pm 2004/08/10 18:55:13 1.58 +++ 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.58 2004/08/10 18:55:13 matthew 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))) { @@ -263,8 +264,8 @@ my %lt=&Apache::lonlocal::texthash( 'help' => 'Help', 'serv' => 'Server', 'servadm' => 'Server Administration', - 'sysadm' => 'System Administration'); - + 'sysadm' => 'System Administration', + 'helpdesk' => 'Contact Helpdesk'); # ---------------------------------------------------------- Serve rest of page $r->print(< - The Learning Online Network with CAPA +

Welcome to the LON-CAPA NSDL Gateway

Sign up for a Guest Login

@@ -447,6 +448,8 @@ ENDNOOPT ENDLOGIN if ($fullgraph) { + my $helpdeskscript; + my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript); $r->print(< @@ -499,13 +502,7 @@ ENDLOGIN
- -    $lt{'sysadm'}:
-       $sysadm
-    $lt{'servadm'}:
-       $servadm
 
-    $version -
+ $contactblock @@ -535,16 +532,59 @@ $domainlogo - +$helpdeskscript ENDDOCUMENT } $r->print(''); return OK; -} +} + +sub contactdisplay { + my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_; + my $contactblock; + my $showsysadm = 1; + my $showservadm = 1; + my $showhelpdesk = 0; + my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; + if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { + $showhelpdesk = 1; + } + if ($showsysadm) { + $contactblock .= '   '.$$lt{'sysadm'}.':
'. + '      '.$sysadm.'
'; + } + if ($showservadm) { + $contactblock .= '   '.$$lt{'servadm'}.':
'. + '      '.$servadm.'
 
'; + } + if ($showhelpdesk) { + $contactblock .= '   '.$$lt{'helpdesk'}.'
'; + my $thisurl = &Apache::lonnet::escape('/adm/login'); + $$helpdeskscript = <<"ENDSCRIPT"; + +ENDSCRIPT + } + $contactblock .= <<"ENDBLOCK"; +    $version +ENDBLOCK + return $contactblock; +} + 1; __END__