--- rat/lonratedt.pm 2005/03/23 22:54:18 1.64
+++ rat/lonratedt.pm 2007/07/11 20:32:01 1.88
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.64 2005/03/23 22:54:18 raeburn Exp $
+# $Id: lonratedt.pm,v 1.88 2007/07/11 20:32:01 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,7 +33,7 @@ package Apache::lonratedt;
=head1 NAME
-Apache::lonratedt: advanced resource assembly tool
+Apache::lonratedt: simple resource assembly tool
=head1 SYNOPSIS
@@ -167,251 +167,42 @@ determined.>
use strict;
use Apache::Constants qw(:common);
use Apache::lonnet;
-use Apache::lonratsrv;
-use Apache::lonsequence;
-use Apache::loncommon;
+use Apache::lonsequence();
+use Apache::loncommon();
use Apache::lonlocal;
+use LONCAPA::map();
use File::Copy;
-
-use vars qw(@order @resources @resparms);
-
-
-# Mapread read maps into global arrays @links and @resources, determines status
-# sets @order - pointer to resources in right order
-# sets @resources - array with the resources with correct idx
-#
-sub mapread {
- my $fn=shift;
-
- my @links;
- undef @links;
- undef @resources;
- undef @order;
- undef @resparms;
- @resources=('');
- @order=();
- @resparms=();
-
- my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
- if ($errtext) { return ($errtext,2); }
-
-# -------------------------------------------------------------------- Read map
- foreach (split(/\<\&\>/,$outtext)) {
- my ($command,$number,$content)=split(/\<\:\>/,$_);
- if ($command eq 'objcont') {
- $resources[$number]=$content;
- }
- if ($command eq 'objlinks') {
- $links[$number]=$content;
- }
- if ($command eq 'objparms') {
- if ($resparms[$number]) {
- $resparms[$number].='&&&'.$content;
- } else {
- $resparms[$number]=$content;
- }
- }
- }
-# ------------------------------------------------------- Is this a linear map?
- my @starters=();
- my @endings=();
- undef @starters;
- undef @endings;
-
- foreach (@links) {
- if (defined($_)) {
- my ($start,$end,$cond)=split(/\:/,$_);
- if ((defined($starters[$start])) || (defined($endings[$end]))) {
- return
- (&mt('Map has branchings. Use advanced editor.'),1);
- }
- $starters[$start]=1;
- $endings[$end]=1;
- if ($cond) {
- return
- (&mt('Map has conditions. Use advanced editor.'),1);
- }
- }
-
- }
- for (my $i=1; $i<=$#resources; $i++) {
- if (defined($resources[$i])) {
- unless (($starters[$i]) || ($endings[$i])) {
- return
- (&mt('Map has unconnected resources. Use advanced editor.'),1);
- }
- }
- }
-# ---------------------------------------------- Did we just read an empty map?
- if ($#resources<1) {
- undef $resources[0];
- $resources[1]=':::start';
- $resources[2]=':::finish';
- }
-# -------------------------------------------------- This is a linear map, sort
-
- my $startidx=0;
- my $endidx=0;
- for (my $i=0; $i<=$#resources; $i++) {
- if (defined($resources[$i])) {
- my ($title,$url,$ext,$type)=split(/\:/,$resources[$i]);
- if ($type eq 'start') { $startidx=$i; }
- if ($type eq 'finish') { $endidx=$i; }
- }
- }
- my $k=0;
- my $currentidx=$startidx;
- $order[$k]=$currentidx;
- for (my $i=0; $i<=$#resources; $i++) {
- foreach (@links) {
- my ($start,$end)=split(/\:/,$_);
- if ($start==$currentidx) {
- $currentidx=$end;
- $k++;
- $order[$k]=$currentidx;
- last;
- }
- }
- if ($currentidx==$endidx) { last; }
- }
- return $errtext;
-}
-
-# ---------------------------------------------- Read a map as well as possible
-# Also used by the sequence handler
-# Call lonsequence::attemptread to read from resource space
-#
-sub attemptread {
- my $fn=shift;
-
- my @links;
- undef @links;
- my @theseres;
- undef @theseres;
-
- my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
- if ($errtext) { return @theseres }
-
-# -------------------------------------------------------------------- Read map
- foreach (split(/\<\&\>/,$outtext)) {
- my ($command,$number,$content)=split(/\<\:\>/,$_);
- if ($command eq 'objcont') {
- $theseres[$number]=$content;
- }
- if ($command eq 'objlinks') {
- $links[$number]=$content;
- }
- }
-
-# --------------------------------------------------------------- Sort, sort of
-
- my @objsort=();
- undef @objsort;
-
- my @data1=();
- my @data2=();
- undef @data1;
- undef @data2;
-
- my $k;
- my $kj;
- my $j;
- my $ij;
-
- for ($k=1;$k<=$#theseres;$k++) {
- if (defined($theseres[$k])) {
- $objsort[$#objsort+1]=$k;
- }
- }
-
- for ($k=1;$k<=$#links;$k++) {
- if (defined($links[$k])) {
- @data1=split(/\:/,$links[$k]);
- $kj=-1;
- for (my $j=0;$j<=$#objsort;$j++) {
- if ((split(/\:/,$objsort[$j]))[0]==$data1[0]) {
- $kj=$j;
- }
- }
- if ($kj!=-1) { $objsort[$kj].=':'.$data1[1]; }
- }
- }
- for ($k=0;$k<=$#objsort;$k++) {
- for ($j=0;$j<=$#objsort;$j++) {
- if ($k!=$j) {
- @data1=split(/\:/,$objsort[$k]);
- @data2=split(/\:/,$objsort[$j]);
- my $dol=$#data1+1;
- my $dtl=$#data2+1;
- if ($dol+$dtl<1000) {
- for ($kj=1;$kj<$dol;$kj++) {
- if ($data1[$kj]==$data2[0]) {
- for ($ij=1;$ij<$dtl;$ij++) {
- $data1[$#data1+1]=$data2[$ij];
- }
- }
- }
- for ($kj=1;$kj<$dtl;$kj++) {
- if ($data2[$kj]==$data1[0]) {
- for ($ij=1;$ij<$dol;$ij++) {
- $data2[$#data2+1]=$data1[$ij];
- }
- }
- }
- $objsort[$k]=join(':',@data1);
- $objsort[$j]=join(':',@data2);
- }
- }
- }
- }
-# ---------------------------------------------------------------- Now sort out
-
- @objsort=sort {
- my @data1=split(/\:/,$a);
- my @data2=split(/\:/,$b);
- my $rvalue=0;
- my $k;
- for ($k=1;$k<=$#data1;$k++) {
- if ($data1[$k]==$data2[0]) { $rvalue--; }
- }
- for ($k=1;$k<=$#data2;$k++) {
- if ($data2[$k]==$data1[0]) { $rvalue++; }
- }
- if ($rvalue==0) { $rvalue=$#data2-$#data1; }
- $rvalue;
- } @objsort;
-
- my @outres=();
- undef @outres;
-
- for ($k=0;$k<=$#objsort;$k++) {
- $outres[$k]=$theseres[(split(/\:/,$objsort[$k]))[0]];
- }
- return @outres;
-}
+use LONCAPA;
+use HTML::Entities();
# --------------------------------------------------------- Build up RAT screen
sub ratedt {
my ($r,$url)=@_;
- my $frameset = '<frameset rows="1,70,*" border="0">';
- if ($ENV{'environment.remote'} eq 'off') {
- $frameset = '<frameset rows="1,250,*" border="0">';
+ my %layout = ('border' => "0");
+ if ($env{'environment.remote'} eq 'off') {
+ $layout{'rows'} = "1,250,*";
+ } else {
+ $layout{'rows'} = "1,70,*";
}
- $r->print(<<ENDDOCUMENT);
-
-<html>
-<head>
-<script language="JavaScript">
+ my $js ='
+<script type="text/javascript">
var flag=0;
-</script>
-</head>
-$frameset
-<frame name=server src="$url/loadonly/ratserver" noresize noscroll>
-<frame name=code src="$url/loadonly/adveditmenu">
-<frame name=mapout src="/adm/rat/map.html">
-</frameset>
-</html>
+</script>';
+ my $start_page =
+ &Apache::loncommon::start_page('Edit Sequence',$js,
+ {'frameset' => 1,
+ 'add_entries' => \%layout});
+ my $end_page =
+ &Apache::loncommon::end_page({'frameset' => 1});
+
+ $r->print(<<ENDDOCUMENT);
+$start_page
+<frame name="server" src="$url/loadonly/ratserver" noresize="noresize"
+ noscroll="noscroll" />
+<frame name="code" src="$url/loadonly/adveditmenu" />
+<frame name="mapout" src="/adm/rat/map.html" />
+$end_page
ENDDOCUMENT
}
@@ -434,169 +225,11 @@ sub buttons {
return $output.'</form><hr>';
}
-# ----------------------------------------------------------- Paste into target
-# modifies @order, @resources
-
-sub pastetarget {
- my ($after,@which)=@_;
- my @insertorder=();
- foreach (@which) {
- if (defined($_)) {
- my ($name,$url)=split(/\=/,$_);
- $name=&Apache::lonnet::unescape($name);
- $url=&Apache::lonnet::unescape($url);
- if ($url) {
- my $idx=$#resources+1;
- $insertorder[$#insertorder+1]=$idx;
- my $ext='false';
- if ($url=~/^http\:\/\//) { $ext='true'; }
- $url=~s/\:/\:/g;
- $name=~s/\:/\:/g;
- $resources[$idx]=$name.':'.$url.':'.$ext.':normal:res';
- }
- }
- }
- my @oldorder=splice(@order,$after);
- @order=(@order,@insertorder,@oldorder);
-}
-
-# ------------------------------------------------ Get start and finish correct
-# modifies @resources
-
-sub startfinish {
-# Remove all start and finish
- foreach (@order) {
- my ($name,$url,$ext)=split(/\:/,$resources[$_]);
- if ($url=~/http\&colon\:\/\//) { $ext='true'; }
- $resources[$_]=$name.':'.$url.':'.$ext.':normal:res';
- }
-# Garbage collection
- my $stillchange=1;
- while (($#order>1) && ($stillchange)) {
- $stillchange=0;
- for (my $i=0;$i<=$#order;$i++) {
- my ($name,$url,$ext)=split(/\:/,$resources[$order[$i]]);
- unless ($url) {
-# Take out empty resource
- for (my $j=$i+1;$j<=$#order;$j++) {
- $order[$j-1]=$order[$j];
- }
- $#order--;
- $stillchange=1;
- last;
- }
- }
- }
-# Put in a start resource
- my ($name,$url,$ext)=split(/\:/,$resources[$order[0]]);
- $resources[$order[0]]=$name.':'.$url.':'.$ext.':start:res';
-# Make sure this has at least start and finish
- if ($#order==0) {
- $resources[$#resources+1]='::false';
- $order[1]=$#resources;
- }
-# Make the last one a finish resource
- ($name,$url,$ext)=split(/\:/,$resources[$order[$#order]]);
- $resources[$order[$#order]]=$name.':'.$url.':'.$ext.':finish:res';
-}
-
-# ------------------------------------------------------------------- Store map
-
-sub storemap {
- my $realfn=shift;
- my $fn=$realfn;
-# unless this is forced to work from the original file, use a temporary file
-# instead
- unless (shift) {
- $fn=$realfn.'.tmp';
- unless (-e $fn) {
- copy($realfn,$fn);
- }
- }
-# store data either into tmp or real file
- &startfinish();
- my $output='graphdef<:>no';
- my $k=1;
- for (my $i=0; $i<=$#order; $i++) {
- if (defined($resources[$order[$i]])) {
- $output.='<&>objcont<:>'.$order[$i].'<:>'.$resources[$order[$i]];
- }
- if (defined($resparms[$order[$i]])) {
- foreach (split('&&&',$resparms[$order[$i]])) {
- if ($_) {
- $output.='<&>objparms<:>'.$order[$i].'<:>'.$_;
- }
- }
- }
- if (defined($order[$i+1])) {
- if (defined($resources[$order[$i+1]])) {
- $output.='<&>objlinks<:>'.$k.'<:>'.
- $order[$i].':'.$order[$i+1].':0';
- $k++;
- }
- }
- }
- $output=~s/http\&colon\;\/\///g;
- $ENV{'form.output'}=$output;
- return
- &Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,''));
-}
-
-# ------------------------------------------ Store and get parameters in global
-
-sub storeparameter {
- my ($to,$name,$value,$ptype)=@_;
- my $newentry='';
- my $nametype='';
- foreach (split('&&&',$resparms[$to])) {
- my ($thistype,$thisname,$thisvalue)=split('___',$_);
- if ($thisname) {
- unless ($thisname eq $name) {
- $newentry.=$_.'&&&';
- } else {
- $nametype=$thistype;
- }
- }
- }
- unless ($ptype) { $ptype=$nametype; }
- unless ($ptype) { $ptype='string'; }
- $newentry.=$ptype.'___'.$name.'___'.$value;
- $resparms[$to]=$newentry;
-}
-
-sub delparameter {
- my ($to,$name)=@_;
- my $newentry='';
- my $nametype='';
- foreach (split('&&&',$resparms[$to])) {
- my ($thistype,$thisname,$thisvalue)=split('___',$_);
- if ($thisname) {
- unless ($thisname eq $name) {
- $newentry.=$_.'&&&';
- }
- }
- }
- $resparms[$to]=$newentry;
-}
-
-sub getparameter {
- my ($to,$name)=@_;
- my $value=undef;
- my $ptype=undef;
- foreach (split('&&&',$resparms[$to])) {
- my ($thistype,$thisname,$thisvalue)=split('___',$_);
- if ($thisname eq $name) {
- $value=$thisvalue;
- $ptype=$thistype;
- }
- }
- return ($value,$ptype);
-}
-
# ----------------------------------------------------------------- Edit script
sub editscript {
my $mode=shift;
- my $resurl=&Apache::loncommon::lastresurl();
+ my $resurl=
+ &Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
return(<<ENDSCRIPT);
var srch;
var srchflag=-1; // 1 means currently open
@@ -638,10 +271,18 @@ function srchclose() {
// -------------------------------------------------------- Open indexer window
function idxopen(mode) {
- var options="scrollbars=1,resizable=1,menubar=0";
+ var options="scrollbars=1,resizable=1,menubar=0,location=1,toolbar=1";
idxmode=mode;
idxflag=1;
- idx=open("$resurl/?launch=1&mode=$mode&catalogmode="+mode,"idxout",options);
+ idx=open('$resurl/?inhibitmenu=yes&launch=1&mode=$mode&catalogmode='+mode,'idxout',options);
+ idx.focus();
+}
+
+// ------------------------------------------------------ Open groupsort window
+function groupopen(url,recover,bookmarks) {
+ var options="scrollbars=1,resizable=1,menubar=0";
+ idxflag=1;
+ idx=open("/adm/groupsort?inhibitmenu=yes&mode=$mode&recover="+recover+"&readfile="+url+"&bookmarks="+bookmarks,"idxout",options);
idx.focus();
}
@@ -650,17 +291,18 @@ function srchopen(mode) {
var options="scrollbars=1,resizable=1,menubar=0";
srchmode=mode;
srchflag=1;
- srch=open("/adm/searchcat?launch=1&mode=$mode&catalogmode="+mode,"srchout",options);
+ srch=open("/adm/searchcat?inhibitmenu=yes&launch=1&mode=$mode&catalogmode="+mode,"srchout",options);
srch.focus();
}
// ----------------------------------------------------- launch indexer browser
function groupsearch() {
- srchcheck('groupsearch');
+ srchcheck('import');
}
function groupimport() {
- idxcheck('groupimport');
+ idxcheck('import');
}
+
// ------------------------------------------------------- Do srch status check
function srchcheck(mode) {
if (!srch || srch.closed || srchmode!=mode) {
@@ -684,6 +326,7 @@ function idxcheck(mode) {
if (editbrowser == null) {
url += 'launch=1&';
}
+ url += 'inhibitmenu=yes&';
url += 'catalogmode=interactive&';
url += 'mode=edit&';
url += 'form=' + formname + '&';
@@ -695,7 +338,7 @@ function idxcheck(mode) {
}
url += 'element=' + elementname + '';
var title = 'Browser';
- var options = 'scrollbars=1,resizable=1,menubar=0';
+ var options = 'scrollbars=1,resizable=1,menubar=0,toolbar=1,location=1';
options += ',width=700,height=600';
editbrowser = open(url,title,options,'1');
editbrowser.focus();
@@ -709,58 +352,42 @@ sub smpedt {
my $buttons=&buttons(2);
my $tmpfn=&Apache::lonnet::filelocation('',$url).'.tmp';
my $targetmsg='';
- if ($ENV{'form.save'}) {
+ if ($env{'form.save'}) {
copy($tmpfn,&Apache::lonnet::filelocation('',$url));
unlink($tmpfn);
my ($errtext,$fatal)=
- &mapread(&Apache::lonnet::filelocation('',$url),'');
+ &LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');
unless ($fatal) {
$targetmsg='<b>'.&mt('Saved.').'</b><br />';
} else {
$targetmsg='<b>'.&mt('An error occured while saving.').'</b><br />';
}
}
- if ($ENV{'form.revert'}) {
+ if ($env{'form.revert'}) {
$targetmsg='<b>'.&mt('Reverted.').'</b><br />';
unlink($tmpfn);
my ($errtext,$fatal)=
- &mapread(&Apache::lonnet::filelocation('',$url),'');
+ &LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');
}
if (-e $tmpfn) {
$targetmsg=
'<b><font color="red">'.&mt('You are working with an unsaved version of your map.').'</font></b><br>';
- my ($errtext,$fatal)=&mapread($tmpfn,'');
+ my ($errtext,$fatal)=&LONCAPA::map::mapread($tmpfn,'');
}
# ---------------------------------------------------------- Process form input
- my @importselect=();
- my @targetselect=();
- undef @importselect;
- undef @targetselect;
- if (defined($ENV{'form.importsel'})) {
- if (ref($ENV{'form.importsel'})) {
- @importselect=sort(@{$ENV{'form.importsel'}});
- } else {
- @importselect=($ENV{'form.importsel'});
- }
- }
- if (defined($ENV{'form.target'})) {
- if (ref($ENV{'form.target'})) {
- @targetselect=sort(@{$ENV{'form.target'}});
- } else {
- @targetselect=($ENV{'form.target'});
- }
- }
+ my @importselect=&Apache::loncommon::get_env_multiple('form.importsel');
+ my @targetselect=&Apache::loncommon::get_env_multiple('form.target');
# ============================================================ Process commands
- my $targetdetail=$ENV{'form.targetdetail'};
- my $importdetail=$ENV{'form.curimpdetail'};
+ my $targetdetail=$env{'form.targetdetail'};
+ my $importdetail=$env{'form.curimpdetail'};
# ---------------------------------------------------- Importing from groupsort
- if (($ENV{'form.importdetail'}) && (!$ENV{'form.impfortarget'})) {
+ if (($env{'form.importdetail'}) && (!$env{'form.impfortarget'})) {
$importdetail='';
- my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+ my @curimport=split(/\&/,$env{'form.curimpdetail'});
my $lastsel;
@@ -777,7 +404,7 @@ sub smpedt {
}
}
- $importdetail.='&'.$ENV{'form.importdetail'};
+ $importdetail.='&'.$env{'form.importdetail'};
for (my $i=$lastsel+1;$i<=$#curimport;$i++) {
my ($name,$url)=split(/\=/,$curimport[$i]);
@@ -789,12 +416,12 @@ sub smpedt {
$importdetail=~s/^\&//;
# ------------------------------------------------------------------- Clear all
- } elsif ($ENV{'form.clear'}) {
+ } elsif ($env{'form.clear'}) {
$importdetail='';
# ------------------------------------------------------------ Discard selected
- } elsif ($ENV{'form.discard'}) {
+ } elsif ($env{'form.discard'}) {
$importdetail='';
- my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+ my @curimport=split(/\&/,$env{'form.curimpdetail'});
foreach (@importselect) {
$curimport[$_]='';
}
@@ -805,9 +432,9 @@ sub smpedt {
}
}
# --------------------------------------------------------- Loading another map
- } elsif ($ENV{'form.loadmap'}) {
+ } elsif ($env{'form.loadmap'}) {
$importdetail='';
- my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+ my @curimport=split(/\&/,$env{'form.curimpdetail'});
my $lastsel;
@@ -825,11 +452,11 @@ sub smpedt {
}
foreach (
- &Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+ &Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
my ($name,$url)=split(/\:/,$_);
if ($url) {
- $importdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
+ $importdetail.='&'.&escape($name).'='.
+ &escape($url);
}
}
@@ -843,19 +470,19 @@ sub smpedt {
$importdetail=~s/^\&//;
# ------------------------------------------------ Groupimport/search to target
- } elsif ($ENV{'form.importdetail'}) {
+ } elsif ($env{'form.importdetail'}) {
my $lastsel;
if (defined($targetselect[-1])) {
$lastsel=$targetselect[-1];
} else {
- $lastsel=$#order+1;
+ $lastsel=$#LONCAPA::map::order+1;
}
- &pastetarget($lastsel,split(/\&/,$ENV{'form.importdetail'}));
- &storemap(&Apache::lonnet::filelocation('',$url));
+ &LONCAPA::map::pastetarget($lastsel,split(/\&/,$env{'form.importdetail'}));
+ &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));
# ------------------------------------------------------------------------- Cut
- } elsif (($ENV{'form.cut'}) || ($ENV{'form.copy'})) {
+ } elsif (($env{'form.cut'}) || ($env{'form.copy'})) {
$importdetail='';
- my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+ my @curimport=split(/\&/,$env{'form.curimpdetail'});
my $lastsel;
@@ -873,10 +500,10 @@ sub smpedt {
}
foreach (@targetselect) {
- my ($name,$url)=split(/\:/,$resources[$order[$_-1]]);
+ my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$LONCAPA::map::order[$_-1]]);
if ($url) {
- $importdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
+ $importdetail.='&'.&escape($name).'='.
+ &escape($url);
}
}
@@ -889,62 +516,66 @@ sub smpedt {
$importdetail=~s/\&+/\&/g;
$importdetail=~s/^\&//;
- if ($ENV{'form.cut'}) {
+ if ($env{'form.cut'}) {
my @neworder=();
- for (my $i=0;$i<=$#order;$i++) {
+ for (my $i=0;$i<=$#LONCAPA::map::order;$i++) {
my $include=1;
foreach (@targetselect) {
if ($_-1==$i) { $include=0; }
}
- if ($include) { $neworder[$#neworder+1]=$order[$i]; }
+ if ($include) {
+ $neworder[$#neworder+1]=$LONCAPA::map::order[$i];
+ } else {
+ &LONCAPA::map::makezombie($LONCAPA::map::order[$i]);
+ }
}
- @order=@neworder;
- &storemap(&Apache::lonnet::filelocation('',$url));
+ @LONCAPA::map::order=@neworder;
+ &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));
}
# ----------------------------------------------------------------------- Paste
- } elsif ($ENV{'form.paste'}) {
+ } elsif ($env{'form.paste'}) {
my $lastsel;
if (defined($targetselect[-1])) {
$lastsel=$targetselect[-1];
} else {
- $lastsel=$#order+1;
+ $lastsel=$#LONCAPA::map::order+1;
}
my @newsequence;
- my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+ my @curimport=split(/\&/,$env{'form.curimpdetail'});
foreach (@importselect) {
$newsequence[$#newsequence+1]=$curimport[$_];
}
- &pastetarget($lastsel,@newsequence);
- &storemap(&Apache::lonnet::filelocation('',$url));
+ &LONCAPA::map::pastetarget($lastsel,@newsequence);
+ &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));
# -------------------------------------------------------------------- Move up
- } elsif ($ENV{'form.moveup'}) {
+ } elsif ($env{'form.moveup'}) {
foreach (sort @targetselect) {
if ($_-1>0) {
- my $movethis=$order[$_-1];
- $order[$_-1]=$order[$_-2];
- $order[$_-2]=$movethis;
+ my $movethis=$LONCAPA::map::order[$_-1];
+ $LONCAPA::map::order[$_-1]=$LONCAPA::map::order[$_-2];
+ $LONCAPA::map::order[$_-2]=$movethis;
}
}
- &storemap(&Apache::lonnet::filelocation('',$url));
+ &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));
# ------------------------------------------------------------------ Move down
- } elsif ($ENV{'form.movedown'}) {
+ } elsif ($env{'form.movedown'}) {
foreach (reverse sort @targetselect) {
- if ($_-1<$#order) {
- my $movethis=$order[$_-1];
- $order[$_-1]=$order[$_];
- $order[$_]=$movethis;
+ if ($_-1<$#LONCAPA::map::order) {
+ my $movethis=$LONCAPA::map::order[$_-1];
+ $LONCAPA::map::order[$_-1]=$LONCAPA::map::order[$_];
+ $LONCAPA::map::order[$_]=$movethis;
}
}
- &storemap(&Apache::lonnet::filelocation('',$url));
+ &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));
# --------------------------------------------------------------------- Rename
- } elsif ($ENV{'form.renameres'}) {
- my $residx=$Apache::lonratedt::order[$ENV{'form.renameidx'}-1];
- my ($name,@resrest)=split(/\:/,$Apache::lonratedt::resources[$residx]);
- $name=$ENV{'form.renametitle'};
+ } elsif ($env{'form.renameres'}) {
+ my $residx=$LONCAPA::map::order[$env{'form.renameidx'}-1];
+ my ($name,@resrest)=split(/\:/,$LONCAPA::map::resources[$residx]);
+ $name=$env{'form.renametitle'};
$name=~s/\:/\&colon\;/g;
- $Apache::lonratedt::resources[$residx]=$name.':'.join(':',@resrest);
- &storemap(&Apache::lonnet::filelocation('',$url));
+ $LONCAPA::map::resources[$residx]=$name.':'.join(':',@resrest);
+ &LONCAPA::map::storemap(&Apache::lonnet::filelocation('',$url));
}
# ------------------------------------------------------------ Assemble windows
@@ -959,7 +590,7 @@ sub smpedt {
my ($name,$url)=split(/\=/,$_);
unless ($name) { $name=(split(/\//,$url))[-1]; }
unless ($name) { $name='EMPTY'; }
- '<option value="'.$idx.'">'.&Apache::lonnet::unescape($name).
+ '<option value="'.$idx.'">'.&unescape($name).
'</option>';
}
} split(/\&/,$importdetail));
@@ -969,26 +600,27 @@ sub smpedt {
my $targetwindow=
'<option value="0"> ------- '.&mt('Target Edit Map').' ------- </option>'.
join("\n",map {
- my ($name,$url)=split(/\:/,$resources[$_]);
+ my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$_]);
unless ($name) { $name=(split(/\//,$url))[-1]; }
unless ($name) { $name='EMPTY'; }
- $targetdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
+ $name = &LONCAPA::map::qtescape($name);
+ $url = &LONCAPA::map::qtescape($url);
+ $targetdetail.='&'.&escape($name).'='.
+ &escape($url);
$idx++;
- $name=~s/\:/\:/g;
+ $name = &HTML::Entities::encode($name,'\'"<>&');
'<option value="'.$idx.'">'.$name.'</option>';
- } @order);
+ } @LONCAPA::map::order);
# ----------------------------------------------------- Start simple RAT screen
my $editscript=&editscript('simple');
- my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
- ($ENV{'environment.remote'} ne 'off')).
- &Apache::loncommon::help_open_menu('','Sequence_Simple_Editor_Creation','Sequence_Simple_Editor_Creation','',6,'RAT');
+
my %lt=&Apache::lonlocal::texthash(
'sa' => 'Save',
'nt' => 'New Title',
'se' => 'Search',
'im' => 'Import',
+ 'bk' => 'Import Bookmarks',
'vi' => 'View',
'lm' => 'Load Map',
'ds' => 'Discard Selected',
@@ -1003,19 +635,16 @@ sub smpedt {
'cs' => 'Cut selected',
'ps' => 'Copy selected',
'pas' => 'Paste after selected',
+ 'reco' => 'Recover Deleted'
);
- $r->print(<<ENDSMPHEAD);
-<html>
-<head>
-<script>
+ my $js=<<ENDJS;
+<script type="text/javascript">
$editscript
function openview(entry) {
var url=unescape((entry.split('='))[1]);
var parts=new Array;
- parts=url.split(':');
- url=parts.join(':');
if (url) { open(url,'cat'); }
}
@@ -1034,12 +663,6 @@ sub smpedt {
var entry=(document.forms.simpleedit.targetdetail.value.split('&'))
[selidx];
var oldname=unescape((entry.split('='))[0]);
- var nameparts=oldname.split(':');
- oldname=unescape(nameparts.join(':'));
- nameparts=oldname.split('"');
- oldname=unescape(nameparts.join('"'));
- nameparts=oldname.split(''');
- oldname=unescape(nameparts.join("'"));
newtitle=prompt('$lt{'nt'}',oldname);
if (newtitle) {
document.forms.simpleedit.renameres.value=1;
@@ -1050,8 +673,16 @@ sub smpedt {
}
</script>
-</head>
-$bodytag
+ENDJS
+
+ my $start_page = &Apache::loncommon::start_page(undef,$js).
+ &Apache::loncommon::help_open_menu('Sequence_Simple_Editor_Creation',
+ 'Sequence_Simple_Editor_Creation',
+ 6,'RAT');
+ my $end_page = &Apache::loncommon::end_page();
+
+ $r->print(<<ENDSMPHEAD);
+$start_page
$buttons
<font color=red>$errtext</font>
<form name=simpleedit method=post>
@@ -1082,6 +713,10 @@ value="Select Map"><input type=submit na
"javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}">
<input type=button onClick=
"javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}">
+<input type=button onClick=
+"javascript:impfortarget.value=1;groupopen(0,1,1);" value="$lt{'bk'}">
+<input type=button onClick=
+"javascript:impfortarget.value=1;groupopen('$url',1,0);" value="$lt{'reco'}">
$lt{'as'}
<hr>
<input type=submit name="moveup" value="$lt{'mu'}">
@@ -1116,30 +751,28 @@ $targetwindow
<input type=hidden name=targetdetail value="$targetdetail">
<input type=hidden name=impfortarget value="0">
</form>
-</body></html>
+$end_page
ENDSMPHEAD
}
# ----------------------------------------------------------------- No such dir
sub nodir {
my ($r,$dir)=@_;
- $dir=~s/^\/home\/\w+\/public\_html//;
- $r->print(<<ENDNODIR);
-<html>
-<body bgcolor='#FFFFFF'>
-<h1>No such directory: $dir</h1>
-</body>
-</html>
-ENDNODIR
+ $dir=~s{^/home/$LONCAPA::username_re/public_html}{};
+ $r->print(&Apache::loncommon::start_page(undef,undef,
+ {'only_body' => 1,
+ 'bgcolor' => '#FFFFFF',}).
+ "<h1>No such directory: $dir</h1>".
+ &Apache::loncommon::end_page());
}
# ---------------------------------------------------------------- View Handler
sub viewmap {
my ($r,$url,$adv,$errtext)=@_;
- $r->print('<html>'.
- &Apache::loncommon::bodytag('Edit Content of a Map').
- &Apache::loncommon::help_open_menu('','','','',6,'RAT').
+ $r->print(
+ &Apache::loncommon::start_page('Edit Content of a Map').
+ &Apache::loncommon::help_open_menu('','',6,'RAT').
&buttons($adv));
if ($errtext) {
$r->print($errtext.'<hr />');
@@ -1157,16 +790,16 @@ sub viewmap {
'<th>'.&mt('Link to resource in Construction Space').'</th>'.
'</tr>');
my @backgroundColors = ("#FFFFFF", "#F6F6F6");
- foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
+ foreach (&LONCAPA::map::attemptread(&Apache::lonnet::filelocation('',$url))) {
if (defined($_)) {
$idx++;
my ($title,$url,$cond)=split(/\:/,$_);
if ($cond eq 'cond') { next; }
- $title=~s/\&colon\;/\:/g;
- $url=~s/\&colon\;/\:/g;
+ $title= &LONCAPA::map::qtescape($title);
+ $url = &LONCAPA::map::qtescape($url);
unless ($title) { $title=(split(/\//,$url))[-1] };
unless ($title) { $title='<i>'.&mt('Empty').'</i>'; }
- my $resurl = &Apache::lonratsrv::qtescape($url);
+ my $resurl = $url;
my $resfilepath = $Apache::lonnet::perlvar{'lonDocRoot'}.$resurl;
my $filename;
if ($resurl =~ m#/([^/]+)$#) {
@@ -1177,14 +810,10 @@ sub viewmap {
my $bgcol = $idx%2;
$r->print('<tr bgcolor='.$backgroundColors[$bgcol].'><td>'.
'<img src="'.&Apache::loncommon::icon($resfilepath).
- '" /></td><td>'.&Apache::lonratsrv::qtescape($title).
+ '" /></td><td>'.&HTML::Entities::encode(&LONCAPA::map::qtescape($title)).
'</td><td>'.$filename.'</td><td>');
if ($url) {
- if (-e $resfilepath) {
- $r->print('<a href="'.$resurl.'">'.&mt('Resource space').'</a>');
- } else {
- $r->print(&mt('unpublished'));
- }
+ $r->print('<a href="'.$resurl.'">'.&mt('Resource space').'</a>');
}
$r->print('</td><td>');
if ($url) {
@@ -1195,7 +824,7 @@ sub viewmap {
}
}
$r->print('</table>');
- $r->print('</body></html>');
+ $r->print(&Apache::loncommon::end_page());
}
# ================================================================ Main Handler
@@ -1206,7 +835,7 @@ sub handler {
$r->send_http_header;
return OK if $r->header_only;
- my $target = $ENV{'form.grade_target'};
+ my $target = $env{'form.grade_target'};
if ($target eq 'meta') {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -1225,8 +854,8 @@ sub handler {
# ------------------------------------------- Determine which tools can be used
my $adv=0;
- unless ($ENV{'form.forcesmp'}) {
- if ($ENV{'form.forceadv'}) {
+ unless ($env{'form.forcesmp'}) {
+ if ($env{'form.forceadv'}) {
$adv=1;
} elsif (my $fh=Apache::File->new($fn)) {
my $allmap=join('',<$fh>);
@@ -1238,15 +867,15 @@ sub handler {
my $fatal=0;
# -------------------------------------------------------------------- Load map
- ($errtext,$fatal)=&mapread($fn,$errtext);
+ ($errtext,$fatal)=&LONCAPA::map::mapread($fn,$errtext);
if ($fatal==1) { $adv=1; }
# ----------------------------------- adv==1 now means "graphical MUST be used"
- if ($ENV{'form.forceadv'}) {
+ if ($env{'form.forceadv'}) {
&ratedt($r,$url);
- } elsif ($ENV{'form.forcesmp'}) {
+ } elsif ($env{'form.forcesmp'}) {
&smpedt($r,$url,$errtext);
} else {
&viewmap($r,$url,$adv,$errtext);