version 1.1240, 2013/10/06 14:20:36
|
version 1.1243, 2013/10/14 17:14:48
|
Line 356 sub get_remote_globals {
|
Line 356 sub get_remote_globals {
|
} |
} |
|
|
sub remote_devalidate_cache { |
sub remote_devalidate_cache { |
my ($lonhost,$name,$id) = @_; |
my ($lonhost,$cachekeys) = @_; |
my $response = &reply('devalidatecache:'.&escape($name).':'.&escape($id),$lonhost); |
my $items; |
|
return unless (ref($cachekeys) eq 'ARRAY'); |
|
my $cachestr = join('&',@{$cachekeys}); |
|
my $response = &reply('devalidatecache:'.&escape($cachestr),$lonhost); |
return $response; |
return $response; |
} |
} |
|
|
Line 1985 sub inst_userrules {
|
Line 1988 sub inst_userrules {
|
|
|
sub get_domain_defaults { |
sub get_domain_defaults { |
my ($domain,$ignore_cache) = @_; |
my ($domain,$ignore_cache) = @_; |
|
return if (($domain eq '') || ($domain eq 'public')); |
my $cachetime = 60*60*24; |
my $cachetime = 60*60*24; |
unless ($ignore_cache) { |
unless ($ignore_cache) { |
my ($result,$cached)=&is_cached_new('domdefaults',$domain); |
my ($result,$cached)=&is_cached_new('domdefaults',$domain); |
Line 3498 sub extract_embedded_items {
|
Line 3502 sub extract_embedded_items {
|
} |
} |
} |
} |
} |
} |
|
if (lc($tagname) eq 'iframe') { |
|
my $src = $attr->{'src'} ; |
|
if (($src ne '') && ($src !~ m{^(/|https?://)})) { |
|
&add_filetype($allfiles,$src,'src'); |
|
} elsif ($src =~ m{^/}) { |
|
if ($env{'request.course.id'}) { |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my $url = &hreflocation('',$fullpath); |
|
if ($url =~ m{^/uploaded/$cdom/$cnum/docs/(\w+/\d+)/}) { |
|
my $relpath = $1; |
|
if ($src =~ m{^/uploaded/$cdom/$cnum/docs/\Q$relpath\E/(.+)$}) { |
|
&add_filetype($allfiles,$1,'src'); |
|
} |
|
} |
|
} |
|
} |
|
} |
if ($t->[4] =~ m{/>$}) { |
if ($t->[4] =~ m{/>$}) { |
pop(@state); |
pop(@state); |
} |
} |
} elsif ($t->[0] eq 'E') { |
} elsif ($t->[0] eq 'E') { |
my ($tagname) = ($t->[1]); |
my ($tagname) = ($t->[1]); |
Line 6201 sub usertools_access {
|
Line 6223 sub usertools_access {
|
} |
} |
return if (!defined($tools{$tool})); |
return if (!defined($tools{$tool})); |
|
|
if ((!defined($udom)) || (!defined($uname))) { |
if (($udom eq '') || ($uname eq '')) { |
$udom = $env{'user.domain'}; |
$udom = $env{'user.domain'}; |
$uname = $env{'user.name'}; |
$uname = $env{'user.name'}; |
} |
} |