version 1.288, 2007/07/12 01:04:36
|
version 1.313, 2008/09/15 15:34:10
|
Line 309 sub exportcourse {
|
Line 309 sub exportcourse {
|
chdir $cwd; |
chdir $cwd; |
$outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,); |
$outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,); |
if ($copyresult) { |
if ($copyresult) { |
$outcome .= 'The following errors occurred during export - '.$copyresult; |
$outcome .= &mt('The following errors occurred during export - [_1]',$copyresult); |
} |
} |
} else { |
} else { |
$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 />'.&mt('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 '.lc($type).' to IMS content package')); |
$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package')); |
Line 818 sub extract_media {
|
Line 818 sub extract_media {
|
$dirpath = $url; |
$dirpath = $url; |
$container = ''; |
$container = ''; |
} |
} |
&Apache::lonnet::extract_embedded_items(undef,undef,\%allfiles,\%codebase,$content); |
&Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,$content); |
foreach my $embed_file (keys(%allfiles)) { |
foreach my $embed_file (keys(%allfiles)) { |
my $filename; |
my $filename; |
if ($embed_file =~ m#([^/]+)$#) { |
if ($embed_file =~ m#([^/]+)$#) { |
Line 924 sub group_import {
|
Line 924 sub group_import {
|
my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom, |
my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom, |
'output',$1.$2); |
'output',$1.$2); |
if ($result != m|^/uploaded/|) { |
if ($result != m|^/uploaded/|) { |
$errtext.='Map not saved: A network error occured when trying to save the new map. '; |
$errtext.='Map not saved: A network error occurred when trying to save the new map. '; |
$fatal = 2; |
$fatal = 2; |
} |
} |
if ($fatal) { |
if ($fatal) { |
Line 949 sub group_import {
|
Line 949 sub group_import {
|
} |
} |
|
|
sub breadcrumbs { |
sub breadcrumbs { |
my ($where)=@_; |
my ($where,$allowed,$type)=@_; |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
my (@folders); |
my (@folders); |
if ($env{'form.pagepath'}) { |
if ($env{'form.pagepath'}) { |
Line 963 sub breadcrumbs {
|
Line 963 sub breadcrumbs {
|
my $randompick=-1; |
my $randompick=-1; |
my $isencrypted=0; |
my $isencrypted=0; |
my $ishidden=0; |
my $ishidden=0; |
|
my $is_random_order=0; |
while (@folders) { |
while (@folders) { |
my $folder=shift(@folders); |
my $folder=shift(@folders); |
my $foldername=shift(@folders); |
my $foldername=shift(@folders); |
if ($folderpath) {$folderpath.='&';} |
if ($folderpath) {$folderpath.='&';} |
$folderpath.=$folder.'&'.$foldername; |
$folderpath.=$folder.'&'.$foldername; |
my $url='/adm/coursedocs?folderpath='. |
my $url='/adm/coursedocs?folderpath='. |
&escape($folderpath); |
&escape($folderpath); |
my $name=&unescape($foldername); |
my $name=&unescape($foldername); |
# randompick number, hidden, encrypted is appended with ":"s to the foldername |
# randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername |
$name=~s/\:(\d*)\:(\w*)\:(\w*)$//; |
$name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//; |
if ($1 ne '') { |
if ($1 ne '') { |
$randompick=$1; |
$randompick=$1; |
} else { |
} else { |
$randompick=-1; |
$randompick=-1; |
} |
} |
if ($2) { $ishidden=1; } |
if ($2) { $ishidden=1; } |
if ($3) { $isencrypted=1; } |
if ($3) { $isencrypted=1; } |
|
if ($4 ne '') { $is_random_order = 1; } |
|
if ($folder eq 'supplemental') { |
|
if ($allowed) { |
|
$name = &mt('Supplemental '.$type.' Documents'); |
|
} else { |
|
$name = &mt($type.' Documents'); |
|
} |
|
} |
&Apache::lonhtmlcommon::add_breadcrumb( |
&Apache::lonhtmlcommon::add_breadcrumb( |
{'href'=>$url.$cpinfo, |
{'href'=>$url.$cpinfo, |
'title'=>$name, |
'title'=>$name, |
Line 991 sub breadcrumbs {
|
Line 1000 sub breadcrumbs {
|
} |
} |
$plain=~s/\>\;\s*$//; |
$plain=~s/\>\;\s*$//; |
return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp', |
return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp', |
'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain); |
'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order); |
} |
} |
|
|
sub log_docs { |
sub log_docs { |
Line 1082 sub docs_change_log {
|
Line 1091 sub docs_change_log {
|
my %lt=('hiddenresource' => 'Resources hidden', |
my %lt=('hiddenresource' => 'Resources hidden', |
'encrypturl' => 'URL hidden', |
'encrypturl' => 'URL hidden', |
'randompick' => 'Randomly pick', |
'randompick' => 'Randomly pick', |
|
'randomorder' => 'Randomly ordered', |
'set' => 'set to', |
'set' => 'set to', |
'del' => 'deleted'); |
'del' => 'deleted'); |
$r->print(&Apache::loncommon::display_filter(). |
$r->print(&Apache::loncommon::display_filter(). |
Line 1164 sub docs_change_log {
|
Line 1174 sub docs_change_log {
|
$r->print('</ul>'); |
$r->print('</ul>'); |
if ($docslog{$id}{'logentry'}{'parameter_res'}) { |
if ($docslog{$id}{'logentry'}{'parameter_res'}) { |
$r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>'); |
$r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>'); |
foreach my $parameter ('randompick','hiddenresource','encrypturl') { |
foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') { |
if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) { |
if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) { |
$r->print('<li>'. |
$r->print('<li>'. |
&mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]', |
&mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]', |
Line 1198 sub update_paste_buffer {
|
Line 1208 sub update_paste_buffer {
|
# Mark for copying |
# Mark for copying |
my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]); |
my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]); |
if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
|
&Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title}); |
($title) = &parse_supplemental_title($title); |
($title) = &parse_supplemental_title($title); |
|
} elsif ($env{'docs.markedcopy_supplemental'}) { |
|
&Apache::lonnet::delenv('docs\\.markedcopy_supplemental'); |
} |
} |
$url=~s{http(:|:)//https(:|:)//}{https$2//}; |
$url=~s{http(:|:)//https(:|:)//}{https$2//}; |
|
|
&Apache::lonnet::appenv('docs.markedcopy_title' => $title, |
&Apache::lonnet::appenv({'docs.markedcopy_title' => $title, |
'docs.markedcopy_url' => $url); |
'docs.markedcopy_url' => $url}); |
delete($env{'form.markcopy'}); |
delete($env{'form.markcopy'}); |
} |
} |
|
|
Line 1224 ENDPASTE
|
Line 1237 ENDPASTE
|
&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')'); |
&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')'); |
} else { |
} else { |
my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1]; |
my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1]; |
my $type = &Apache::loncommon::filedescription($extension); |
my $icon = &Apache::loncommon::icon($extension); |
my $icon = '<img src="'.&Apache::loncommon::icon($extension). |
if ($extension eq 'sequence' && |
'" alt="" class="LC_icon" />'; |
$env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) { |
|
$icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
|
$icon .= '/folder_closed.gif'; |
|
} |
|
$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />'; |
$r->print($icon.$type.': '. &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}))); |
$r->print($icon.$type.': '. &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}))); |
} |
} |
if ($container eq 'page') { |
if ($container eq 'page') { |
Line 1242 ENDPASTE
|
Line 1259 ENDPASTE
|
$r->print('</p></form>'); |
$r->print('</p></form>'); |
} |
} |
|
|
sub editor { |
sub do_paste_from_buffer { |
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_; |
my ($coursenum,$coursedom,$folder) = @_; |
my $errtext=''; |
|
my $fatal=0; |
return 0 if (!$env{'form.pastemarked'}); |
my $container='sequence'; |
|
if ($env{'form.pagepath'}) { |
# paste resource to end of list |
$container='page'; |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}); |
|
my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}); |
|
# Maps need to be copied first |
|
if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) { |
|
$title=&mt('Copy of').' '.$title; |
|
my $newid=$$.time; |
|
$url=~/^(.+)\.(\w+)$/; |
|
my $newurl=$1.$newid.'.'.$2; |
|
my $storefn=$newurl; |
|
$storefn=~s{^/\w+/$match_domain/$match_username/}{}; |
|
&Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn, |
|
&Apache::lonnet::getfile($url)); |
|
$url = $newurl; |
|
} |
|
# published maps can only exists once, so remove it from paste buffer when done |
|
if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) { |
|
&Apache::lonnet::delenv('docs\\.markedcopy'); |
|
} |
|
if ($url=~ m{/smppg$}) { |
|
my $db_name = &Apache::lonsimplepage::get_db_name($url); |
|
if ($db_name =~ /^smppage_/) { |
|
#simple pages, need to copy the db contents to a new one. |
|
my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum); |
|
my $now = time(); |
|
$db_name =~ s{_\d*$ }{_$now}x; |
|
my $result=&Apache::lonnet::put($db_name,\%contents, |
|
$coursedom,$coursenum); |
|
$url =~ s{/(\d*)/smppg$ }{/$now/smppg}x; |
|
$title=&mt('Copy of').' '.$title; |
|
} |
|
} |
|
$title = &LONCAPA::map::qtunescape($title); |
|
my $ext='false'; |
|
if ($url=~m{^http(|s)://}) { $ext='true'; } |
|
$url = &LONCAPA::map::qtunescape($url); |
|
# Now insert the URL at the bottom |
|
my $newidx = &LONCAPA::map::getresidx($url); |
|
if ($env{'docs.markedcopy_supplemental'}) { |
|
if ($folder =~ /^supplemental/) { |
|
$title = $env{'docs.markedcopy_supplemental'}; |
|
} else { |
|
(undef,undef,$title) = |
|
&parse_supplemental_title($env{'docs.markedcopy_supplemental'}); |
|
} |
|
} else { |
|
if ($folder=~/^supplemental/) { |
|
$title=time.'___&&&___'.$env{'user.name'}.'___&&&___'. |
|
$env{'user.domain'}.'___&&&___'.$title; |
|
} |
|
} |
|
|
|
$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; |
|
push(@LONCAPA::map::order, $newidx); |
|
# Store the result |
|
} |
|
|
|
my %parameter_type = ( 'randompick' => 'int_pos', |
|
'hiddenresource' => 'string_yesno', |
|
'encrypturl' => 'string_yesno', |
|
'randomorder' => 'string_yesno',); |
|
my $valid_parameters_re = join('|',keys(%parameter_type)); |
|
# set parameters |
|
sub update_parameter { |
|
|
|
return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/); |
|
|
|
my $which = $env{'form.changeparms'}; |
|
my $idx = $env{'form.setparms'}; |
|
if ($env{'form.'.$which.'_'.$idx}) { |
|
my $value = ($which eq 'randompick') ? $env{'form.'.$which.'_'.$idx} |
|
: 'yes'; |
|
&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; |
|
} |
|
|
|
|
|
sub handle_edit_cmd { |
|
my ($coursenum,$coursedom) =@_; |
|
|
|
my ($cmd,$idx)=split('_',$env{'form.cmd'}); |
|
|
|
my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]; |
|
my ($title, $url, @rrest) = split(':', $ratstr); |
|
|
|
if ($cmd eq 'del') { |
|
if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) && |
|
($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) { |
|
&Apache::lonnet::removeuploadedurl($url); |
|
} else { |
|
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); |
|
} |
|
splice(@LONCAPA::map::order, $idx, 1); |
|
|
|
} elsif ($cmd eq 'cut') { |
|
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); |
|
splice(@LONCAPA::map::order, $idx, 1); |
|
|
|
} elsif ($cmd eq 'up' |
|
&& ($idx) && (defined($LONCAPA::map::order[$idx-1]))) { |
|
@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1]; |
|
|
|
} elsif ($cmd eq 'down' |
|
&& defined($LONCAPA::map::order[$idx+1])) { |
|
@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1]; |
|
|
|
} elsif ($cmd eq 'rename') { |
|
|
|
my $comment = &LONCAPA::map::qtunescape($env{'form.title'}); |
|
if ($comment=~/\S/) { |
|
$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]= |
|
$comment.':'.join(':', $url, @rrest); |
|
} |
|
# Devalidate title cache |
|
my $renamed_url=&LONCAPA::map::qtescape($url); |
|
&Apache::lonnet::devalidate_title_cache($renamed_url); |
|
} else { |
|
return 0; |
} |
} |
($errtext,$fatal) = &mapread($coursenum,$coursedom,$folder.'.'.$container); |
return 1; |
|
} |
|
|
|
sub editor { |
|
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_; |
|
|
|
my $container= ($env{'form.pagepath'}) ? 'page' |
|
: 'sequence'; |
|
|
|
my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
|
$folder.'.'.$container); |
|
return $errtext if ($fatal); |
|
|
if ($#LONCAPA::map::order<1) { |
if ($#LONCAPA::map::order<1) { |
my $idx=&LONCAPA::map::getresidx(); |
my $idx=&LONCAPA::map::getresidx(); |
if ($idx<=0) { $idx=1; } |
if ($idx<=0) { $idx=1; } |
Line 1258 sub editor {
|
Line 1410 sub editor {
|
$LONCAPA::map::resources[$idx]=''; |
$LONCAPA::map::resources[$idx]=''; |
} |
} |
|
|
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder); |
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)= |
|
&breadcrumbs($folder,$allowed,$type); |
$r->print($breadcrumbtrail); |
$r->print($breadcrumbtrail); |
if ($fatal) { |
|
$r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); |
|
} else { |
|
# ------------------------------------------------------------ Process commands |
# ------------------------------------------------------------ Process commands |
|
|
# ---------------- if they are for this folder and user allowed to make changes |
# ---------------- if they are for this folder and user allowed to make changes |
if (($allowed) && ($env{'form.folder'} eq $folder)) { |
if (($allowed) && ($env{'form.folder'} eq $folder)) { |
# set parameters and change order |
# set parameters and change order |
&snapshotbefore(); |
&snapshotbefore(); |
if ($env{'form.changeparms'}) { |
|
my $idx=$env{'form.setparms'}; |
if (&update_parameter()) { |
# set parameters |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); |
if ($env{'form.changeparms'} eq 'randompick') { |
return $errtext if ($fatal); |
if ($env{'form.randpick_'.$idx}) { |
} |
&LONCAPA::map::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos'); |
|
&remember_parms($idx,'randompick','set',$env{'form.randpick_'.$idx}); |
|
} else { |
|
&LONCAPA::map::delparameter($idx,'parameter_randompick'); |
|
&remember_parms($idx,'randompick','del'); |
|
} |
|
} |
|
if ($env{'form.changeparms'} eq 'hiddenresource') { |
|
if ($env{'form.hidprs_'.$idx}) { |
|
&LONCAPA::map::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno'); |
|
&remember_parms($idx,'hiddenresource','set',$env{'form.hidprs_'.$idx}); |
|
} else { |
|
&LONCAPA::map::delparameter($idx,'parameter_hiddenresource'); |
|
&remember_parms($idx,'hiddenresource','del'); |
|
} |
|
} |
|
if ($env{'form.changeparms'} eq 'encrypturl') { |
|
if ($env{'form.encprs_'.$idx}) { |
|
&LONCAPA::map::storeparameter($idx,'parameter_encrypturl','yes','string_yesno'); |
|
&remember_parms($idx,'encrypturl','set',$env{'form.encprs_'.$idx}); |
|
} else { |
|
&LONCAPA::map::delparameter($idx,'parameter_encrypturl'); |
|
&remember_parms($idx,'encrypturl','del'); |
|
} |
|
} |
|
# store the changed version |
|
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); |
|
if ($fatal) { |
|
$r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); |
|
return; |
|
} |
|
} |
|
|
|
if ($env{'form.newpos'}) { |
if ($env{'form.newpos'} && $env{'form.currentpos'}) { |
# change order |
# change order |
my $newpos=$env{'form.newpos'}-1; |
my $res = splice(@LONCAPA::map::order,$env{'form.currentpos'}-1,1); |
my $currentpos=$env{'form.currentpos'}-1; |
splice(@LONCAPA::map::order,$env{'form.newpos'}-1,0,$res); |
my $i; |
|
my @neworder=(); |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); |
if ($newpos>$currentpos) { |
return $errtext if ($fatal); |
# moving stuff up |
} |
for ($i=0;$i<$currentpos;$i++) { |
|
$neworder[$i]=$LONCAPA::map::order[$i]; |
|
} |
|
for ($i=$currentpos;$i<$newpos;$i++) { |
|
$neworder[$i]=$LONCAPA::map::order[$i+1]; |
|
} |
|
$neworder[$newpos]=$LONCAPA::map::order[$currentpos]; |
|
for ($i=$newpos+1;$i<=$#LONCAPA::map::order;$i++) { |
|
$neworder[$i]=$LONCAPA::map::order[$i]; |
|
} |
|
} else { |
|
# moving stuff down |
|
for ($i=0;$i<$newpos;$i++) { |
|
$neworder[$i]=$LONCAPA::map::order[$i]; |
|
} |
|
$neworder[$newpos]=$LONCAPA::map::order[$currentpos]; |
|
for ($i=$newpos+1;$i<$currentpos+1;$i++) { |
|
$neworder[$i]=$LONCAPA::map::order[$i-1]; |
|
} |
|
for ($i=$currentpos+1;$i<=$#LONCAPA::map::order;$i++) { |
|
$neworder[$i]=$LONCAPA::map::order[$i]; |
|
} |
|
} |
|
@LONCAPA::map::order=@neworder; |
|
# store the changed version |
|
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); |
|
if ($fatal) { |
|
$r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); |
|
return; |
|
} |
|
} |
|
|
|
if ($env{'form.pastemarked'}) { |
if ($env{'form.pastemarked'}) { |
# paste resource to end of list |
&do_paste_from_buffer($coursenum,$coursedom,$folder); |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}); |
($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container); |
my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}); |
return $errtext if ($fatal); |
# Maps need to be copied first |
} |
if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) { |
|
$title=&mt('Copy of').' '.$title; |
|
my $newid=$$.time; |
|
$url=~/^(.+)\.(\w+)$/; |
|
my $newurl=$1.$newid.'.'.$2; |
|
my $storefn=$newurl; |
|
$storefn=~s{^/\w+/$match_domain/$match_username/}{}; |
|
&Apache::lonclonecourse::writefile |
|
($env{'request.course.id'},$storefn, |
|
&Apache::lonnet::getfile($url)); |
|
$url=$newurl; |
|
} |
|
$title = &LONCAPA::map::qtunescape($title); |
|
my $ext='false'; |
|
if ($url=~m{^http(|s)://}) { $ext='true'; } |
|
$url = &LONCAPA::map::qtunescape($url); |
|
# Now insert the URL at the bottom |
|
my $newidx=&LONCAPA::map::getresidx($url); |
|
$LONCAPA::map::resources[$newidx]= |
|
$title.':'.$url.':'.$ext.':normal:res'; |
|
$LONCAPA::map::order[1+$#LONCAPA::map::order]=$newidx; |
|
# Store the result |
|
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); |
|
if ($fatal) { |
|
$r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); |
|
return; |
|
} |
|
|
|
} |
$r->print($upload_output); |
$r->print($upload_output); |
|
if ($env{'form.cmd'}) { |
if (&handle_edit_cmd()) { |
my ($cmd,$idx)=split(/\_/,$env{'form.cmd'}); |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); |
if ($cmd eq 'del') { |
return $errtext if ($fatal); |
my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]); |
} |
if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) && |
|
($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) { |
|
&Apache::lonnet::removeuploadedurl($url); |
|
} else { |
|
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); |
|
} |
|
for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) { |
|
$LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1]; |
|
} |
|
$#LONCAPA::map::order--; |
|
} elsif ($cmd eq 'cut') { |
|
my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]); |
|
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); |
|
for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) { |
|
$LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1]; |
|
} |
|
$#LONCAPA::map::order--; |
|
} elsif ($cmd eq 'up') { |
|
if (($idx) && (defined($LONCAPA::map::order[$idx-1]))) { |
|
my $i=$LONCAPA::map::order[$idx-1]; |
|
$LONCAPA::map::order[$idx-1] = $LONCAPA::map::order[$idx]; |
|
$LONCAPA::map::order[$idx] = $i; |
|
} |
|
} elsif ($cmd eq 'down') { |
|
if (defined($LONCAPA::map::order[$idx+1])) { |
|
my $i=$LONCAPA::map::order[$idx+1]; |
|
$LONCAPA::map::order[$idx+1] = $LONCAPA::map::order[$idx]; |
|
$LONCAPA::map::order[$idx] = $i; |
|
} |
|
} elsif ($cmd eq 'rename') { |
|
my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]; |
|
my ($rtitle,@rrest)=split(/\:/, |
|
$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]); |
|
my $comment=$env{'form.title'}; |
|
$comment = &LONCAPA::map::qtunescape($comment); |
|
if ($comment=~/\S/) { |
|
$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]= |
|
$comment.':'.join(':',@rrest); |
|
} |
|
# Devalidate title cache |
|
my $renamed_url=&LONCAPA::map::qtescape($rrest[0]); |
|
&Apache::lonnet::devalidate_title_cache($renamed_url); |
|
} |
|
# Store the changed version |
|
($errtext,$fatal)=&storemap($coursenum,$coursedom, |
|
$folder.'.'.$container); |
|
if ($fatal) { |
|
$r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); |
|
return; |
|
} |
|
} |
|
# Group import/search |
# Group import/search |
if ($env{'form.importdetail'}) { |
if ($env{'form.importdetail'}) { |
my @imports; |
my @imports; |
foreach (split(/\&/,$env{'form.importdetail'})) { |
foreach (split(/\&/,$env{'form.importdetail'})) { |
if (defined($_)) { |
if (defined($_)) { |
my ($name,$url,$residx)= |
my ($name,$url,$residx)= |
map {&unescape($_)} split(/\=/,$_); |
map {&unescape($_)} split(/\=/,$_); |
push(@imports, [$name, $url, $residx]); |
push(@imports, [$name, $url, $residx]); |
} |
|
} |
} |
# Store the changed version |
} |
($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder, |
($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder, |
$container,'londocs',@imports); |
$container,'londocs',@imports); |
if ($fatal) { |
return $errtext if ($fatal); |
$r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); |
} |
return; |
|
} |
|
} |
|
# Loading a complete map |
# Loading a complete map |
if ($env{'form.loadmap'}) { |
if ($env{'form.loadmap'}) { |
if ($env{'form.importmap'}=~/\w/) { |
if ($env{'form.importmap'}=~/\w/) { |
foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) { |
foreach my $res (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) { |
my ($title,$url,$ext,$type)=split(/\:/,$_); |
my ($title,$url,$ext,$type)=split(/\:/,$res); |
my $idx=&LONCAPA::map::getresidx($url); |
my $idx=&LONCAPA::map::getresidx($url); |
$LONCAPA::map::resources[$idx]=$_; |
$LONCAPA::map::resources[$idx]=$res; |
$LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx; |
$LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx; |
} |
} |
# Store the changed version |
($errtext,$fatal)=&storemap($coursenum,$coursedom, |
($errtext,$fatal)=&storemap($coursenum,$coursedom, |
$folder.'.'.$container); |
$folder.'.'.$container); |
return $errtext if ($fatal); |
if ($fatal) { |
} else { |
$r->print('<p><span class="LC_error">'.$errtext.'</span></p>'); |
$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>'); |
return; |
|
} |
} |
} else { |
|
$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>'); |
|
|
|
} |
|
} |
|
&log_differences($plain); |
|
} |
} |
|
&log_differences($plain); |
|
} |
# ---------------------------------------------------------------- End commands |
# ---------------------------------------------------------------- End commands |
# ---------------------------------------------------------------- Print screen |
# ---------------------------------------------------------------- Print screen |
my $idx=0; |
my $idx=0; |
my $shown=0; |
my $shown=0; |
if (($ishidden) || ($isencrypted) || ($randompick>=0)) { |
if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) { |
$r->print('<p>'.&mt('Parameters').':<ul>'. |
$r->print('<p>'.&mt('Parameters').':<ul>'. |
($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':''). |
($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':''). |
($ishidden?'<li>'.&mt('contents hidden').'</li>':''). |
($ishidden?'<li>'.&mt('contents hidden').'</li>':''). |
($isencrypted?'<li>'.&mt('URLs hidden').'</li>':''). |
($isencrypted?'<li>'.&mt('URLs hidden').'</li>':''). |
'</ul></p>'); |
'</ul></p>'); |
} |
} |
if ($randompick>=0) { |
if ($randompick>=0) { |
$r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>'); |
$r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>'); |
} |
} |
$r->print('<table class="LC_docs_editor">'); |
if ($is_random_order) { |
foreach my $res (@LONCAPA::map::order) { |
$r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown.').'</p>'); |
my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); |
} |
$name=&LONCAPA::map::qtescape($name); |
$r->print('<table class="LC_docs_editor">'); |
$url=&LONCAPA::map::qtescape($url); |
foreach my $res (@LONCAPA::map::order) { |
unless ($name) { $name=(split(/\//,$url))[-1]; } |
my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); |
unless ($name) { $idx++; next; } |
$name=&LONCAPA::map::qtescape($name); |
$r->print(&entryline($idx,$name,$url,$folder,$allowed,$res, |
$url=&LONCAPA::map::qtescape($url); |
$coursenum)); |
unless ($name) { $name=(split(/\//,$url))[-1]; } |
$idx++; |
unless ($name) { $idx++; next; } |
$shown++; |
$r->print(&entryline($idx,$name,$url,$folder,$allowed,$res, |
} |
$coursenum)); |
unless ($shown) { |
$idx++; |
$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>'); |
$shown++; |
} |
} |
$r->print("\n</table>\n"); |
unless ($shown) { |
|
$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>'); |
&print_paste_buffer($r,$container); |
|
|
|
} |
} |
|
$r->print("\n</table>\n"); |
|
if ($allowed) { |
|
&print_paste_buffer($r,$container); |
|
} |
|
return; |
} |
} |
|
|
sub process_file_upload { |
sub process_file_upload { |
Line 1591 sub process_file_upload {
|
Line 1596 sub process_file_upload {
|
|
|
$$upload_output .= |
$$upload_output .= |
'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'. |
'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'. |
&ask_for_embedded_content('/adm/coursedocs', |
&Apache::loncommon::ask_for_embedded_content( |
$state,$allfiles,$codebase); |
'/adm/coursedocs',$state,$allfiles,$codebase); |
} else { |
} else { |
$$upload_output .= 'No embedded items identified<br />'; |
$$upload_output .= 'No embedded items identified<br />'; |
} |
} |
Line 1602 sub process_file_upload {
|
Line 1607 sub process_file_upload {
|
return $phase_status; |
return $phase_status; |
} |
} |
|
|
sub ask_for_embedded_content { |
|
my ($actionurl,$state,$allfiles,$codebase,$args)=@_; |
|
my $upload_output = ' |
|
<form name="upload_embedded" action="'.$actionurl.'" |
|
method="post" enctype="multipart/form-data">'; |
|
$upload_output .= $state; |
|
$upload_output .= '<b>Upload embedded files</b>:<br />'. |
|
&Apache::loncommon::start_data_table(); |
|
|
|
my $num = 0; |
|
foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) { |
|
$upload_output .= &Apache::loncommon::start_data_table_row(). |
|
'<td>'.$embed_file.'</td><td>'; |
|
if ($args->{'ignore_remote_references'} |
|
&& $embed_file =~ m{^\w+://}) { |
|
$upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>'; |
|
} elsif ($args->{'error_on_invalid_names'} |
|
&& $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) { |
|
|
|
$upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>'; |
|
|
|
} else { |
|
|
|
$upload_output .=' |
|
<input name="embedded_item_'.$num.'" type="file" value="bob" /> |
|
<input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />'; |
|
my $attrib = join(':',@{$$allfiles{$embed_file}}); |
|
$upload_output .= |
|
"\n\t\t". |
|
'<input name="embedded_attrib_'.$num.'" type="hidden" value="'. |
|
$attrib.'" />'; |
|
if (exists($$codebase{$embed_file})) { |
|
$upload_output .= |
|
"\n\t\t". |
|
'<input name="codebase_'.$num.'" type="hidden" value="'. |
|
&escape($$codebase{$embed_file}).'" />'; |
|
} |
|
} |
|
$upload_output .= '</td>'.&Apache::loncommon::end_data_table_row(); |
|
$num++; |
|
} |
|
$upload_output .= &Apache::loncommon::end_data_table().'<br /> |
|
<input type ="hidden" name="number_embedded_items" value="'.$num.'" /> |
|
<input type ="submit" value="'.&mt('Upload Listed Files').'" /> |
|
'.&mt('(only files for which a location has been provided will be uploaded)').' |
|
</form>'; |
|
return $upload_output; |
|
} |
|
|
|
sub process_secondary_uploads { |
sub process_secondary_uploads { |
my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_; |
my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_; |
my $folder=$env{'form.folder'}; |
my $folder=$env{'form.folder'}; |
Line 1722 sub entryline {
|
Line 1678 sub entryline {
|
my $line='<tr>'; |
my $line='<tr>'; |
my ($form_start,$form_end); |
my ($form_start,$form_end); |
# Edit commands |
# Edit commands |
my $container; |
|
my ($container, $type, $esc_path, $path, $symb); |
my ($container, $type, $esc_path, $path, $symb); |
if ($env{'form.folderpath'}) { |
if ($env{'form.folderpath'}) { |
$type = 'folder'; |
$type = 'folder'; |
Line 1771 sub entryline {
|
Line 1726 sub entryline {
|
my $nocopy=0; |
my $nocopy=0; |
my $nocut=0; |
my $nocut=0; |
if ($url=~/\.(page|sequence)$/) { |
if ($url=~/\.(page|sequence)$/) { |
foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) { |
if ($url =~ m{/res/}) { |
my ($title,$url,$ext,$type)=split(/\:/,$_); |
# no copy for published maps |
if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) { |
$nocopy = 1; |
$nocopy=1; |
} else { |
last; |
foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) { |
|
my ($title,$url,$ext,$type)=split(/\:/,$_); |
|
if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) { |
|
$nocopy=1; |
|
last; |
|
} |
} |
} |
} |
} |
} |
} |
Line 1786 sub entryline {
|
Line 1746 sub entryline {
|
my $copylink=' '; |
my $copylink=' '; |
my $cutlink=' '; |
my $cutlink=' '; |
|
|
|
my $skip_confirm = 0; |
|
if ( $folder =~ /^supplemental/ |
|
|| ($url =~ m{( /smppg$ |
|
|/syllabus$ |
|
|/aboutme$ |
|
|/navmaps$ |
|
|/bulletinboard$ |
|
|\.html$ |
|
|^/adm/wrapper/ext)}x)) { |
|
$skip_confirm = 1; |
|
} |
|
|
if (!$nocopy) { |
if (!$nocopy) { |
$copylink=(<<ENDCOPY); |
$copylink=(<<ENDCOPY); |
<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_copy">$lt{'cp'}</a> |
<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_copy">$lt{'cp'}</a> |
Line 1793 ENDCOPY
|
Line 1765 ENDCOPY
|
} |
} |
if (!$nocut) { |
if (!$nocut) { |
$cutlink=(<<ENDCUT); |
$cutlink=(<<ENDCUT); |
<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_cut">$lt{'ct'}</a> |
<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder",$skip_confirm);' class="LC_docs_cut">$lt{'ct'}</a> |
ENDCUT |
ENDCUT |
} |
} |
$form_start = (<<END); |
$form_start = (<<END); |
Line 1825 END
|
Line 1797 END
|
$form_end |
$form_end |
</td> |
</td> |
<td class="LC_docs_entry_commands"> |
<td class="LC_docs_entry_commands"> |
<a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_remove">$lt{'rm'}</a> |
<a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a> |
$cutlink |
$cutlink |
<a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a> |
<a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a> |
$copylink |
$copylink |
Line 1898 END
|
Line 1870 END
|
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); |
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); |
} |
} |
} |
} |
my $parameterset=' '; |
my ($parameterset,$rand_order_text) = (' ', ' '); |
if ($isfolder || $extension eq 'sequence') { |
if ($isfolder || $extension eq 'sequence') { |
my $foldername=&escape($foldertitle); |
my $foldername=&escape($foldertitle); |
my $folderpath=$env{'form.folderpath'}; |
my $folderpath=$env{'form.folderpath'}; |
Line 1910 END
|
Line 1882 END
|
.':'.((&LONCAPA::map::getparameter($orderidx, |
.':'.((&LONCAPA::map::getparameter($orderidx, |
'parameter_hiddenresource'))[0]=~/^yes$/i) |
'parameter_hiddenresource'))[0]=~/^yes$/i) |
.':'.((&LONCAPA::map::getparameter($orderidx, |
.':'.((&LONCAPA::map::getparameter($orderidx, |
'parameter_encrypturl'))[0]=~/^yes$/i); |
'parameter_encrypturl'))[0]=~/^yes$/i) |
|
.':'.((&LONCAPA::map::getparameter($orderidx, |
|
'parameter_randomorder'))[0]=~/^yes$/i); |
$url.='folderpath='.&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.changeparms.value='."'randompick'".';this.form.submit()" name="randpick_'.$orderidx.'" value="'. |
'<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'. |
(&LONCAPA::map::getparameter($orderidx, |
(&LONCAPA::map::getparameter($orderidx, |
'parameter_randompick'))[0]. |
'parameter_randompick'))[0]. |
'" />'. |
'" />'. |
'<a href="javascript:void(0)">'.&mt('Save').'</a></label>'; |
'<a href="javascript:void(0)">'.&mt('Save').'</a></label>'; |
|
my $ro_set= |
|
((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':''); |
|
$rand_order_text =' |
|
<nobr><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></nobr>'; |
} |
} |
if ($ispage) { |
if ($ispage) { |
my $pagename=&escape($pagetitle); |
my $pagename=&escape($pagetitle); |
Line 1962 END
|
Line 1939 END
|
$line.=(<<ENDPARMS); |
$line.=(<<ENDPARMS); |
<td class="LC_docs_entry_parameter"> |
<td class="LC_docs_entry_parameter"> |
$form_start |
$form_start |
<label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label> |
<label><input type="checkbox" name="hiddenresource_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label> |
$form_end |
$form_end |
</td> |
</td> |
<td class="LC_docs_entry_parameter"> |
<td class="LC_docs_entry_parameter"> |
$form_start |
$form_start |
<label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label> |
<label><input type="checkbox" name="encrypturl_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label> |
$form_end |
$form_end |
</td> |
</td> |
|
<td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td> |
<td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td> |
<td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td> |
ENDPARMS |
ENDPARMS |
} |
} |
Line 2012 sub checkonthis {
|
Line 1990 sub checkonthis {
|
$r->rflush(); |
$r->rflush(); |
if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { |
if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { |
$r->print("\n<br />"); |
$r->print("\n<br />"); |
|
if ($level==0) { |
|
$r->print("<br />"); |
|
} |
for (my $i=0;$i<=$level*5;$i++) { |
for (my $i=0;$i<=$level*5;$i++) { |
$r->print(' '); |
$r->print(' '); |
} |
} |
Line 2021 sub checkonthis {
|
Line 2002 sub checkonthis {
|
my $result=&Apache::lonnet::repcopy( |
my $result=&Apache::lonnet::repcopy( |
&Apache::lonnet::filelocation('',$url)); |
&Apache::lonnet::filelocation('',$url)); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$r->print('<font color="green">'.&mt('ok').'</font>'); |
$r->print('<span class="LC_success">'.&mt('ok').'</span>'); |
$r->rflush(); |
$r->rflush(); |
&Apache::lonnet::countacc($url); |
&Apache::lonnet::countacc($url); |
$url=~/\.(\w+)$/; |
$url=~/\.(\w+)$/; |
Line 2031 sub checkonthis {
|
Line 2012 sub checkonthis {
|
for (my $i=0;$i<=$level*5;$i++) { |
for (my $i=0;$i<=$level*5;$i++) { |
$r->print(' '); |
$r->print(' '); |
} |
} |
$r->print('- '.&mt('Rendering').': '); |
$r->print('- '.&mt('Rendering:').' '); |
my ($errorcount,$warningcount)=split(/:/, |
my ($errorcount,$warningcount)=split(/:/, |
&Apache::lonnet::ssi_body($url, |
&Apache::lonnet::ssi_body($url, |
('grade_target'=>'web', |
('grade_target'=>'web', |
Line 2040 sub checkonthis {
|
Line 2021 sub checkonthis {
|
($warningcount)) { |
($warningcount)) { |
if ($errorcount) { |
if ($errorcount) { |
$r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'. |
$r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'. |
$errorcount.' '. |
&mt('[quant,_1,error]',$errorcount).'</span>'); |
&mt('error(s)').'</span> '); |
|
} |
} |
if ($warningcount) { |
if ($warningcount) { |
$r->print('<span class="LC_warning">'. |
$r->print('<span class="LC_warning">'. |
$warningcount.' '. |
&mt('[quant,_1,warning]',$warningcount).'</span>'); |
&mt('warning(s)').'</span>'); |
|
} |
} |
} else { |
} else { |
$r->print('<span class="LC_success">'.&mt('ok').'</span>'); |
$r->print('<span class="LC_success">'.&mt('ok').'</span>'); |
Line 2064 sub checkonthis {
|
Line 2043 sub checkonthis {
|
$r->print('<span class="LC_error">'.&mt('connection down').'</span>'); |
$r->print('<span class="LC_error">'.&mt('connection down').'</span>'); |
} elsif ($result eq 'not_found') { |
} elsif ($result eq 'not_found') { |
unless ($url=~/\$/) { |
unless ($url=~/\$/) { |
$r->print('<span class="LC_error">'.&mt('not found').'</b></font>'); |
$r->print('<span class="LC_error">'.&mt('not found').'</b></span>'); |
} else { |
} else { |
$r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>'); |
$r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>'); |
} |
} |
} else { |
} else { |
$r->print('<span class="LC_error">'.&mt('access denied').'</span>'); |
$r->print('<span class="LC_error">'.&mt('access denied').'</span>'); |
} |
} |
} |
} |
} |
} |
} |
} |
|
|
|
|
Line 2437 sub init_breadcrumbs {
|
Line 2416 sub init_breadcrumbs {
|
my ($form,$text)=@_; |
my ($form,$text)=@_; |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs", |
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs", |
text=>&Apache::loncommon::course_type()." Documents", |
text=>"Edit ".&Apache::loncommon::course_type(), |
faq=>273, |
faq=>273, |
bug=>'Instructor Interface', |
bug=>'Instructor Interface', |
help => 'Docs_Adding_Course_Doc'}); |
help => 'Docs_Adding_Course_Doc'}); |
Line 2511 sub handler {
|
Line 2490 sub handler {
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['folderpath','pagepath', |
['folderpath','pagepath', |
'pagesymb']); |
'pagesymb']); |
|
# No folderpath, no pagepath, see if we have something stored |
|
if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) { |
|
&Apache::loncommon::restore_course_settings('docs_folderpath', |
|
{'folderpath' => 'scalar'}); |
|
} |
|
if (!$env{'form.folderpath'}) { |
|
&Apache::loncommon::restore_course_settings('docs_folderpath', |
|
{'pagepath' => 'scalar'}); |
|
} |
|
if ($env{'form.pagepath'}) { |
|
$env{'form.folderpath'}=''; |
|
} |
|
if ($env{'form.folderpath'} =~ /^supplemental_\d+/) { |
|
$env{'form.folderpath'} = 'supplemental&'. |
|
&escape(&mt('Supplemental '.$type.' Documents')).'&'. |
|
$env{'form.folderpath'}; |
|
} |
|
&Apache::loncommon::store_course_settings('docs_folderpath', |
|
{'pagepath' => 'scalar', |
|
'folderpath' => 'scalar'}); |
if ($env{'form.folderpath'}) { |
if ($env{'form.folderpath'}) { |
my (@folderpath)=split('&',$env{'form.folderpath'}); |
my (@folderpath)=split('&',$env{'form.folderpath'}); |
$env{'form.foldername'}=&unescape(pop(@folderpath)); |
$env{'form.foldername'}=&unescape(pop(@folderpath)); |
Line 2572 sub handler {
|
Line 2571 sub handler {
|
if (($env{'form.uploaddoc.filename'}) && |
if (($env{'form.uploaddoc.filename'}) && |
($env{'form.cmd'}=~/^upload_(\w+)/)) { |
($env{'form.cmd'}=~/^upload_(\w+)/)) { |
# Process file upload - phase one - upload and parse primary file. |
# Process file upload - phase one - upload and parse primary file. |
|
undef($hadchanges); |
$upload_result = &process_file_upload(\$upload_output,$coursenum, |
$upload_result = &process_file_upload(\$upload_output,$coursenum, |
$coursedom,\%allfiles, |
$coursedom,\%allfiles, |
\%codebase,$1); |
\%codebase,$1); |
|
if ($hadchanges) { |
|
&mark_hash_old(); |
|
} |
if ($upload_result eq 'phasetwo') { |
if ($upload_result eq 'phasetwo') { |
$r->print($upload_output); |
$r->print($upload_output); |
} |
} |
Line 2676 sub handler {
|
Line 2679 sub handler {
|
'bull' => 'Bulletin Board', |
'bull' => 'Bulletin Board', |
'mypi' => 'My Personal Info', |
'mypi' => 'My Personal Info', |
'grpo' => 'Group Files', |
'grpo' => 'Group Files', |
|
'rost' => 'Course Roster', |
'abou' => 'About User', |
'abou' => 'About User', |
'imsf' => 'Import IMS package', |
'imsf' => 'Import IMS package', |
'file' => 'File', |
'file' => 'File', |
Line 2746 ENDCOURSEVERIFY
|
Line 2750 ENDCOURSEVERIFY
|
&mt('Editing the Table of Contents for your '.$type))); |
&mt('Editing the Table of Contents for your '.$type))); |
} |
} |
# --------------------------------------------------------- Standard documents |
# --------------------------------------------------------- Standard documents |
$r->print('<table class="LC_docs_documents">');#border=2 cellspacing=4 cellpadding=4>'); |
$r->print('<table class="LC_docs_documents">'); |
|
|
if (($standard) && ($allowed) && (!$forcesupplement)) { |
if (($standard) && ($allowed) && (!$forcesupplement)) { |
$r->print('<tr><td class="LC_docs_document">'); |
$r->print('<tr><td class="LC_docs_document">'); |
# '<h2>'.&mt('Main Course Documents'). |
# '<h2>'.&mt('Main Course Documents'). |
Line 2755 ENDCOURSEVERIFY
|
Line 2760 ENDCOURSEVERIFY
|
if ($folder eq '' || $folder eq 'supplemental') { |
if ($folder eq '' || $folder eq 'supplemental') { |
$folder='default'; |
$folder='default'; |
$env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents')); |
$env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents')); |
|
$uploadtag = '<input type="hidden" name="folderpath" value="'. |
|
&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'; |
} |
} |
my $postexec=''; |
my $postexec=''; |
if ($folder eq 'default') { |
if ($folder eq 'default') { |
Line 2763 ENDCOURSEVERIFY
|
Line 2770 ENDCOURSEVERIFY
|
#$postexec='self.close();'; |
#$postexec='self.close();'; |
} |
} |
$hadchanges=0; |
$hadchanges=0; |
&editor($r,$coursenum,$coursedom,$folder,$allowed,$upload_output); |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed, |
|
$upload_output,$type); |
|
if ($error) { |
|
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
|
} |
if ($hadchanges) { |
if ($hadchanges) { |
&mark_hash_old() |
&mark_hash_old() |
} |
} |
Line 2797 $uploadtag
|
Line 2808 $uploadtag
|
<br /> |
<br /> |
<span class="LC_nobreak"> |
<span class="LC_nobreak"> |
<label>$lt{'parse'}? |
<label>$lt{'parse'}? |
<input type="checkbox" name="parserflag" /> |
<input type="checkbox" name="parserflag" checked="checked" /> |
</label> |
</label> |
</span> |
</span> |
<br /> |
<br /> |
Line 2877 value="$lt{'newp'}" />$help{'Adding_Page
|
Line 2888 value="$lt{'newp'}" />$help{'Adding_Page
|
<br /><form action="/adm/coursedocs" method="post" name="newsyl"> |
<br /><form action="/adm/coursedocs" method="post" name="newsyl"> |
$uploadtag |
$uploadtag |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="Syllabus=/public/$coursedom/$coursenum/syllabus" /> |
value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" /> |
<span class="LC_nobreak"> |
<span class="LC_nobreak"> |
<input name="newsyl" type="submit" value="$lt{'syll'}" /> |
<input name="newsyl" type="submit" value="$lt{'syll'}" /> |
$help{'Syllabus'} |
$help{'Syllabus'} |
Line 2886 value="Syllabus=/public/$coursedom/$cour
|
Line 2897 value="Syllabus=/public/$coursedom/$cour
|
<br /><form action="/adm/coursedocs" method="post" name="newnav"> |
<br /><form action="/adm/coursedocs" method="post" name="newnav"> |
$uploadtag |
$uploadtag |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="Navigate Content=/adm/navmaps" /> |
value="$lt{'navc'}=/adm/navmaps" /> |
<span class="LC_nobreak"> |
<span class="LC_nobreak"> |
<input name="newnav" type="submit" value="$lt{'navc'}" /> |
<input name="newnav" type="submit" value="$lt{'navc'}" /> |
$help{'Navigate_Content'} |
$help{'Navigate_Content'} |
Line 2954 onClick="javascript:makeabout();" />
|
Line 2965 onClick="javascript:makeabout();" />
|
<br /><form action="/adm/coursedocs" method="post" name="newgroupfiles"> |
<br /><form action="/adm/coursedocs" method="post" name="newgroupfiles"> |
$uploadtag |
$uploadtag |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="Group Files=/adm/$coursedom/$coursenum/aboutme" /> |
value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> |
<span class="LC_nobreak"> |
<span class="LC_nobreak"> |
<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" /> |
<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" /> |
$help{'Group Files'} |
$help{'Group Files'} |
</span> |
</span> |
</form> |
</form> |
|
<br /><form action="/adm/coursedocs" method="post" name="newroster"> |
|
$uploadtag |
|
<input type="hidden" name="importdetail" |
|
value="$lt{'rost'}=/adm/viewclasslist" /> |
|
<span class="LC_nobreak"> |
|
<input name="newroster" type="submit" value="$lt{'rost'}" /> |
|
$help{'Course Roster'} |
|
</span> |
|
</form> |
ENDFORM |
ENDFORM |
} |
} |
if ($env{'form.pagepath'}) { |
if ($env{'form.pagepath'}) { |
Line 2997 ENDBLOCK
|
Line 3017 ENDBLOCK
|
$folder='supplemental'; |
$folder='supplemental'; |
} |
} |
if ($folder =~ /^supplemental$/ && |
if ($folder =~ /^supplemental$/ && |
$env{'form.folderpath'} =~ /^default\&/) { |
(($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { |
$env{'form.folderpath'}='supplemental&'. |
$env{'form.folderpath'} = 'supplemental&'. |
&escape(&mt('Supplemental '.$type.' Documents')); |
&escape(&mt('Supplemental '.$type.' Documents')); |
|
} |
|
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); |
|
if ($error) { |
|
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
} |
} |
&editor($r,$coursenum,$coursedom,$folder,$allowed); |
|
if ($allowed) { |
if ($allowed) { |
my $folderseq= |
my $folderseq= |
'/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time. |
'/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time. |
Line 3106 ENDSUPFORM
|
Line 3129 ENDSUPFORM
|
sub editing_js { |
sub editing_js { |
my ($udom,$uname) = @_; |
my ($udom,$uname) = @_; |
my $now = time(); |
my $now = time(); |
|
my %lt = &Apache::lonlocal::texthash( |
|
p_mnf => 'Name of New Folder', |
|
t_mnf => 'New Folder', |
|
p_mnp => 'Name of New Page', |
|
t_mnp => 'New Page', |
|
p_mxu => 'Title for the Uploaded Score', |
|
p_msp => 'Title for the Page', |
|
p_msb => 'Title for the Problem', |
|
p_mdb => 'Title for the Drop Box', |
|
p_mbb => 'Title for the Bulletin Board', |
|
p_mab => "Enter user:domain for User's 'About Me' Page", |
|
p_mab2 => "About [_99]", |
|
p_mab_alrt1 => 'Not a valid user:domain', |
|
p_mab_alrt2 => 'Please enter both user and domain in the format user:domain', |
|
p_chn => 'New Title', |
|
p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!', |
|
p_rmr2a => 'Remove[_99]', |
|
p_rmr2b => '?[_99]', |
|
p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!', |
|
p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.', |
|
p_ctr2a => 'Cut[_98]', |
|
p_ctr2b => '?[_98]' |
|
); |
|
|
return <<ENDNEWSCRIPT; |
return <<ENDNEWSCRIPT; |
function makenewfolder(targetform,folderseq) { |
function makenewfolder(targetform,folderseq) { |
var foldername=prompt('Name of New Folder','New Folder'); |
var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}'); |
if (foldername) { |
if (foldername) { |
targetform.importdetail.value=escape(foldername)+"="+folderseq; |
targetform.importdetail.value=escape(foldername)+"="+folderseq; |
targetform.submit(); |
targetform.submit(); |
Line 3117 function makenewfolder(targetform,folder
|
Line 3163 function makenewfolder(targetform,folder
|
} |
} |
|
|
function makenewpage(targetform,folderseq) { |
function makenewpage(targetform,folderseq) { |
var pagename=prompt('Name of New Page','New Page'); |
var pagename=prompt('$lt{"p_mnp"}','$lt{"t_mnp"}'); |
if (pagename) { |
if (pagename) { |
targetform.importdetail.value=escape(pagename)+"="+folderseq; |
targetform.importdetail.value=escape(pagename)+"="+folderseq; |
targetform.submit(); |
targetform.submit(); |
Line 3141 function edittext(targetname,residx,titl
|
Line 3187 function edittext(targetname,residx,titl
|
} |
} |
|
|
function makeexamupload() { |
function makeexamupload() { |
var title=prompt('Listed Title for the Uploaded Score'); |
var title=prompt('$lt{"p_mxu"}'); |
if (title) { |
if (title) { |
this.document.forms.newexamupload.importdetail.value= |
this.document.forms.newexamupload.importdetail.value= |
escape(title)+'=/res/lib/templates/examupload.problem'; |
escape(title)+'=/res/lib/templates/examupload.problem'; |
Line 3150 function makeexamupload() {
|
Line 3196 function makeexamupload() {
|
} |
} |
|
|
function makesmppage() { |
function makesmppage() { |
var title=prompt('Listed Title for the Page'); |
var title=prompt('$lt{"p_msp"}'); |
if (title) { |
if (title) { |
this.document.forms.newsmppg.importdetail.value= |
this.document.forms.newsmppg.importdetail.value= |
escape(title)+'=/adm/$udom/$uname/$now/smppg'; |
escape(title)+'=/adm/$udom/$uname/$now/smppg'; |
Line 3159 function makesmppage() {
|
Line 3205 function makesmppage() {
|
} |
} |
|
|
function makesmpproblem() { |
function makesmpproblem() { |
var title=prompt('Listed Title for the Problem'); |
var title=prompt('$lt{"p_msb"}'); |
if (title) { |
if (title) { |
this.document.forms.newsmpproblem.importdetail.value= |
this.document.forms.newsmpproblem.importdetail.value= |
escape(title)+'=/res/lib/templates/simpleproblem.problem'; |
escape(title)+'=/res/lib/templates/simpleproblem.problem'; |
Line 3168 function makesmpproblem() {
|
Line 3214 function makesmpproblem() {
|
} |
} |
|
|
function makedropbox() { |
function makedropbox() { |
var title=prompt('Listed Title for the Drop Box'); |
var title=prompt('$lt{"p_mdb"}'); |
if (title) { |
if (title) { |
this.document.forms.newdropbox.importdetail.value= |
this.document.forms.newdropbox.importdetail.value= |
escape(title)+'=/res/lib/templates/DropBox.problem'; |
escape(title)+'=/res/lib/templates/DropBox.problem'; |
Line 3177 function makedropbox() {
|
Line 3223 function makedropbox() {
|
} |
} |
|
|
function makebulboard() { |
function makebulboard() { |
var title=prompt('Listed Title for the Bulletin Board'); |
var title=prompt('$lt{"p_mbb"}'); |
if (title) { |
if (title) { |
this.document.forms.newbul.importdetail.value= |
this.document.forms.newbul.importdetail.value= |
escape(title)+'=/adm/$udom/$uname/$now/bulletinboard'; |
escape(title)+'=/adm/$udom/$uname/$now/bulletinboard'; |
Line 3186 function makebulboard() {
|
Line 3232 function makebulboard() {
|
} |
} |
|
|
function makeabout() { |
function makeabout() { |
var user=prompt("Enter user:domain for User's 'About Me' Page"); |
var user=prompt("$lt{'p_mab'}"); |
if (user) { |
if (user) { |
var comp=new Array(); |
var comp=new Array(); |
comp=user.split(':'); |
comp=user.split(':'); |
if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) { |
if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) { |
if ((comp[0]) && (comp[1])) { |
if ((comp[0]) && (comp[1])) { |
this.document.forms.newaboutsomeone.importdetail.value= |
this.document.forms.newaboutsomeone.importdetail.value= |
'About '+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme'; |
'$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme'; |
this.document.forms.newaboutsomeone.submit(); |
this.document.forms.newaboutsomeone.submit(); |
} else { |
} else { |
alert("Not a valid user:domain"); |
alert("$lt{'p_mab_alrt1'}"); |
} |
} |
} else { |
} else { |
alert("Please enter both user and domain in the format user:domain"); |
alert("$lt{'p_mab_alrt2'}"); |
} |
} |
} |
} |
} |
} |
Line 3221 function finishpick() {
|
Line 3267 function finishpick() {
|
} |
} |
|
|
function changename(folderpath,index,oldtitle,container,pagesymb) { |
function changename(folderpath,index,oldtitle,container,pagesymb) { |
var title=prompt('New Title',oldtitle); |
var title=prompt('$lt{"p_chn"}',oldtitle); |
if (title) { |
if (title) { |
this.document.forms.renameform.markcopy.value=-1; |
this.document.forms.renameform.markcopy.value=-1; |
this.document.forms.renameform.title.value=title; |
this.document.forms.renameform.title.value=title; |
Line 3237 function changename(folderpath,index,old
|
Line 3283 function changename(folderpath,index,old
|
} |
} |
} |
} |
|
|
function removeres(folderpath,index,oldtitle,container,pagesymb) { |
function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) { |
if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) { |
if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) { |
this.document.forms.renameform.markcopy.value=-1; |
this.document.forms.renameform.markcopy.value=-1; |
this.document.forms.renameform.cmd.value='del_'+index; |
this.document.forms.renameform.cmd.value='del_'+index; |
if (container == 'sequence') { |
if (container == 'sequence') { |
Line 3252 function removeres(folderpath,index,oldt
|
Line 3298 function removeres(folderpath,index,oldt
|
} |
} |
} |
} |
|
|
function cutres(folderpath,index,oldtitle,container,pagesymb,folder) { |
function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) { |
if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) { |
if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) { |
this.document.forms.renameform.cmd.value='cut_'+index; |
this.document.forms.renameform.cmd.value='cut_'+index; |
this.document.forms.renameform.markcopy.value=index; |
this.document.forms.renameform.markcopy.value=index; |
this.document.forms.renameform.copyfolder.value=folder+'.'+container; |
this.document.forms.renameform.copyfolder.value=folder+'.'+container; |