--- loncom/interface/lonhelper.pm	2011/10/31 01:20:05	1.185
+++ loncom/interface/lonhelper.pm	2015/08/14 15:34:01	1.194
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.185 2011/10/31 01:20:05 raeburn Exp $
+# $Id: lonhelper.pm,v 1.194 2015/08/14 15:34:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -261,7 +261,7 @@ sub real_handler {
     my $uri = shift;
     if (!defined($uri)) { $uri = $r->uri(); }
     $env{'request.uri'} = $uri;
-    my $filename = '/home/httpd/html' . $uri;
+    my $filename = $r->dir_config('lonDocRoot').$uri;
     my $fh = Apache::File->new($filename);
     my $file;
     read $fh, $file, 100000000;
@@ -651,7 +651,7 @@ sub display {
     $result .= $buttons;
 
 
-    #foreach my $key (keys %{$self->{VARS}}) {
+    #foreach my $key (keys(%{$self->{VARS}})) {
     #    $result .= "|$key| -> " . $self->{VARS}->{$key} . "<br />";
     #}
 
@@ -1913,7 +1913,13 @@ CHECK
 	if ($anytime) {
 	    $result.=' checked="checked" '
 	}
-	$result.="name='${var}anytime'/>".&mt('Any time').'</label>'
+        my $anytimetext = &mt('Any time');
+        if (($var eq 'startreserve') || ($var eq 'endreserve')) {
+            $anytimetext = &mt('Any time before slot starts');
+        } elsif (($var eq 'startunique') || ($var eq 'endunique')) {
+            $anytimetext = &mt('No restriction on uniqueness');     
+        }
+	$result.="name='${var}anytime'/>".$anytimetext.'</label>'
     }
     return $result;
 
@@ -2390,7 +2396,7 @@ BUTTONS
 		    $result .= "<th>$text</th>";
 		}
 	    }
-	    $result .= "<th>Select</th>";
+	    $result .= '<th>'.&Apache::lonlocal::mt('Select').'</th>';
 	    $result .= "</tr><tr>"; # Close off the extra row and start a new one.
 	    $headings_done = 1;
 	}
@@ -2487,9 +2493,9 @@ BUTTONS
 	    &HTML::Entities::encode(&$valueFunc($resource),"<>&\"'");
 	if ($addparts && (scalar(@{$resource->parts}) > 1)) {
 	    $col .= "<select onclick=\"javascript:updateRadio(this.form,'${var}_forminput','$resource_name');updateHidden(this.form,'$id','${var}');\" name='part_${id}_forminput'>\n";
-	    $col .= "<option value=\"$part\">All Parts</option>\n";
+	    $col .= "<option value=\"$part\">".&Apache::lonlocal::mt('All Parts')."</option>\n";
 	    foreach my $part (@{$resource->parts}) {
-		$col .= "<option value=\"$part\">Part: $part</option>\n";
+		$col .= "<option value=\"$part\">".&Apache::lonlocal::mt('Part: [_1]',$part)."</option>\n";
 	    }
 	    $col .= "</select>";
 	}
@@ -2534,7 +2540,8 @@ RADIO
 				       'closeAllPages' => $self->{'closeallpages'},
                                        'suppressEmptySequences' => $self->{'suppressEmptySequences'},
 				       'include_top_level_map' => $self->{'include_top_level_map'},
-                                       'iterator_map' => $mapUrl }
+                                       'iterator_map' => $mapUrl,
+                                       'map_no_edit_link' => 1, } 
                                        );
 
     $result .= $buttons;
@@ -2976,10 +2983,13 @@ BUTTONS
     # If the subdirectory is in local CSTR space
     my $metadir;
     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
-    if ($subdir =~ m{^\Q$londocroot/priv/\E[^/]+/[^/]+/(.*)$}) {
+    if ($subdir =~ m{^(?:\Q$londocroot\E)*/priv/[^/]+/[^/]+/(.*)$}) {
         my $innerpath=$1;
+        unless ($subdir=~m{^\Q$londocroot\E}) {
+           $subdir=$londocroot.$subdir;
+        }
 	my ($user,$domain)= 
-	    &Apache::loncacc::constructaccess($subdir);
+	    &Apache::lonnet::constructaccess($subdir);
 	$metadir='/res/'.$domain.'/'.$user.'/'.$innerpath;
         ($listref,$listerror) =
             &Apache::lonnet::dirlist($subdir,$domain,$user,undef,undef,'/');
@@ -3624,7 +3634,7 @@ sub render {
     my @results;
 
     # Collect all the results
-    for my $stateName (keys %{$helper->{STATES}}) {
+    for my $stateName (keys(%{$helper->{STATES}})) {
         my $state = $helper->{STATES}->{$stateName};
         
         for my $element (@{$state->{ELEMENTS}}) {