version 1.224, 2006/03/17 00:06:54
|
version 1.229, 2006/05/30 20:09:25
|
Line 42 use HTML::Entities;
|
Line 42 use HTML::Entities;
|
use GDBM_File; |
use GDBM_File; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Cwd; |
use Cwd; |
|
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
|
|
my $iconpath; |
my $iconpath; |
|
|
Line 119 sub authorhosts {
|
Line 121 sub authorhosts {
|
|
|
sub dumpbutton { |
sub dumpbutton { |
my ($home,$other,%outhash)=&authorhosts(); |
my ($home,$other,%outhash)=&authorhosts(); |
|
my $type = 'Course'; |
|
if (defined($env{'course.'.$env{'request.course.id'}.'.type'})) { |
|
$type = $env{'course.'.$env{'request.course.id'}.'.type'}; |
|
} |
if ($home+$other==0) { return ''; } |
if ($home+$other==0) { return ''; } |
my $output='</td><td bgcolor="#DDDDCC">'; |
my $output='</td><td bgcolor="#DDDDCC">'; |
if ($home) { |
if ($home) { |
return '</td><td bgcolor="#DDDDCC">'. |
return '</td><td bgcolor="#DDDDCC">'. |
'<input type="submit" name="dumpcourse" value="'. |
'<input type="submit" name="dumpcourse" value="'. |
&mt('Dump Course DOCS to Construction Space').'" />'. |
&mt('Dump [_1] DOCS to Construction Space',$type).'" />'. |
&Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs'); |
&Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs'); |
} else { |
} else { |
return'</td><td bgcolor="#DDDDCC">'. |
return'</td><td bgcolor="#DDDDCC">'. |
&mt('Dump Course DOCS to Construction Space: available on other servers'); |
&mt('Dump [_1] DOCS to Construction Space: available on other servers', |
|
$type); |
} |
} |
} |
} |
|
|
Line 141 sub clean {
|
Line 148 sub clean {
|
|
|
sub dumpcourse { |
sub dumpcourse { |
my ($r) = @_; |
my ($r) = @_; |
|
my $type = 'Course'; |
$r->print(&Apache::loncommon::start_page('Dump Course DOCS to Construction Space'). |
if (defined($env{'course.'.$env{'request.course.id'}.'.type'})) { |
'<form name="dumpdoc" method="post">'); |
$type = $env{'course.'.$env{'request.course.id'}.'.type'}; |
|
} |
|
$r->print(&Apache::loncommon::start_page('Dump [_1] DOCS to Construction Space', |
|
$type).'<form name="dumpdoc" method="post">'); |
my ($home,$other,%outhash)=&authorhosts(); |
my ($home,$other,%outhash)=&authorhosts(); |
unless ($home) { return ''; } |
unless ($home) { return ''; } |
my $origcrsid=$env{'request.course.id'}; |
my $origcrsid=$env{'request.course.id'}; |
Line 221 sub dumpcourse {
|
Line 231 sub dumpcourse {
|
$r->print('</select>'); |
$r->print('</select>'); |
} |
} |
my $title=$origcrsdata{'description'}; |
my $title=$origcrsdata{'description'}; |
$title=~s/\s+/\_/gs; |
$title=~s/[\/\s]+/\_/gs; |
$title=&clean($title); |
$title=&clean($title); |
$r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />'); |
$r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />'); |
&tiehash(); |
&tiehash(); |
Line 244 sub dumpcourse {
|
Line 254 sub dumpcourse {
|
$r->print("</table>\n"); |
$r->print("</table>\n"); |
&untiehash(); |
&untiehash(); |
$r->print( |
$r->print( |
'<p><input type="submit" name="dumpcourse" value="'.&mt('Dump Course DOCS').'" /></p></form>'); |
'<p><input type="submit" name="dumpcourse" value="'.&mt('Dump [_1] DOCS',$type).'" /></p></form>'); |
} |
} |
} |
} |
|
|
# ------------------------------------------------------ Generate "export" button |
# ------------------------------------------------------ Generate "export" button |
|
|
sub exportbutton { |
sub exportbutton { |
|
my $type = 'Course'; |
|
if (defined($env{'course.'.$env{'request.course.id'}.'.type'})) { |
|
$type = $env{'course.'.$env{'request.course.id'}.'.type'}; |
|
} |
return '</td><td bgcolor="#DDDDCC">'. |
return '</td><td bgcolor="#DDDDCC">'. |
'<input type="submit" name="exportcourse" value="'. |
'<input type="submit" name="exportcourse" value="'. |
&mt('Export Course to IMS').'" />'. |
&mt('Export [_1] to IMS',$type).'" />'. |
&Apache::loncommon::help_open_topic('Docs_Export_Course_Docs'); |
&Apache::loncommon::help_open_topic('Docs_Export_Course_Docs'); |
} |
} |
|
|
sub exportcourse { |
sub exportcourse { |
my $r=shift; |
my $r=shift; |
|
my $type = 'Course'; |
|
if (defined($env{'course.'.$env{'request.course.id'}.'.type'})) { |
|
$type = $env{'course.'.$env{'request.course.id'}.'.type'}; |
|
} |
my %discussiontime = &Apache::lonnet::dump('discussiontimes', |
my %discussiontime = &Apache::lonnet::dump('discussiontimes', |
$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); |
$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); |
my $numdisc = keys %discussiontime; |
my $numdisc = keys %discussiontime; |
Line 299 sub exportcourse {
|
Line 317 sub exportcourse {
|
open(OUTPUT, "zip -r $imszip * 2> /dev/null |"); |
open(OUTPUT, "zip -r $imszip * 2> /dev/null |"); |
close(OUTPUT); |
close(OUTPUT); |
chdir $cwd; |
chdir $cwd; |
$outcome .= 'Download the zip file from <a href="'.$imszipfile.'">IMS course archive</a><br />'; |
$outcome .= &mt('Download the zip file from <a href="[_1]">IMS [_2] archive</a><br />',$imszipfile,lc($type)); |
if ($copyresult) { |
if ($copyresult) { |
$outcome .= 'The following errors occurred during export - '.$copyresult; |
$outcome .= 'The following errors occurred during export - '.$copyresult; |
} |
} |
Line 307 sub exportcourse {
|
Line 325 sub exportcourse {
|
$outcome = '<br />Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.<br />'; |
$outcome = '<br />Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.<br />'; |
} |
} |
} |
} |
$r->print(&Apache::loncommon::start_page('Export course to IMS content package')); |
$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package')); |
$r->print($outcome); |
$r->print($outcome); |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
} else { |
} else { |
my $display; |
my $display; |
$display = '<form name="exportdoc" method="post">'."\n"; |
$display = '<form name="exportdoc" method="post">'."\n"; |
$display .= 'Choose which items you wish to export from your course.<br /><br />'; |
$display .= &mt('Choose which items you wish to export from your [_1].<br /><br />',$type); |
$display .= '<table border="0" cellspacing="0" cellpadding="3">'. |
$display .= '<table border="0" cellspacing="0" cellpadding="3">'. |
'<tr><td><fieldset><legend> <b>Content items</b></legend>'. |
'<tr><td><fieldset><legend> <b>Content items</b></legend>'. |
'<input type="button" value="check all" '. |
'<input type="button" value="check all" '. |
Line 447 function containerCheck(item) {
|
Line 465 function containerCheck(item) {
|
|
|
</script> |
</script> |
|; |
|; |
$r->print(&Apache::loncommon::start_page('Export course to IMS content package', |
$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package', |
$scripttag)); |
$scripttag)); |
$r->print($display.'</table>'. |
$r->print($display.'</table>'. |
'<p><input type="hidden" name="finishexport" value="1">'. |
'<p><input type="hidden" name="finishexport" value="1">'. |
'<input type="submit" name="exportcourse" value="'. |
'<input type="submit" name="exportcourse" value="'. |
&mt('Export Course DOCS').'" /></p></form>'. |
&mt('Export [_1] DOCS',$type).'" /></p></form>'. |
&Apache::loncommon::end_page()); |
&Apache::loncommon::end_page()); |
} |
} |
} |
} |
Line 950 sub breadcrumbs {
|
Line 968 sub breadcrumbs {
|
if ($env{'form.markedcopy_url'}) { |
if ($env{'form.markedcopy_url'}) { |
&Apache::lonnet::logthis('Found '.$env{'form.markedcopy_url'}); |
&Apache::lonnet::logthis('Found '.$env{'form.markedcopy_url'}); |
$cpinfo='&markedcopy_url='. |
$cpinfo='&markedcopy_url='. |
&Apache::lonnet::escape($env{'form.markedcopy_url'}). |
&escape($env{'form.markedcopy_url'}). |
'&markedcopy_title='. |
'&markedcopy_title='. |
&Apache::lonnet::escape($env{'form.markedcopy_title'}); |
&escape($env{'form.markedcopy_title'}); |
} |
} |
while (@folders) { |
while (@folders) { |
my $folder=shift(@folders); |
my $folder=shift(@folders); |
Line 960 sub breadcrumbs {
|
Line 978 sub breadcrumbs {
|
if ($folderpath) {$folderpath.='&';} |
if ($folderpath) {$folderpath.='&';} |
$folderpath.=$folder.'&'.$foldername; |
$folderpath.=$folder.'&'.$foldername; |
my $url='/adm/coursedocs?folderpath='. |
my $url='/adm/coursedocs?folderpath='. |
&Apache::lonnet::escape($folderpath); |
&escape($folderpath); |
&Apache::lonhtmlcommon::add_breadcrumb( |
&Apache::lonhtmlcommon::add_breadcrumb( |
{'href'=>$url.$cpinfo, |
{'href'=>$url.$cpinfo, |
'title'=>&Apache::lonnet::unescape($foldername), |
'title'=>&unescape($foldername), |
'text'=>'<font size="+1">'. |
'text'=>'<font size="+1">'. |
&Apache::lonnet::unescape($foldername).'</font>' |
&unescape($foldername).'</font>' |
}); |
}); |
|
|
|
|
} |
} |
return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef, |
return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp'); |
0,'nohelp'); |
|
} |
} |
|
|
sub editor { |
sub editor { |
Line 1171 sub editor {
|
Line 1188 sub editor {
|
foreach (split(/\&/,$env{'form.importdetail'})) { |
foreach (split(/\&/,$env{'form.importdetail'})) { |
if (defined($_)) { |
if (defined($_)) { |
my ($name,$url)=split(/\=/,$_); |
my ($name,$url)=split(/\=/,$_); |
$name=&Apache::lonnet::unescape($name); |
$name=&unescape($name); |
$url=&Apache::lonnet::unescape($url); |
$url=&unescape($url); |
push @imports, $name, $url; |
push @imports, $name, $url; |
} |
} |
} |
} |
Line 1325 sub process_file_upload {
|
Line 1342 sub process_file_upload {
|
method="post" enctype="multipart/form-data"> |
method="post" enctype="multipart/form-data"> |
<input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" /> <input type="hidden" name="cmd" value="upload_embedded" /> |
<input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" /> <input type="hidden" name="cmd" value="upload_embedded" /> |
<input type="hidden" name="newidx" value="'.$newidx.'" /> |
<input type="hidden" name="newidx" value="'.$newidx.'" /> |
<input type="hidden" name="primaryurl" value="'.&Apache::lonnet::escape($url).'" /> |
<input type="hidden" name="primaryurl" value="'.&escape($url).'" /> |
<input type="hidden" name="phasetwo" value="'.$total_embedded.'" />'; |
<input type="hidden" name="phasetwo" value="'.$total_embedded.'" />'; |
$$upload_output .= '<b>Upload embedded files</b>:<br /> |
$$upload_output .= '<b>Upload embedded files</b>:<br /> |
<table>'; |
<table>'; |
foreach my $embed_file (keys(%{$allfiles})) { |
foreach my $embed_file (keys(%{$allfiles})) { |
$$upload_output .= '<tr><td>'.$embed_file. |
$$upload_output .= '<tr><td>'.$embed_file. |
'<input name="embedded_item_'.$num.'" type="file" /> |
'<input name="embedded_item_'.$num.'" type="file" /> |
<input name="embedded_orig_'.$num.'" type="hidden" value="'.&Apache::lonnet::escape($embed_file).'" />'; |
<input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />'; |
my $attrib; |
my $attrib; |
if (@{$$allfiles{$embed_file}} > 1) { |
if (@{$$allfiles{$embed_file}} > 1) { |
$attrib = join(':',@{$$allfiles{$embed_file}}); |
$attrib = join(':',@{$$allfiles{$embed_file}}); |
Line 1343 sub process_file_upload {
|
Line 1360 sub process_file_upload {
|
'<input name="embedded_attrib_'.$num.'" type="hidden" value="'.$attrib.'" />'; |
'<input name="embedded_attrib_'.$num.'" type="hidden" value="'.$attrib.'" />'; |
if (exists($$codebase{$embed_file})) { |
if (exists($$codebase{$embed_file})) { |
$$upload_output .= |
$$upload_output .= |
'<input name="codebase_'.$num.'" type="hidden" value="'.&Apache::lonnet::escape($$codebase{$embed_file}).'" />'; |
'<input name="codebase_'.$num.'" type="hidden" value="'.&escape($$codebase{$embed_file}).'" />'; |
} |
} |
$$upload_output .= '</td></tr>'; |
$$upload_output .= '</td></tr>'; |
$num ++; |
$num ++; |
Line 1386 sub entryline {
|
Line 1403 sub entryline {
|
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_; |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_; |
$title=~s/\&colon\;/\:/g; |
$title=~s/\&colon\;/\:/g; |
$title=&HTML::Entities::encode(&HTML::Entities::decode( |
$title=&HTML::Entities::encode(&HTML::Entities::decode( |
&Apache::lonnet::unescape($title)),'"<>&\''); |
&unescape($title)),'"<>&\''); |
my $renametitle=$title; |
my $renametitle=$title; |
my $foldertitle=$title; |
my $foldertitle=$title; |
my $pagetitle=$title; |
my $pagetitle=$title; |
Line 1406 sub entryline {
|
Line 1423 sub entryline {
|
my $folderpath; |
my $folderpath; |
if ($env{'form.folderpath'}) { |
if ($env{'form.folderpath'}) { |
$container = 'sequence'; |
$container = 'sequence'; |
$folderpath=&Apache::lonnet::escape($env{'form.folderpath'}); |
$folderpath=&escape($env{'form.folderpath'}); |
# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"'); |
# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"'); |
} |
} |
my ($pagepath,$pagesymb); |
my ($pagepath,$pagesymb); |
if ($env{'form.pagepath'}) { |
if ($env{'form.pagepath'}) { |
$container = 'page'; |
$container = 'page'; |
$pagepath=&Apache::lonnet::escape($env{'form.pagepath'}); |
$pagepath=&escape($env{'form.pagepath'}); |
$pagesymb=&Apache::lonnet::escape($env{'form.pagesymb'}); |
$pagesymb=&escape($env{'form.pagesymb'}); |
} |
} |
my $cpinfo=''; |
my $cpinfo=''; |
if ($env{'form.markedcopy_url'}) { |
if ($env{'form.markedcopy_url'}) { |
$cpinfo='&markedcopy_url='. |
$cpinfo='&markedcopy_url='. |
&Apache::lonnet::escape($env{'form.markedcopy_url'}). |
&escape($env{'form.markedcopy_url'}). |
'&markedcopy_title='. |
'&markedcopy_title='. |
&Apache::lonnet::escape($env{'form.markedcopy_title'}); |
&escape($env{'form.markedcopy_title'}); |
} |
} |
if ($allowed) { |
if ($allowed) { |
my $incindex=$index+1; |
my $incindex=$index+1; |
Line 1578 END
|
Line 1595 END
|
} elsif ($url=~m|^/ext/|) { |
} elsif ($url=~m|^/ext/|) { |
$url='/adm/wrapper'.$url; |
$url='/adm/wrapper'.$url; |
} |
} |
$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb); |
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); |
if ($container eq 'page') { |
if ($container eq 'page') { |
my $symb=$env{'form.pagesymb'}; |
my $symb=$env{'form.pagesymb'}; |
|
|
$url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]); |
$url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]); |
$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb); |
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); |
} |
} |
} |
} |
my $parameterset=' '; |
my $parameterset=' '; |
if ($isfolder || $extension eq 'sequence') { |
if ($isfolder || $extension eq 'sequence') { |
my $foldername=&Apache::lonnet::escape($foldertitle); |
my $foldername=&escape($foldertitle); |
my $folderpath=$env{'form.folderpath'}; |
my $folderpath=$env{'form.folderpath'}; |
if ($folderpath) { $folderpath.='&' }; |
if ($folderpath) { $folderpath.='&' }; |
$folderpath.=$folderarg.'&'.$foldername; |
$folderpath.=$folderarg.'&'.$foldername; |
$url.='folderpath='.&Apache::lonnet::escape($folderpath).$cpinfo; |
$url.='folderpath='.&escape($folderpath).$cpinfo; |
$parameterset='<label>'.&mt('Randomly Pick: '). |
$parameterset='<label>'.&mt('Randomly Pick: '). |
'<input type="text" size="4" onChange="this.form.submit()" name="randpick_'.$orderidx.'" value="'. |
'<input type="text" size="4" onChange="this.form.submit()" name="randpick_'.$orderidx.'" value="'. |
(&Apache::lonratedt::getparameter($orderidx, |
(&Apache::lonratedt::getparameter($orderidx, |
Line 1602 END
|
Line 1619 END
|
|
|
} |
} |
if ($ispage) { |
if ($ispage) { |
my $pagename=&Apache::lonnet::escape($pagetitle); |
my $pagename=&escape($pagetitle); |
my $pagepath; |
my $pagepath; |
my $folderpath=$env{'form.folderpath'}; |
my $folderpath=$env{'form.folderpath'}; |
if ($folderpath) { $pagepath = $folderpath.'&' }; |
if ($folderpath) { $pagepath = $folderpath.'&' }; |
Line 1616 END
|
Line 1633 END
|
$residx, |
$residx, |
$path.$pagearg.'.page'); |
$path.$pagearg.'.page'); |
} |
} |
$url.='pagepath='.&Apache::lonnet::escape($pagepath). |
$url.='pagepath='.&escape($pagepath). |
'&pagesymb='.&Apache::lonnet::escape($symb).$cpinfo; |
'&pagesymb='.&escape($symb).$cpinfo; |
} |
} |
$line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon. |
$line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon. |
'" border="0"></a></td>'. |
'" border="0"></a></td>'. |
Line 1672 sub untiehash {
|
Line 1689 sub untiehash {
|
|
|
sub checkonthis { |
sub checkonthis { |
my ($r,$url,$level,$title)=@_; |
my ($r,$url,$level,$title)=@_; |
$url=&Apache::lonnet::unescape($url); |
$url=&unescape($url); |
$alreadyseen{$url}=1; |
$alreadyseen{$url}=1; |
$r->rflush(); |
$r->rflush(); |
if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { |
if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { |
Line 1763 sub list_symbs {
|
Line 1780 sub list_symbs {
|
# |
# |
sub verifycontent { |
sub verifycontent { |
my ($r) = @_; |
my ($r) = @_; |
|
my $type = 'Course'; |
|
if (defined($env{'course.'.$env{'request.course.id'}.'.type'})) { |
|
$type = $env{'course.'.$env{'request.course.id'}.'.type'}; |
|
} |
my $loaderror=&Apache::lonnet::overloaderror($r); |
my $loaderror=&Apache::lonnet::overloaderror($r); |
if ($loaderror) { return $loaderror; } |
if ($loaderror) { return $loaderror; } |
$r->print(&Apache::loncommon::start_page('Verify Course Documents')); |
$r->print(&Apache::loncommon::start_page('Verify '.$type.' Documents')); |
$hashtied=0; |
$hashtied=0; |
undef %alreadyseen; |
undef %alreadyseen; |
%alreadyseen=(); |
%alreadyseen=(); |
&tiehash(); |
&tiehash(); |
foreach (keys %hash) { |
foreach (keys %hash) { |
if ($hash{$_}=~/\.(page|sequence)$/) { |
if ($hash{$_}=~/\.(page|sequence)$/) { |
if (($_=~/^src_/) && ($alreadyseen{&Apache::lonnet::unescape($hash{$_})})) { |
if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) { |
$r->print('<hr /><font color="red">'. |
$r->print('<hr /><font color="red">'. |
&mt('The following sequence or page is included more than once in your course: '). |
&mt('The following sequence or page is included more than once in your [_1]: ',$type). |
&Apache::lonnet::unescape($hash{$_}).'</font><br />'. |
&unescape($hash{$_}).'</font><br />'. |
&mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />')); |
&mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />')); |
} |
} |
} |
} |
if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&Apache::lonnet::unescape($hash{$_})})) { |
if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$_})})) { |
&checkonthis($r,$hash{$_},0,$hash{'title_'.$1}); |
&checkonthis($r,$hash{$_},0,$hash{'title_'.$1}); |
} |
} |
} |
} |
Line 1799 sub devalidateversioncache {
|
Line 1820 sub devalidateversioncache {
|
|
|
sub checkversions { |
sub checkversions { |
my ($r) = @_; |
my ($r) = @_; |
$r->print(&Apache::loncommon::start_page('Check Course Document Versions')); |
my $type = 'Course'; |
|
if (defined($env{'course.'.$env{'request.course.id'}.'.type'})) { |
|
$type = $env{'course.'.$env{'request.course.id'}.'.type'}; |
|
} |
|
$r->print(&Apache::loncommon::start_page("Check $type Document Versions")); |
my $header=''; |
my $header=''; |
my $startsel=''; |
my $startsel=''; |
my $monthsel=''; |
my $monthsel=''; |
Line 1860 sub checkversions {
|
Line 1885 sub checkversions {
|
&changewarning($r,''); |
&changewarning($r,''); |
if ($env{'form.timerange'} eq 'all') { |
if ($env{'form.timerange'} eq 'all') { |
# show all documents |
# show all documents |
$header=&mt('All Documents in Course'); |
$header=&mt('All Documents in [_1]',$type); |
$allsel=1; |
$allsel=1; |
foreach (keys %hash) { |
foreach (keys %hash) { |
if ($_=~/^ids\_(\/res\/.+)$/) { |
if ($_=~/^ids\_(\/res\/.+)$/) { |
Line 1905 sub checkversions {
|
Line 1930 sub checkversions {
|
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
my %lt=&Apache::lonlocal::texthash |
my %lt=&Apache::lonlocal::texthash |
('st' => 'Version changes since start of Course', |
('st' => 'Version changes since start of '.$type, |
'lm' => 'Version changes since last Month', |
'lm' => 'Version changes since last Month', |
'lw' => 'Version changes since last Week', |
'lw' => 'Version changes since last Week', |
'sy' => 'Version changes since Yesterday', |
'sy' => 'Version changes since Yesterday', |
Line 1914 sub checkversions {
|
Line 1939 sub checkversions {
|
'fi' => 'File', |
'fi' => 'File', |
'md' => 'Modification Date', |
'md' => 'Modification Date', |
'mr' => 'Most recently published Version', |
'mr' => 'Most recently published Version', |
've' => 'Version used in Course', |
've' => 'Version used in '.$type, |
'vu' => 'Set Version to be used in Course', |
'vu' => 'Set Version to be used in '.$type, |
'sv' => 'Set Versions to be used in Course according to Selections below', |
'sv' => 'Set Versions to be used in '.$type.' according to Selections below', |
'sm' => 'Keep all Resources up-to-date with most recent Versions (default)', |
'sm' => 'Keep all Resources up-to-date with most recent Versions (default)', |
'sc' => 'Set all Resource Versions to current Version (Fix Versions)', |
'sc' => 'Set all Resource Versions to current Version (Fix Versions)', |
'di' => 'Differences'); |
'di' => 'Differences'); |
Line 1963 ENDHEADERS
|
Line 1988 ENDHEADERS
|
'<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '. |
'<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '. |
'<font size="+1">'.$currentversion.'</font>'. |
'<font size="+1">'.$currentversion.'</font>'. |
'</nobr></td>'. |
'</nobr></td>'. |
'<td title="'.$lt{'ve'}.'"><nobr>In Course: '. |
'<td title="'.$lt{'ve'}.'"><nobr>In '.$type.': '. |
'<font size="+1">'); |
'<font size="+1">'); |
# Used in course |
# Used in course |
my $usedversion=$hash{'version_'.$linkurl}; |
my $usedversion=$hash{'version_'.$linkurl}; |
Line 2067 sub changewarning {
|
Line 2092 sub changewarning {
|
my ($r,$postexec,$message,$url)=@_; |
my ($r,$postexec,$message,$url)=@_; |
if (!&is_hash_old()) { return; } |
if (!&is_hash_old()) { return; } |
my $pathvar='folderpath'; |
my $pathvar='folderpath'; |
my $path=&Apache::lonnet::escape($env{'form.folderpath'}); |
my $path=&escape($env{'form.folderpath'}); |
if (!defined($url)) { |
if (!defined($url)) { |
if (defined($env{'form.pagepath'})) { |
if (defined($env{'form.pagepath'})) { |
$pathvar='pagepath'; |
$pathvar='pagepath'; |
$path=&Apache::lonnet::escape($env{'form.pagepath'}); |
$path=&escape($env{'form.pagepath'}); |
$path.='&pagesymb='.&Apache::lonnet::escape($env{'form.pagesymb'}); |
$path.='&pagesymb='.&escape($env{'form.pagesymb'}); |
} |
} |
$url='/adm/coursedocs?'.$pathvar.'='.$path; |
$url='/adm/coursedocs?'.$pathvar.'='.$path; |
} |
} |
|
my $crstype = 'course'; |
|
if (defined($env{'course.'.$env{'request.course.id'}.'.type'})) { |
|
$crstype = $env{'course.'.$env{'request.course.id'}.'.type'}; |
|
} |
if (!defined($message)) { |
if (!defined($message)) { |
$message='Changes will become active for your current session after [_1], or the next time you log in.'; |
$message='Changes will become active for your current session after [_1], or the next time you log in.'; |
} |
} |
Line 2086 sub changewarning {
|
Line 2115 sub changewarning {
|
'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'. |
'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'. |
&mt($message,' <input type="hidden" name="'. |
&mt($message,' <input type="hidden" name="'. |
$env{'request.role'}.'" value="1" /><input type="button" value="'. |
$env{'request.role'}.'" value="1" /><input type="button" value="'. |
&mt('re-initializing course').'" onClick="reinit(this.form)" />'). |
&mt('re-initializing [_1]',$crstype).'" onClick="reinit(this.form)" />'). |
$help{'Caching'}.'</font></h3></form>'."\n\n"); |
$help{'Caching'}.'</font></h3></form>'."\n\n"); |
} |
} |
|
|
Line 2096 sub handler {
|
Line 2125 sub handler {
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
return OK if $r->header_only; |
return OK if $r->header_only; |
|
# Identify type - Course or Group. |
|
my $type = 'Course'; |
|
if (defined($env{'course.'.$env{'request.course.id'}.'.type'})) { |
|
$type = $env{'course.'.$env{'request.course.id'}.'.type'}; |
|
} |
|
|
|
|
# --------------------------------------------- Initialize help topics for this |
# --------------------------------------------- Initialize help topics for this |
foreach ('Adding_Course_Doc','Main_Course_Documents', |
foreach ('Adding_Course_Doc','Main_Course_Documents', |
Line 2139 sub handler {
|
Line 2174 sub handler {
|
my $forcestandard = 0; |
my $forcestandard = 0; |
my $forcesupplement; |
my $forcesupplement; |
my $script=''; |
my $script=''; |
my $events=''; |
|
my $showdoc=0; |
my $showdoc=0; |
my $containertag; |
my $containertag; |
my $uploadtag; |
my $uploadtag; |
Line 2149 sub handler {
|
Line 2183 sub handler {
|
'markedcopy_title']); |
'markedcopy_title']); |
if ($env{'form.folderpath'}) { |
if ($env{'form.folderpath'}) { |
my (@folderpath)=split('&',$env{'form.folderpath'}); |
my (@folderpath)=split('&',$env{'form.folderpath'}); |
$env{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath)); |
$env{'form.foldername'}=&unescape(pop(@folderpath)); |
$env{'form.folder'}=pop(@folderpath); |
$env{'form.folder'}=pop(@folderpath); |
} |
} |
if ($env{'form.pagepath'}) { |
if ($env{'form.pagepath'}) { |
my (@pagepath)=split('&',$env{'form.pagepath'}); |
my (@pagepath)=split('&',$env{'form.pagepath'}); |
$env{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath)); |
$env{'form.pagename'}=&unescape(pop(@pagepath)); |
$env{'form.folder'}=pop(@pagepath); |
$env{'form.folder'}=pop(@pagepath); |
$containertag = '<input type="hidden" name="pagepath" value="" />'. |
$containertag = '<input type="hidden" name="pagepath" value="" />'. |
'<input type="hidden" name="pagesymb" value="" />'; |
'<input type="hidden" name="pagesymb" value="" />'; |
Line 2177 sub handler {
|
Line 2211 sub handler {
|
} |
} |
} else { # got called in sequence from course |
} else { # got called in sequence from course |
$allowed=0; |
$allowed=0; |
$script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>'; |
|
$events='onLoad="'.&Apache::lonmenu::loadevents(). |
|
'" onUnload="'.&Apache::lonmenu::unloadevents().'"'; |
|
} |
} |
|
|
# get course data |
# get course data |
my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
|
# get personal data |
# get personal data |
|
|
my $uname=$env{'user.name'}; |
my $uname=$env{'user.name'}; |
my $udom=$env{'user.domain'}; |
my $udom=$env{'user.domain'}; |
my $plainname=&Apache::lonnet::escape( |
my $plainname=&escape( |
&Apache::loncommon::plainname($uname,$udom)); |
&Apache::loncommon::plainname($uname,$udom)); |
|
|
# graphics settings |
# graphics settings |
Line 2202 sub handler {
|
Line 2232 sub handler {
|
} |
} |
# -------------------------------------------------------------------- Body tag |
# -------------------------------------------------------------------- Body tag |
$script = '<script type="text/javascript">'."\n".$script."\n".'</script>'; |
$script = '<script type="text/javascript">'."\n".$script."\n".'</script>'; |
$r->print(&Apache::loncommon::start_page('Course Documents', $script, |
$r->print(&Apache::loncommon::start_page("$type Documents", $script, |
{'add_entries' => $events, |
{'force_register' => $showdoc,}). |
'force_register' => $showdoc,}). |
|
&Apache::loncommon::help_open_menu('','','','',273,'RAT')); |
&Apache::loncommon::help_open_menu('','','','',273,'RAT')); |
|
|
my %allfiles = (); |
my %allfiles = (); |
Line 2225 sub handler {
|
Line 2254 sub handler {
|
my %attribs = (); |
my %attribs = (); |
my $updateflag = 0; |
my $updateflag = 0; |
my $residx = $env{'form.newidx'}; |
my $residx = $env{'form.newidx'}; |
my $primary_url = &Apache::lonnet::unescape($env{'form.primaryurl'}); |
my $primary_url = &unescape($env{'form.primaryurl'}); |
# Process file upload - phase two - gather secondary files. |
# Process file upload - phase two - gather secondary files. |
for (my $i=0; $i<$env{'form.phasetwo'}; $i++) { |
for (my $i=0; $i<$env{'form.phasetwo'}; $i++) { |
if ($env{'form.embedded_item_'.$i.'.filename'}) { |
if ($env{'form.embedded_item_'.$i.'.filename'}) { |
my $javacodebase; |
my $javacodebase; |
$newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx); |
$newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx); |
$origname{$i} = &Apache::lonnet::unescape($env{'form.embedded_orig_'.$i}); |
$origname{$i} = &unescape($env{'form.embedded_orig_'.$i}); |
if (exists($env{'form.embedded_codebase_'.$i})) { |
if (exists($env{'form.embedded_codebase_'.$i})) { |
$javacodebase = &Apache::lonnet::unescape($env{'form.embedded_codebase_'.$i}); |
$javacodebase = &unescape($env{'form.embedded_codebase_'.$i}); |
$origname{$i} =~ s#^\Q$javacodebase\E/##; |
$origname{$i} =~ s#^\Q$javacodebase\E/##; |
} |
} |
my @attributes = (); |
my @attributes = (); |
Line 2243 sub handler {
|
Line 2272 sub handler {
|
@attributes = ($env{'form.embedded_attrib_'.$i}); |
@attributes = ($env{'form.embedded_attrib_'.$i}); |
} |
} |
foreach (@attributes) { |
foreach (@attributes) { |
push(@{$attribs{$i}},&Apache::lonnet::unescape($_)); |
push(@{$attribs{$i}},&unescape($_)); |
} |
} |
if ($javacodebase) { |
if ($javacodebase) { |
$codebase{$i} = $javacodebase; |
$codebase{$i} = $javacodebase; |
Line 2292 sub handler {
|
Line 2321 sub handler {
|
unless ($showdoc || $upload_result eq 'phasetwo') { |
unless ($showdoc || $upload_result eq 'phasetwo') { |
# ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'uplm' => 'Upload a new main course document', |
'uplm' => 'Upload a new main '.lc($type).' document', |
'upls' => 'Upload a new supplemental course document', |
'upls' => 'Upload a new supplemental '.lc($type).' document', |
'impp' => 'Import a document', |
'impp' => 'Import a document', |
'pubd' => 'Published documents', |
'pubd' => 'Published documents', |
'copm' => 'All documents out of a published map into this folder', |
'copm' => 'All documents out of a published map into this folder', |
Line 2337 sub handler {
|
Line 2366 sub handler {
|
if ($env{'form.folder'} eq '' || |
if ($env{'form.folder'} eq '' || |
$env{'form.folder'} eq 'supplemental') { |
$env{'form.folder'} eq 'supplemental') { |
$folderpath='default&'. |
$folderpath='default&'. |
&Apache::lonnet::escape(&mt('Main Course Documents')); |
&escape(&mt('Main [_1] Documents',$type)); |
} |
} |
} |
} |
unless ($env{'form.pagepath'}) { |
unless ($env{'form.pagepath'}) { |
Line 2370 $exportbut
|
Line 2399 $exportbut
|
</form> |
</form> |
ENDCOURSEVERIFY |
ENDCOURSEVERIFY |
$r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', |
$r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', |
&mt('Editing the Table of Contents for your Course'))); |
&mt('Editing the Table of Contents for your [_1]',$type))); |
} |
} |
# --------------------------------------------------------- Standard documents |
# --------------------------------------------------------- Standard documents |
$r->print('<table border=2 cellspacing=4 cellpadding=4>'); |
$r->print('<table border=2 cellspacing=4 cellpadding=4>'); |
Line 2381 ENDCOURSEVERIFY
|
Line 2410 ENDCOURSEVERIFY
|
my $folder=$env{'form.folder'}; |
my $folder=$env{'form.folder'}; |
if ($folder eq '' || $folder eq 'supplemental') { |
if ($folder eq '' || $folder eq 'supplemental') { |
$folder='default'; |
$folder='default'; |
$env{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents')); |
$env{'form.folderpath'}='default&'.&escape(&mt('Main [_1] Documents',$type)); |
} |
} |
my $postexec=''; |
my $postexec=''; |
if ($folder eq 'default') { |
if ($folder eq 'default') { |
Line 2612 ENDBLOCK
|
Line 2641 ENDBLOCK
|
if ($folder =~ /^supplemental$/ && |
if ($folder =~ /^supplemental$/ && |
$env{'form.folderpath'} =~ /^default\&/) { |
$env{'form.folderpath'} =~ /^default\&/) { |
$env{'form.folderpath'}='supplemental&'. |
$env{'form.folderpath'}='supplemental&'. |
&Apache::lonnet::escape(&mt('Supplemental Course Documents')); |
&escape(&mt('Supplemental [_1] Documents',$type)); |
} |
} |
&editor($r,$coursenum,$coursedom,$folder,$allowed); |
&editor($r,$coursenum,$coursedom,$folder,$allowed); |
if ($allowed) { |
if ($allowed) { |