version 1.89, 2007/03/08 01:58:48
|
version 1.91, 2007/04/06 22:06:02
|
Line 133 ENDFAILED
|
Line 133 ENDFAILED
|
} |
} |
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 $lonhost = $r->dir_config('lonHostID'); |
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'); |
Line 245 ENDTROUBLE
|
Line 246 ENDTROUBLE
|
} |
} |
|
|
# ----------------------------------------------- Apparently we are in business |
# ----------------------------------------------- Apparently we are in business |
|
$servadm=~s/\,/\<br \/\>/g; |
my $domainlogo=&Apache::loncommon::domainlogo($domain); |
|
|
|
# --------------------------------------------------- Print login screen header |
# --------------------------------------------------- Print login screen header |
$r->print(<<ENDHEADER); |
$r->print(<<ENDHEADER); |
Line 278 ENDHEADER
|
Line 278 ENDHEADER
|
($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF'); |
($fullgraph?&Apache::loncommon::designparm('login.sidebg',$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 $showadminmail=&Apache::loncommon::designparm('login.adminmail', $domain); |
|
my $showcoursecat = |
|
&Apache::loncommon::designparm('login.coursecatalog',$domain); |
|
|
|
|
# ----------------------------------------------------------------------- Texts |
# ----------------------------------------------------------------------- Texts |
|
|
Line 295 my %lt=&Apache::lonlocal::texthash(
|
Line 300 my %lt=&Apache::lonlocal::texthash(
|
'log' => 'Log in', |
'log' => 'Log in', |
'help' => 'Log-in Help', |
'help' => 'Log-in Help', |
'serv' => 'Server', |
'serv' => 'Server', |
|
'servadm' => 'Server Administration', |
'helpdesk' => 'Contact Helpdesk', |
'helpdesk' => 'Contact Helpdesk', |
'forgotpw' => 'Forgot password?'); |
'forgotpw' => 'Forgot password?'); |
# -------------------------------------------------- Change password field name |
# -------------------------------------------------- Change password field name |
Line 379 ENDSCRIPT
|
Line 385 ENDSCRIPT
|
<input type="hidden" name="localres" value="$env{'form.localres'}" /> |
<input type="hidden" name="localres" value="$env{'form.localres'}" /> |
</form> |
</form> |
ENDSERVERFORM |
ENDSERVERFORM |
|
my $coursecatalog; |
|
if ($showcoursecat eq '' || $showcoursecat)) { |
|
$coursecatalog = &coursecatalog_link($lt{'catalog'}); |
|
} |
if ($fullgraph) { $r->print(<<ENDTOP); |
if ($fullgraph) { $r->print(<<ENDTOP); |
<!-- The LON-CAPA Header --> |
<!-- The LON-CAPA Header --> |
<tr> |
<tr> |
Line 415 ENDSERVERFORM
|
Line 425 ENDSERVERFORM
|
<tr> |
<tr> |
<td> </td> |
<td> </td> |
<td><a href="/adm/about.html"><b>$lt{'about'}</b></a></td> |
<td><a href="/adm/about.html"><b>$lt{'about'}</b></a></td> |
</tr> |
</tr>$coursecatalog |
<tr> |
|
<td> </td> |
|
<td><a href="/adm/coursecatalog"><b>$lt{'catalog'}</b></a></td> |
|
</tr> |
|
<tr> |
<tr> |
<td colspan="2"> </td> |
<td colspan="2"> </td> |
</tr> |
</tr> |
Line 508 ENDNOOPT
|
Line 514 ENDNOOPT
|
ENDLOGIN |
ENDLOGIN |
if ($fullgraph) { |
if ($fullgraph) { |
my $helpdeskscript; |
my $helpdeskscript; |
my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript); |
my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, |
|
$version,$authdomain,\$helpdeskscript); |
$r->print(<<ENDDOCUMENT); |
$r->print(<<ENDDOCUMENT); |
</td> |
</td> |
|
|
Line 604 ENDDOCUMENT
|
Line 611 ENDDOCUMENT
|
} |
} |
|
|
sub contactdisplay { |
sub contactdisplay { |
my ($lt,$version,$authdomain,$helpdeskscript) = @_; |
my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; |
my $contactblock; |
my $contactblock; |
my $showhelpdesk = 0; |
my $showhelpdesk = 0; |
my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { |
if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { |
$showhelpdesk = 1; |
$showhelpdesk = 1; |
} |
} |
|
if ($servadm && $showadminmail) { |
|
$contactblock .= '<b> '.$$lt{'servadm'}.':</b><br />'. |
|
'<tt> '.$servadm.'</tt><br /> <br />'; |
|
} |
if ($showhelpdesk) { |
if ($showhelpdesk) { |
$contactblock .= '<b> <a href="javascript:helpdesk()"><font size="+1">'.$lt->{'helpdesk'}.'</font></a></b><br />'; |
$contactblock .= '<b> <a href="javascript:helpdesk()"><font size="+1">'.$lt->{'helpdesk'}.'</font></a></b><br />'; |
my $thisurl = &escape('/adm/login'); |
my $thisurl = &escape('/adm/login'); |
Line 652 sub loginhelpdisplay {
|
Line 663 sub loginhelpdisplay {
|
return; |
return; |
} |
} |
|
|
|
sub coursecatalog_link { |
|
my ($linkname) = @_; |
|
return <<"END"; |
|
<tr> |
|
<td> </td> |
|
<td><a href="/adm/coursecatalog"><b>$linkname</b></a></td> |
|
</tr> |
|
END |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |