version 1.288, 2013/12/01 21:50:30
|
version 1.290, 2014/07/27 11:14:36
|
Line 468 Currently undocumented
|
Line 468 Currently undocumented
|
######################################### |
######################################### |
######################################### |
######################################### |
sub set_allow { |
sub set_allow { |
my ($allow,$logfile,$target,$tag,$oldurl)=@_; |
my ($allow,$logfile,$target,$tag,$oldurl,$type)=@_; |
my $newurl=&urlfixup($oldurl,$target); |
my $newurl=&urlfixup($oldurl,$target); |
my $return_url=$oldurl; |
my $return_url=$oldurl; |
print $logfile 'GUYURL: '.$tag.':'.$oldurl.' - '.$newurl."\n"; |
print $logfile 'GUYURL: '.$tag.':'.$oldurl.' - '.$newurl."\n"; |
Line 480 sub set_allow {
|
Line 480 sub set_allow {
|
($newurl !~ /^mailto:/i) && |
($newurl !~ /^mailto:/i) && |
($newurl !~ /^(?:http|https|ftp):/i) && |
($newurl !~ /^(?:http|https|ftp):/i) && |
($newurl !~ /^\#/)) { |
($newurl !~ /^\#/)) { |
|
if (($type eq 'src') || ($type eq 'href')) { |
|
if ($newurl =~ /^([^?]+)\?[^?]*$/) { |
|
$newurl = $1; |
|
} |
|
} |
$$allow{&absoluteurl($newurl,$target)}=1; |
$$allow{&absoluteurl($newurl,$target)}=1; |
} |
} |
return $return_url; |
return $return_url; |
Line 723 sub fix_ids_and_indices {
|
Line 728 sub fix_ids_and_indices {
|
if ($key =~ /^$type$/i) { |
if ($key =~ /^$type$/i) { |
$parms{$key}=&set_allow(\%allow,$logfile, |
$parms{$key}=&set_allow(\%allow,$logfile, |
$target,$tag, |
$target,$tag, |
$parms{$key}); |
$parms{$key},$type); |
} |
} |
} |
} |
} |
} |
Line 836 sub fix_ids_and_indices {
|
Line 841 sub fix_ids_and_indices {
|
} |
} |
} |
} |
} |
} |
$outstring .= $script |
$outstring .= $script; |
} |
} |
} |
} |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
Line 1928 sub publishdirectory {
|
Line 1933 sub publishdirectory {
|
my $thisdisresdir=$thisdisfn; |
my $thisdisresdir=$thisdisfn; |
$thisdisresdir=~s/^\/priv\//\/res\//; |
$thisdisresdir=~s/^\/priv\//\/res\//; |
my $resdir = $r->dir_config('lonDocRoot').$thisdisresdir; |
my $resdir = $r->dir_config('lonDocRoot').$thisdisresdir; |
$r->print(&Apache::lonhtmlcommon::start_pick_box() |
$r->print('<form name="pubdirpref" method="post" action="">' |
|
.&Apache::lonhtmlcommon::start_pick_box() |
.&Apache::lonhtmlcommon::row_title(&mt('Directory')) |
.&Apache::lonhtmlcommon::row_title(&mt('Directory')) |
.'<span class="LC_filename">'.$thisdisfn.'</span>' |
.'<span class="LC_filename">'.$thisdisfn.'</span>' |
.&Apache::lonhtmlcommon::row_closure() |
.&Apache::lonhtmlcommon::row_closure() |
Line 1942 sub publishdirectory {
|
Line 1948 sub publishdirectory {
|
$r->print(&Apache::lonhtmlcommon::row_closure() |
$r->print(&Apache::lonhtmlcommon::row_closure() |
.&Apache::lonhtmlcommon::row_title(&mt('Options')) |
.&Apache::lonhtmlcommon::row_title(&mt('Options')) |
); |
); |
$r->print('<form name="pubdirpref" method="post" action="">'. |
$r->print(&hiddenfield('phase','two'). |
&hiddenfield('phase','two'). |
|
&hiddenfield('filename',$env{'form.filename'}). |
&hiddenfield('filename',$env{'form.filename'}). |
&checkbox('pubrec','include subdirectories'). |
&checkbox('pubrec','include subdirectories'). |
&checkbox('forcerepub','force republication of previously published files'). |
&checkbox('forcerepub','force republication of previously published files'). |
&checkbox('obsolete','make file(s) obsolete'). |
&checkbox('obsolete','make file(s) obsolete'). |
&checkbox('forceoverride','force directory level metadata over existing'). |
&checkbox('forceoverride','force directory level metadata over existing') |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
); |
$r->print(&Apache::lonhtmlcommon::row_closure(1) |
$r->print(&Apache::lonhtmlcommon::row_closure(1) |
.&Apache::lonhtmlcommon::end_pick_box() |
.&Apache::lonhtmlcommon::end_pick_box() |
|
.'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>' |
); |
); |
$lock=0; |
$lock=0; |
} else { |
} else { |
Line 2215 sub handler {
|
Line 2221 sub handler {
|
if ($fn=~/\/$/) { |
if ($fn=~/\/$/) { |
# -------------------------------------------------------- This is a directory |
# -------------------------------------------------------- This is a directory |
&publishdirectory($r,$docroot.$fn,$thisdisfn); |
&publishdirectory($r,$docroot.$fn,$thisdisfn); |
$r->print('<hr /><a href="'.$thisdisfn.'">'.&mt('Return to Directory').'</a>'); |
$r->print( |
|
'<br /><br />'. |
|
&Apache::lonhtmlcommon::actionbox([ |
|
'<a href="'.$thisdisfn.'">'.&mt('Return to Directory').'</a>'])); |
} else { |
} else { |
# ---------------------- Evaluate individual file, and then output information. |
# ---------------------- Evaluate individual file, and then output information. |
$fn=~/\.(\w+)$/; |
$fn=~/\.(\w+)$/; |