--- loncom/interface/londocs.pm 2005/02/21 00:32:45 1.168 +++ loncom/interface/londocs.pm 2005/06/08 21:38:44 1.182 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.168 2005/02/21 00:32:45 www Exp $ +# $Id: londocs.pm,v 1.182 2005/06/08 21:38:44 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -86,17 +86,17 @@ sub authorhosts { my %outhash=(); my $home=0; my $other=0; - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^user\.role\.(au|ca)\.(.+)$/) { my $role=$1; my $realm=$2; - my ($start,$end)=split(/\./,$ENV{$_}); + my ($start,$end)=split(/\./,$env{$_}); if (($start) && ($start>time)) { next; } if (($end) && (time>$end)) { next; } my $ca; my $cd; if ($1 eq 'au') { - $ca=$ENV{'user.name'}; - $cd=$ENV{'user.domain'}; + $ca=$env{'user.name'}; + $cd=$env{'user.domain'}; } else { ($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/); } @@ -147,22 +147,22 @@ sub dumpcourse { '
'); my ($home,$other,%outhash)=&authorhosts(); unless ($home) { return ''; } - my $origcrsid=$ENV{'request.course.id'}; + my $origcrsid=$env{'request.course.id'}; my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid); - if (($ENV{'form.authorspace'}) && ($ENV{'form.authorfolder'}=~/\w/)) { + if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { # Do the dumping - unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; } - my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'}); + unless ($outhash{'home_'.$env{'form.authorspace'}}) { return ''; } + my ($ca,$cd)=split(/\@/,$env{'form.authorspace'}); $r->print('

'.&mt('Copying Files').'

'); - my $title=$ENV{'form.authorfolder'}; + my $title=$env{'form.authorfolder'}; $title=&clean($title); my %replacehash=(); - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.namefor\_(.+)/) { - $replacehash{$1}=$ENV{$_}; + $replacehash{$1}=$env{$_}; } } - my $crs='/uploaded/'.$ENV{'request.course.id'}.'/'; + my $crs='/uploaded/'.$env{'request.course.id'}.'/'; $crs=~s/\_/\//g; foreach (keys %replacehash) { my $newfilename=$title.'/'.$replacehash{$_}; @@ -181,12 +181,12 @@ sub dumpcourse { if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) { if ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) { print $fh &Apache::loncreatecourse::rewritefile( - &Apache::loncreatecourse::readfile($ENV{'request.course.id'},$_), + &Apache::loncreatecourse::readfile($env{'request.course.id'},$_), (%replacehash,$crs => '') ); } else { print $fh - &Apache::loncreatecourse::readfile($ENV{'request.course.id'},$_); + &Apache::loncreatecourse::readfile($env{'request.course.id'},$_); } $fh->close(); } else { @@ -259,7 +259,7 @@ sub exportbutton { sub exportcourse { my $r=shift; my %discussiontime = &Apache::lonnet::dump('discussiontimes', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); my $numdisc = keys %discussiontime; my $navmap = Apache::lonnavmaps::navmap->new(); my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef); @@ -268,26 +268,12 @@ sub exportcourse { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['finishexport']); - if ($ENV{'form.finishexport'}) { + if ($env{'form.finishexport'}) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['archive','discussion']); - my @exportitems = (); - if (defined($ENV{'form.archive'})) { - if (ref($ENV{'form.archive'}) eq 'ARRAY') { - @exportitems = @{$ENV{'form.archive'}}; - } else { - $exportitems[0] = $ENV{'form.archive'}; - } - } - my @discussions = (); - if (defined($ENV{'form.discussion'})) { - if (ref($ENV{'form.discussion'}) eq 'ARRAY') { - @discussions = $ENV{'form.discussion'}; - } else { - $discussions[0] = $ENV{'form.discussion'}; - } - } + my @exportitems = &Apache::loncommon::get_env_multiple('form.archive'); + my @discussions = &Apache::loncommon::get_env_multiple('form.discussion'); if (@exportitems == 0 && @discussions == 0) { $outcome = '
As you did not select any content items or discussions for export, an IMS package has not been created. Please go back to select either content items or discussions for export'; } else { @@ -304,20 +290,14 @@ sub exportcourse { #Create zip file in prtspool my $imszipfile = '/prtspool/'. - $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'. + $env{'user.name'}.'_'.$env{'user.domain'}.'_'. time.'_'.rand(1000000000).'.zip'; -# zip can cause an sh launch which can pass along all of %ENV -# which can be too large for /bin/sh to handle - my %oldENV=%ENV; - undef(%ENV); my $cwd = &Cwd::getcwd(); my $imszip = '/home/httpd/'.$imszipfile; chdir $tempexport; open(OUTPUT, "zip -r $imszip * 2> /dev/null |"); close(OUTPUT); chdir $cwd; - %ENV=%oldENV; - undef(%oldENV); $outcome .= 'Download the zip file from IMS course archive
'; if ($copyresult) { $outcome .= 'The following errors occurred during export - '.$copyresult; @@ -491,7 +471,7 @@ sub create_ims_store { if (!-e $$tempexport) { mkdir($$tempexport,0700); } - $$tempexport .= '/'.$ENV{'user.domain'}.'_'.$ENV{'user.name'}; + $$tempexport .= '/'.$env{'user.domain'}.'_'.$env{'user.name'}; if (!-e $$tempexport) { mkdir($$tempexport,0700); } @@ -508,13 +488,13 @@ sub create_ims_store { ''."\n". -' '."\n". -' '."\n". +' '."\n". -' '.$ENV{'request.'.$ENV{'request.course.id'}.'.description'}.'' +' '.$env{'request.'.$env{'request.course.id'}.'.description'}.'' } else { $$outcome .= 'An error occurred opening the IMS manifest file.
' ; @@ -532,8 +512,8 @@ sub build_package { my $lastcontainer = 0; my %parent = (); my @dependencies = (); - my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; - my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; while ($curRes = $it->next()) { if (ref($curRes)) { $count ++; @@ -583,7 +563,7 @@ sub build_package { $isvisible = 'false'; } unless ($curRes->is_sequence()) { - $resourceref = 'identifierref="RES-'.$ENV{'request.course.id'}.'-'.$count.'"'; + $resourceref = 'identifierref="RES-'.$env{'request.course.id'}.'-'.$count.'"'; } if (($depth <= $prevdepth) && ($count > 1) && ($included)) { print $ims_manifest "\n".' '."\n"; @@ -592,7 +572,7 @@ sub build_package { $prevdepth = $depth; my $itementry = - ''. ''.$curRes->title().''; print $ims_manifest "\n".$itementry; @@ -603,7 +583,7 @@ sub build_package { &process_content($count,$curRes,$cdom,$cnum,$symb,\$content_file,\@hrefs,$copyresult,$tempexport); if ($content_file) { $imsresources .= "\n". - ' '."\n". ' '."\n"; foreach (@hrefs) { @@ -717,7 +697,7 @@ sub process_content { $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded'); } elsif ($symb =~ m-\.(sequence|page)___\d+___([^/]+)/([^/]+)-) { my $canedit = 0; - if ($2 eq $ENV{'user.domain'} && $3 eq $ENV{'user.name'}) { + if ($2 eq $env{'user.domain'} && $3 eq $env{'user.name'}) { $canedit= 1; } if ($canedit) { @@ -859,7 +839,7 @@ sub group_import { ''."\n". ''."\n". ''; - $ENV{'form.output'}=$newmapstr; + $env{'form.output'}=$newmapstr; my $home=&Apache::lonnet::homeserver($coursenum,$coursedom); my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$home, 'output',$1.$2); @@ -872,7 +852,7 @@ sub group_import { } } if ($url) { - my $idx = $#Apache::lonratedt::resources + 1; + my $idx = &Apache::lonratedt::getresidx($url); $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx; my $ext = 'false'; if ($url=~/^http:\/\//) { $ext = 'true'; } @@ -889,19 +869,19 @@ sub breadcrumbs { my ($where)=@_; &Apache::lonhtmlcommon::clear_breadcrumbs(); my (@folders); - if ($ENV{'form.pagepath'}) { - @folders = split('&',$ENV{'form.pagepath'}); + if ($env{'form.pagepath'}) { + @folders = split('&',$env{'form.pagepath'}); } else { - @folders=split('&',$ENV{'form.folderpath'}); + @folders=split('&',$env{'form.folderpath'}); } my $folderpath; my $cpinfo=''; - if ($ENV{'form.markedcopy_url'}) { - &Apache::lonnet::logthis('Found '.$ENV{'form.markedcopy_url'}); + if ($env{'form.markedcopy_url'}) { + &Apache::lonnet::logthis('Found '.$env{'form.markedcopy_url'}); $cpinfo='&markedcopy_url='. - &Apache::lonnet::escape($ENV{'form.markedcopy_url'}). + &Apache::lonnet::escape($env{'form.markedcopy_url'}). '&markedcopy_title='. - &Apache::lonnet::escape($ENV{'form.markedcopy_title'}); + &Apache::lonnet::escape($env{'form.markedcopy_title'}); } while (@folders) { my $folder=shift(@folders); @@ -928,20 +908,22 @@ sub editor { my $errtext=''; my $fatal=0; my $container='sequence'; - if ($ENV{'form.pagepath'}) { + if ($env{'form.pagepath'}) { $container='page'; } ($errtext,$fatal)= &mapread($coursenum,$coursedom,$folder.'.'.$container); if ($#Apache::lonratedt::order<1) { - $Apache::lonratedt::order[0]=1; - $Apache::lonratedt::resources[1]=''; + my $idx=&Apache::lonratedt::getresidx(); + if ($idx<=0) { $idx=1; } + $Apache::lonratedt::order[0]=$idx; + $Apache::lonratedt::resources[$idx]=''; } - if (defined($ENV{'form.markcopy'})) { + if (defined($env{'form.markcopy'})) { # Mark for copying - my ($title,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$ENV{'form.markcopy'}]]); - $ENV{'form.markedcopy_title'}=$title; - $ENV{'form.markedcopy_url'}=$url; + my ($title,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$env{'form.markcopy'}]]); + $env{'form.markedcopy_title'}=$title; + $env{'form.markedcopy_url'}=$url; } $r->print(&breadcrumbs($folder)); if ($fatal) { @@ -950,32 +932,32 @@ sub editor { # ------------------------------------------------------------ Process commands # ---------------- 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 - if (defined($ENV{'form.setparms'})) { - my $idx=$ENV{'form.setparms'}; + if (defined($env{'form.setparms'})) { + my $idx=$env{'form.setparms'}; # set parameters - if ($ENV{'form.randpick_'.$idx}) { - &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos'); + if ($env{'form.randpick_'.$idx}) { + &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos'); } else { &Apache::lonratedt::delparameter($idx,'parameter_randompick'); } - if ($ENV{'form.hidprs_'.$idx}) { + if ($env{'form.hidprs_'.$idx}) { &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno'); } else { &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource'); } - if ($ENV{'form.encprs_'.$idx}) { + if ($env{'form.encprs_'.$idx}) { &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno'); } else { &Apache::lonratedt::delparameter($idx,'parameter_encrypturl'); } - if ($ENV{'form.newpos'}) { + if ($env{'form.newpos'}) { # change order - my $newpos=$ENV{'form.newpos'}-1; - my $currentpos=$ENV{'form.currentpos'}-1; + my $newpos=$env{'form.newpos'}-1; + my $currentpos=$env{'form.currentpos'}-1; my $i; my @neworder=(); if ($newpos>$currentpos) { @@ -1014,10 +996,10 @@ sub editor { } } - if ($ENV{'form.pastemarked'}) { + if ($env{'form.pastemarked'}) { # paste resource to end of list - my $url=$ENV{'form.markedcopy_url'}; - my $title=$ENV{'form.markedcopy_title'}; + my $url=$env{'form.markedcopy_url'}; + my $title=$env{'form.markedcopy_title'}; # Maps need to be copied first if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) { $title=&mt('Copy of').' '.$title; @@ -1027,7 +1009,7 @@ sub editor { my $storefn=$newurl; $storefn=~s/^\/\w+\/\w+\/\w+\///; &Apache::loncreatecourse::writefile - ($ENV{'request.course.id'},$storefn, + ($env{'request.course.id'},$storefn, &Apache::lonnet::getfile($url)); $url=$newurl; } @@ -1038,7 +1020,7 @@ sub editor { if ($url=~/^http\:\/\//) { $ext='true'; } $url=~s/\:/\:/g; # Now insert the URL at the bottom - my $newidx=1+$#Apache::lonratedt::resources; + my $newidx=&Apache::lonratedt::getresidx($url); $Apache::lonratedt::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; $Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx; @@ -1051,23 +1033,32 @@ sub editor { } # upload a file, if present - if (($ENV{'form.uploaddoc.filename'}) && - ($ENV{'form.cmd'}=~/^upload_(\w+)/)) { + if (($env{'form.uploaddoc.filename'}) && + ($env{'form.cmd'}=~/^upload_(\w+)/)) { if ( ($folder=~/^$1/) || ($1 eq 'default') ) { + my $destination = 'docs/'; + if ($folder eq 'default') { + $destination .= 'default/'; + } elsif ($folder =~ /^default_(\d+)$/) { + $destination .= $1.'/'; + } # 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 $newidx=$#Apache::lonratedt::resources+1; - my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs/'.$newidx); + + my $newidx=&Apache::lonratedt::getresidx(); + $destination .= $newidx; + my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination); + my $ext='false'; if ($url=~/^http\:\/\//) { $ext='true'; } $url=~s/\:/\:/g; - my $comment=$ENV{'form.comment'}; + my $comment=$env{'form.comment'}; $comment=~s/\/\>\;/g; $comment=~s/\:/\:/g; if ($folder=~/^supplemental/) { - $comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'. - $ENV{'user.domain'}.'___&&&___'.$comment; + $comment=time.'___&&&___'.$env{'user.name'}.'___&&&___'. + $env{'user.domain'}.'___&&&___'.$comment; } $Apache::lonratedt::resources[$newidx]= $comment.':'.$url.':'.$ext.':normal:res'; @@ -1081,13 +1072,22 @@ sub editor { } } } - if ($ENV{'form.cmd'}) { - my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'}); + 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); } + &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]); + for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) { + $Apache::lonratedt::order[$i]= + $Apache::lonratedt::order[$i+1]; + } + $#Apache::lonratedt::order--; + } elsif ($cmd eq 'cut') { + my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]); + &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]); for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) { $Apache::lonratedt::order[$i]= $Apache::lonratedt::order[$i+1]; @@ -1113,7 +1113,7 @@ sub editor { $Apache::lonratedt::resources[ $Apache::lonratedt::order[$idx]]); my $comment= - &HTML::Entities::decode($ENV{'form.title'}); + &HTML::Entities::decode($env{'form.title'}); $comment=~s/\/\>\;/g; $comment=~s/\:/\:/g; @@ -1132,9 +1132,9 @@ sub editor { } } # Group import/search - if ($ENV{'form.importdetail'}) { + if ($env{'form.importdetail'}) { my @imports; - foreach (split(/\&/,$ENV{'form.importdetail'})) { + foreach (split(/\&/,$env{'form.importdetail'})) { if (defined($_)) { my ($name,$url)=split(/\=/,$_); $name=&Apache::lonnet::unescape($name); @@ -1151,10 +1151,10 @@ sub editor { } } # Loading a complete map - if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) { - foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) { - my $idx=$#Apache::lonratedt::resources; - $idx++; + if (($env{'form.importmap'}) && ($env{'form.loadmap'})) { + foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) { + my ($title,$url,$ext,$type)=split(/\:/,$_); + my $idx=&Apache::lonratedt::getresidx($url); $Apache::lonratedt::resources[$idx]=$_; $Apache::lonratedt::order [$#Apache::lonratedt::order+1]=$idx; @@ -1186,25 +1186,25 @@ sub editor { $r->print(''.&mt('Currently no documents.').''); } $r->print("\n\n"); - if ($ENV{'form.markedcopy_url'}) { + if ($env{'form.markedcopy_url'}) { $r->print(< - - + + ENDPASTE $r->print( ' '.&Apache::loncommon::filedescription( - (split(/\./,$ENV{'form.markedcopy_url'}))[-1]).': '. - $ENV{'form.markedcopy_title'}); + (split(/\./,$env{'form.markedcopy_url'}))[-1]).': '. + $env{'form.markedcopy_title'}); if ($container eq 'page') { $r->print(< - + + PAGEINFO } else { $r->print(< + FOLDERINFO } $r->print('

'); @@ -1235,23 +1235,23 @@ sub entryline { # Edit commands my $container; my $folderpath; - if ($ENV{'form.folderpath'}) { + if ($env{'form.folderpath'}) { $container = 'sequence'; - $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'}); - # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"'); + $folderpath=&Apache::lonnet::escape($env{'form.folderpath'}); + # $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"'); } my ($pagepath,$pagesymb); - if ($ENV{'form.pagepath'}) { + if ($env{'form.pagepath'}) { $container = 'page'; - $pagepath=&Apache::lonnet::escape($ENV{'form.pagepath'}); - $pagesymb=&Apache::lonnet::escape($ENV{'form.pagesymb'}); + $pagepath=&Apache::lonnet::escape($env{'form.pagepath'}); + $pagesymb=&Apache::lonnet::escape($env{'form.pagesymb'}); } my $cpinfo=''; - if ($ENV{'form.markedcopy_url'}) { + if ($env{'form.markedcopy_url'}) { $cpinfo='&markedcopy_url='. - &Apache::lonnet::escape($ENV{'form.markedcopy_url'}). + &Apache::lonnet::escape($env{'form.markedcopy_url'}). '&markedcopy_title='. - &Apache::lonnet::escape($ENV{'form.markedcopy_title'}); + &Apache::lonnet::escape($env{'form.markedcopy_title'}); } if ($allowed) { my $incindex=$index+1; @@ -1280,15 +1280,16 @@ sub entryline { 'up' => 'Move Up', 'dw' => 'Move Down', 'rm' => 'Remove', + 'ct' => 'Cut', 'rn' => 'Rename', 'cp' => 'Copy'); - if ($ENV{'form.pagepath'}) { + if ($env{'form.pagepath'}) { $line.=(< - - - - + + + +
@@ -1302,6 +1303,8 @@ sub entryline { $lt{'rm'} + +$lt{'ct'} $lt{'rn'} @@ -1310,9 +1313,9 @@ END } else { $line.=(< - - - + + + '."\n". '
@@ -1326,6 +1329,8 @@ END $lt{'rm'} + +$lt{'ct'} $lt{'rn'} @@ -1363,8 +1368,8 @@ END if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) { my $symb=&Apache::lonnet::symbclean( &Apache::lonnet::declutter('uploaded/'. - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'. - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder. + $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'. + $env{'course.'.$env{'request.course.id'}.'.num'}.'/'.$folder. '.sequence'). '___'.$residx.'___'. &Apache::lonnet::declutter($url)); @@ -1385,7 +1390,7 @@ END } $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb); if ($container eq 'page') { - my $symb=$ENV{'form.pagesymb'}; + my $symb=$env{'form.pagesymb'}; $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]); $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb); @@ -1394,7 +1399,7 @@ END my $parameterset=' '; if ($isfolder) { my $foldername=&Apache::lonnet::escape($foldertitle); - my $folderpath=$ENV{'form.folderpath'}; + my $folderpath=$env{'form.folderpath'}; if ($folderpath) { $folderpath.='&' }; $folderpath.=$folderarg.'&'.$foldername; $url.='folderpath='.&Apache::lonnet::escape($folderpath).$cpinfo; @@ -1409,14 +1414,14 @@ END if ($ispage) { my $pagename=&Apache::lonnet::escape($pagetitle); my $pagepath; - my $folderpath=$ENV{'form.folderpath'}; + my $folderpath=$env{'form.folderpath'}; if ($folderpath) { $pagepath = $folderpath.'&' }; $pagepath.=$pagearg.'&'.$pagename; - my $symb=$ENV{'form.pagesymb'}; + my $symb=$env{'form.pagesymb'}; if (!$symb) { my $path='uploaded/'. - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'. - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'; + $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'. + $env{'course.'.$env{'request.course.id'}.'.num'}.'/'; $symb=&Apache::lonnet::encode_symb($path.$folder.'.sequence', $residx, $path.$pagearg.'.page'); @@ -1452,14 +1457,14 @@ ENDPARMS sub tiehash { my ($mode)=@_; $hashtied=0; - if ($ENV{'request.course.fn'}) { + if ($env{'request.course.fn'}) { if ($mode eq 'write') { - if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", + if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.".db", &GDBM_WRCREAT(),0640)) { $hashtied=2; } } else { - if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db", + if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.".db", &GDBM_READER(),0640)) { $hashtied=1; } @@ -1489,7 +1494,7 @@ sub checkonthis { if ($url=~/^\/res\//) { my $result=&Apache::lonnet::repcopy( &Apache::lonnet::filelocation('',$url)); - if ($result==OK) { + if ($result eq 'ok') { $r->print(''.&mt('ok').''); $r->rflush(); &Apache::lonnet::countacc($url); @@ -1501,23 +1506,20 @@ sub checkonthis { $r->print(' '); } $r->print('- '.&mt('Rendering').': '); - my $oldpath=$ENV{'request.filename'}; - $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url); - &Apache::lonxml::xmlparse($r,'web', - &Apache::lonnet::getfile( - &Apache::lonnet::filelocation('',$url))); - undef($Apache::lonhomework::parsing_a_problem); - $ENV{'request.filename'}=$oldpath; - if (($Apache::lonxml::errorcount) || - ($Apache::lonxml::warningcount)) { - if ($Apache::lonxml::errorcount) { + my ($errorcount,$warningcount)=split(/:/, + &Apache::lonnet::ssi_body($url, + ('grade_target'=>'web', + 'return_only_error_and_warning_counts' => 1))); + if (($errorcount) || + ($warningcount)) { + if ($errorcount) { $r->print(''. - $Apache::lonxml::errorcount.' '. + $errorcount.' '. &mt('error(s)').' '); } - if ($Apache::lonxml::warningcount) { + if ($warningcount) { $r->print(''. - $Apache::lonxml::warningcount.' '. + $warningcount.' '. &mt('warning(s)').''); } } else { @@ -1532,9 +1534,9 @@ sub checkonthis { &checkonthis($r,$_,$level+1); } } - } elsif ($result==HTTP_SERVICE_UNAVAILABLE) { + } elsif ($result eq 'unavailable') { $r->print(''.&mt('connection down').''); - } elsif ($result==HTTP_NOT_FOUND) { + } elsif ($result eq 'not_found') { unless ($url=~/\$/) { $r->print(''.&mt('not found').''); } else { @@ -1597,20 +1599,20 @@ sub checkversions { my $starttime=0; my $haschanged=0; my %setversions=&Apache::lonnet::dump('resourceversions', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); $hashtied=0; &tiehash(); my %newsetversions=(); - if ($ENV{'form.setmostrecent'}) { + if ($env{'form.setmostrecent'}) { $haschanged=1; foreach (keys %hash) { if ($_=~/^ids\_(\/res\/.+)$/) { $newsetversions{$1}='mostrecent'; } } - } elsif ($ENV{'form.setcurrent'}) { + } elsif ($env{'form.setcurrent'}) { $haschanged=1; foreach (keys %hash) { if ($_=~/^ids\_(\/res\/.+)$/) { @@ -1620,21 +1622,21 @@ sub checkversions { } } } - } elsif ($ENV{'form.setversions'}) { + } elsif ($env{'form.setversions'}) { $haschanged=1; - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.set_version_(.+)$/) { my $src=$1; - if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) { - $newsetversions{$src}=$ENV{$_}; + if (($env{$_}) && ($env{$_} ne $setversions{$src})) { + $newsetversions{$src}=$env{$_}; } } } } if ($haschanged) { if (&Apache::lonnet::put('resourceversions',\%newsetversions, - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}) eq 'ok') { + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') { $r->print('

'.&mt('Your Version Settings have been Stored').'

'); } else { $r->print('

'.&mt('An Error Occured while Attempting to Store your Version Settings').'

'); @@ -1642,7 +1644,7 @@ sub checkversions { &mark_hash_old(); } &changewarning($r,''); - if ($ENV{'form.timerange'} eq 'all') { + if ($env{'form.timerange'} eq 'all') { # show all documents $header=&mt('All Documents in Course'); $allsel=1; @@ -1655,28 +1657,28 @@ sub checkversions { } else { # show documents which changed %changes=&Apache::lonnet::dump - ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + ('versionupdate',$env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); my $firstkey=(keys %changes)[0]; unless ($firstkey=~/^error\:/) { - unless ($ENV{'form.timerange'}) { - $ENV{'form.timerange'}=604800; + unless ($env{'form.timerange'}) { + $env{'form.timerange'}=604800; } - my $seltext=&mt('during the last').' '.$ENV{'form.timerange'}.' ' + my $seltext=&mt('during the last').' '.$env{'form.timerange'}.' ' .&mt('seconds'); - if ($ENV{'form.timerange'}==-1) { + if ($env{'form.timerange'}==-1) { $seltext='since start of course'; $startsel='selected'; - $ENV{'form.timerange'}=time; + $env{'form.timerange'}=time; } - $starttime=time-$ENV{'form.timerange'}; - if ($ENV{'form.timerange'}==2592000) { + $starttime=time-$env{'form.timerange'}; + if ($env{'form.timerange'}==2592000) { $seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; $monthsel='selected'; - } elsif ($ENV{'form.timerange'}==604800) { + } elsif ($env{'form.timerange'}==604800) { $seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; $weeksel='selected'; - } elsif ($ENV{'form.timerange'}==86400) { + } elsif ($env{'form.timerange'}==86400) { $seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; $daysel='selected'; } @@ -1686,8 +1688,8 @@ sub checkversions { } } %setversions=&Apache::lonnet::dump('resourceversions', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); my %lt=&Apache::lonlocal::texthash ('st' => 'Version changes since start of Course', 'lm' => 'Version changes since last Month', @@ -1848,25 +1850,29 @@ sub is_hash_old { } sub changewarning { - my ($r,$postexec)=@_; + my ($r,$postexec,$message,$url)=@_; if (!&is_hash_old()) { return; } my $pathvar='folderpath'; - my $path=&Apache::lonnet::escape($ENV{'form.folderpath'}); - if (defined($ENV{'form.pagepath'})) { - $pathvar='pagepath'; - $path=&Apache::lonnet::escape($ENV{'form.pagepath'}); - $path.='&symb='.&Apache::lonnet::escape($ENV{'form.pagesymb'}); + my $path=&Apache::lonnet::escape($env{'form.folderpath'}); + if (!defined($url)) { + if (defined($env{'form.pagepath'})) { + $pathvar='pagepath'; + $path=&Apache::lonnet::escape($env{'form.pagepath'}); + $path.='&symb='.&Apache::lonnet::escape($env{'form.pagesymb'}); + } + $url='/adm/coursedocs?'.$pathvar.'='.$path; + } + if (!defined($message)) { + $message='Changes will become active for your current session after [_1], or the next time you log in.'; } $r->print( ''. -'
'. -''. +'

'. -&mt('Changes will become active for your current session after'). -' '.&mt(', or the next time you log in.'). +&mt($message,' '). $help{'Caching'}.'

'); } @@ -1899,18 +1905,18 @@ sub handler { 'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages'); $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); - if ($ENV{'form.verify'}) { + if ($env{'form.verify'}) { &verifycontent($r); - } elsif ($ENV{'form.versions'}) { + } elsif ($env{'form.versions'}) { &checkversions($r); - } elsif ($ENV{'form.dumpcourse'}) { + } elsif ($env{'form.dumpcourse'}) { &dumpcourse($r); - } elsif ($ENV{'form.exportcourse'}) { + } elsif ($env{'form.exportcourse'}) { &exportcourse($r); } else { # is this a standard course? - my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//); + my $standard=($env{'request.course.uri'}=~/^\/uploaded\//); my $forcestandard = 0; my $forcesupplement; my $script=''; @@ -1921,32 +1927,32 @@ sub handler { my $uploadtag; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['folderpath','pagepath','pagesymb','markedcopy_url','markedcopy_title']); - if ($ENV{'form.folderpath'}) { - my (@folderpath)=split('&',$ENV{'form.folderpath'}); - $ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath)); - $ENV{'form.folder'}=pop(@folderpath); - } - if ($ENV{'form.pagepath'}) { - my (@pagepath)=split('&',$ENV{'form.pagepath'}); - $ENV{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath)); - $ENV{'form.folder'}=pop(@pagepath); + if ($env{'form.folderpath'}) { + my (@folderpath)=split('&',$env{'form.folderpath'}); + $env{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath)); + $env{'form.folder'}=pop(@folderpath); + } + if ($env{'form.pagepath'}) { + my (@pagepath)=split('&',$env{'form.pagepath'}); + $env{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath)); + $env{'form.folder'}=pop(@pagepath); $containertag = ''. ''; - $uploadtag = ''. - ''; + $uploadtag = ''. + ''; } if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { $showdoc='/'.$1; } unless ($showdoc) { # got called from remote - if (($ENV{'form.folder'}=~/^default_/) || - ($ENV{'form.folder'} =~ m#^\d+/(pages|sequences)/#)) { + if (($env{'form.folder'}=~/^default_/) || + ($env{'form.folder'} =~ m#^\d+/(pages|sequences)/#)) { $forcestandard = 1; } - $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/); + $forcesupplement=($env{'form.folder'}=~/^supplemental_/); # does this user have privileges to post, etc? - $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); + $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'}); if ($allowed) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']); $script=&Apache::lonratedt::editscript('simple'); @@ -1959,19 +1965,19 @@ sub handler { } # get course data - my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; - my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; + my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'}; + my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'}; # get personal data - my $uname=$ENV{'user.name'}; - my $udom=$ENV{'user.domain'}; + my $uname=$env{'user.name'}; + my $udom=$env{'user.domain'}; my $plainname=&Apache::lonnet::escape( &Apache::loncommon::plainname($uname,$udom)); # graphics settings - $iconpath = $r->dir_config('lonIconsURL') . "/"; + $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/"); my $now=time; @@ -2098,7 +2104,7 @@ function changename(folderpath,index,old } function removeres(folderpath,index,oldtitle,container,pagesymb) { - if (confirm('Remove "'+oldtitle+'"?')) { + if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) { this.document.forms.renameform.cmd.value='del_'+index; if (container == 'sequence') { this.document.forms.renameform.folderpath.value=folderpath; @@ -2111,6 +2117,21 @@ function removeres(folderpath,index,oldt } } +function cutres(folderpath,index,oldtitle,container,pagesymb) { + if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible,\\neven if it is pasted in again elsewhere!\\nCut "'+oldtitle+'"?')) { + this.document.forms.renameform.cmd.value='cut_'+index; + this.document.forms.renameform.markcopy.value=index; + if (container == 'sequence') { + this.document.forms.renameform.folderpath.value=folderpath; + } + if (container == 'page') { + this.document.forms.renameform.pagepath.value=folderpath; + this.document.forms.renameform.pagesymb.value=pagesymb; + } + this.document.forms.renameform.submit(); + } +} + function markcopy(folderpath,index,oldtitle,container,pagesymb) { this.document.forms.renameform.markcopy.value=index; if (container == 'sequence') { @@ -2139,7 +2160,7 @@ ENDNEWSCRIPT 'upls' => 'Upload a new supplemental course document', 'impp' => 'Import a document', 'pubd' => 'Published documents', - 'copm' => 'All documents out of a published map', + 'copm' => 'All documents out of a published map into this folder', 'spec' => 'Special documents', 'upld' => 'Upload Document', 'srch' => 'Search', @@ -2171,15 +2192,15 @@ ENDNEWSCRIPT 'cv' => 'Check/Set Resource Versions', ); - my $folderpath=$ENV{'form.folderpath'}; + my $folderpath=$env{'form.folderpath'}; if (!$folderpath) { - if ($ENV{'form.folder'} eq '' || - $ENV{'form.folder'} eq 'supplemental') { + if ($env{'form.folder'} eq '' || + $env{'form.folder'} eq 'supplemental') { $folderpath='default&'. &Apache::lonnet::escape(&mt('Main Course Documents')); } } - unless ($ENV{'form.pagepath'}) { + unless ($env{'form.pagepath'}) { $containertag = ''; $uploadtag = ''; } @@ -2215,10 +2236,10 @@ ENDCOURSEVERIFY $r->print('
'); # '

'.&mt('Main Course Documents'). # ($allowed?' '.$help{'Main_Course_Documents'}:'').'

'); - my $folder=$ENV{'form.folder'}; + my $folder=$env{'form.folder'}; if ($folder eq '' || $folder eq 'supplemental') { $folder='default'; - $ENV{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents')); + $env{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents')); } my $postexec=''; if ($folder eq 'default') { @@ -2245,7 +2266,7 @@ ENDCOURSEVERIFY
$lt{'file'}:
-
+
$lt{'title'}:
@@ -2269,8 +2290,8 @@ $help{'Importing_LON-CAPA_Resource'}

-$lt{'copm'} -
+$lt{'copm'}
+
@@ -2278,7 +2299,7 @@ $help{'Load_Map'}

ENDFORM - unless ($ENV{'form.pagepath'}) { + unless ($env{'form.pagepath'}) { $r->print(<
@@ -2297,10 +2318,10 @@ value="$lt{'extr'}" /> $help{'Adding_Ext ENDFORM } $r->print('
'); - unless ($ENV{'form.pagepath'}) { + unless ($env{'form.pagepath'}) { $r->print(< - + $help{'Adding_Fold
- + +
ENDFORM } - if ($ENV{'form.pagepath'}) { + if ($env{'form.pagepath'}) { $r->print(< $uploadtag @@ -2405,8 +2427,8 @@ $uploadtag onClick="javascript:makeexamupload();" /> $help{'Score_Upload_Form'} + ENDBLOCK - $r->print(''); } $r->print('
'); @@ -2417,13 +2439,13 @@ ENDBLOCK $r->print('
'); # '

'.&mt('Supplemental Course Documents'). # ($allowed?' '.$help{'Supplemental'}:'').'

'); - my $folder=$ENV{'form.folder'}; + my $folder=$env{'form.folder'}; unless ($folder=~/^supplemental/) { $folder='supplemental'; } if ($folder =~ /^supplemental$/ && - $ENV{'form.folderpath'} =~ /^default\&/) { - $ENV{'form.folderpath'}='supplemental&'. + $env{'form.folderpath'} =~ /^default\&/) { + $env{'form.folderpath'}='supplemental&'. &Apache::lonnet::escape(&mt('Supplemental Course Documents')); } &editor($r,$coursenum,$coursedom,$folder,$allowed); @@ -2444,7 +2466,7 @@ ENDBLOCK
- + @@ -2454,7 +2476,7 @@ ENDBLOCK
- + $help{'Adding_Fol
- + $help{'Adding_Ext
- + @@ -2481,7 +2503,7 @@ $help{'Syllabus'}
- + @@ -2495,7 +2517,7 @@ ENDSUPFORM } } if ($allowed) { - $r->print(''); + $r->print('
'); } $r->print('
'); } else {