--- loncom/interface/groupsort.pm	2006/07/31 18:39:15	1.48
+++ loncom/interface/groupsort.pm	2007/07/11 20:32:15	1.54
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.48 2006/07/31 18:39:15 albertel Exp $
+# $Id: groupsort.pm,v 1.54 2007/07/11 20:32:15 albertel Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use GDBM_File;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
+use LONCAPA();
 
 my $iconpath; # variable to be accessible to multiple subroutines
 my %hash; # variable to tie to user specific database
@@ -64,6 +65,9 @@ sub readfromdb {
 	foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {
 	    my $key = $_;
 	    if ($ahash{$key} eq '1') {
+	        if ($hash{'pre_'.$key.'_title'} eq 'Not_retrieved') {
+	            $hash{'pre_'.$key.'_title'} = &Apache::lonnet::gettitle($hash{'pre_'.$key.'_link'});
+	        }
 		$hash{'store_'.$hash{'pre_'.$key.'_link'}} =
 		    $hash{'pre_'.$key.'_title'};
 		$hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =
@@ -174,7 +178,7 @@ sub readfromfile {
 
 		    my $url=$token->[2]->{'src'};
                     my $name=$token->[2]->{'title'};
-		    $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;
+		    $name=~s/ \[\((\d+)\,($LONCAPA::username_re)\,($LONCAPA::domain_re)\)\]$//;
 		    if ($1) {
 			$$nhash{$url}='<br />'.&mt('Removed by ').
 			    &Apache::loncommon::plainname($2,$3).', '.
@@ -327,6 +331,7 @@ END
 		'ci' => 'Continue Import',
 		'cs' => 'Continue Search',
 		'fi' => 'Finish Import',
+		're' => 'Recover Checked',
 		'ca' => 'Cancel',
 		'co' => 'Change Order',
 		'ti' => 'Title',
@@ -348,21 +353,29 @@ END
 <input type="hidden" name="recover" value="$env{'form.recover'}" />
 END
 
+        $r->print(&Apache::loncommon::inhibit_menu_check('input'));
+        # ---
+    
+        if ($env{'form.recover'}) {
+	    $r->print(<<END);
+<input type="button" name="alter" value="$lt{'re'}"
+ onClick="finish_import()" />&nbsp;
+<input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
+END
+	} else {
         # --- Continue Buttons
-        my $resurl = &Apache::loncommon::lastresurl();
-        $r->print(<<END);
+	    my $resurl = 
+		&Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
+	    $r->print(<<END);
 <input type="button" name="alter" value="$lt{'ci'}"
- onClick="window.location='$resurl?catalogmode=import'" />&nbsp;
+ onClick="window.location='$resurl?inhibitmenu=yes&amp;catalogmode=import'" />&nbsp;
 <input type="button" name="altersearch" value="$lt{'cs'}"
- onClick="window.location='/adm/searchcat?catalogmode=import'" />&nbsp;
-END
-        # ---
-
-	$r->print(<<END);
+ onClick="window.location='/adm/searchcat?inhibitmenu=yes&amp;catalogmode=import'" />&nbsp;
 <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'})) { 
@@ -383,6 +396,8 @@ END
 <input type="hidden" name="newval" value="" />
 <input type="hidden" name="mode" value="$env{'form.mode'}" />
 END
+        $r->print(&Apache::loncommon::inhibit_menu_check('input'));
+
     }
     foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {
 	my $key=$_;