version 1.279, 2012/03/14 20:54:02
|
version 1.286, 2013/10/16 18:28:18
|
Line 121 use HTML::LCParser;
|
Line 121 use HTML::LCParser;
|
use HTML::Entities; |
use HTML::Entities; |
use Encode::Encoder; |
use Encode::Encoder; |
use Apache::lonxml; |
use Apache::lonxml; |
use Apache::loncacc; |
|
use DBI; |
use DBI; |
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::loncommon(); |
use Apache::loncommon(); |
Line 791 sub fix_ids_and_indices {
|
Line 790 sub fix_ids_and_indices {
|
} |
} |
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; } |
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; } |
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
if ($lctag eq 'm' || $lctag eq 'script' || $lctag eq 'answer' |
if ($lctag eq 'm' || $lctag eq 'answer' || $lctag eq 'display' || |
|| $lctag eq 'display' || $lctag eq 'tex') { |
$lctag eq 'tex') { |
$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser); |
$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser); |
} |
} elsif ($lctag eq 'script') { |
|
if ($parms{'type'} eq 'loncapa/perl') { |
|
$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser); |
|
} else { |
|
my $script = &get_all_text_unbalanced('/'.$lctag,\@parser); |
|
if ($script =~ m{\.set\w+(Src|Swf)\(["']}i) { |
|
my @srcs = split(/\.set/i,$script); |
|
if (scalar(@srcs) > 1) { |
|
foreach my $item (@srcs) { |
|
if ($item =~ m{^(FlashPlayerSwf|MediaSrc|XMPSrc|ConfigurationSrc|PosterImageSrc)\((['"])(?:(?!\2).)+\2\)}is) { |
|
my $srctype = $1; |
|
my $quote = $2; |
|
my ($url) = ($item =~ m{^\Q$srctype($quote\E([^$quote]+)\Q$quote)\E}); |
|
$url = &urlfixup($url); |
|
unless ($url=~m{^(?:http|https|ftp)://}) { |
|
$allow{&absoluteurl($url,$target)}=1; |
|
if ($srctype eq 'ConfigurationSrc') { |
|
if ($url =~ m{^(.+/)configuration_express\.xml$}) { |
|
# |
|
# Camtasia 8.1: express_show/spritesheet.png needed, and included in zip archive. |
|
# Not referenced directly in <main>.html or <main>_player.html files, |
|
# so add this file to %allow (where <main> is name user gave to file/archive). |
|
# |
|
my $spritesheet = $1.'express_show/spritesheet.png'; |
|
$allow{&absoluteurl($spritesheet,$target)}=1; |
|
} |
|
} elsif ($srctype eq 'PosterImageSrc') { |
|
if ($url =~ m{^(.+)_First_Frame\.png$}) { |
|
my $prefix = $1; |
|
# |
|
# Camtasia 8.1: <main>_Thumbnails.png needed, and included in zip archive. |
|
# Not referenced directly in <main>.html or <main>_player.html files, |
|
# so add this file to %allow (where <main> is name user gave to file/archive). |
|
# |
|
my $thumbnail = $prefix.'_Thumbnails.png'; |
|
$allow{&absoluteurl($thumbnail,$target)}=1; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
$outstring .= $script |
|
} |
|
} |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
if ($token->[2]) { |
if ($token->[2]) { |
unless ($token->[1] eq 'allow') { |
unless ($token->[1] eq 'allow') { |
Line 1775 sub phasetwo {
|
Line 1819 sub phasetwo {
|
my $thissrcdir=$thissrc; |
my $thissrcdir=$thissrc; |
$thissrcdir=~s/\/[^\/]+$/\//; |
$thissrcdir=~s/\/[^\/]+$/\//; |
|
|
$r->print(&Apache::loncommon::head_subbox( |
$r->print( |
&Apache::lonhtmlcommon::start_funclist(). |
&Apache::lonhtmlcommon::actionbox([ |
&Apache::lonhtmlcommon::add_item_funclist( |
|
'<a href="'.$thisdistarget.'">'. |
'<a href="'.$thisdistarget.'">'. |
&mt('View Published Version'). |
&mt('View Published Version'). |
'</a>'). |
'</a>', |
&Apache::lonhtmlcommon::add_item_funclist( |
|
'<a href="'.$thissrc.'">'. |
'<a href="'.$thissrc.'">'. |
&mt('Back to Source'). |
&mt('Back to Source'). |
'</a>'). |
'</a>', |
&Apache::lonhtmlcommon::add_item_funclist( |
|
'<a href="'.$thissrcdir.'">'. |
'<a href="'.$thissrcdir.'">'. |
&mt('Back to Source Directory'). |
&mt('Back to Source Directory'). |
'</a>'). |
'</a>']) |
&Apache::lonhtmlcommon::end_funclist()) |
|
); |
); |
} |
} |
return 1; |
return 1; |
Line 1900 sub publishdirectory {
|
Line 1940 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">'. |
$r->print('<form name="pubdirpref" method="post" action="">'. |
&hiddenfield('phase','two'). |
&hiddenfield('phase','two'). |
&hiddenfield('filename',$env{'form.filename'}). |
&hiddenfield('filename',$env{'form.filename'}). |
&checkbox('pubrec','include subdirectories'). |
&checkbox('pubrec','include subdirectories'). |
Line 1930 sub publishdirectory {
|
Line 1970 sub publishdirectory {
|
if ($filename=~/\.(\w+)$/) { $extension=$1; } |
if ($filename=~/\.(\w+)$/) { $extension=$1; } |
if ($cmode&$dirptr) { |
if ($cmode&$dirptr) { |
if (($filename!~/^\./) && ($env{'form.pubrec'})) { |
if (($filename!~/^\./) && ($env{'form.pubrec'})) { |
&publishdirectory($r,$docroot.$fn.'/'.$filename,$thisdisfn.'/'.$filename); |
&publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename); |
} |
} |
} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') && |
} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') && |
($filename!~/^[\#\.]/) && ($filename!~/\~$/)) { |
($filename!~/^[\#\.]/) && ($filename!~/\~$/)) { |
Line 2019 sub defaultmetapublish {
|
Line 2059 sub defaultmetapublish {
|
$r->print($reply.'</p><br />');$r->rflush; |
$r->print($reply.'</p><br />');$r->rflush; |
} |
} |
# ------------------------------------------------------------------- Link back |
# ------------------------------------------------------------------- Link back |
$r->print("<a href='".&Apache::lonnet::display($fn)."'>".&mt('Back to Metadata').'</a>'); |
$r->print("<a href='".&Apache::loncfile::display($fn)."'>".&mt('Back to Metadata').'</a>'); |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
} |
} |
Line 2083 sub handler {
|
Line 2123 sub handler {
|
# -------------------------------------------------------------- Check filename |
# -------------------------------------------------------------- Check filename |
|
|
my $fn=&unescape($env{'form.filename'}); |
my $fn=&unescape($env{'form.filename'}); |
($cuname,$cudom)=&Apache::loncacc::constructaccess($fn); |
($cuname,$cudom)=&Apache::lonnet::constructaccess($fn); |
# ----------------------------------------------------- Do we have permissions? |
# ----------------------------------------------------- Do we have permissions? |
unless (($cuname) && ($cudom)) { |
unless (($cuname) && ($cudom)) { |
$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. |
$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. |
Line 2148 sub handler {
|
Line 2188 sub handler {
|
# Breadcrumbs |
# Breadcrumbs |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::add_breadcrumb({ |
&Apache::lonhtmlcommon::add_breadcrumb({ |
'text' => 'Construction Space', |
'text' => 'Authoring Space', |
'href' => &Apache::loncommon::authorspace($fn), |
'href' => &Apache::loncommon::authorspace($fn), |
}); |
}); |
&Apache::lonhtmlcommon::add_breadcrumb({ |
&Apache::lonhtmlcommon::add_breadcrumb({ |
Line 2223 ENDCAPTION
|
Line 2263 ENDCAPTION
|
$r->print(&Apache::lonhtmlcommon::row_closure() |
$r->print(&Apache::lonhtmlcommon::row_closure() |
.&Apache::lonhtmlcommon::row_title(&mt('Diffs'))); |
.&Apache::lonhtmlcommon::row_title(&mt('Diffs'))); |
$r->print(<<ENDDIFF); |
$r->print(<<ENDDIFF); |
<a href='javascript:void(window.open("/adm/diff?filename=$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'> |
<a href='javascript:void(window.open("/adm/diff?filename=$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'> |
ENDDIFF |
ENDDIFF |
$r->print(&mt('Diffs with Current Version').'</a>'); |
$r->print(&mt('Diffs with Current Version').'</a>'); |
} |
} |