--- loncom/interface/groupsort.pm	2001/08/08 03:00:54	1.1
+++ loncom/interface/groupsort.pm	2006/07/21 00:21:28	1.45
@@ -1,11 +1,32 @@
 # The LearningOnline Network with CAPA
-#
 # The LON-CAPA group sort handler
-#
 # Allows for sorting prior to import into RAT.
 #
-# YEAR=2001
-# 8/7 Scott Harrison
+# $Id: groupsort.pm,v 1.45 2006/07/21 00:21:28 www Exp $
+# 
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+###
 
 package Apache::groupsort;
 
@@ -13,58 +34,271 @@ use strict;
 
 use Apache::Constants qw(:common);
 use GDBM_File;
+use Apache::loncommon;
+use Apache::lonlocal;
+use Apache::lonnet;
+
+my $iconpath; # variable to be accessible to multiple subroutines
+my %hash; # variable to tie to user specific database
+
+
+sub readfromdb {
+    my ($r,$shash,$thash)=@_;
+
+    my $diropendb = 
+       "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
+
+# ----------------------------- diropendb is now the filename of the db to open
+    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
+	my $acts = $env{'form.acts'};
+	my @Acts = split(/b/,$acts);
+	my %ahash;
+	my %achash;
+	my $ac = 0;
+	foreach (@Acts) {
+	    my ($state,$ref) = split(/a/);
+	    $ahash{$ref} = $state;
+	    $achash{$ref} = $ac;
+	    $ac++;
+	}
+	foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {
+	    my $key = $_;
+	    if ($ahash{$key} eq '1') {
+		$hash{'store_'.$hash{'pre_'.$key.'_link'}} =
+		    $hash{'pre_'.$key.'_title'};
+		$hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =
+		    $hash{'storectr'}+0;
+		$hash{'storectr'}++;
+	    }
+	    if ($ahash{$key} eq '0') {
+		if ($hash{'store_'.$hash{'pre_'.$key.'_link'}}) {
+		    delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};
+		}
+	    }
+	}
+	foreach (keys %hash) {
+	    if ($_ =~ /^store_/) {
+		my $key = $_;
+		$key =~ s/^store_//;
+		$$shash{$key} = $hash{'storectr_'.$key};
+		if (&Apache::lonnet::gettitle($key) eq '') {
+		    $$thash{$key} = $hash{'store_'.$key};
+		} else {
+		    $$thash{$key} = &Apache::lonnet::gettitle($key);
+		}
+	    }
+	}
+	if ($env{'form.oldval'}) {
+	    my $newctr = 0;
+	    my %chash;
+	    foreach (sort {$$shash{$a} <=> $$shash{$b}} (keys %{$shash})) {
+		my $key = $_;
+		$newctr++;
+		$$shash{$key} = $newctr;
+		$hash{'storectr_'.$key} = $newctr;
+		$chash{$newctr} = $key;
+	    }
+	    my $oldval = $env{'form.oldval'};
+	    my $newval = $env{'form.newval'};
+	    if ($oldval != $newval) {
+		# when newval==0, then push down and delete
+		if ($newval!=0) {
+		    $$shash{$chash{$oldval}} = $newval;
+		    $hash{'storectr_'.$chash{$oldval}} = $newval;
+		} else {
+		    $$shash{$chash{$oldval}} = $newctr;
+		    $hash{'storectr_'.$chash{$oldval}} = $newctr;
+		}
+		if ($newval==0) { # push down
+		    my $newval2=$newctr;
+		    for my $idx ($oldval..($newval2-1)) {
+			$$shash{$chash{$idx+1}} = $idx;
+			$hash{'storectr_'.$chash{$idx+1}} = $idx;
+		    }
+		    delete $$shash{$chash{$oldval}};
+		    delete $hash{'storectr_'.$chash{$oldval}};
+		    delete $hash{'store_'.$chash{$oldval}};
+		} elsif ($oldval < $newval) { # push down
+		    for my $idx ($oldval..($newval-1)) {
+			$$shash{$chash{$idx+1}} = $idx;
+			$hash{'storectr_'.$chash{$idx+1}} = $idx;
+		    }
+		} elsif ($oldval > $newval) { # push up
+		    for my $idx (reverse($newval..($oldval-1))) {
+			$$shash{$chash{$idx}} = $idx+1;
+			$hash{'storectr_'.$chash{$idx}} = $idx+1;
+		    }
+		}
+	    }
+	}
+    } else {
+	$r->print('Unable to tie hash to db file');
+    }
+    untie %hash;
+    return ($shash,$thash);
+}
+
+
+
+sub cleanup {
+    if (tied(%hash)){
+	&Apache::lonnet::logthis('Cleanup groupsort: hash');
+        unless (untie(%hash)) {
+	    &Apache::lonnet::logthis('Failed cleanup groupsort: hash');
+        }
+    }
+    return OK;
+}
+
+# -------------------------------------------------------------- Read from file
+
+sub readfromfile {
+    my ($r,$shash,$thash,$nhash)=@_;
+    my $cont=&Apache::lonnet::getfile
+	(&Apache::lonnet::filelocation('',$env{'form.readfile'}));
+    if ($cont==-1) {
+	$r->print('Unable to read file: '.
+		  &Apache::lonnet::filelocation('',$env{'form.readfile'}));
+    } else {
+        my $parser = HTML::TokeParser->new(\$cont);
+        my $token;
+	my $n=1;
+        while ($token = $parser->get_token) {
+	    if ($token->[0] eq 'S') {
+                if ($token->[1] eq 'resource') {
+		    if ($env{'form.recover'}) {
+			if ($token->[2]->{'type'} ne 'zombie') { next; }
+		    } else {
+			if ($token->[2]->{'type'} eq 'zombie') { next; }
+		    }
 
-my %hash;
-my $iconpath;
+		    my $url=$token->[2]->{'src'};
+                    my $name=$token->[2]->{'title'};
+		    $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;
+		    if ($1) {
+			$$nhash{$url}='<br />'.&mt('Removed by ').
+			    &Apache::loncommon::plainname($2,$3).', '.
+			    &Apache::lonlocal::locallocaltime($1);
+		    }
+		    $name=~s/\&colon\;/\:/g;
+		    $$thash{$url}=$name;
+                    $$shash{$url}=$n;
+                    $n++;
+		}
+	    }
+	}
+    }
+    return ($shash,$thash);
+}
+
+# --------------------------------------------------------- Read from bookmarks
+
+sub readfrombookmarks {
+    my ($r,$shash,$thash)=@_;
+    my %bookmarks=&Apache::lonnet::dump('bookmarks');
+# the bookmark "hash" is just one entry
+# it's a javascript program code with arguments like ('title','url');
+    my @bookmarks=($bookmarks{'bookmarks'}=~/\((?:\'([^\']+)\'\,\'([^\']+)\'|\"([^\"]+)\"\,\"([^\"]+)\")\)\;/g);
+    my $order=1;
+    for (my $index=0;$index<($#bookmarks+1)/2;$index++) {
+        if ($bookmarks[$index*2+1]) {
+	    $$thash{$bookmarks[$index*2+1]}=$bookmarks[$index*2];
+	    $$thash{$bookmarks[$index*2+1]}=~s/^LON\-CAPA\s+//;
+	    $$shash{$bookmarks[$index*2+1]}=$order;
+	    $order++;
+	}
+    }
+    return ($shash,$thash);
+}
+
+# ---------------------------------------------------------- Clear the database
+
+sub clear_basket {
+    my $diropendb =
+       "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
+    unlink ($diropendb);
+}                                                                                                         
+
+# ---------------------------------------------------------------- Main Handler
 sub handler {
     my $r = shift;
-    my $fileclr='#ffffe6';
-    my $titleclr='#ddffff';
-    $r->content_type('text/html');
+ 
+   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+			     ['acts','mode','readfile','recover','bookmarks']);
+    # color scheme
+    my $fileclr = '#ffffe6';
+    my $titleclr = '#ddffff';
+
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-    $r->print(<<END);
-<html>
-<head>
-<title>The LearningOnline Network With CAPA Group Sorter</title>
-<script language='javascript'>
-function insertRowInLastRow() {
-    opener.insertrow(opener.maxrow);
-    opener.addobj(opener.maxrow,'e&2');
-}
-function placeResourceInLastRow (title,url,linkflag) {
-    opener.newresource(opener.maxrow,2,opener.escape(title),opener.escape(url),'false','normal');
-    opener.save();
-    opener.mostrecent=opener.obj.length-1;
-    if (linkflag) {
-	opener.joinres(opener.linkmode,opener.mostrecent,0);
+
+# finish_import looks different for graphical or "simple" RAT
+    my $finishimport='';
+    my $begincondition='';
+    my $endcondition='';
+    if (($env{'form.readfile'}) || ($env{'form.bookmarks'}))  {
+        $begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {';
+	$endcondition='}';
     }
-    opener.linkmode=opener.mostrecent;
+    if ($env{'form.mode'} eq 'simple' || $env{'form.mode'} eq '') {
+        $finishimport=(<<ENDSMP);
+function finish_import() {
+    opener.document.forms.simpleedit.importdetail.value='';
+    for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
+	$begincondition
+	opener.document.forms.simpleedit.importdetail.value+='&'+
+              escape(eval("document.forms.groupsort.title"+num+".value"))+'='+
+	      escape(eval("document.forms.groupsort.filelink"+num+".value"));
+	$endcondition
+    }
+    opener.document.forms.simpleedit.submit();
+    self.close();
 }
+ENDSMP
+    } else {
+        $finishimport=(<<ENDADV);
 function finish_import() {
     var linkflag=false;
     for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
-//	if (eval("document.forms.groupsort.filelink"+num+".value")) {
-//	    alert(eval("document.forms.groupsort.title"+num+".value")+
-//		       eval("document.forms.groupsort.filelink"+num+".value"));
-	    insertRowInLastRow();
-	    placeResourceInLastRow(
-		   eval("document.forms.groupsort.title"+num+".value"),
-		   eval("document.forms.groupsort.filelink"+num+".value"),
-				   linkflag
-				   );
-            linkflag=true;
-//	}
+	$begincondition
+	insertRowInLastRow();
+	placeResourceInLastRow(
+	       eval("document.forms.groupsort.title"+num+".value"),
+ 	       eval("document.forms.groupsort.filelink"+num+".value"),
+	       linkflag
+	);
+        linkflag=true;
+	$endcondition
     }
     opener.editmode=0;
     opener.notclear=0;
     opener.linkmode=0;
-    opener.infoclear();
     opener.draw();
-//    self.close();
+    self.close();
 }
+ENDADV
+    }
+
+# output start of web page
+    my $js = <<END;
+<script type="text/javascript">
+function insertRowInLastRow() {
+    opener.insertrow(opener.maxrow);
+    opener.addobj(opener.maxrow,'e&2');
+}
+function placeResourceInLastRow (title,url,linkflag) {
+    opener.mostrecent=opener.newresource(opener.maxrow,2,opener.escape(title),
+		       opener.escape(url),'false','normal');
+    opener.save();
+    if (linkflag) {
+	opener.joinres(opener.linkmode,opener.mostrecent,0);
+    }
+    opener.linkmode=opener.mostrecent;
+}
+$finishimport
 function selectchange(val) {
-    var newval=1+eval("document.forms.groupsort.alt"+val+".selectedIndex");
+    var newval=0+eval("document.forms.groupsort.alt"+val+".selectedIndex");
     orderchange(val,newval);
 }
 function move(val,newval) {
@@ -76,187 +310,186 @@ function orderchange(val,newval) {
     document.forms.groupsort.submit();
 }
 </script>
-</head>
-<body bgcolor="#FFFFFF">
 END
+    # read pertinent machine configuration
     my $domain  = $r->dir_config('lonDefDomain');
-    $iconpath= $r->dir_config('lonIconsURL') . "/";
-    my $diropendb = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
-    my %shash;
-    my %thash;
-    map {
-       my ($name, $value) = split(/=/,$_);
-       $value =~ tr/+/ /;
-       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-       if ($name eq 'acts') {
-           $ENV{'form.'.$name}=$value;
-       }
-    } (split(/&/,$ENV{'QUERY_STRING'}));
-    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
-	my $acts=$ENV{'form.acts'};
-	my @Acts=split(/b/,$acts);
-	my %ahash;
-	my %achash;
-	my $ac=0;
-	map {
-	    my ($state,$ref)=split(/a/);
-	    $ahash{$ref}=$state;
-	    $achash{$ref}=$ac;
-	    $ac++;
-	} (@Acts);
-	map {
-	    my $key=$_;
-	    if ($ahash{$key} eq '1') {
-#		    $r->print("<b>NEW: ");
-#		    $r->print($hash{'pre_'.$key.'_title'});
-#		    $r->print(" : ");
-#		    $r->print($hash{'pre_'.$key.'_link'});
-#		    $r->print("</b><br />");
-		$hash{'store_'.$hash{'pre_'.$key.'_link'}}=
-		    $hash{'pre_'.$key.'_title'};
-		$hash{'storectr_'.$hash{'pre_'.$key.'_link'}}=
-		    $hash{'storectr'}+0;
-		$hash{'storectr'}++;
-	    }
-	    if ($ahash{$key} eq '0') {
-		if ($hash{'store_'.$hash{'pre_'.$key.'_link'}}) {
-		    delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};
-		}
-	    }
-	} sort {$achash{$a}<=>$achash{$b}} (keys %ahash);
-	map {
-	    if ($_ =~ /^store_/) {
-		my $key=$_;
-		$key=~s/^store_//;
-#		$r->print("<b>STORE: ");
-#		$r->print($hash{'storectr_'.$key});
-#		$r->print(':');
-#		$r->print($hash{'store_'.$key});
-#		$r->print(':');
-#		$r->print($key);
-		$shash{$key}=$hash{'storectr_'.$key};
-		$thash{$key}=$hash{'store_'.$key};
-#		$r->print("</b><br />");
-	    }
-	} keys %hash;	
-	if ($ENV{'form.oldval'}) {
-#	    $r->print('TEST TEST');
-	    my $newctr=0;
-	    my %chash;
-	    map {
-		my $key=$_;
-		$newctr++;
-		$shash{$key}=$newctr;
-		$hash{'storectr_'.$key}=$newctr;
-		$chash{$newctr}=$key;
-	    } sort {$shash{$a}<=>$shash{$b}} (keys %shash);
-	    my $oldval=$ENV{'form.oldval'};
-	    my $newval=$ENV{'form.newval'};
-	    if ($oldval!=$newval) {
-		$shash{$chash{$oldval}}=$newval;
-		$hash{'storectr_'.$chash{$oldval}}=$newval;
-		if ($oldval<$newval) { # push down
-		    for my $idx ($oldval..($newval-1)) {
-			$shash{$chash{$idx+1}}=$idx;
-			$hash{'storectr_'.$chash{$idx+1}}=$idx;
-		    }
-		}
-		elsif ($oldval>$newval) { # push up
-		    for my $idx (reverse($newval..($oldval-1))) {
-			$shash{$chash{$idx}}=$idx+1;
-			$hash{'storectr_'.$chash{$idx}}=$idx+1;
-		    }
-		}
-	    }
-	}
+    $iconpath = $r->dir_config('lonIconsURL') . "/";
+
+    my %shash; # sort order (key is resource location, value is sort order)
+    my %thash; # title (key is resource location, value is title)
+    my %nhash; # notes (key is resource location);
+
+    if ($env{'form.readfile'}) {
+	&readfromfile($r,\%shash,\%thash,\%nhash);
+    } elsif ($env{'form.bookmarks'}) {
+	&readfrombookmarks($r,\%shash,\%thash);
     } else {
-	$r->print('<html><head></head><body>Unable to tie hash to db file</body></html>');
-	return OK;
+	&readfromdb($r,\%shash,\%thash);
     }
-    untie %hash;
-#    $r->print($ENV{'form.acts'});
-    my $ctr=0;
-    my $clen=scalar(keys %shash);
-    $r->print('<h2><font color="#888888">The LearningOnline With CAPA Group Sorter</font></h2>'."\n");
-    $r->print('<b><font color="#888888">Finalize order of resources</font></b>'."\n");
-    $r->print("<form method='post' action='/adm/groupsort' name='groupsort' enctype='application/x-www-form-urlencoded'>");
-    $r->print(<<END);
+
+    my $ctr = 0;
+    my $clen = scalar(keys %shash);
+    if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+	my %lt=&Apache::lonlocal::texthash(
+		'fin'=> 'Finalize order of resources',
+		'ci' => 'Continue Import',
+		'cs' => 'Continue Search',
+		'fi' => 'Finish Import',
+		'ca' => 'Cancel',
+		'co' => 'Change Order',
+		'ti' => 'Title',
+		'pa' => 'Path',
+                'in' => 'Include'
+		);
+	$r->print(&Apache::loncommon::start_page('Sort Imported Resources',
+						 $js));
+	$r->print(<<END);
+<b><font color="#888888">$lt{'fin'}</font></b>
+<form method='post' action='/adm/groupsort' name='groupsort'
+      enctype='application/x-www-form-urlencoded'>
 <input type="hidden" name="fnum" value="$clen" />
 <input type="hidden" name="oldval" value="" />
 <input type="hidden" name="newval" value="" />
-<input type="button" name="alter" value="GO BACK" onClick="window.location='/res/?catalogmode=groupimport'" />&nbsp;
-<input type="button" name="alter" value="FINISH IMPORT" onClick="finish_import()" />&nbsp;
-<input type="button" name="alter" value="CANCEL" onClick="self.close()" />
+<input type="hidden" name="mode" value="$env{'form.mode'}" />
+<input type="hidden" name="readfile" value="$env{'form.readfile'}" />
+<input type="hidden" name="bookmarks" value="$env{'form.bookmarks'}" />
+<input type="hidden" name="recover" value="$env{'form.recover'}" />
+END
+
+        # --- Continue Buttons
+        my $resurl = &Apache::loncommon::lastresurl();
+        $r->print(<<END);
+<input type="button" name="alter" value="$lt{'ci'}"
+ onClick="window.location='$resurl?catalogmode=import'" />&nbsp;
+<input type="button" name="altersearch" value="$lt{'cs'}"
+ onClick="window.location='/adm/searchcat?catalogmode=import'" />&nbsp;
 END
-    $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
-    $r->print("<table border=0><tr>\n");
-    $r->print("<td colspan='2' bgcolor='$titleclr'><b>Change order</b></td>\n");
-    $r->print("<td colspan='2' bgcolor='$titleclr'><b>Title</b></td>\n");
-    $r->print("<td bgcolor='$titleclr'><b>Path</b></td></tr>\n");
-    map {
+        # ---
+
+	$r->print(<<END);
+<input type="button" name="alter" value="$lt{'fi'}"
+ onClick="finish_import()" />&nbsp;
+<input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
+END
+        $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
+	$r->print("<table border=0><tr>\n");
+	if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { 
+	    $r->print("<td bgcolor='$titleclr'><b>$lt{'in'}</b></td>\n");
+	} else { 
+	    $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'co'}</b></td>\n"); 
+	}
+	$r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'ti'}</b></td>\n");
+	$r->print("<td bgcolor='$titleclr'><b>$lt{'pa'}</b></td></tr>\n");
+    } else {
+	$r->print(&Apache::loncommon::start_page(undef,$js,
+						 {'only_body' => 1}));
+	$r->print(<<END);
+<form method='post' action='/adm/groupsort' name='groupsort'
+      enctype='application/x-www-form-urlencoded'>
+<input type="hidden" name="fnum" value="$clen" />
+<input type="hidden" name="oldval" value="" />
+<input type="hidden" name="newval" value="" />
+<input type="hidden" name="mode" value="$env{'form.mode'}" />
+END
+    }
+    foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {
 	my $key=$_;
 	$ctr++;
-	my @file_ext = split(/\./,$key);
-	my $curfext = $file_ext[scalar(@file_ext)-1];
-	$r->print("<tr><td bgcolor='$fileclr'>");
-	$r->print(&movers($clen,$ctr));
+	my $iconname=&Apache::loncommon::icon($key);
+	if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+	    $r->print("<tr><td bgcolor='$fileclr'>");
+            if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+		$r->print(&checkbox($ctr-1));
+	    } else {
+		$r->print(&movers($clen,$ctr));
+	    }
+	}
 	$r->print(&hidden($ctr-1,$thash{$key},$key));
-	$r->print("</td><td bgcolor='$fileclr'>");
-	$r->print(&select_box($clen,$ctr));
-	$r->print("</td><td bgcolor='$fileclr'>");
-	$r->print("<img src='$iconpath$curfext.gif'>");
-	$r->print("</td><td bgcolor='$fileclr'>");
-	$r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
-	$r->print("$key</td></tr>\n");
-    } sort {$shash{$a}<=>$shash{$b}} (keys %shash);
-    $r->print("</table></td></tr></table></form>");
-    $r->print(<<END);
-</body>
-</html>
+	if (($clen > 1)  || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+	    $r->print("</td>");
+            unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+		$r->print("<td bgcolor='$fileclr'>".
+			  &select_box($clen,$ctr).
+			  "</td>");
+	    }
+	    $r->print("<td bgcolor='$fileclr'>");
+	    $r->print("<img src='$iconname' />");
+	    $r->print("</td><td bgcolor='$fileclr'>");
+	    $r->print("$thash{$key}$nhash{$key}</td><td bgcolor='$fileclr'>\n");
+	    $r->print("$key</td></tr>\n");
+	} 
+    }
+    if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+	$r->print("</table></td></tr></table></form>");
+    } else {
+	$r->print(<<END);
+<script type="text/javascript">
+    finish_import();
+</script>
 END
+    }
+
+    $r->print(&Apache::loncommon::end_page());
+
     return OK;
 }
 
