loncom/interface/londocs.pm - diff

Return to londocs.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.291 and 1.304

version 1.291, 2007/07/13 23:08:07	version 1.304, 2008/03/12 02:45:07
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);
Line 970 sub breadcrumbs {	Line 971 sub breadcrumbs {
$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; }
&Apache::lonhtmlcommon::add_breadcrumb(	&Apache::lonhtmlcommon::add_breadcrumb(
{'href'=>$url.$cpinfo,	{'href'=>$url.$cpinfo,
'title'=>$name,	'title'=>$name,
Line 991 sub breadcrumbs {	Line 993 sub breadcrumbs {
}	}
$plain=~s/\&gt\;\s*$//;	$plain=~s/\&gt\;\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 1084 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 1167 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 1202 sub update_paste_buffer {	Line 1205 sub update_paste_buffer {
}	}
$url=~s{http(&colon;\|:)//https(&colon;\|:)//}{https$2//};	$url=~s{http(&colon;\|:)//https(&colon;\|:)//}{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 1227 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 1243 ENDPASTE	Line 1250 ENDPASTE
}	}

sub do_paste_from_buffer {	sub do_paste_from_buffer {
my ($coursenum,$coursedom,$folder,$container) = @_;	my ($coursenum,$coursedom) = @_;

	return 0 if (!$env{'form.pastemarked'});

# paste resource to end of list	# paste resource to end of list
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});	my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});	my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
Line 1285 sub do_paste_from_buffer {	Line 1295 sub do_paste_from_buffer {
$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res';	$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res';
push(@LONCAPA::map::order, $newidx);	push(@LONCAPA::map::order, $newidx);
# Store the result	# Store the result
return &storemap($coursenum,$coursedom,$folder.'.'.$container);	}

	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;
	}
	return 1;
}	}

