--- loncom/interface/lonhelper.pm	2004/04/27 18:30:35	1.79
+++ loncom/interface/lonhelper.pm	2004/08/12 07:45:03	1.86
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.79 2004/04/27 18:30:35 sakharuk Exp $
+# $Id: lonhelper.pm,v 1.86 2004/08/12 07:45:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1271,7 +1271,6 @@ BUTTONS
             $choiceLabel = eval($choiceLabel);
             $choiceLabel = &$choiceLabel($helper, $self);
         }
-	&Apache::lonnet::logthis("TITLE TRANSLATION >$choiceLabel<");
         $result .= "/></td><td> " . &mtn($choiceLabel) . "</td></tr>\n";
     }
     $result .= "</table>\n\n\n";
@@ -2090,7 +2089,9 @@ sub render {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
 	    comp = document.forms.helpform.elements.chksec.value;
             if (document.forms.helpform.elements[i].value.indexOf(':'+comp+':') != -1) {
-                document.forms.helpform.elements[i].checked=value;
+		if (document.forms.helpform.elements[i].value.indexOf(':Active') != -1) {
+		    document.forms.helpform.elements[i].checked=value;
+		}
             }
         }
     }
@@ -2098,7 +2099,14 @@ sub render {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
             if (document.forms.helpform.elements[i].value.indexOf(':Active') != -1) {
                 document.forms.helpform.elements[i].checked=true;
-            }
+            } 
+        }
+    }
+    function uncheckexpired() {
+	for (i=0; i<document.forms.helpform.elements.length; i++) {
+            if (document.forms.helpform.elements[i].value.indexOf(':Expired') != -1) {
+                document.forms.helpform.elements[i].checked=false;
+            } 
         }
     }
 </script>
@@ -2106,16 +2114,18 @@ SCRIPT
 
         my %lt=&Apache::lonlocal::texthash(
                     'ocs'  => "Select Only Current Students",
+                    'ues'  => "Unselect Expired Students",
                     'sas'  => "Select All Students",
                     'uas'  => "Unselect All Students",
-                    'sfsg' => "Select for Section/Group",
+                    'sfsg' => "Select Current Students for Section/Group",
 		    'ufsg' => "Unselect for Section/Group");
  
         $buttons = <<BUTTONS;
 <br />
 <input type="button" onclick="checkactive()" value="$lt{'ocs'}" />
+<input type="button" onclick="uncheckexpired()" value="$lt{'ues'}" /><br />
 <input type="button" onclick="checkall(true, '$var')" value="$lt{'sas'}" />
-<input type="button" onclick="checkall(false, '$var')" value="$lt{'uas'}" />
+<input type="button" onclick="checkall(false, '$var')" value="$lt{'uas'}" /><br />
 <input type="button" onclick="checksec(true)" value="$lt{'sfsg'}">
 <input type="text" size="5" name="chksec">&nbsp;
 <input type="button" onclick="checksec(false)" value="$lt{'ufsg'}">
@@ -2178,7 +2188,6 @@ BUTTONS
     }
 
     my $name = $self->{'coursepersonnel'} ? &mt('Name') : &mt('Student Name');
-    &Apache::lonnet::logthis("THE NAME IS >$name<");
     my $type = 'radio';
     if ($self->{'multichoice'}) { $type = 'checkbox'; }
     $result .= "<table cellspacing='2' cellpadding='2' border='0'>\n";
@@ -2452,7 +2461,7 @@ BUTTONS
     }
 
     # Sort the fileList into order
-    @fileList = sort @fileList;
+    @fileList = sort {lc($a) cmp lc($b)} @fileList;
 
     $result .= $buttons;
 
@@ -2539,10 +2548,14 @@ sub fileState {
     my $constructionSpaceDir = shift;
     my $file = shift;
     
+    my ($uname,$udom)=($ENV{'user.name'},$ENV{'user.domain'});
+    if ($ENV{'request.role'}=~/^ca\./) {
+	(undef,$udom,$uname)=split(/\//,$ENV{'request.role'});
+    }
     my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     my $subdirpart = $constructionSpaceDir;
-    $subdirpart =~ s/^\/home\/$ENV{'user.name'}\/public_html//;
-    my $resdir = $docroot . '/res/' . $ENV{'user.domain'} . '/' . $ENV{'user.name'} .
+    $subdirpart =~ s/^\/home\/$uname\/public_html//;
+    my $resdir = $docroot . '/res/' . $udom . '/' . $uname .
         $subdirpart;
 
     my @constructionSpaceFileStat = stat($constructionSpaceDir . '/' . $file);
@@ -2790,6 +2803,8 @@ be able to call methods on it.
 
 =cut
 
+use Apache::lonlocal;
+
 BEGIN {
     &Apache::lonhelper::register('Apache::lonhelper::general',
                                  'exec', 'condition', 'clause',
@@ -3202,7 +3217,7 @@ sub render {
 
     # Print value
     if ($vars->{ACTION_TYPE} ne 'tries' && $vars->{ACTION_TYPE} ne 'weight') {
-	$result .= '<li>'.&mt('to [_1] ( [_2] )',"<b>ctime($vars->{PARM_DATE})</b>",Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE})).'</li>\n';
+	$result .= '<li>'.&mt('to [_1] ([_2])',"<b>".ctime($vars->{PARM_DATE})."</b>",Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE}))."</li>\n";
     }
  
     # print pres_marker