+# --------------------------------------- Hidden values (returns scalar string)
 sub hidden {
-    my ($sel,$title,$filelink)=@_;
-    my $string='<input type="hidden" name="title'.$sel.'" value="'.$title.'" />';
-    $string.='<input type="hidden" name="filelink'.$sel.'" value="'.$filelink.'" />';
+    my ($sel,$title,$filelink) = @_;
+    my $string = '<input type="hidden" name="title'.$sel.'" value="'.$title.
+	'" />';
+    $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.
+	$filelink.'" />';
     return $string;
 }
 
+# --------------------------------------- Moving arrows (returns scalar string)
 sub movers {
-    my ($total,$sel)=@_;
-    my $dsel=$sel-1;
-    my $usel=$sel+1;
-    $usel=1 if $usel>$total;
-    $dsel=$total if $dsel<1;
+    my ($total,$sel) = @_;
+    my $dsel = $sel-1;
+    my $usel = $sel+1;
+    $usel = 1 if $usel > $total;
+    $dsel = $total if $dsel < 1;
     my $string;
-    $string=<<END;
+    $string = (<<END);
 <table border='0' cellspacing='0' cellpadding='0'>
-<tr><td><a href='javascript:move($sel,$dsel)'><img src="${iconpath}move_up.gif" alt='UP' border='0' /></a></td></tr>
-<tr><td><a href='javascript:move($sel,$usel)'><img src="${iconpath}move_down.gif" alt='DOWN' border='0' /></a></td></tr>
+<tr><td><a href='javascript:move($sel,$dsel)'>
+<img src="${iconpath}move_up.gif" alt='UP' border='0' /></a></td></tr>
+<tr><td><a href='javascript:move($sel,$usel)'>
+<img src="${iconpath}move_down.gif" alt='DOWN' border='0' /></a></td></tr>
 </table>
 END
     return $string;
 }
