version 1.124, 2004/05/06 18:28:16
|
version 1.128, 2004/05/11 06:45:35
|
Line 326 sub editor {
|
Line 326 sub editor {
|
|
|
my $newpos=$ENV{'form.newpos'}-1; |
my $newpos=$ENV{'form.newpos'}-1; |
my $currentpos=$ENV{'form.currentpos'}-1; |
my $currentpos=$ENV{'form.currentpos'}-1; |
$r->print('Sorting '.$idx.': '.$currentpos.' -> '.$newpos); |
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 |
# store the changed version |
|
|
Line 344 sub editor {
|
Line 371 sub editor {
|
if ( ($folder=~/^$1/) || ($1 eq 'default') ) { |
if ( ($folder=~/^$1/) || ($1 eq 'default') ) { |
# this is for a course, not a user, so set coursedoc flag |
# this is for a course, not a user, so set coursedoc flag |
# probably the only place in the system where this should be "1" |
# 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'; |
my $ext='false'; |
if ($url=~/^http\:\/\//) { $ext='true'; } |
if ($url=~/^http\:\/\//) { $ext='true'; } |
$url=~s/\:/\:/g; |
$url=~s/\:/\:/g; |
Line 372 sub editor {
|
Line 399 sub editor {
|
if ($ENV{'form.cmd'}) { |
if ($ENV{'form.cmd'}) { |
my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'}); |
my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'}); |
if ($cmd eq 'del') { |
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++) { |
for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) { |
$Apache::lonratedt::order[$i]= |
$Apache::lonratedt::order[$i]= |
$Apache::lonratedt::order[$i+1]; |
$Apache::lonratedt::order[$i+1]; |
Line 558 END
|
Line 589 END
|
&Apache::lonnet::declutter($url)); |
&Apache::lonnet::declutter($url)); |
(undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
(undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
$url=&Apache::lonnet::clutter($url); |
$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); |
$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb); |
} |
} |
my $parameterset=' '; |
my $parameterset=' '; |
Line 1021 sub handler {
|
Line 1063 sub handler {
|
$ENV{'form.folder'}=pop(@folderpath); |
$ENV{'form.folder'}=pop(@folderpath); |
} |
} |
if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { |
if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { |
$showdoc=$1; |
$showdoc='/'.$1; |
} |
} |
unless ($showdoc) { # got called from remote |
unless ($showdoc) { # got called from remote |
$forcestandard=($ENV{'form.folder'}=~/^default_/); |
$forcestandard=($ENV{'form.folder'}=~/^default_/); |