version 1.570, 2013/11/17 14:40:31
|
version 1.592, 2015/03/01 22:20:56
|
Line 46 use Apache::lonsimplepage();
|
Line 46 use Apache::lonsimplepage();
|
use HTML::Entities; |
use HTML::Entities; |
use HTML::TokeParser; |
use HTML::TokeParser; |
use GDBM_File; |
use GDBM_File; |
|
use File::MMagic; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Cwd; |
use Cwd; |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
Line 301 ENDJS
|
Line 302 ENDJS
|
if ($contents{content}) { |
if ($contents{content}) { |
$content .= ' |
$content .= ' |
<div class="LC_Box"> |
<div class="LC_Box"> |
<h4 class="LC_hcell">Content</h4>'. |
<h4 class="LC_hcell">'.&mt('Content').'</h4>'. |
$contents{content}.' |
$contents{content}.' |
</div>'; |
</div>'; |
} |
} |
if ($contents{webreferences}) { |
if ($contents{webreferences}) { |
$content .= ' |
$content .= ' |
<div class="LC_Box"> |
<div class="LC_Box"> |
<h4 class="LC_hcell">Web References</h4>'. |
<h4 class="LC_hcell">'.&mt('Web References').'</h4>'. |
$contents{webreferences}.' |
$contents{webreferences}.' |
</div>'; |
</div>'; |
} |
} |
Line 976 sub docs_change_log {
|
Line 977 sub docs_change_log {
|
|
|
sub update_paste_buffer { |
sub update_paste_buffer { |
my ($coursenum,$coursedom,$folder) = @_; |
my ($coursenum,$coursedom,$folder) = @_; |
my (@possibles,%removals,%cuts); |
my (@possibles,%removals,%cuts,$output); |
if ($env{'form.multiremove'}) { |
if ($env{'form.multiremove'}) { |
$env{'form.multiremove'} =~ s/,$//; |
$env{'form.multiremove'} =~ s/,$//; |
map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'}); |
map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'}); |
Line 1044 sub update_paste_buffer {
|
Line 1045 sub update_paste_buffer {
|
next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url})); |
next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url})); |
my ($suffix,$errortxt,$locknotfreed) = |
my ($suffix,$errortxt,$locknotfreed) = |
&new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste'); |
&new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste'); |
push(@newpaste,$suffix); |
if ($suffix ne '') { |
if ($locknotfreed) { |
push(@newpaste,$suffix); |
return $locknotfreed; |
} else { |
last; |
if ($locknotfreed) { |
|
return $locknotfreed; |
|
} |
} |
} |
if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
&Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title}); |
&Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title}); |
Line 1081 sub update_paste_buffer {
|
Line 1084 sub update_paste_buffer {
|
} |
} |
} |
} |
} |
} |
|
if ($locknotfreed) { |
|
$output = $locknotfreed; |
|
last; |
|
} |
} |
} |
if (@newpaste) { |
if (@newpaste) { |
$addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste)); |
$addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste)); |
} |
} |
&Apache::lonnet::appenv(\%addtoenv); |
&Apache::lonnet::appenv(\%addtoenv); |
delete($env{'form.markcopy'}); |
delete($env{'form.markcopy'}); |
|
return $output; |
} |
} |
|
|
sub recurse_uploaded_maps { |
sub recurse_uploaded_maps { |
Line 1124 sub print_paste_buffer {
|
Line 1132 sub print_paste_buffer {
|
|
|
my @currpaste = split(/,/,$env{'docs.markedcopies'}); |
my @currpaste = split(/,/,$env{'docs.markedcopies'}); |
my ($pasteitems,@pasteable); |
my ($pasteitems,@pasteable); |
|
my $clipboardcount = 0; |
|
|
# Construct identifiers for current contents of user's paste buffer |
# Construct identifiers for current contents of user's paste buffer |
foreach my $suffix (@currpaste) { |
foreach my $suffix (@currpaste) { |
Line 1132 sub print_paste_buffer {
|
Line 1141 sub print_paste_buffer {
|
my $url = $env{'docs.markedcopy_url_'.$suffix}; |
my $url = $env{'docs.markedcopy_url_'.$suffix}; |
if (($cid =~ /^$match_domain\_$match_courseid$/) && |
if (($cid =~ /^$match_domain\_$match_courseid$/) && |
($url ne '')) { |
($url ne '')) { |
|
$clipboardcount ++; |
my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent, |
my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent, |
$canpaste,$nopaste,$othercrs,$areachange); |
$canpaste,$nopaste,$othercrs,$areachange); |
my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1]; |
my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1]; |
Line 1187 sub print_paste_buffer {
|
Line 1197 sub print_paste_buffer {
|
$icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
$icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
$icon .= '/navmap.folder.closed.gif'; |
$icon .= '/navmap.folder.closed.gif'; |
} |
} |
|
my $title = $env{'docs.markedcopy_title_'.$suffix}; |
|
if ($title eq '') { |
|
($title) = ($url =~ m{/([^/]+)$}); |
|
} |
$buffer = '<img src="'.$icon.'" alt="" class="LC_icon" />'. |
$buffer = '<img src="'.$icon.'" alt="" class="LC_icon" />'. |
': '. |
': '. |
&Apache::loncommon::parse_supplemental_title( |
&Apache::loncommon::parse_supplemental_title( |
&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix})); |
&LONCAPA::map::qtescape($title)); |
} |
} |
$pasteitems .= '<div class="LC_left_float">'; |
$pasteitems .= '<div class="LC_left_float">'; |
my ($options,$onclick); |
my ($options,$onclick); |
Line 1225 sub print_paste_buffer {
|
Line 1239 sub print_paste_buffer {
|
$pasteitems .= '<div style="padding:0;clear:both;margin:0;border:0"></div>'; |
$pasteitems .= '<div style="padding:0;clear:both;margin:0;border:0"></div>'; |
$form_start = '<form name="pasteform" action="/adm/coursedocs" method="post" onsubmit="return validateClipboard();">'; |
$form_start = '<form name="pasteform" action="/adm/coursedocs" method="post" onsubmit="return validateClipboard();">'; |
if (@pasteable) { |
if (@pasteable) { |
$buttons = '<input type="submit" name="pastemarked" value="'.&mt('Paste selected').'" />'.(' 'x2); |
my $value = &mt('Paste to current folder'); |
|
if ($container eq 'page') { |
|
$value = &mt('Paste to current page'); |
|
} |
|
$buttons = '<input type="submit" name="pastemarked" value="'.$value.'" />'.(' 'x2); |
} |
} |
$buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Clear selected').'" />'. |
$buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Remove from clipboard').'" />'.(' 'x2); |
'<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'; |
if ($clipboardcount > 1) { |
$form_end = '</form>'; |
$buttons .= |
|
'<span style="text-decoration:line-through">'.(' 'x20).'</span>'.(' 'x2). |
|
'<input type="button" name="checkallclip" value="'.&mt('Check all').'" style="height:20px;" onclick="checkClipboard();" />'. |
|
(' 'x2). |
|
'<input type="button" name="uncheckallclip" value="'.&mt('Uncheck all').'" style="height:20px;" onclick="uncheckClipboard();" />'. |
|
(' 'x2); |
|
} |
|
$form_end = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'. |
|
'</form>'; |
} else { |
} else { |
$pasteitems = &mt('Clipboard is empty'); |
$pasteitems = &mt('Clipboard is empty'); |
} |
} |
Line 1383 function validateClipboard() {
|
Line 1409 function validateClipboard() {
|
} |
} |
} |
} |
|
|
|
function checkClipboard() { |
|
if (document.pasteform.pasting.length > 1) { |
|
for (var i=0; i<document.pasteform.pasting.length; i++) { |
|
document.pasteform.pasting[i].checked = true; |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function uncheckClipboard() { |
|
if (document.pasteform.pasting.length >1) { |
|
for (var i=0; i<document.pasteform.pasting.length; i++) { |
|
document.pasteform.pasting[i].checked = false; |
|
} |
|
} |
|
return; |
|
} |
|
|
END |
END |
|
|
} |
} |
Line 2569 sub update_parameter {
|
Line 2613 sub update_parameter {
|
} |
} |
return $haschanges; |
return $haschanges; |
} else { |
} else { |
return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/); |
my $haschanges = 0; |
|
return $haschanges if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/); |
|
|
my $which = $env{'form.changeparms'}; |
my $which = $env{'form.changeparms'}; |
my $idx = $env{'form.setparms'}; |
my $idx = $env{'form.setparms'}; |
|
my $oldvalue = 0; |
|
my $newvalue = 0; |
|
my $current = (&LONCAPA::map::getparameter($idx,'parameter_'.$which))[0]; |
|
if ($which eq 'randompick') { |
|
if ($current =~ /^(\d+)$/) { |
|
$oldvalue = $1; |
|
} |
|
} elsif ($current =~ /^yes$/i) { |
|
$oldvalue = 1; |
|
} |
if ($env{'form.'.$which.'_'.$idx}) { |
if ($env{'form.'.$which.'_'.$idx}) { |
my $value = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx} |
$newvalue = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx} |
: 'yes'; |
: 1; |
&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value, |
|
$parameter_type{$which}); |
|
&remember_parms($idx,$which,'set',$value); |
|
} else { |
|
&LONCAPA::map::delparameter($idx,'parameter_'.$which); |
|
|
|
&remember_parms($idx,$which,'del'); |
|
} |
} |
return 1; |
if ($oldvalue ne $newvalue) { |
|
$haschanges = 1; |
|
if ($newvalue) { |
|
my $storeval = 'yes'; |
|
if ($which eq 'randompick') { |
|
$storeval = $newvalue; |
|
} |
|
&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $storeval, |
|
$parameter_type{$which}); |
|
&remember_parms($idx,$which,'set',$storeval); |
|
} else { |
|
&LONCAPA::map::delparameter($idx,'parameter_'.$which); |
|
&remember_parms($idx,$which,'del'); |
|
} |
|
} |
|
return $haschanges; |
} |
} |
} |
} |
|
|
|
|
sub handle_edit_cmd { |
sub handle_edit_cmd { |
my ($coursenum,$coursedom) =@_; |
my ($coursenum,$coursedom) =@_; |
if ($env{'form.cmd'} eq '') { |
if ($env{'form.cmd'} eq '') { |
Line 2680 sub editor {
|
Line 2742 sub editor {
|
&snapshotbefore(); |
&snapshotbefore(); |
|
|
if (&update_parameter()) { |
if (&update_parameter()) { |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,1); |
return $errtext if ($fatal); |
return $errtext if ($fatal); |
} |
} |
|
|
Line 2744 sub editor {
|
Line 2806 sub editor {
|
# Rename, cut, copy or remove a single resource |
# Rename, cut, copy or remove a single resource |
if (&handle_edit_cmd()) { |
if (&handle_edit_cmd()) { |
my $contentchg; |
my $contentchg; |
if ($env{'form.cmd'} =~ m{^(del|cut)_}) { |
if ($env{'form.cmd'} =~ m{^(remove|cut)_}) { |
$contentchg = 1; |
$contentchg = 1; |
} |
} |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg); |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg); |
Line 2776 sub editor {
|
Line 2838 sub editor {
|
my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); |
my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); |
$name=&LONCAPA::map::qtescape($name); |
$name=&LONCAPA::map::qtescape($name); |
$url=&LONCAPA::map::qtescape($url); |
$url=&LONCAPA::map::qtescape($url); |
next unless ($name && $url); |
next unless $url; |
my %denied = |
my %denied = |
&action_restrictions($coursenum,$coursedom,$url, |
&action_restrictions($coursenum,$coursedom,$url, |
$env{'form.folderpath'},\%curr_groups); |
$env{'form.folderpath'},\%curr_groups); |
Line 3141 sub process_file_upload {
|
Line 3203 sub process_file_upload {
|
my $quotatype = 'unofficial'; |
my $quotatype = 'unofficial'; |
if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
$quotatype = 'community'; |
$quotatype = 'community'; |
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.instcode'}) { |
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { |
$quotatype = 'official'; |
$quotatype = 'official'; |
|
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { |
|
$quotatype = 'textbook'; |
} |
} |
if (&Apache::loncommon::get_user_quota($coursenum,$coursedom,'course',$quotatype)) { |
if (&Apache::loncommon::get_user_quota($coursenum,$coursedom,'course',$quotatype)) { |
$filesize = int($filesize/1000); #expressed in kb |
$filesize = int($filesize/1000); #expressed in kb |
$$upload_output = &Apache::loncommon::excess_filesize_warning($coursenum,$coursedom,'course', |
$$upload_output = &Apache::loncommon::excess_filesize_warning($coursenum,$coursedom,'course', |
$env{'form.uploaddoc.filename'},$filesize,'upload'); |
$env{'form.uploaddoc.filename'},$filesize, |
|
'upload',$quotatype); |
return if ($$upload_output); |
return if ($$upload_output); |
} |
} |
my ($parseaction,$showupload,$nextphase,$mimetype); |
my ($parseaction,$showupload,$nextphase,$mimetype); |
Line 3245 sub process_file_upload {
|
Line 3310 sub process_file_upload {
|
$$upload_output .= &mt('No embedded items identified').'<br />'; |
$$upload_output .= &mt('No embedded items identified').'<br />'; |
} |
} |
$$upload_output = '<div id="uploadfileresult">'.$$upload_output.'</div>'; |
$$upload_output = '<div id="uploadfileresult">'.$$upload_output.'</div>'; |
} elsif (&Apache::loncommon::is_archive_file($mimetype)) { |
} elsif ((&Apache::loncommon::is_archive_file($mimetype)) && |
|
($env{'form.uploaddoc.filename'} =~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/i)) { |
$nextphase = 'decompress_uploaded'; |
$nextphase = 'decompress_uploaded'; |
my $position = scalar(@LONCAPA::map::order)-1; |
my $position = scalar(@LONCAPA::map::order)-1; |
my $noextract = &return_to_editor(); |
my $noextract = &return_to_editor(); |
Line 3307 sub is_supplemental_title {
|
Line 3373 sub is_supplemental_title {
|
sub entryline { |
sub entryline { |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, |
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups)=@_; |
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups)=@_; |
my ($foldertitle,$renametitle); |
my ($foldertitle,$renametitle,$oldtitle); |
if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
} else { |
} else { |
Line 3320 sub entryline {
|
Line 3386 sub entryline {
|
|
|
$renametitle=~s/\\/\\\\/g; |
$renametitle=~s/\\/\\\\/g; |
$renametitle=~s/\"\;/\\\"/g; |
$renametitle=~s/\"\;/\\\"/g; |
|
$renametitle=~s/"/%22/g; |
$renametitle=~s/ /%20/g; |
$renametitle=~s/ /%20/g; |
|
$oldtitle = $renametitle; |
|
$renametitle=~s/\'/\\\'/g; |
my $line=&Apache::loncommon::start_data_table_row(); |
my $line=&Apache::loncommon::start_data_table_row(); |
my ($form_start,$form_end,$form_common,$form_param); |
my ($form_start,$form_end,$form_common,$form_param); |
# Edit commands |
# Edit commands |
Line 3470 ENDREM
|
Line 3539 ENDREM
|
} |
} |
} |
} |
$renamelink=(<<ENDREN); |
$renamelink=(<<ENDREN); |
<a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a> |
<a href='javascript:changename("$esc_path","$index","$oldtitle");' class="LC_docs_rename">$lt{'rn'}</a> |
ENDREN |
ENDREN |
$line.=(<<END); |
$line.=(<<END); |
<td> |
<td> |
Line 3785 sub new_timebased_suffix {
|
Line 3854 sub new_timebased_suffix {
|
if ($type eq 'paste') { |
if ($type eq 'paste') { |
$prefix = $type; |
$prefix = $type; |
$namespace = 'courseeditor'; |
$namespace = 'courseeditor'; |
|
$idtype = 'addcode'; |
} elsif ($type eq 'map') { |
} elsif ($type eq 'map') { |
$prefix = 'docs'; |
$prefix = 'docs'; |
if ($area eq 'supplemental') { |
if ($area eq 'supplemental') { |
Line 3796 sub new_timebased_suffix {
|
Line 3866 sub new_timebased_suffix {
|
$prefix = $type; |
$prefix = $type; |
$namespace = 'templated'; |
$namespace = 'templated'; |
} |
} |
$idtype = 'concat'; |
|
my ($suffix,$freedlock,$error) = |
my ($suffix,$freedlock,$error) = |
&Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num); |
&Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num,$idtype); |
if (!$suffix) { |
if (!$suffix) { |
if ($type eq 'paste') { |
if ($type eq 'paste') { |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when adding to the paste buffer.'); |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when adding to the paste buffer.'); |
Line 3818 sub new_timebased_suffix {
|
Line 3887 sub new_timebased_suffix {
|
'<div class="LC_error">'. |
'<div class="LC_error">'. |
&mt('There was a problem removing a lockfile.').' '; |
&mt('There was a problem removing a lockfile.').' '; |
if ($type eq 'paste') { |
if ($type eq 'paste') { |
&mt('This will prevent use of the paste buffer until th next log-in.'); |
if ($freedlock eq 'nolock') { |
|
$locknotfreed = |
|
'<div class="LC_error">'. |
|
&mt('A lockfile was not released when you added content to the clipboard earlier in this session.').' '. |
|
|
|
&mt('As a result addition of items to the clipboard wll be unavailable until your next log-in.'); |
|
} else { |
|
$locknotfreed .= |
|
&mt('This will prevent addition of items to the clipboard until your next log-in.'); |
|
} |
} elsif ($type eq 'map') { |
} elsif ($type eq 'map') { |
&mt('This will prevent creation of additional folders or composite pages in this course.'); |
$locknotfreed .= |
|
&mt('This will prevent creation of additional folders or composite pages in this course.'); |
} elsif ($type eq 'smppg') { |
} elsif ($type eq 'smppg') { |
$locknotfreed .= |
$locknotfreed .= |
&mt('This will prevent creation of additional simple pages in this course.'); |
&mt('This will prevent creation of additional simple pages in this course.'); |
Line 4033 sub devalidateversioncache {
|
Line 4112 sub devalidateversioncache {
|
sub checkversions { |
sub checkversions { |
my ($r) = @_; |
my ($r) = @_; |
my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
$r->print(&Apache::loncommon::start_page("Check $crstype Document Versions")); |
$r->print(&Apache::loncommon::start_page("Check $crstype Resource Versions")); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions")); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Resource Versions")); |
$r->print(&startContentScreen('tools')); |
$r->print(&startContentScreen('tools')); |
|
|
my $header=''; |
my $header=''; |
Line 4190 $lt{'sc'}: <input type="submit" name="se
|
Line 4269 $lt{'sc'}: <input type="submit" name="se
|
<br clear="all" /> |
<br clear="all" /> |
<hr /> |
<hr /> |
<h4>$lt{'vers'}</h4> |
<h4>$lt{'vers'}</h4> |
<input type="submit" name="setversions" value="$lt{'save'}" /> |
|
ENDHEADERS |
ENDHEADERS |
#number of columns for version history |
#number of columns for version history |
|
my %changedbytime; |
|
foreach my $key (keys(%changes)) { |
|
#excludes not versionable problems from resource version history: |
|
next if ($key =~ /^\/res\/lib\/templates/); |
|
my $chg; |
|
if ($env{'form.timerange'} eq 'all') { |
|
my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); |
|
$chg = &Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate'); |
|
} else { |
|
$chg = $changes{$key}; |
|
next if ($chg < $starttime); |
|
} |
|
push(@{$changedbytime{$chg}},$key); |
|
} |
|
if (keys(%changedbytime) == 0) { |
|
&untiehash(); |
|
$r->print(&mt('No content changes in imported content in specified time frame'). |
|
&endContentScreen()); |
|
return; |
|
} |
$r->print( |
$r->print( |
|
'<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'. |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
'<th>'.&mt('Resources').'</th>'. |
'<th>'.&mt('Resources').'</th>'. |
Line 4203 ENDHEADERS
|
Line 4302 ENDHEADERS
|
'<th>'.&mt('History').'</th>'. |
'<th>'.&mt('History').'</th>'. |
&Apache::loncommon::end_data_table_header_row() |
&Apache::loncommon::end_data_table_header_row() |
); |
); |
foreach my $key (sort(keys(%changes))) { |
foreach my $chg (sort {$b <=> $a } keys(%changedbytime)) { |
#excludes not versionable problems from resource version history: |
foreach my $key (sort(@{$changedbytime{$chg}})) { |
next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/); |
my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); |
my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); |
my $currentversion=&Apache::lonnet::getversion($key); |
my $currentversion=&Apache::lonnet::getversion($key); |
if ($currentversion<0) { |
if ($currentversion<0) { |
$currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>'; |
$currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>'; |
} |
} |
my $linkurl=&Apache::lonnet::clutter($key); |
my $linkurl=&Apache::lonnet::clutter($key); |
$r->print( |
$r->print( |
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br />'. |
'<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br />'. |
'<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'. |
'<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'. |
'<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br />('. |
'<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br />('. |
&Apache::lonlocal::locallocaltime($chg).')</span></td>'. |
&Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')</span></td>'. |
'<td align="right">' |
'<td align="right">' |
); |
); |
# Used in course |
# Used in course |
my $usedversion=$hash{'version_'.$linkurl}; |
my $usedversion=$hash{'version_'.$linkurl}; |
if (($usedversion) && ($usedversion ne 'mostrecent')) { |
if (($usedversion) && ($usedversion ne 'mostrecent')) { |
|
if ($usedversion != $currentversion) { |
if ($usedversion != $currentversion) { |
$r->print('<span class="LC_warning">'.$usedversion.'</span>'); |
$r->print('<span class="LC_warning">'.$usedversion.'</span>'); |
} else { |
} else { |
Line 4231 ENDHEADERS
|
Line 4329 ENDHEADERS
|
} else { |
} else { |
$r->print($currentversion); |
$r->print($currentversion); |
} |
} |
$r->print('</td><td title="'.$lt{'vu'}.'">'); |
$r->print('</td><td title="'.$lt{'vu'}.'">'); |
# Set version |
# Set version |
$r->print(&Apache::loncommon::select_form( |
$r->print(&Apache::loncommon::select_form( |
$setversions{$linkurl}, |
$setversions{$linkurl}, |
'set_version_'.$linkurl, |
'set_version_'.$linkurl, |
{'select_form_order' => ['',1..$currentversion,'mostrecent'], |
{'select_form_order' => ['',1..$currentversion,'mostrecent'], |
'' => '', |
'' => '', |
'mostrecent' => &mt('most recent'), |
'mostrecent' => &mt('most recent'), |
map {$_,$_} (1..$currentversion)})); |
map {$_,$_} (1..$currentversion)})); |
my $lastold=1; |
my $lastold=1; |
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { |
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { |
my $url=$root.'.'.$prevvers.'.'.$extension; |
my $url=$root.'.'.$prevvers.'.'.$extension; |
if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) { |
if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) { |
$lastold=$prevvers; |
$lastold=$prevvers; |
} |
} |
} |
} |
$r->print('</td>'); |
$r->print('</td>'); |
# List all available versions |
# List all available versions |
$r->print('<td valign="top"><span class="LC_fontsize_medium">'); |
$r->print('<td valign="top"><span class="LC_fontsize_medium">'); |
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { |
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { |
my $url=$root.'.'.$prevvers.'.'.$extension; |
my $url=$root.'.'.$prevvers.'.'.$extension; |
$r->print( |
|
'<span class="LC_nobreak">' |
|
.'<a href="'.&Apache::lonnet::clutter($url).'">' |
|
.&mt('Version [_1]',$prevvers).'</a>' |
|
.' ('.&Apache::lonlocal::locallocaltime( |
|
&Apache::lonnet::metadata($url,'lastrevisiondate')) |
|
.')'); |
|
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { |
|
$r->print( |
$r->print( |
' <a href="/adm/diff?filename='. |
'<span class="LC_nobreak">' |
&Apache::lonnet::clutter($root.'.'.$extension). |
.'<a href="'.&Apache::lonnet::clutter($url).'">' |
&HTML::Entities::encode('&versionone='.$prevvers,'"<>&'). |
.&mt('Version [_1]',$prevvers).'</a>' |
'" target="diffs">'.&mt('Diffs').'</a>'); |
.' ('.&Apache::lonlocal::locallocaltime( |
|
&Apache::lonnet::metadata($url,'lastrevisiondate')) |
|
.')'); |
|
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { |
|
$r->print( |
|
' <a href="/adm/diff?filename='. |
|
&Apache::lonnet::clutter($root.'.'.$extension). |
|
&HTML::Entities::encode('&versionone='.$prevvers,'"<>&'). |
|
'" target="diffs">'.&mt('Diffs').'</a>'); |
|
} |
|
$r->print('</span><br />'); |
} |
} |
$r->print('</span><br />'); |
$r->print('</span></td>'.&Apache::loncommon::end_data_table_row()); |
} |
} |
$r->print('</span></td>'.&Apache::loncommon::end_data_table_row()); |
|
} |
} |
$r->print( |
$r->print( |
&Apache::loncommon::end_data_table(). |
&Apache::loncommon::end_data_table(). |
Line 4278 ENDHEADERS
|
Line 4377 ENDHEADERS
|
|
|
&untiehash(); |
&untiehash(); |
$r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
|
return; |
} |
} |
|
|
sub mark_hash_old { |
sub mark_hash_old { |
Line 4332 $help{'Caching'}.'</p></form>'."\n\n");
|
Line 4432 $help{'Caching'}.'</p></form>'."\n\n");
|
|
|
|
|
sub init_breadcrumbs { |
sub init_breadcrumbs { |
my ($form,$text)=@_; |
my ($form,$text,$help)=@_; |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1", |
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1", |
text=>&Apache::loncommon::course_type().' Editor', |
text=>&Apache::loncommon::course_type().' Editor', |
faq=>273, |
faq=>273, |
bug=>'Instructor Interface', |
bug=>'Instructor Interface', |
help => 'Docs_Adding_Course_Doc'}); |
help => $help}); |
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?".$form.'=1', |
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?".$form.'=1', |
text=>$text, |
text=>$text, |
faq=>273, |
faq=>273, |
Line 4422 sub handler {
|
Line 4522 sub handler {
|
'Adding_Folders','Docs_Overview', 'Load_Map', |
'Adding_Folders','Docs_Overview', 'Load_Map', |
'Supplemental','Score_Upload_Form','Adding_Pages', |
'Supplemental','Score_Upload_Form','Adding_Pages', |
'Importing_LON-CAPA_Resource','Importing_IMS_Course', |
'Importing_LON-CAPA_Resource','Importing_IMS_Course', |
'Uploading_From_Harddrive', |
'Uploading_From_Harddrive','Course_Roster','Web_Page', |
'Check_Resource_Versions','Verify_Content', |
'Dropbox','Simple_Problem') { |
'Course_Roster','Web_Page','Dropbox') { |
|
$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); |
$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); |
} |
} |
# Composite help files |
# Composite help files |
Line 4432 sub handler {
|
Line 4531 sub handler {
|
'Docs_About_Syllabus,Docs_Editing_Templated_Pages'); |
'Docs_About_Syllabus,Docs_Editing_Templated_Pages'); |
$help{'Simple Page'} = &Apache::loncommon::help_open_topic( |
$help{'Simple Page'} = &Apache::loncommon::help_open_topic( |
'Docs_About_Simple_Page,Docs_Editing_Templated_Pages'); |
'Docs_About_Simple_Page,Docs_Editing_Templated_Pages'); |
$help{'Simple Problem'} = &Apache::loncommon::help_open_topic( |
|
'Option_Response_Simple'); |
|
$help{'Bulletin Board'} = &Apache::loncommon::help_open_topic( |
$help{'Bulletin Board'} = &Apache::loncommon::help_open_topic( |
'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages'); |
'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages'); |
$help{'My Personal Information Page'} = &Apache::loncommon::help_open_topic( |
$help{'My Personal Information Page'} = &Apache::loncommon::help_open_topic( |
Line 4448 sub handler {
|
Line 4545 sub handler {
|
$allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'}); |
$allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'}); |
} |
} |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chooseserver', |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']); |
'inhibitmenu']); |
if ($allowed && $env{'form.verify'}) { |
if ($allowed && $env{'form.chooseserver'}) { |
&init_breadcrumbs('verify','Verify Content','Docs_Verify_Content'); |
&choose_dump_server($r); |
|
return OK; |
|
} elsif ($allowed && $env{'form.verify'}) { |
|
&init_breadcrumbs('verify','Verify Content'); |
|
&verifycontent($r); |
&verifycontent($r); |
} elsif ($allowed && $env{'form.listsymbs'}) { |
} elsif ($allowed && $env{'form.listsymbs'}) { |
&init_breadcrumbs('listsymbs','List Content IDs'); |
&init_breadcrumbs('listsymbs','List Content IDs'); |
Line 4467 sub handler {
|
Line 4560 sub handler {
|
} |
} |
&docs_change_log($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath); |
&docs_change_log($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath); |
} elsif ($allowed && $env{'form.versions'}) { |
} elsif ($allowed && $env{'form.versions'}) { |
&init_breadcrumbs('versions','Check/Set Resource Versions'); |
&init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions'); |
&checkversions($r); |
&checkversions($r); |
} elsif ($allowed && $env{'form.dumpcourse'}) { |
} elsif ($allowed && $env{'form.dumpcourse'}) { |
&init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space'); |
&init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space'); |
Line 4679 sub handler {
|
Line 4772 sub handler {
|
if ($showdoc) { |
if ($showdoc) { |
$r->print(&Apache::loncommon::start_page("$crstype documents",undef, |
$r->print(&Apache::loncommon::start_page("$crstype documents",undef, |
{'force_register' => $showdoc,})); |
{'force_register' => $showdoc,})); |
|
} elsif ($toolsflag) { |
|
&Apache::lonhtmlcommon::add_breadcrumb({ |
|
href=>"/adm/coursedocs",text=>"$crstype Contents"}); |
|
$r->print(&Apache::loncommon::start_page("$crstype Contents", $script) |
|
.&Apache::loncommon::help_open_menu('','',273,'RAT') |
|
.&Apache::lonhtmlcommon::breadcrumbs( |
|
'Editing Course Contents') |
|
); |
} elsif ($r->uri eq '/adm/supplemental') { |
} elsif ($r->uri eq '/adm/supplemental') { |
my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); |
my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); |
$r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, |
$r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, |
Line 4787 sub handler {
|
Line 4888 sub handler {
|
'title' => 'Title', |
'title' => 'Title', |
'comment' => 'Comment', |
'comment' => 'Comment', |
'parse' => 'Upload embedded images/multimedia files if HTML file', |
'parse' => 'Upload embedded images/multimedia files if HTML file', |
); |
'bb5' => 'Blackboard 5', |
|
'bb6' => 'Blackboard 6', |
|
'angel5' => 'ANGEL 5.5', |
|
'webctce4' => 'WebCT 4 Campus Edition', |
|
); |
# ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
my $fileupload=(<<FIUP); |
my $fileupload=(<<FIUP); |
$lt{'file'}:<br /> |
$lt{'file'}:<br /> |
Line 4818 CHBO
|
Line 4923 CHBO
|
$lt{'cms'}: |
$lt{'cms'}: |
<select name="source"> |
<select name="source"> |
<option value="-1" selected="selected">$lt{'se'}</option> |
<option value="-1" selected="selected">$lt{'se'}</option> |
<option value="bb5">Blackboard 5</option> |
<option value="bb5">$lt{'bb5'}</option> |
<option value="bb6">Blackboard 6</option> |
<option value="bb6">$lt{'bb6'}</option> |
<option value="angel5">ANGEL 5.5</option> |
<option value="angel5">$lt{'angel5'}</option> |
<option value="webctce4">WebCT 4 Campus Edition</option> |
<option value="webctce4">$lt{'webctce4'}</option> |
</select> |
</select> |
<input type="hidden" name="folder" value="$imsfolder" /> |
<input type="hidden" name="folder" value="$imsfolder" /> |
</p> |
</p> |
Line 4973 NSPFORM
|
Line 5078 NSPFORM
|
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a> |
<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a> |
$help{'Simple Problem'} |
$help{'Simple_Problem'} |
</form> |
</form> |
|
|
NSPROBFORM |
NSPROBFORM |
Line 5394 sub decompression_info {
|
Line 5499 sub decompression_info {
|
my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $container='sequence'; |
my $container='sequence'; |
my ($pathitem,$hiddenelem); |
my ($pathitem,$hiddenelem); |
my @hiddens = ('newidx','comment','position','folderpath'); |
my @hiddens = ('newidx','comment','position','folderpath','archiveurl'); |
if ($env{'form.folderpath'} =~ /\:1$/) { |
if ($env{'form.folderpath'} =~ /\:1$/) { |
$container='page'; |
$container='page'; |
} |
} |
Line 5402 sub decompression_info {
|
Line 5507 sub decompression_info {
|
foreach my $item (@hiddens) { |
foreach my $item (@hiddens) { |
if ($env{'form.'.$item}) { |
if ($env{'form.'.$item}) { |
$hiddenelem .= '<input type="hidden" name="'.$item.'" value="'. |
$hiddenelem .= '<input type="hidden" name="'.$item.'" value="'. |
$env{'form.'.$item}.'" />'."\n"; |
&HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n"; |
} |
} |
} |
} |
return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container, |
return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container, |
Line 5459 sub remove_archive {
|
Line 5564 sub remove_archive {
|
} else { |
} else { |
$delwarning = &mt('An error occurred retrieving the contents of the current folder.'); |
$delwarning = &mt('An error occurred retrieving the contents of the current folder.'); |
} |
} |
$delwarning .= &mt('As a result the archive file has not been removed.'); |
$delwarning .= ' '.&mt('As a result the archive file has not been removed.'); |
} else { |
} else { |
my $currcmd = $env{'form.cmd'}; |
my $currcmd = $env{'form.cmd'}; |
my $position = $env{'form.position'}; |
my $position = $env{'form.position'}; |
|
my $archiveidx = $position; |
if ($position > 0) { |
if ($position > 0) { |
$env{'form.cmd'} = 'remove_'.$position; |
if (($env{'form.autoextract_camtasia'}) && (scalar(@LONCAPA::map::order) == 2)) { |
my ($title,$url,@rrest) = |
$archiveidx = $position-1; |
split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]); |
} |
if (&handle_edit_cmd($docuname,$docudom)) { |
$env{'form.cmd'} = 'remove_'.$archiveidx; |
($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); |
my ($title,$url,@rrest) = |
if ($fatal) { |
split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$archiveidx]]); |
if ($container eq 'page') { |
if ($url eq $env{'form.archiveurl'}) { |
$delwarning = &mt('An error occurred updating the contents of the current page.'); |
if (&handle_edit_cmd($docuname,$docudom)) { |
|
($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); |
|
if ($fatal) { |
|
if ($container eq 'page') { |
|
$delwarning = &mt('An error occurred updating the contents of the current page.'); |
|
} else { |
|
$delwarning = &mt('An error occurred updating the contents of the current folder.'); |
|
} |
} else { |
} else { |
$delwarning = &mt('An error occurred updating the contents of the current folder.'); |
$delresult = &mt('Archive file removed.'); |
} |
} |
} else { |
|
$delresult = &mt('Archive file removed.'); |
|
} |
} |
|
} else { |
|
$delwarning .= &mt('Archive file had unexpected item number in folder.'). |
|
' '.&mt('As a result the archive file has not been removed.'); |
} |
} |
} |
} |
$env{'form.cmd'} = $currcmd; |
$env{'form.cmd'} = $currcmd; |
Line 5535 sub generate_admin_menu {
|
Line 5649 sub generate_admin_menu {
|
{ linktext => $lt{'vc'}, |
{ linktext => $lt{'vc'}, |
url => "javascript:injectData(document.courseverify,'dummy','verify','$lt{'vc'}')", |
url => "javascript:injectData(document.courseverify,'dummy','verify','$lt{'vc'}')", |
permission => 'F', |
permission => 'F', |
help => 'Verify_Content', |
help => 'Docs_Verify_Content', |
icon => 'verify.png', |
icon => 'verify.png', |
linktitle => 'Verify contents can be retrieved/rendered', |
linktitle => 'Verify contents can be retrieved/rendered', |
}, |
}, |
{ linktext => $lt{'cv'}, |
{ linktext => $lt{'cv'}, |
url => "javascript:injectData(document.courseverify,'dummy','versions','$lt{'cv'}')", |
url => "javascript:injectData(document.courseverify,'dummy','versions','$lt{'cv'}')", |
permission => 'F', |
permission => 'F', |
help => 'Check_Resource_Versions', |
help => 'Docs_Check_Resource_Versions', |
icon => 'resversion.png', |
icon => 'resversion.png', |
linktitle => "View version information for resources in your $lc_crstype, and fix/unfix use of specific versions", |
linktitle => "View version information for resources in your $lc_crstype, and fix/unfix use of specific versions", |
}, |
}, |
Line 5567 sub generate_admin_menu {
|
Line 5681 sub generate_admin_menu {
|
{ linktext => $lt{'dcd'}, |
{ linktext => $lt{'dcd'}, |
url => $dumpurl, |
url => $dumpurl, |
permission => $candump, |
permission => $candump, |
#help => '', |
help => 'Docs_Dump_Course_Docs', |
icon => 'dump.png', |
icon => 'dump.png', |
linktitle => $lt{'dcd'}, |
linktitle => $lt{'dcd'}, |
}, |
}, |
Line 5740 sub editing_js {
|
Line 5854 sub editing_js {
|
if (&Apache::lonnet::is_on_map($res)) { |
if (&Apache::lonnet::is_on_map($res)) { |
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='. |
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='. |
&HTML::Entities::encode($caller,'<>&"'); |
&HTML::Entities::encode($caller,'<>&"'); |
|
$backtourl = &Apache::loncommon::escape_single($backtourl); |
} else { |
} else { |
$backtourl = '/adm/navmaps'; |
$backtourl = '/adm/navmaps'; |
} |
} |
Line 6626 ENDINJECT
|
Line 6741 ENDINJECT
|
sub dump_switchserver_js { |
sub dump_switchserver_js { |
my @hosts = @_; |
my @hosts = @_; |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
dump => 'Copying Content to Authoring Space requires switching server.', |
dump => 'Copying content to Authoring Space requires switching server.', |
swit => 'Switch server?', |
swit => 'Switch server?', |
duco => 'Copying Content to Authoring Space', |
duco => 'Copying Content to Authoring Space', |
yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.', |
yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.', |