--- loncom/interface/groupsort.pm	2007/07/12 01:04:36	1.58
+++ loncom/interface/groupsort.pm	2008/09/15 13:22:48	1.62
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.58 2007/07/12 01:04:36 albertel Exp $
+# $Id: groupsort.pm,v 1.62 2008/09/15 13:22:48 bisitz Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,7 @@ use GDBM_File;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
-use LONCAPA();
+use LONCAPA;
 
 my $iconpath; # variable to be accessible to multiple subroutines
 my %hash; # variable to tie to user specific database
@@ -45,14 +45,15 @@ my %hash; # variable to tie to user spec
 
 sub update_actions_hash {
     my ($hash) = @_;
+    # be careful in here, there is also a global %hash
     my $acts=$env{'form.acts'};
     my @Acts=split(/b/,$acts);
     my %ahash;
     my %achash;
-    my $ac=0;
     # some initial hashes for working with data
+    my $ac=0;
     foreach (@Acts) {
-	my ($state,$ref)=split(/a/);
+ 	my ($state,$ref)=split(/a/);
 	$ahash{$ref}=$state;
 	$achash{$ref}=$ac;
 	$ac++;
@@ -60,15 +61,16 @@ sub update_actions_hash {
     # sorting through the actions and changing the global database hash
     foreach my $key (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {
 	if ($ahash{$key} eq '1') {
-	    $hash->{'store_'.$hash{'pre_'.$key.'_link'}}=
+	    $hash->{'store_'.$hash->{'pre_'.$key.'_link'}}=
 		$hash->{'pre_'.$key.'_title'};
-	    $hash->{'storectr_'.$hash{'pre_'.$key.'_link'}}=
+	    $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'}});
+	    if ($hash->{'store_'.$hash->{'pre_'.$key.'_link'}}) {
+		delete($hash->{'store_'.$hash->{'pre_'.$key.'_link'}});
+		delete($hash->{'storectr_'.$hash->{'pre_'.$key.'_link'}});
 	    }
 	}
     }
@@ -204,9 +206,6 @@ sub handler {
  
    &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;
@@ -227,9 +226,9 @@ function finish_import() {
     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"))+'='+
-	      escape(eval("document.forms.groupsort.id"+num+".value"));
+              eval("document.forms.groupsort.title"+num+".value")+'='+
+	      eval("document.forms.groupsort.filelink"+num+".value")+'='+
+	      eval("document.forms.groupsort.id"+num+".value");
 	$endcondition
     }
     opener.document.forms.simpleedit.submit();
@@ -246,6 +245,7 @@ function finish_import() {
 	placeResourceInLastRow(
 	       eval("document.forms.groupsort.title"+num+".value"),
  	       eval("document.forms.groupsort.filelink"+num+".value"),
+ 	       eval("document.forms.groupsort.id"+num+".value"),
 	       linkflag
 	);
         linkflag=true;
@@ -267,9 +267,9 @@ function insertRowInLastRow() {
     opener.insertrow(opener.maxrow);
     opener.addobj(opener.maxrow,'e&2');
 }
-function placeResourceInLastRow (title,url,linkflag) {
+function placeResourceInLastRow (title,url,id,linkflag) {
     opener.mostrecent=opener.newresource(opener.maxrow,2,opener.escape(title),
-		       opener.escape(url),'false','normal');
+		       opener.escape(url),'false','normal',id);
     opener.save();
     if (linkflag) {
 	opener.joinres(opener.linkmode,opener.mostrecent,0);
@@ -350,7 +350,8 @@ END
 	    my $resurl = 
 		&Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
 	    $r->print(<<END);
-<b><font color="#888888">$lt{'fin'}</font></b>
+<h2>$lt{'fin'}</h2>
+<div>
 <input type="button" name="alter" value="$lt{'ci'}"
  onClick="window.location='$resurl?inhibitmenu=yes&amp;catalogmode=import'" />&nbsp;
 <input type="button" name="altersearch" value="$lt{'cs'}"
@@ -358,17 +359,21 @@ END
 <input type="button" name="alter" value="$lt{'fi'}"
  onClick="finish_import()" />&nbsp;
 <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
+</div>
+<br />
 END
         }
-        $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
-	$r->print("<table border=0><tr>\n");
+        $r->print(&Apache::loncommon::start_data_table()
+                 .&Apache::loncommon::start_data_table_header_row());
 	if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { 
-	    $r->print("<td bgcolor='$titleclr'><b>$lt{'in'}</b></td>\n");
+	    $r->print("<th>$lt{'in'}</th>\n");
 	} else { 
-	    $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'co'}</b></td>\n"); 
+	    $r->print("<th colspan='2'>$lt{'co'}</th>\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");
+	$r->print("<th colspan='2'>$lt{'ti'}</th>\n");
+	$r->print("<th>$lt{'pa'}</th>");
+        $r->print(&Apache::loncommon::end_data_table_header_row()
+                 ."\n");
     } else {
 	$r->print(&Apache::loncommon::start_page(undef,$js,
 						 {'only_body' => 1}));
@@ -387,7 +392,8 @@ END
 	$ctr++;
 	my $iconname=&Apache::loncommon::icon($resource->{'url'});
 	if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
-	    $r->print("<tr><td bgcolor='$fileclr'>");
+	    $r->print(&Apache::loncommon::start_data_table_row()
+                     ."<td>");
             if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 		$r->print(&checkbox($ctr-1));
 	    } else {
@@ -399,19 +405,22 @@ END
 	if (($clen > 1)  || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 	    $r->print("</td>");
             unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
-		$r->print("<td bgcolor='$fileclr'>".
+		$r->print("<td>".
 			  &select_box($clen,$ctr).
 			  "</td>");
 	    }
-	    $r->print("<td bgcolor='$fileclr'>");
+	    $r->print("<td>");
 	    $r->print("<img src='$iconname' />");
-	    $r->print("</td><td bgcolor='$fileclr'>");
-	    $r->print($resource->{'title'}.$resource->{'notes'}."</td><td bgcolor='$fileclr'>\n");
-	    $r->print($resource->{'url'}."</td></tr>\n");
+	    $r->print("</td><td>");
+	    $r->print($resource->{'title'}.$resource->{'notes'}."</td><td>\n");
+	    $r->print($resource->{'url'}."</td>"
+                     .&Apache::loncommon::end_data_table_row()
+                     ."\n");
 	} 
     }
     if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
-	$r->print("</table></td></tr></table></form>");
+        $r->print(&Apache::loncommon::end_data_table()
+                 ."</form>");
     } else {
 	$r->print(<<END);
 <script type="text/javascript">
@@ -428,12 +437,12 @@ END
 # --------------------------------------- Hidden values (returns scalar string)
 sub hidden {
     my ($sel,$title,$filelink,$id) = @_;
-    my $string = '<input type="hidden" name="title'.$sel.'" value="'.$title.
-	'" />';
+    my $string = '<input type="hidden" name="title'.$sel.'" value="'.
+	&escape($title).'" />';
     $filelink=~s|^/ext/|http://|;
     $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.
-	$filelink.'" />';
-    $string .= '<input type="hidden" name="id'.$sel.'" value="'.$id.'" />';
+	&escape($filelink).'" />';
+    $string .= '<input type="hidden" name="id'.$sel.'" value="'.&escape($id).'" />';
     return $string;
 }