--- loncom/interface/londocs.pm 2004/04/26 16:56:26 1.121 +++ loncom/interface/londocs.pm 2004/06/10 22:23:35 1.129 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.121 2004/04/26 16:56:26 www Exp $ +# $Id: londocs.pm,v 1.129 2004/06/10 22:23:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -301,38 +301,77 @@ sub editor { # ---------------- if they are for this folder and user allowed to make changes if (($allowed) && ($ENV{'form.folder'} eq $folder)) { -# set parameters +# set parameters and change order if (defined($ENV{'form.setparms'})) { my $idx=$ENV{'form.setparms'}; +# set parameters if ($ENV{'form.randpick_'.$idx}) { - &Apache::lonratedt::storeparameter($idx,'randompick',$ENV{'form.randpick_'.$idx},'int_pos'); + &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos'); } else { - &Apache::lonratedt::delparameter($idx,'randompick'); + &Apache::lonratedt::delparameter($idx,'parameter_randompick'); } if ($ENV{'form.hidprs_'.$idx}) { - &Apache::lonratedt::storeparameter($idx,'hiddenresource','yes','string_yesno'); + &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno'); } else { - &Apache::lonratedt::delparameter($idx,'hiddenresource'); + &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource'); } if ($ENV{'form.encprs_'.$idx}) { - &Apache::lonratedt::storeparameter($idx,'encrypturl','yes','string_yesno'); + &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno'); } else { - &Apache::lonratedt::delparameter($idx,'encrypturl'); + &Apache::lonratedt::delparameter($idx,'parameter_encrypturl'); + } + + if ($ENV{'form.newpos'}) { +# change order + + my $newpos=$ENV{'form.newpos'}-1; + my $currentpos=$ENV{'form.currentpos'}-1; + my $i; + my @neworder=(); + if ($newpos>$currentpos) { +# moving stuff up + for ($i=0;$i<$currentpos;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i]; + } + for ($i=$currentpos;$i<$newpos;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i+1]; + } + $neworder[$newpos]=$Apache::lonratedt::order[$currentpos]; + for ($i=$newpos+1;$i<=$#Apache::lonratedt::order;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i]; + } + } else { +# moving stuff down + for ($i=0;$i<$newpos;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i]; + } + $neworder[$newpos]=$Apache::lonratedt::order[$currentpos]; + for ($i=$newpos+1;$i<$currentpos+1;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i-1]; + } + for ($i=$currentpos+1;$i<=$#Apache::lonratedt::order;$i++) { + $neworder[$i]=$Apache::lonratedt::order[$i]; + } + } + @Apache::lonratedt::order=@neworder; } +# store the changed version ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence'); if ($fatal) { $r->print('

'.$errtext.'

'); return; } + } + # upload a file, if present if (($ENV{'form.uploaddoc.filename'}) && ($ENV{'form.cmd'}=~/^upload_(\w+)/)) { if ( ($folder=~/^$1/) || ($1 eq 'default') ) { # this is for a course, not a user, so set coursedoc flag # probably the only place in the system where this should be "1" - my $url=&Apache::lonnet::userfileupload('uploaddoc',1); + my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs'); my $ext='false'; if ($url=~/^http\:\/\//) { $ext='true'; } $url=~s/\:/\:/g; @@ -360,6 +399,10 @@ sub editor { if ($ENV{'form.cmd'}) { my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'}); if ($cmd eq 'del') { + my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]); + if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) { + &Apache::lonnet::removeuploadedurl($url); + } for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) { $Apache::lonratedt::order[$i]= $Apache::lonratedt::order[$i+1]; @@ -463,6 +506,7 @@ sub entryline { &Apache::lonnet::unescape($title)),'"<>&\''); my $renametitle=$title; my $foldertitle=$title; + my $orderidx=$Apache::lonratedt::order[$index]; if ($title=~ /^(\d+)___&&&___(\w+)___&&&___(\w+)___&&&___(.*)$/ ) { $foldertitle=&Apache::lontexconvert::msgtexconverted($4); $renametitle=$4; @@ -479,6 +523,21 @@ sub entryline { # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"'); } if ($allowed) { + my $incindex=$index+1; + my $selectbox=''; + if ($folder!~/^supplemental/) { + $selectbox= + ''. + ''; + } my %lt=&Apache::lonlocal::texthash( 'up' => 'Move Up', 'dw' => 'Move Down', @@ -487,7 +546,7 @@ sub entryline { $line.=(< - + -
@@ -495,7 +554,9 @@ sub entryline {
$lt{
+ +$selectbox + $lt{'rm'} @@ -528,6 +589,17 @@ END &Apache::lonnet::declutter($url)); (undef,undef,$url)=&Apache::lonnet::decode_symb($symb); $url=&Apache::lonnet::clutter($url); + if ($url=~/^\/*uploaded\//) { + $url=~/\.(\w+)$/; + my $embstyle=&Apache::loncommon::fileembstyle($1); + if (($embstyle eq 'img') || ($embstyle eq 'emb')) { + $url='/adm/wrapper'.$url; + } elsif ($embstyle eq 'ssi') { + #do nothing with these + } elsif ($url!~/\.(sequence|page)$/) { + $url='/adm/coursedocs/showdoc'.$url; + } + } $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb); } my $parameterset=' '; @@ -538,8 +610,8 @@ END $folderpath.=$folderarg.'&'.$foldername; $url.='folderpath='.&Apache::lonnet::escape($folderpath); $parameterset=&mt('Randomly Pick: '). - ''; + ''; } $line.=''. @@ -549,11 +621,15 @@ END 'hd' => 'Hidden', 'ec' => 'URL hidden', 'sp' => 'Store Parameters'); + my $enctext= + ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':''); + my $hidtext= + ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':''); $line.=(< - $lt{'hd'} + $lt{'hd'} - $lt{'ec'} + $lt{'ec'} $parameterset @@ -987,7 +1063,7 @@ sub handler { $ENV{'form.folder'}=pop(@folderpath); } if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { - $showdoc=$1; + $showdoc='/'.$1; } unless ($showdoc) { # got called from remote $forcestandard=($ENV{'form.folder'}=~/^default_/); @@ -1249,8 +1325,8 @@ $lt{'title'}:
- + $help{'Uploading_From_Harddrive'}