version 1.215, 2006/12/06 22:22:39
|
version 1.218, 2007/01/26 22:16:33
|
Line 471 sub set_allow {
|
Line 471 sub set_allow {
|
($newurl !~ /^\#/)) { |
($newurl !~ /^\#/)) { |
$$allow{&absoluteurl($newurl,$target)}=1; |
$$allow{&absoluteurl($newurl,$target)}=1; |
} |
} |
return $return_url |
return $return_url; |
} |
} |
|
|
######################################### |
######################################### |
Line 495 sub get_subscribed_hosts {
|
Line 495 sub get_subscribed_hosts {
|
my $srcf=$2; |
my $srcf=$2; |
opendir(DIR,$1); |
opendir(DIR,$1); |
while ($filename=readdir(DIR)) { |
while ($filename=readdir(DIR)) { |
if ($filename=~/\Q$srcf\E\.(\w+)$/) { |
if ($filename=~/\Q$srcf\E\.($match_lonid)$/) { |
my $subhost=$1; |
my $subhost=$1; |
if (($subhost ne 'meta' && $subhost ne 'subscription' && |
if (($subhost ne 'meta' && $subhost ne 'subscription' && |
$subhost ne 'tmp') && |
$subhost ne 'tmp') && |
Line 507 sub get_subscribed_hosts {
|
Line 507 sub get_subscribed_hosts {
|
closedir(DIR); |
closedir(DIR); |
my $sh; |
my $sh; |
if ( $sh=Apache::File->new("$target.subscription") ) { |
if ( $sh=Apache::File->new("$target.subscription") ) { |
&Apache::lonnet::logthis("opened $target.subscription"); |
|
while (my $subline=<$sh>) { |
while (my $subline=<$sh>) { |
if ($subline =~ /(^\w+):/) { |
if ($subline =~ /^($match_lonid):/) { |
if ($1 ne $Apache::lonnet::perlvar{'lonHostID'}) { |
if ($1 ne $Apache::lonnet::perlvar{'lonHostID'}) { |
push(@subscribed,$1); |
push(@subscribed,$1); |
} |
} |
} else { |
|
&Apache::lonnet::logthis("No Match for $subline"); |
|
} |
} |
} |
} |
} else { |
|
&Apache::lonnet::logthis("Unable to open $target.subscription"); |
|
} |
} |
return @subscribed; |
return @subscribed; |
} |
} |
Line 719 sub fix_ids_and_indices {
|
Line 714 sub fix_ids_and_indices {
|
($lctag eq 'image')) { |
($lctag eq 'image')) { |
my $next_token=$parser[-1]->get_token(); |
my $next_token=$parser[-1]->get_token(); |
if ($next_token->[0] eq 'T') { |
if ($next_token->[0] eq 'T') { |
|
$next_token->[1] =~ s/[\n\r\f]+//g; |
$next_token->[1]=&set_allow(\%allow,$logfile, |
$next_token->[1]=&set_allow(\%allow,$logfile, |
$target,$tag, |
$target,$tag, |
$next_token->[1]); |
$next_token->[1]); |