sub editor {	sub editor {
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_;	my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_;
my $errtext='';
my $fatal=0;	my $container= ($env{'form.pagepath'}) ? 'page'
my $container='sequence';	: 'sequence';
if ($env{'form.pagepath'}) {
$container='page';	my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
}	$folder.'.'.$container);
($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 1304 sub editor {	Line 1386 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);
$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'};
# set parameters
if ($env{'form.changeparms'} eq 'randompick') {
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 (&update_parameter()) {
	($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
	return $errtext if ($fatal);
	}

	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'}) {
my ($errtext,$fatal) =	&do_paste_from_buffer($coursenum,$coursedom);
&do_paste_from_buffer($coursenum,$coursedom,$folder,	($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
$container);	return $errtext if ($fatal);
if ($fatal) {	}
$r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;	$r->print($upload_output);

	if (&handle_edit_cmd()) {
	($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
	return $errtext if ($fatal);
	}
	# Group import/search
	if ($env{'form.importdetail'}) {
	my @imports;
	foreach (split(/\&/,$env{'form.importdetail'})) {
	if (defined($_)) {
	my ($name,$url,$residx)=
	map {&unescape($_)} split(/\=/,$_);
	push(@imports, [$name, $url, $residx]);
}	}
}	}
$r->print($upload_output);	($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
if ($env{'form.cmd'}) {	$container,'londocs',@imports);
my ($cmd,$idx)=split(/\_/,$env{'form.cmd'});	return $errtext if ($fatal);
if ($cmd eq 'del') {	}
my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);	# Loading a complete map
if (($url=~m\|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/\|) &&	if ($env{'form.loadmap'}) {
($url!~/\.(page\|sequence\|problem\|exam\|quiz\|assess\|survey\|form\|library\|task)$/)) {	if ($env{'form.importmap'}=~/\w/) {
&Apache::lonnet::removeuploadedurl($url);	foreach my $res (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
} else {	my ($title,$url,$ext,$type)=split(/\:/,$res);
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);	my $idx=&LONCAPA::map::getresidx($url);
}	$LONCAPA::map::resources[$idx]=$res;
for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) {	$LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
$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,	($errtext,$fatal)=&storemap($coursenum,$coursedom,
$folder.'.'.$container);	$folder.'.'.$container);
if ($fatal) {	return $errtext if ($fatal);
$r->print('<p><span class="LC_error">'.$errtext.'</span></p>');	} else {
return;	$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
}
}	}
# Group import/search
if ($env{'form.importdetail'}) {
my @imports;
foreach (split(/\&/,$env{'form.importdetail'})) {
if (defined($_)) {
my ($name,$url,$residx)=
map {&unescape($_)} split(/\=/,$_);
push(@imports, [$name, $url, $residx]);
}
}
# Store the changed version
($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
$container,'londocs',@imports);
if ($fatal) {
$r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;
}
}
# Loading a complete map
if ($env{'form.loadmap'}) {
if ($env{'form.importmap'}=~/\w/) {
foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
my ($title,$url,$ext,$type)=split(/\:/,$_);
my $idx=&LONCAPA::map::getresidx($url);
$LONCAPA::map::resources[$idx]=$_;
$LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
}
# Store the changed version
($errtext,$fatal)=&storemap($coursenum,$coursedom,
$folder.'.'.$container);
if ($fatal) {
$r->print('<p><span class="LC_error">'.$errtext.'</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");

&print_paste_buffer($r,$container);

}	}
	unless ($shown) {
	$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
	}
	$r->print("\n</table>\n");

	&print_paste_buffer($r,$container);
	return;
}	}

sub process_file_upload {	sub process_file_upload {
Line 1743 sub entryline {	Line 1702 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 1796 sub entryline {	Line 1754 sub entryline {
# no copy for published maps	# no copy for published maps
$nocopy = 1;	$nocopy = 1;
} else {	} else {
foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {	foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
my ($title,$url,$ext,$type)=split(/\:/,$_);	my ($title,$url,$ext,$type)=split(/\:/,$_);
if (($url=~/\.(page\|sequence)/) && ($type ne 'zombie')) {	if (($url=~/\.(page\|sequence)/) && ($type ne 'zombie')) {
$nocopy=1;	$nocopy=1;
Line 1936 END	Line 1894 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 1948 END	Line 1906 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 2000 END	Line 1963 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 2475 sub init_breadcrumbs {	Line 2439 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 2610 sub handler {	Line 2574 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 2714 sub handler {	Line 2682 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 2784 ENDCOURSEVERIFY	Line 2753 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 2793 ENDCOURSEVERIFY	Line 2763 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 2801 ENDCOURSEVERIFY	Line 2773 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);
	if ($error) {
	$r->print('<p><span class="LC_error">'.$error.'</span></p>');
	}
if ($hadchanges) {	if ($hadchanges) {
&mark_hash_old()	&mark_hash_old()
}	}
Line 2998 value="Group Files=/adm/$coursedom/$cour	Line 2974 value="Group Files=/adm/$coursedom/$cour
$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="Course Roster=/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 3039 ENDBLOCK	Line 3024 ENDBLOCK
$env{'form.folderpath'}='supplemental&'.	$env{'form.folderpath'}='supplemental&'.
&escape(&mt('Supplemental '.$type.' Documents'));	&escape(&mt('Supplemental '.$type.' Documents'));
}	}
&editor($r,$coursenum,$coursedom,$folder,$allowed);	my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed);
	if ($error) {
	$r->print('<p><span class="LC_error">'.$error.'</span></p>');
	}
if ($allowed) {	if ($allowed) {
my $folderseq=	my $folderseq=
'/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.	'/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
Line 3144 ENDSUPFORM	Line 3132 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 => 'Listed Title for the Uploaded Score',
	p_msp => 'Listed Title for the Page',
	p_msb => 'Listed Title for the Problem',
	p_mdb => 'Listed Title for the Drop Box',
	p_mbb => 'Listed 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 3155 function makenewfolder(targetform,folder	Line 3166 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 3179 function edittext(targetname,residx,titl	Line 3190 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 3188 function makeexamupload() {	Line 3199 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 3197 function makesmppage() {	Line 3208 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 3206 function makesmpproblem() {	Line 3217 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 3215 function makedropbox() {	Line 3226 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 3224 function makebulboard() {	Line 3235 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 3259 function finishpick() {	Line 3270 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 3276 function changename(folderpath,index,old	Line 3287 function changename(folderpath,index,old
}	}

function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {	function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
if (skip_confirm \|\| 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 3291 function removeres(folderpath,index,oldt	Line 3302 function removeres(folderpath,index,oldt
}	}

function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {	function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
if (skip_confirm \|\| 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;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.291
changed lines
	Added in v.1.304