-1;
+
+# ------------------------------------------ Select box (returns scalar string)
 sub select_box {
-    my ($total,$sel)=@_;
+    my ($total,$sel) = @_;
     my $string;
-    $string='<select name="alt'.$sel.'"';
-    $string.=" onChange='selectchange($sel)'>";
+    $string = '<select name="alt'.$sel.'"';
+    $string .= " onChange='selectchange($sel)'>";
+    $string .= "<option name='o0' value='0'>".&mt('discard')."</option>";
     for my $cur (1..$total) {
-	$string.="<option name='o$cur' value='$cur'";
-	if ($cur==$sel) {
-	    $string.="selected";
+	$string .= "<option name='o$cur' value='$cur'";
+	if ($cur == $sel) {
+	    $string .= "selected";
 	}
-	$string.=">$cur</option>";
+	$string .= ">$cur</option>";
     }
-    $string.="</select>\n";
+    $string .= "</select>\n";
     return $string;
 }
 
+# ------------------------------------------------------------------- Checkbox
+
+sub checkbox {
+    my $sel=shift;
+    return "<label><input type='checkbox' name='include$sel'".
+       ($env{"form.include$sel"}?' checked="checked"':'').
+       ' />'.&mt('Include').'</label>';
+}
+
 1;
 
 __END__
-