--- loncom/interface/lonhelper.pm	2004/10/07 22:12:47	1.88
+++ loncom/interface/lonhelper.pm	2006/03/07 16:09:59	1.133
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.88 2004/10/07 22:12:47 albertel Exp $
+# $Id: lonhelper.pm,v 1.133 2006/03/07 16:09:59 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,10 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# (Page Handler
-#
-# (.helper handler
-#
 
 =pod
 
@@ -186,6 +182,7 @@ use Apache::Constants qw(:common);
 use Apache::File;
 use Apache::lonxml;
 use Apache::lonlocal;
+use Apache::lonnet;
 
 # Register all the tags with the helper, so the helper can 
 # push and pop them
@@ -255,7 +252,7 @@ sub real_handler {
     my $r = shift;
     my $uri = shift;
     if (!defined($uri)) { $uri = $r->uri(); }
-    $ENV{'request.uri'} = $uri;
+    $env{'request.uri'} = $uri;
     my $filename = '/home/httpd/html' . $uri;
     my $fh = Apache::File->new($filename);
     my $file;
@@ -263,7 +260,7 @@ sub real_handler {
 
 
     # Send header, don't cache this page
-    if ($ENV{'browser.mathml'}) {
+    if ($env{'browser.mathml'}) {
 	&Apache::loncommon::content_type($r,'text/xml');
     } else {
 	&Apache::loncommon::content_type($r,'text/html');
@@ -278,7 +275,7 @@ sub real_handler {
 
     my $allowed = $helper->allowedCheck();
     if (!$allowed) {
-        $ENV{'user.error.msg'} = $ENV{'request.uri'}.':'.$helper->{REQUIRED_PRIV}.
+        $env{'user.error.msg'} = $env{'request.uri'}.':'.$helper->{REQUIRED_PRIV}.
             ":0:0:Permission denied to access this helper.";
         return HTTP_NOT_ACCEPTABLE;
     }
@@ -363,6 +360,7 @@ use HTML::Entities();
 use Apache::loncommon;
 use Apache::File;
 use Apache::lonlocal;
+use Apache::lonnet;
 
 sub new {
     my $proto = shift;
@@ -374,16 +372,16 @@ sub new {
     
     # If there is a state from the previous form, use that. If there is no
     # state, use the start state parameter.
-    if (defined $ENV{"form.CURRENT_STATE"})
+    if (defined $env{"form.CURRENT_STATE"})
     {
-	$self->{STATE} = $ENV{"form.CURRENT_STATE"};
+	$self->{STATE} = $env{"form.CURRENT_STATE"};
     }
     else
     {
 	$self->{STATE} = "START";
     }
 
-    $self->{TOKEN} = $ENV{'form.TOKEN'};
+    $self->{TOKEN} = $env{'form.TOKEN'};
     # If a token was passed, we load that in. Otherwise, we need to create a 
     # new storage file
     # Tried to use standard Tie'd hashes, but you can't seem to take a 
@@ -416,16 +414,16 @@ sub new {
             return undef;
         }
         # Must create the storage
-        $self->{TOKEN} = md5_hex($ENV{'user.name'} . $ENV{'user.domain'} .
+        $self->{TOKEN} = md5_hex($env{'user.name'} . $env{'user.domain'} .
                                  time() . rand());
         $self->{FILENAME} = $Apache::lonnet::tmpdir . md5_hex($self->{TOKEN});
     }
 
     # OK, we now have our persistent storage.
 
-    if (defined $ENV{"form.RETURN_PAGE"})
+    if (defined $env{"form.RETURN_PAGE"})
     {
-	$self->{RETURN_PAGE} = $ENV{"form.RETURN_PAGE"};
+	$self->{RETURN_PAGE} = $env{"form.RETURN_PAGE"};
     }
     else
     {
@@ -486,11 +484,11 @@ sub declareVar {
     }
 
     my $envname = 'form.' . $var . '.forminput';
-    if (defined($ENV{$envname})) {
-        if (ref($ENV{$envname})) {
-            $self->{VARS}->{$var} = join('|||', @{$ENV{$envname}});
+    if (defined($env{$envname})) {
+        if (ref($env{$envname})) {
+            $self->{VARS}->{$var} = join('|||', @{$env{$envname}});
         } else {
-            $self->{VARS}->{$var} = $ENV{$envname};
+            $self->{VARS}->{$var} = $env{$envname};
         }
     }
 }
@@ -502,7 +500,7 @@ sub allowedCheck {
         return 1;
     }
 
-    return Apache::lonnet::allowed($self->{REQUIRED_PRIV}, $ENV{'request.course.id'});
+    return Apache::lonnet::allowed($self->{REQUIRED_PRIV}, $env{'request.course.id'});
 }
 
 sub changeState {
@@ -524,7 +522,7 @@ sub process {
     # Phase 1: Post processing for state of previous screen (which is actually
     # the "current state" in terms of the helper variables), if it wasn't the 
     # beginning state.
-    if ($self->{STATE} ne "START" || $ENV{"form.SUBMIT"} eq &mt("Next ->")) {
+    if ($self->{STATE} ne "START" || $env{"form.SUBMIT"} eq &mt("Next ->")) {
 	my $prevState = $self->{STATES}{$self->{STATE}};
         $prevState->postprocess();
     }
@@ -575,8 +573,10 @@ sub display {
     }
 
     # Phase 4: Display.
+    my $html=&Apache::lonxml::xmlbegin();
     my $stateTitle=&mt($state->title());
     my $helperTitle = &mt($self->{TITLE});
+    my $browser_searcher_js = &Apache::loncommon::browser_and_searcher_javascript();
     my $bodytag = &Apache::loncommon::bodytag($helperTitle,'','');
     my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
     my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
@@ -584,10 +584,12 @@ sub display {
     my $loncapaHelper = &mt("LON-CAPA Helper:");
 
     $result .= <<HEADER;
-<html>
+$html
     <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <title>$loncapaHelper: $helperTitle</title>
+        <script type="text/javascript">
+$browser_searcher_js
+        </script>
     </head>
     $bodytag
 HEADER
@@ -1115,6 +1117,7 @@ no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
 use Apache::lonlocal;
+use Apache::lonnet;
 
 BEGIN {
     &Apache::lonhelper::register('Apache::lonhelper::choices',
@@ -1165,7 +1168,7 @@ sub start_choice {
                                               $parser));
     my $nextstate = $token->[2]{'nextstate'};
     my $evalFlag = $token->[2]{'eval'};
-    push @{$paramHash->{CHOICES}}, [$human, $computer, $nextstate, 
+    push @{$paramHash->{CHOICES}}, [&mtn($human), $computer, $nextstate, 
                                     $evalFlag];
     return '';
 }
@@ -1189,7 +1192,8 @@ sub render {
 
     if ($self->{'multichoice'}) {
         $result .= <<SCRIPT;
-<script>
+<script type="text/javascript">
+// <!--
     function checkall(value, checkName) {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
             ele = document.forms.helpform.elements[i];
@@ -1198,6 +1202,7 @@ sub render {
             }
         }
     }
+// -->
 </script>
 SCRIPT
     }
@@ -1266,13 +1271,13 @@ BUTTONS
         my $id = &new_id();
         $result .= "<tr>\n<td width='20'>&nbsp;</td>\n";
         $result .= "<td valign='top'><input type='$type' name='$var.forminput'"
-            . "' value='" . 
-            HTML::Entities::encode($choice->[1],'<>&"') 
+            . " value='" . 
+            HTML::Entities::encode($choice->[1],"<>&\"'") 
             . "'";
         if ($checkedChoices{$choice->[1]}) {
-            $result .= " checked ";
+            $result .= " checked='checked' ";
         }
-        $result .= qq{id="$id"};
+        $result .= qq{id="id$id"};
         my $choiceLabel = $choice->[0];
         if ($choice->[4]) {  # if we need to evaluate this choice
             $choiceLabel = "sub { my $helper = shift; my $state = shift;" .
@@ -1280,8 +1285,8 @@ BUTTONS
             $choiceLabel = eval($choiceLabel);
             $choiceLabel = &$choiceLabel($helper, $self);
         }
-        $result .= "/></td><td> ".qq{<label for="$id">}.
-            &mtn($choiceLabel). "</label></td></tr>\n";
+        $result .= "/></td><td> ".qq{<label for="id$id">}.
+            $choiceLabel. "</label></td></tr>\n";
     }
     $result .= "</table>\n\n\n";
     $result .= $buttons;
@@ -1293,7 +1298,7 @@ BUTTONS
 # given, switch to it
 sub postprocess {
     my $self = shift;
-    my $chosenValue = $ENV{'form.' . $self->{'variable'} . '.forminput'};
+    my $chosenValue = $env{'form.' . $self->{'variable'} . '.forminput'};
 
     if (!defined($chosenValue) && !$self->{'allowempty'}) {
         $self->{ERROR_MSG} = 
@@ -1347,6 +1352,7 @@ no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
 use Apache::lonlocal;
+use Apache::lonnet;
 
 BEGIN {
     &Apache::lonhelper::register('Apache::lonhelper::dropdown',
@@ -1424,10 +1430,10 @@ sub render {
     $result .= "<select name='${var}.forminput'>\n";
     foreach my $choice (@{$self->{CHOICES}}) {
         $result .= "<option value='" . 
-            HTML::Entities::encode($choice->[1],'<>&"') 
+            HTML::Entities::encode($choice->[1],"<>&\"'") 
             . "'";
         if ($checkedChoices{$choice->[1]}) {
-            $result .= " selected";
+            $result .= " selected='selected' ";
         }
         my $choiceLabel = $choice->[0];
         if ($choice->[4]) {  # if we need to evaluate this choice
@@ -1436,7 +1442,7 @@ sub render {
             $choiceLabel = eval($choiceLabel);
             $choiceLabel = &$choiceLabel($helper, $self);
         }
-        $result .= ">" . &mtn($choiceLabel) . "\n";
+        $result .= ">" . &mtn($choiceLabel) . "</option>\n";
     }
     $result .= "</select>\n";
 
@@ -1447,7 +1453,7 @@ sub render {
 # given, switch to it
 sub postprocess {
     my $self = shift;
-    my $chosenValue = $ENV{'form.' . $self->{'variable'} . '.forminput'};
+    my $chosenValue = $env{'form.' . $self->{'variable'} . '.forminput'};
 
     if (!defined($chosenValue) && !$self->{'allowempty'}) {
         $self->{ERROR_MSG} = "You must choose one or more choices to" .
@@ -1506,7 +1512,7 @@ no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
 use Apache::lonlocal; # A localization nightmare
-
+use Apache::lonnet;
 use Time::localtime;
 
 BEGIN {
@@ -1534,6 +1540,7 @@ sub start_date {
     $paramHash->{'variable'} = $token->[2]{'variable'};
     $helper->declareVar($paramHash->{'variable'});
     $paramHash->{'hoursminutes'} = $token->[2]{'hoursminutes'};
+    $paramHash->{'anytime'} = $token->[2]{'anytime'};
 }
 
 sub end_date {
@@ -1552,10 +1559,29 @@ sub render {
     my $var = $self->{'variable'};
 
     my $date;
-    
-    # Default date: The current hour.
-    $date = localtime();
+
+    my $time=time;
+    $date = localtime($time);
     $date->min(0);
+    my ($anytime,$onclick);
+
+    if (defined($self->{DEFAULT_VALUE})) {
+        my $valueFunc = eval($self->{DEFAULT_VALUE});
+        die('Error in default value code for variable ' . 
+            $self->{'variable'} . ', Perl said: ' . $@) if $@;
+        $time = &$valueFunc($helper, $self);
+	if (lc($time) eq 'anytime') {
+	    $anytime=1;
+	} else {
+	    $date = localtime($time);
+	}
+    } else {
+
+    }
+    if ($anytime) {
+	$onclick = "onclick=\"javascript:updateCheck(this.form,'${var}anytime',false)\"";
+    }
+    # Default date: The current hour.
 
     if (defined $self->{ERROR_MSG}) {
         $result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
@@ -1563,10 +1589,10 @@ sub render {
 
     # Month
     my $i;
-    $result .= "<select name='${var}month'>\n";
+    $result .= "<select $onclick name='${var}month'>\n";
     for ($i = 0; $i < 12; $i++) {
         if ($i == $date->mon) {
-            $result .= "<option value='$i' selected>";
+            $result .= "<option value='$i' selected='selected'>";
         } else {
             $result .= "<option value='$i'>";
         }
@@ -1575,10 +1601,10 @@ sub render {
     $result .= "</select>\n";
 
     # Day
-    $result .= "<select name='${var}day'>\n";
+    $result .= "<select $onclick name='${var}day'>\n";
     for ($i = 1; $i < 32; $i++) {
         if ($i == $date->mday) {
-            $result .= '<option selected>';
+            $result .= '<option selected="selected">';
         } else {
             $result .= '<option>';
         }
@@ -1587,10 +1613,10 @@ sub render {
     $result .= "</select>,\n";
 
     # Year
-    $result .= "<select name='${var}year'>\n";
+    $result .= "<select $onclick name='${var}year'>\n";
     for ($i = 2000; $i < 2030; $i++) { # update this after 64-bit dates
         if ($date->year + 1900 == $i) {
-            $result .= "<option selected>";
+            $result .= "<option selected='selected'>";
         } else {
             $result .= "<option>";
         }
@@ -1604,22 +1630,22 @@ sub render {
 	my $am = &mt('a.m.');
 	my $pm = &mt('p.m.');
         # Build hour
-        $result .= "<select name='${var}hour'>\n";
-        $result .= "<option " . ($date->hour == 0 ? 'selected ':'') .
+        $result .= "<select $onclick name='${var}hour'>\n";
+        $result .= "<option " . ($date->hour == 0 ? 'selected="selected" ':'') .
             " value='0'>" . &mt('midnight') . "</option>\n";
         for ($i = 1; $i < 12; $i++) {
             if ($date->hour == $i) {
-                $result .= "<option selected value='$i'>$i $am</option>\n";
+                $result .= "<option selected='selected' value='$i'>$i $am</option>\n";
             } else {
                 $result .= "<option value='$i'>$i $am</option>\n";
             }
         }
-        $result .= "<option " . ($date->hour == 12 ? 'selected ':'') .
+        $result .= "<option " . ($date->hour == 12 ? 'selected="selected" ':'') .
             " value='12'>" . &mt('noon') . "</option>\n";
         for ($i = 13; $i < 24; $i++) {
             my $printedHour = $i - 12;
             if ($date->hour == $i) {
-                $result .= "<option selected value='$i'>$printedHour $pm</option>\n";
+                $result .= "<option selected='selected' value='$i'>$printedHour $pm</option>\n";
             } else {
                 $result .= "<option value='$i'>$printedHour $pm</option>\n";
             }
@@ -1627,14 +1653,16 @@ sub render {
 
         $result .= "</select> :\n";
 
-        $result .= "<select name='${var}minute'>\n";
-        for ($i = 0; $i < 60; $i++) {
+        $result .= "<select $onclick name='${var}minute'>\n";
+	my $selected=0;
+        for my $i ((0,15,30,45,59,undef,0..59)) {
             my $printedMinute = $i;
-            if ($i < 10) {
+            if (defined($i) && $i < 10) {
                 $printedMinute = "0" . $printedMinute;
             }
-            if ($date->min == $i) {
-                $result .= "<option selected>";
+            if (!$selected && $date->min == $i) {
+                $result .= "<option selected='selected'>";
+		$selected=1;
             } else {
                 $result .= "<option>";
             }
@@ -1642,7 +1670,23 @@ sub render {
         }
         $result .= "</select>\n";
     }
-
+    if ($self->{'anytime'}) {
+	$result.=(<<CHECK);
+<script type="text/javascript">
+// <!--
+    function updateCheck(form,name,value) {
+	var checkbox=form[name];
+	checkbox.checked = value;
+    }
+// -->
+</script>
+CHECK
+	$result.="&nbsp;or&nbsp;<label><input type='checkbox' ";
+	if ($anytime) {
+	    $result.=' checked="checked" '
+	}
+	$result.="name='${var}anytime'/>".&mt('Anytime').'</label>'
+    }
     return $result;
 
 }
@@ -1650,41 +1694,44 @@ sub render {
 sub postprocess {
     my $self = shift;
     my $var = $self->{'variable'};
-    my $month = $ENV{'form.' . $var . 'month'}; 
-    my $day = $ENV{'form.' . $var . 'day'}; 
-    my $year = $ENV{'form.' . $var . 'year'}; 
-    my $min = 0; 
-    my $hour = 0;
-    if ($self->{'hoursminutes'}) {
-        $min = $ENV{'form.' . $var . 'minute'};
-        $hour = $ENV{'form.' . $var . 'hour'};
-    }
+    if ($env{'form.' . $var . 'anytime'}) {
+	$helper->{VARS}->{$var} = undef;
+    } else {
+	my $month = $env{'form.' . $var . 'month'}; 
+	my $day = $env{'form.' . $var . 'day'}; 
+	my $year = $env{'form.' . $var . 'year'}; 
+	my $min = 0; 
+	my $hour = 0;
+	if ($self->{'hoursminutes'}) {
+	    $min = $env{'form.' . $var . 'minute'};
+	    $hour = $env{'form.' . $var . 'hour'};
+	}
+
+	my $chosenDate;
+	eval {$chosenDate = Time::Local::timelocal(0, $min, $hour, $day, $month, $year);};
+	my $error = $@;
+
+	# Check to make sure that the date was not automatically co-erced into a 
+	# valid date, as we want to flag that as an error
+	# This happens for "Feb. 31", for instance, which is coerced to March 2 or
+	# 3, depending on if it's a leap year
+	my $checkDate = localtime($chosenDate);
+	
+	if ($error || $checkDate->mon != $month || $checkDate->mday != $day ||
+	    $checkDate->year + 1900 != $year) {
+	    unless (Apache::lonlocal::current_language()== ~/^en/) {
+		$self->{ERROR_MSG} = &mt("Invalid date entry");
+		return 0;
+	    }
+	    # LOCALIZATION FIXME: Needs to be parameterized
+	    $self->{ERROR_MSG} = "Can't use " . $months[$month] . " $day, $year as a "
+		. "date because it doesn't exist. Please enter a valid date.";
 
-    my $chosenDate;
-    eval {$chosenDate = Time::Local::timelocal(0, $min, $hour, $day, $month, $year);};
-    my $error = $@;
-
-    # Check to make sure that the date was not automatically co-erced into a 
-    # valid date, as we want to flag that as an error
-    # This happens for "Feb. 31", for instance, which is coerced to March 2 or
-    # 3, depending on if it's a leap year
-    my $checkDate = localtime($chosenDate);
-
-    if ($error || $checkDate->mon != $month || $checkDate->mday != $day ||
-        $checkDate->year + 1900 != $year) {
-	unless (Apache::lonlocal::current_language()== ~/^en/) {
-	    $self->{ERROR_MSG} = &mt("Invalid date entry");
 	    return 0;
 	}
-	# LOCALIZATION FIXME: Needs to be parameterized
-        $self->{ERROR_MSG} = "Can't use " . $months[$month] . " $day, $year as a "
-            . "date because it doesn't exist. Please enter a valid date.";
-
-        return 0;
+	$helper->{VARS}->{$var} = $chosenDate;
     }
 
-    $helper->{VARS}->{$var} = $chosenDate;
-
     if (defined($self->{NEXTSTATE})) {
         $helper->changeState($self->{NEXTSTATE});
     }
@@ -1715,7 +1762,9 @@ to false. The "suppressEmptySequences" a
 suppressEmptySequences argument to the render routine, which will cause
 folders that have all of their contained resources filtered out to also
 be filtered out. The 'addstatus' attribute, if true, will add the icon
-and long status display columns to the display.
+and long status display columns to the display. The 'addparts'
+attribute will add in a part selector beside problems that have more
+than 1 part.
 
 =head3 SUB-TAGS
 
@@ -1755,12 +1804,13 @@ and long status display columns to the d
 no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
+use Apache::lonnet;
 
 BEGIN {
     &Apache::lonhelper::register('Apache::lonhelper::resource',
                               ('resource', 'filterfunc', 
                                'choicefunc', 'valuefunc',
-                               'mapurl'));
+                               'mapurl','option'));
 }
 
 sub new {
@@ -1782,6 +1832,10 @@ sub start_resource {
     $paramHash->{'suppressEmptySequences'} = $token->[2]{'suppressEmptySequences'};
     $paramHash->{'toponly'} = $token->[2]{'toponly'};
     $paramHash->{'addstatus'} = $token->[2]{'addstatus'};
+    $paramHash->{'addparts'} = $token->[2]{'addparts'};
+    if ($paramHash->{'addparts'}) {
+	$helper->declareVar($paramHash->{'variable'}.'_part');
+    }
     $paramHash->{'closeallpages'} = $token->[2]{'closeallpages'};
     return '';
 }
@@ -1865,6 +1919,42 @@ sub start_mapurl {
 
 sub end_mapurl { return ''; }
 
+
+sub start_option {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if (!defined($paramHash->{OPTION_TEXTS})) {
+	$paramHash->{OPTION_TEXTS} = [ ];
+	$paramHash->{OPTION_VARS}  = [ ];
+
+    }
+    # OPTION_TEXTS is a list of the text attribute
+    #               values used to create column headings.
+    # OPTION_VARS is a list of the variable names, used to create the checkbox
+    #             inputs.
+    #  We're ok with empty elements. as place holders
+    # Although the 'variable' element should really exist.
+    #
+
+    my $option_texts  = $paramHash->{OPTION_TEXTS};
+    my $option_vars   = $paramHash->{OPTION_VARS};
+    push(@$option_texts,  $token->[2]{'text'});
+    push(@$option_vars,   $token->[2]{'variable'});
+
+    #  Need to create and declare the option variables as well to make them
+    # persistent.
+    #
+    my $varname = $token->[2]{'variable'};
+    $helper->declareVar($varname);
+
+
+    return '';
+}
+
+sub end_option {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    return '';
+}
+
 # A note, in case I don't get to this before I leave.
 # If someone complains about the "Back" button returning them
 # to the previous folder state, instead of returning them to
@@ -1887,7 +1977,8 @@ sub render {
 
     if ($self->{'multichoice'}) {
         $result = <<SCRIPT;
-<script>
+<script type="text/javascript">
+// <!--
     function checkall(value, checkName) {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
             ele = document.forms.helpform.elements[i];
@@ -1896,6 +1987,7 @@ sub render {
             }
         }
     }
+// -->
 </script>
 SCRIPT
         my %lt=&Apache::lonlocal::texthash(
@@ -1916,10 +2008,14 @@ BUTTONS
 
     $result .= $buttons;
 
-    my $filterFunc = $self->{FILTER_FUNC};
-    my $choiceFunc = $self->{CHOICE_FUNC};
-    my $valueFunc = $self->{VALUE_FUNC};
-    my $multichoice = $self->{'multichoice'};
+    my $filterFunc     = $self->{FILTER_FUNC};
+    my $choiceFunc     = $self->{CHOICE_FUNC};
+    my $valueFunc      = $self->{VALUE_FUNC};
+    my $multichoice    = $self->{'multichoice'};
+    my $option_vars    = $self->{OPTION_VARS};
+    my $option_texts   = $self->{OPTION_TEXTS};
+    my $addparts       = $self->{'addparts'};
+    my $headings_done  = 0;
 
     # Evaluate the map url as needed
     my $mapUrl;
@@ -1931,38 +2027,130 @@ BUTTONS
 	$mapUrl = $self->{MAP_URL};
     }
 
+    my %defaultSymbs;
+    if (defined($self->{DEFAULT_VALUE})) {
+        my $valueFunc = eval($self->{DEFAULT_VALUE});
+        die 'Error in default value code for variable ' . 
+            $self->{'variable'} . ', Perl said: ' . $@ if $@;
+        my @defaultSymbs = &$valueFunc($helper, $self);
+	if (!$multichoice && @defaultSymbs) { # only allowed 1
+	    @defaultSymbs = ($defaultSymbs[0]);
+	}
+	%defaultSymbs = map { if ($_) {($_,1) } } @defaultSymbs;
+	delete($defaultSymbs{''});
+    }
+
     # Create the composite function that renders the column on the nav map
     # have to admit any language that lets me do this can't be all bad
     #  - Jeremy (Pythonista) ;-)
     my $checked = 0;
     my $renderColFunc = sub {
         my ($resource, $part, $params) = @_;
+	my $result = "";
+
+	if(!$headings_done) {
+	    if ($option_texts) {
+		foreach my $text (@$option_texts) {
+		    $result .= "<th>$text</th>";
+		}
+	    }
+	    $result .= "<th>Select</th>";
+	    $result .= "</tr><tr>"; # Close off the extra row and start a new one.
+	    $headings_done = 1;
+	}
 
         my $inputType;
         if ($multichoice) { $inputType = 'checkbox'; }
         else {$inputType = 'radio'; }
 
         if (!&$choiceFunc($resource)) {
-            return '<td>&nbsp;</td>';
+	    $result .= '<td>&nbsp;</td>';
+            return $result;
         } else {
-            my $col = "<td><input type='$inputType' name='${var}.forminput' ";
-            if (!$checked && !$multichoice) {
-                $col .= "checked ";
-                $checked = 1;
-            }
-	    if ($multichoice) { # all resources start checked; see bug 1174
-		$col .= "checked ";
-		$checked = 1;
+	    my $col = "";
+	    my $raw_name = &$valueFunc($resource);
+	    my $resource_name =   
+                   HTML::Entities::encode($raw_name,"<>&\"'");
+	    if($option_vars) {
+		foreach my $option_var (@$option_vars) {
+		    my $var_value = "\|\|\|" . $helper->{VARS}->{$option_var} . 
+			"\|\|\|";
+		    my $checked ="";
+		    if($var_value =~ /\Q|||$raw_name|||\E/) {
+			$checked = "checked='checked'";
+		    }
+		    $col .= 
+                        "<td align='center'><input type='checkbox' name ='$option_var".
+			".forminput' value='".
+			$resource_name . "' $checked /> </td>";
+		}
 	    }
-            $col .= "value='" . 
-                HTML::Entities::encode(&$valueFunc($resource),'<>&"') 
-                . "' /></td>";
-            return $col;
+
+            $col .= "<td align='center'><input type='$inputType' name='${var}.forminput' ";
+	    if (%defaultSymbs) {
+		my $symb=$resource->symb();
+		if (exists($defaultSymbs{$symb})) {
+		    $col .= "checked='checked' ";
+		    $checked = 1;
+		}
+	    } else {
+		if (!$checked && !$multichoice) {
+		    $col .= "checked='checked' ";
+		    $checked = 1;
+		}
+		if ($multichoice) { # all resources start checked; see bug 1174
+		    $col .= "checked='checked' ";
+		    $checked = 1;
+		}
+	    }
+            $col .= "value='" . $resource_name  . "' /></td>";
+
+            return $result.$col;
         }
     };
+    my $renderPartsFunc = sub {
+        my ($resource, $part, $params) = @_;
+	my $col= "<td>";
+	my $id=$resource->{ID};
+	my $resource_name =   
+	    &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";
+	    foreach my $part (@{$resource->parts}) {
+		$col .= "<option value=\"$part\">Part: $part</option>\n";
+	    }
+	    $col .= "</select>";
+	}
+	$col .= "</td>";
+    };
+    $result.=(<<RADIO);
+<script type="text/javascript">
+// <!--
+    function updateRadio(form,name,value) {
+	var radiobutton=form[name];
+	for (var i=0; i<radiobutton.length; i++) {
+	    if (radiobutton[i].value == value) {
+		radiobutton[i].checked = true;
+		break;
+	    }
+	}
+    }
+    function updateHidden(form,id,name) {
+	var select=form['part_'+id+'.forminput'];
+	var hidden=form[name+'_part.forminput'];
+	var which=select.selectedIndex;
+	hidden.value=select.options[which].value;
+    }
+// -->
+</script>
+<input type="hidden" name="${var}_part.forminput" />
 
-    $ENV{'form.condition'} = !$self->{'toponly'};
-    my $cols = [$renderColFunc, Apache::lonnavmaps::resource()];
+RADIO
+    $env{'form.condition'} = !$self->{'toponly'};
+    my $cols = [$renderColFunc];
+    if ($self->{'addparts'}) { push(@$cols, $renderPartsFunc); }
+    push(@$cols, Apache::lonnavmaps::resource());
     if ($self->{'addstatus'}) {
 	push @$cols, (Apache::lonnavmaps::part_status_summary());
 	
@@ -2031,6 +2219,10 @@ selection. Defaults to false.
 If true, only active students and course personnel will be
 shown. Defaults to false.
 
+=item * B<emptyallowed>:
+
+If true, the selection of no users is allowed. Defaults to false.
+
 =back
 
 =cut
@@ -2039,7 +2231,7 @@ no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
 use Apache::lonlocal;
-
+use Apache::lonnet;
 
 BEGIN {
     &Apache::lonhelper::register('Apache::lonhelper::student',
@@ -2062,10 +2254,11 @@ sub start_student {
     $helper->declareVar($paramHash->{'variable'});
     $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
     $paramHash->{'coursepersonnel'} = $token->[2]{'coursepersonnel'};
-    $paramHash->{'sctiveonly'} = $token->[2]{'activeonly'};
+    $paramHash->{'activeonly'} = $token->[2]{'activeonly'};
     if (defined($token->[2]{'nextstate'})) {
         $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
     }
+    $paramHash->{'emptyallowed'} = $token->[2]{'emptyallowed'};
     
 }    
 
@@ -2086,7 +2279,8 @@ sub render {
 
     if ($self->{'multichoice'}) {
         $result = <<SCRIPT;
-<script>
+<script type="text/javascript">
+// <!--
     function checkall(value, checkName) {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
             ele = document.forms.helpform.elements[i];
@@ -2112,6 +2306,13 @@ sub render {
             } 
         }
     }
+    function checkexpired()  {
+	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=true;
+            } 
+        }
+    }
     function uncheckexpired() {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
             if (document.forms.helpform.elements[i].value.indexOf(':Expired') != -1) {
@@ -2119,6 +2320,44 @@ sub render {
             } 
         }
     }
+    function getDesiredState() {     // Return desired person state radio value.
+        numRadio = document.forms.helpform.personstate.length;
+        for (i =0; i < numRadio; i++) {
+	    if (document.forms.helpform.personstate[i].checked) {
+                return document.forms.helpform.personstate[i].value;
+            }
+        }
+        return "";
+    }
+
+    function checksections(value) {    // Check selected sections.
+        numSections  = document.forms.helpform.chosensections.length;
+	desiredState = getDesiredState();
+
+	for (var option = 0; option < numSections; option++) {
+	    if(document.forms.helpform.chosensections.options[option].selected) {
+		section = document.forms.helpform.chosensections.options[option].text;
+		if (section == "none") {
+		    section ="";
+		}
+		for (i = 0; i < document.forms.helpform.elements.length; i++ ) {
+		    if (document.forms.helpform.elements[i].value.indexOf(':') != -1) {
+			info = document.forms.helpform.elements[i].value.split(':');
+			hisSection = info[2];
+			hisState   = info[4];
+			if (desiredState == hisState ||
+			    desiredState == "All") {
+			    if(hisSection == section ||
+			       section =="" ) {
+				document.forms.helpform.elements[i].checked = value;
+			    }
+			}
+		    }
+		}
+            }
+	}
+				   }
+// -->
 </script>
 SCRIPT
 
@@ -2132,22 +2371,38 @@ SCRIPT
  
         $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'}" /><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'}">
+<table>
+  
+  <tr>
+     <td><input type="button" onclick="checkall(true, '$var')" value="$lt{'sas'}" /></td>
+     <td> <input type="button" onclick="checkall(false, '$var')" value="$lt{'uas'}" /><br /></td>
+  </tr>
+  
+</table>
 <br />
 BUTTONS
+    $result .= $buttons;   
+
     }
 
     if (defined $self->{ERROR_MSG}) {
         $result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
     }
 
+    my %defaultUsers;
+    if (defined($self->{DEFAULT_VALUE})) {
+        my $valueFunc = eval($self->{DEFAULT_VALUE});
+        die 'Error in default value code for variable ' . 
+            $self->{'variable'} . ', Perl said: ' . $@ if $@;
+        my @defaultUsers = &$valueFunc($helper, $self);
+	if (!$self->{'multichoice'} && @defaultUsers) { # only allowed 1
+	    @defaultUsers = ($defaultUsers[0]);
+	}
+	%defaultUsers = map { if ($_) {($_,1) } } @defaultUsers;
+	delete($defaultUsers{''});
+    }
     my $choices = [];
+    my $expired_students = [];	# Will hold expired students.
 
     # Load up the non-students, if necessary
     if ($self->{'coursepersonnel'}) {
@@ -2185,15 +2440,67 @@ BUTTONS
         }
         return $classlist->{$a}->[$fullname] cmp $classlist->{$b}->[$fullname];
     } @keys;
+    #
+    #  now add the fancy section choice... first enumerate the sections:
+    if ($self->{'multichoice'}) {
+	my %sections;
+	for my $key (@keys) {
+	    my $section_name = $classlist->{$key}->[$section];
+	    if ($section_name ne "") {
+		$sections{$section_name} = 1;
+	    }
+	}
+	#  The variable $choice_widget will have the html to make the choice 
+	#  selector.
+	my $size=5;
+	if (scalar(keys(%sections)) < 5) {
+	    $size=scalar(keys(%sections));
+	}
+	my $choice_widget = '<select multiple name="chosensections" size="'.$size.'">'."\n";
+	foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
+	    $choice_widget .= "<option name=\"$sec\">$sec</option>\n";
+	}
+	$choice_widget .= "<option>none</option></select>\n";
+
+	# Build a table without any borders to contain the section based
+	# selection:
+
+	my $section_selectors =<<SECTIONSELECT;
+<table border="0">
+  <tr valign="top">
+   <td>For Sections:</td><td>$choice_widget</td>
+   <td><label><input type="radio" name="personstate" value="Active" checked />
+               Current Students</label></td>
+   <td><label><input type="radio" name="personstate" value="All" />
+               All students</label></td>
+   <td><label><input type="radio" name="personstate" value="Expired" />
+               Expired Students</label></td>
+  </tr>
+  <tr>
+   <td><input type="button" value="Select" onclick="checksections(true);" /></td>
+   <td><input type="button" value="Unselect" onclick="checksections(false);" /></td></tr>
+</table>
+<br />
+SECTIONSELECT
+         $result .= $section_selectors;
+    }
 
     # username, fullname, section, type
     for (@keys) {
-	# Filter out inactive students if we've set "activeonly"
-	if (!$self->{'activeonly'} || $classlist->{$_}->[$status] eq
+
+	# We split the active students into the choices array and
+        # inactive ones into expired_students so that we can put them in 2 separate
+	# tables.
+
+	if ( $classlist->{$_}->[$status] eq
 	    'Active') {
 	    push @$choices, [$_, $classlist->{$_}->[$fullname], 
 			     $classlist->{$_}->[$section],
 			     $classlist->{$_}->[$status], 'Student'];
+	} else {
+	    push @$expired_students, [$_, $classlist->{$_}->[$fullname], 
+				      $classlist->{$_}->[$section],
+				      $classlist->{$_}->[$status], 'Student'];
 	}
     }
 
@@ -2208,16 +2515,28 @@ BUTTONS
 	"<td align='center'><b>".&mt('Username').":".&mt('Domain')."</b></td></tr>";
 
     my $checked = 0;
+    #
+    # Give the active students and staff:
+    #
     for my $choice (@$choices) {
         $result .= "<tr><td><input type='$type' name='" .
             $self->{'variable'} . '.forminput' . "'";
             
-        if (!$self->{'multichoice'} && !$checked) {
-            $result .= " checked ";
+	if (%defaultUsers) {
+	    my $user=$choice->[0];
+	    if (exists($defaultUsers{$user})) {
+		$result .= " checked='checked' ";
+		$checked = 1;
+	    }
+	} elsif (!$self->{'multichoice'} && !$checked) {
+            $result .= " checked='checked' ";
             $checked = 1;
         }
         $result .=
-            " value='" . HTML::Entities::encode($choice->[0] . ':' . $choice->[2] . ':' . $choice->[1] . ':' . $choice->[3],'<>&"')
+            " value='" . HTML::Entities::encode($choice->[0] . ':' 
+						.$choice->[2] . ':' 
+						.$choice->[1] . ':' 
+						.$choice->[3], "<>&\"'")
             . "' /></td><td>"
             . HTML::Entities::encode($choice->[1],'<>&"')
             . "</td><td align='center'>" 
@@ -2230,20 +2549,74 @@ BUTTONS
 	    . HTML::Entities::encode($choice->[0],'<>&"')
 	    . "</td></tr>\n";
     }
-
     $result .= "</table>\n\n";
-    $result .= $buttons;    
-    
+
+    # If activeonly is not set then we can also give the expired students:
+    #
+    if (!$self->{'activeonly'} && ((scalar @$expired_students) > 0)) {
+	$result .= "<p>Inactive students: </p>\n";
+	$result .= <<INACTIVEBUTTONS;
+	   <table>
+              <tr>
+                 <td><input type="button" value="Select expired" onclick="checkexpired();" /> </td>
+		 <td><input type="button" value="Unselect expired" onclick="uncheckexpired();" /></td>
+              </tr>
+           </table>
+INACTIVEBUTTONS
+	$result .= "<table>\n";
+
+	for my $choice (@$expired_students) {
+        $result .= "<tr><td><input type='$type' name='" .
+            $self->{'variable'} . '.forminput' . "'";
+            
+	if (%defaultUsers) {
+	    my $user=$choice->[0];
+	    if (exists($defaultUsers{$user})) {
+		$result .= " checked='checked' ";
+		$checked = 1;
+	    }
+	} elsif (!$self->{'multichoice'} && !$checked) {
+            $result .= " checked='checked' ";
+            $checked = 1;
+        }
+        $result .=
+            " value='" . HTML::Entities::encode($choice->[0] . ':' 
+						.$choice->[2] . ':' 
+						.$choice->[1] . ':' 
+						.$choice->[3], "<>&\"'")
+            . "' /></td><td>"
+            . HTML::Entities::encode($choice->[1],'<>&"')
+            . "</td><td align='center'>" 
+            . HTML::Entities::encode($choice->[2],'<>&"')
+            . "</td>\n<td>" 
+	    . HTML::Entities::encode($choice->[3],'<>&"')
+            . "</td>\n<td>" 
+	    . HTML::Entities::encode($choice->[4],'<>&"')
+            . "</td>\n<td>" 
+	    . HTML::Entities::encode($choice->[0],'<>&"')
+	    . "</td></tr>\n";	    
+	}
+	$result .= "</table>\n";
+	
+    }
+
+
+
     return $result;
 }
 
 sub postprocess {
     my $self = shift;
 
-    my $result = $ENV{'form.' . $self->{'variable'} . '.forminput'};
-    if (!$result) {
-        $self->{ERROR_MSG} = 
-	    &mt('You must choose at least one student to continue.');
+    my $result = $env{'form.' . $self->{'variable'} . '.forminput'};
+    if (!$result && !$self->{'emptyallowed'}) {
+	if ($self->{'coursepersonnel'}) {
+	    $self->{ERROR_MSG} = 
+		&mt('You must choose at least one user to continue.');
+	} else {
+	    $self->{ERROR_MSG} = 
+		&mt('You must choose at least one student to continue.');
+	}
         return 0;
     }
 
@@ -2310,7 +2683,7 @@ no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
 use Apache::lonlocal;
-
+use Apache::lonnet;
 use Apache::lonpubdir; # for getTitleString
 
 BEGIN {
@@ -2415,7 +2788,8 @@ sub render {
 
     if ($self->{'multichoice'}) {
         $result = <<SCRIPT;
-<script>
+<script type="text/javascript">
+// <!--
     function checkall(value, checkName) {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
             ele = document.forms.helpform.elements[i];
@@ -2433,6 +2807,7 @@ sub render {
             }
         }
     }
+// -->
 </script>
 SCRIPT
        my %lt=&Apache::lonlocal::texthash(
@@ -2462,19 +2837,21 @@ BUTTONS
     # If the subdirectory is in local CSTR space
     my $metadir;
     if ($subdir =~ m|/home/([^/]+)/public_html/(.*)|) {
-        my $user = $1;
-        my $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+	my ($user,$domain)= 
+	    &Apache::loncacc::constructaccess($subdir,
+				     $Apache::lonnet::perlvar{'lonDefDomain'});
 	$metadir='/res/'.$domain.'/'.$user.'/'.$2;
         @fileList = &Apache::lonnet::dirlist($subdir, $domain, $user, '');
     } elsif ($subdir =~ m|^~([^/]+)/(.*)$|) {
 	$subdir='/home/'.$1.'/public_html/'.$2;
-        my $user = $1;
-        my $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+	my ($user,$domain)= 
+	    &Apache::loncacc::constructaccess($subdir,
+				     $Apache::lonnet::perlvar{'lonDefDomain'});
 	$metadir='/res/'.$domain.'/'.$user.'/'.$2;
         @fileList = &Apache::lonnet::dirlist($subdir, $domain, $user, '');
     } else {
         # local library server resource space
-        @fileList = &Apache::lonnet::dirlist($subdir, $ENV{'user.domain'}, $ENV{'user.name'}, '');
+        @fileList = &Apache::lonnet::dirlist($subdir, $env{'user.domain'}, $env{'user.name'}, '');
     }
 
     # Sort the fileList into order
@@ -2533,10 +2910,10 @@ BUTTONS
             my $id = &new_id();
             $result .= '<tr><td align="right"' . " bgcolor='$color'>" .
                 "<input $onclick type='$type' name='" . $var
-            . ".forminput' ".qq{id="$id"}." value='" . HTML::Entities::encode($fileName,'<>&"').
+            . ".forminput' ".qq{id="$id"}." value='" . HTML::Entities::encode($fileName,"<>&\"'").
                 "'";
             if (!$self->{'multichoice'} && $choices == 0) {
-                $result .= ' checked';
+                $result .= ' checked="checked"';
             }
             $result .= "/></td><td bgcolor='$color'>".
                 qq{<label for="$id">}. $file . "</label></td>" .
@@ -2567,9 +2944,9 @@ 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 ($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;
@@ -2594,7 +2971,7 @@ sub fileState {
 
 sub postprocess {
     my $self = shift;
-    my $result = $ENV{'form.' . $self->{'variable'} . '.forminput'};
+    my $result = $env{'form.' . $self->{'variable'} . '.forminput'};
     if (!$result) {
         $self->{ERROR_MSG} = 'You must choose at least one file '.
             'to continue.';
@@ -2650,6 +3027,7 @@ sub start_section {
     $paramHash->{'variable'} = $token->[2]{'variable'};
     $helper->declareVar($paramHash->{'variable'});
     $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
+    $paramHash->{'allowempty'} = $token->[2]{'allowempty'};
     if (defined($token->[2]{'nextstate'})) {
         $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
     }
@@ -2684,6 +3062,74 @@ sub end_section {
 }    
 1;
 
+package Apache::lonhelper::group;
+
+=pod
+ 
+=head2 Element: groupX<group, helper element>
+ 
+<section> allows the user to choose one or more groups from the current course.
+
+It takes the standard attributes "variable", "multichoice", and "nextstate", meaning what they do for most other elements.
+ 
+=cut
+
+no strict;
+@ISA = ("Apache::lonhelper::choices");
+use strict;
+
+BEGIN {
+    &Apache::lonhelper::register('Apache::lonhelper::group',
+                                 ('group'));
+}
+
+sub new {
+    my $ref = Apache::lonhelper::choices->new();
+    bless($ref);
+}
+ 
+sub start_group {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ 
+    if ($target ne 'helper') {
+        return '';
+    }
+
+    $paramHash->{CHOICES} = [];
+
+    $paramHash->{'variable'} = $token->[2]{'variable'};
+    $helper->declareVar($paramHash->{'variable'});
+    $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
+    $paramHash->{'allowempty'} = $token->[2]{'allowempty'};
+    if (defined($token->[2]{'nextstate'})) {
+        $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
+    }
+
+    # Populate the CHOICES element
+    my %choices;
+
+    my $numgroups;
+    my %curr_groups;
+    if (&Apache::loncommon::coursegroups(\%curr_groups)) {
+        foreach my $group_name (keys %curr_groups) {
+            $choices{$group_name} = $group_name;
+        }
+    }
+    foreach my $group_name (sort(keys(%choices))) {
+        push @{$paramHash->{CHOICES}}, [$group_name, $group_name];
+    }
+}
+                                                                                    
+sub end_group {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+    if ($target ne 'helper') {
+        return '';
+    }
+    Apache::lonhelper::group->new();
+}
+1;
+
 package Apache::lonhelper::string;
 
 =pod
@@ -2747,7 +3193,7 @@ sub render {
     my $result = '';
 
     if (defined $self->{ERROR_MSG}) {
-        $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
+        $result .= '<p><font color="#FF0000">' . $self->{ERROR_MSG} . '</font></p>';
     }
 
     $result .= '<input type="string" name="' . $self->{'variable'} . '.forminput"';
@@ -2801,7 +3247,7 @@ package Apache::lonhelper::general;
 =head2 General-purpose tag: <exec>X<exec, helper tag>
 
 The contents of the exec tag are executed as Perl code, B<not> inside a 
-safe space, so the full range of $ENV and such is available. The code
+safe space, so the full range of $env and such is available. The code
 will be executed as a subroutine wrapped with the following code:
 
 "sub { my $helper = shift; my $state = shift;" and
@@ -2823,6 +3269,7 @@ be able to call methods on it.
 =cut
 
 use Apache::lonlocal;
+use Apache::lonnet;
 
 BEGIN {
     &Apache::lonhelper::register('Apache::lonhelper::general',
@@ -2945,12 +3392,16 @@ will make a "Finish Helper" button that
 which is useful for the Course Initialization helper so the users never see
 the old values taking effect.
 
+If the parameter "restartCourse" is not true a 'Finish' Button will be
+presented that takes the user back to whatever was defined as <exitpage>
+
 =cut
 
 no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
 use Apache::lonlocal;
+use Apache::lonnet;
 BEGIN {
     &Apache::lonhelper::register('Apache::lonhelper::final',
                                  ('final', 'exitpage'));
@@ -3042,35 +3493,41 @@ sub render {
 	$result .= '</ul>';
     }
 
+    my $actionURL = $self->{EXIT_PAGE};
+    my $targetURL = '';
+    my $finish=&mt('Finish');
     if ($self->{'restartCourse'}) {
-	my $targetURL = '/adm/menu';
-	if ($ENV{'course.'.$ENV{'request.course.id'}.'.url'}=~/^uploaded/) {
+	$actionURL = '/adm/roles';
+	$targetURL = '/adm/menu';
+	if ($env{'course.'.$env{'request.course.id'}.'.url'}=~/^uploaded/) {
 	    $targetURL = '/adm/coursedocs';
 	} else {
 	    $targetURL = '/adm/navmaps';
 	}
-	if ($ENV{'course.'.$ENV{'request.course.id'}.'.clonedfrom'}) {
+	if ($env{'course.'.$env{'request.course.id'}.'.clonedfrom'}) {
 	    $targetURL = '/adm/parmset?overview=1';
 	}
-	my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
-	my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
-        $result .= "<center>\n" .
-            "<form action='/adm/roles' method='post' target='loncapaclient'>\n" .
-            "<input type='button' onclick='history.go(-1)' value='$previous' />" .
-            "<input type='hidden' name='orgurl' value='$targetURL' />" .
-            "<input type='hidden' name='selectrole' value='1' />\n" .
-            "<input type='hidden' name='" . $ENV{'request.role'} . 
-            "' value='1' />\n<input type='submit' value='" .
-	    &mt('Finish Course Initialization') . "' />\n" .
-            "</form></center>";
+	my $finish=&mt('Finish Course Initialization');
     }
+    my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
+    my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
+    my $target = " target='loncapaclient'";
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) {  $target='';  }
+    $result .= "<center>\n" .
+	"<form action='".$actionURL."' method='post' $target>\n" .
+	"<input type='button' onclick='history.go(-1)' value='$previous' />" .
+	"<input type='hidden' name='orgurl' value='$targetURL' />" .
+	"<input type='hidden' name='selectrole' value='1' />\n" .
+	"<input type='hidden' name='" . $env{'request.role'} . 
+	"' value='1' />\n<input type='submit' value='" . $finish . "' />\n" .
+	"</form></center>";
 
     return $result;
 }
 
 sub overrideForm {
-    my $self = shift;
-    return $self->{'restartCourse'};
+    return 1;
 }
 
 1;
@@ -3086,6 +3543,7 @@ no strict;
 @ISA = ('Apache::lonhelper::element');
 use strict;
 use Apache::lonlocal;
+use Apache::lonnet;
 
 BEGIN {
     &Apache::lonhelper::register('Apache::lonhelper::parmwizfinal',
@@ -3127,6 +3585,11 @@ sub render {
                         'answer_date' => "0_answerdate",
 			'tries' => '0_maxtries',
 			'weight' => '0_weight' );
+    my %realParmName = ('open_date' => "opendate",
+                        'due_date' => "duedate",
+                        'answer_date' => "answerdate",
+			'tries' => 'maxtries',
+			'weight' => 'weight' );
     
     my $affectedResourceId = "";
     my $parm_name = $parmTypeHash{$vars->{ACTION_TYPE}};
@@ -3134,11 +3597,17 @@ sub render {
     my $resourceString;
     my $symb;
     my $paramlevel;
-
+    
     # Print the granularity, depending on the action
     if ($vars->{GRANULARITY} eq 'whole_course') {
         $resourceString .= '<li>'.&mt('for <b>all resources in the course</b>').'</li>';
-        $level = 9; # general course, see lonparmset.pm perldoc
+	if ($vars->{TARGETS} eq 'course') {
+	    $level = 11; # general course, see lonparmset.pm perldoc
+	} elsif ($vars->{TARGETS} eq 'section') {
+	    $level = 6;
+	} else {
+	    $level = 3;
+	}
         $affectedResourceId = "0.0";
         $symb = 'a';
         $paramlevel = 'general';
@@ -3148,21 +3617,51 @@ sub render {
         my $title = $res->compTitle();
         $symb = $res->symb();
         $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
-        $level = 8;
+	if ($vars->{TARGETS} eq 'course') {
+	    $level = 10; # general course, see lonparmset.pm perldoc
+	} elsif ($vars->{TARGETS} eq 'section') {
+	    $level = 5;
+	} else {
+	    $level = 2;
+	}
         $affectedResourceId = $vars->{RESOURCE_ID};
         $paramlevel = 'map';
     } else {
         my $navmap = Apache::lonnavmaps::navmap->new();
         my $res = $navmap->getById($vars->{RESOURCE_ID});
+        my $part = $vars->{RESOURCE_ID_part};
+	if ($part ne 'All Parts' && $part) { $parm_name=~s/^0/$part/; } else { $part=&mt('All Parts'); }
         $symb = $res->symb();
         my $title = $res->compTitle();
-        $resourceString .= '<li>'.&mt('for the resource named [_1]',"<b>$title</b>").'</li>';
-        $level = 7;
+        $resourceString .= '<li>'.&mt('for the resource named [_1] part [_2]',"<b>$title</b>","<b>$part</b>").'</li>';
+	if ($vars->{TARGETS} eq 'course') {
+	    $level = 7; # general course, see lonparmset.pm perldoc
+	} elsif ($vars->{TARGETS} eq 'section') {
+	    $level = 4;
+	} else {
+	    $level = 1;
+	}
         $affectedResourceId = $vars->{RESOURCE_ID};
         $paramlevel = 'full';
     }
 
-    my $result = "<form name='helpform' method='get' action='/adm/parmset#$affectedResourceId&$parm_name&$level'>\n";
+    my $result = "<form name='helpform' method='POST' action='/adm/parmset#$affectedResourceId&$parm_name&$level'>\n";
+    $result .= "<input type='hidden' name='action' value='settable' />\n";
+    $result .= "<input type='hidden' name='dis' value='helper' />\n";
+    $result .= "<input type='hidden' name='pscat' value='".
+	$realParmName{$vars->{ACTION_TYPE}}."' />\n";
+    if ($vars->{GRANULARITY} eq 'resource') {
+	$result .= "<input type='hidden' name='symb' value='".
+	    HTML::Entities::encode($symb,"'<>&\"") . "' />\n";
+    } elsif ($vars->{GRANULARITY} eq 'map') {
+	$result .= "<input type='hidden' name='pschp' value='".
+	    $affectedResourceId."' />\n";
+    }
+    my $part = $vars->{RESOURCE_ID_part};
+    if ($part eq 'All Parts' || !$part) { $part=0; }
+    $result .= "<input type='hidden' name='psprt' value='".
+	HTML::Entities::encode($part,"'<>&\"") . "' />\n";
+
     $result .= '<p>'.&mt('Confirm that this information is correct, then click &quot;Finish Helper&quot; to complete setting the parameter.').'<ul>';
     
     # Print the type of manipulation:
@@ -3200,6 +3699,8 @@ sub render {
     } elsif ($vars->{ACTION_TYPE} eq 'tries') {
 	$result .= "<input type='hidden' name='pres_value' " .
 	    "value='" . $vars->{TRIES} . "' />\n";
+        $result .= "<input type='hidden' name='pres_type' " .
+            "value='int_pos' />\n";
     } elsif ($vars->{ACTION_TYPE} eq 'weight') {
 	$result .= "<input type='hidden' name='pres_value' " .
 	    "value='" . $vars->{WEIGHT} . "' />\n";
@@ -3213,23 +3714,23 @@ sub render {
     } elsif ($vars->{TARGETS} eq 'section') {
         my $section = $vars->{SECTION_NAME};
         $result .= '<li>'.&mt('for section [_1]',"<b>$section</b>").'</li>';
-        $level -= 3;
-        $result .= "<input type='hidden' name='csec' value='" .
-            HTML::Entities::encode($section,'<>&"') . "' />\n";
+	$result .= "<input type='hidden' name='csec' value='" .
+            HTML::Entities::encode($section,"'<>&\"") . "' />\n";
+    } elsif ($vars->{TARGETS} eq 'group') {
+        my $group = $vars->{GROUP_NAME};
+        $result .= '<li>'.&mt('for group [_1]',"<b>$group</b>").'</li>';
+        $result .= "<input type='hidden' name='cgroup' value='" .
+            HTML::Entities::encode($group,"'<>&\"") . "' />\n";
     } else {
         # FIXME: This is probably wasteful! Store the name!
         my $classlist = Apache::loncoursedata::get_classlist();
-        my $username = $vars->{USER_NAME};
-        # Chop off everything after the last colon (section)
-        $username = substr($username, 0, rindex($username, ':'));
-        my $name = $classlist->{$username}->[6];
+	my ($uname,$udom)=split(':',$vars->{USER_NAME});
+        my $name = $classlist->{$uname.':'.$udom}->[6];
         $result .= '<li>'.&mt('for [_1]',"<b>$name</b>").'</li>';
-        $level -= 6;
-        my ($uname, $udom) = split /:/, $vars->{USER_NAME};
         $result .= "<input type='hidden' name='uname' value='".
-            HTML::Entities::encode($uname,'<>&"') . "' />\n";
+            HTML::Entities::encode($uname,"'<>&\"") . "' />\n";
         $result .= "<input type='hidden' name='udom' value='".
-            HTML::Entities::encode($udom,'<>&"') . "' />\n";
+            HTML::Entities::encode($udom,"'<>&\"") . "' />\n";
     }
 
     # Print value
@@ -3243,7 +3744,6 @@ sub render {
     
     # Make the table appear
     $result .= "\n<input type='hidden' value='true' name='prevvisit' />";
-    $result .= "\n<input type='hidden' value='all' name='pschp' />";
     $result .= "\n<input type='hidden' value='$symb' name='pssymb' />";
     $result .= "\n<input type='hidden' value='$paramlevel' name='parmlev' />";