version 1.84, 2006/11/15 00:53:48
|
version 1.87, 2007/01/14 02:00:04
|
Line 40 use Apache::migrateuser();
|
Line 40 use Apache::migrateuser();
|
use lib '/home/httpd/lib/perl/'; |
use lib '/home/httpd/lib/perl/'; |
use LONCAPA; |
use LONCAPA; |
|
|
|
|
sub additional_machine_domains { |
|
my @domains; |
|
open(my $fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/expected_domains.tab'); |
|
while( my $line = <$fh>) { |
|
$line =~ s/\s//g; |
|
push(@domains,$line); |
|
} |
|
return @domains; |
|
} |
|
|
|
sub handler { |
sub handler { |
my $r = shift; |
my $r = shift; |
|
|
Line 84 sub handler {
|
Line 73 sub handler {
|
my $lonid=$cookies{'lonID'}; |
my $lonid=$cookies{'lonID'}; |
my $cookie; |
my $cookie; |
if ($lonid) { |
if ($lonid) { |
my $handle=$lonid->value; |
my $handle=&LONCAPA::clean_handle($lonid->value); |
$handle=~s/\W//g; |
|
my $lonidsdir=$r->dir_config('lonIDsDir'); |
my $lonidsdir=$r->dir_config('lonIDsDir'); |
if (-e "$lonidsdir/$handle.id") { |
if (-e "$lonidsdir/$handle.id") { |
# Is there an existing token file? |
# Is there an existing token file? |
Line 138 ENDFAILED
|
Line 126 ENDFAILED
|
} |
} |
my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use. |
my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use. |
$r->dir_config('lonIconsURL'); |
$r->dir_config('lonIconsURL'); |
my $domain = $r->dir_config('lonDefDomain'); |
my $domain = &Apache::lonnet::default_login_domain(); |
my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0]; |
|
foreach my $posdom (&Apache::lonnet::current_machine_domains(), |
|
&additional_machine_domains()) { |
|
if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; } |
|
} |
|
if (($env{'form.domain'}) && |
if (($env{'form.domain'}) && |
($Apache::lonnet::domaindescription{$env{'form.domain'}})) { |
($Apache::lonnet::domaindescription{$env{'form.domain'}})) { |
$domain=$env{'form.domain'}; |
$domain=$env{'form.domain'}; |
Line 420 ENDSERVERFORM
|
Line 403 ENDSERVERFORM
|
|
|
<!-- A cell that will hold the 'access', 'about', and 'catalog' links --> |
<!-- A cell that will hold the 'access', 'about', and 'catalog' links --> |
<!-- Row 3 Column 1 --> |
<!-- Row 3 Column 1 --> |
<td valign="top" height=60 align="left" bgcolor="$sidebg"> |
<td valign="top" height="60" align="left" bgcolor="$sidebg"> |
<table cellpadding="0" cellspacing="2" border="0"> |
<table cellpadding="0" cellspacing="2" border="0"> |
<tr> |
<tr> |
<td> </td> |
<td> </td> |
<td><a href="/adm/login?interface=textual"><b>$lt{'access'}</b></a></td> |
<td><a href="/adm/login?interface=textual"><b>$lt{'access'}</b></a></td> |
</tr> |
</tr> |
<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> |
<tr> |
<tr> |
<td> </td> |
<td> </td> |
<td><a href="/adm/coursecatalog"><b>$lt{'catalog'}</b></a></td> |
<td><a href="/adm/coursecatalog"><b>$lt{'catalog'}</b></a></td> |
</tr> |
</tr> |
<tr> |
<tr> |
<td colspan="2"> </td> |
<td colspan="2"> </td> |
</tr> |
</tr> |
</table> |
</table> |
|
</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" alt="" /></td> |
<td width=27 height=60 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td> |