loncom/interface/lonhelper.pm - diff

Return to lonhelper.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhelper.pm between versions 1.37 and 1.140

-version 1.37, 2003/06/12 13:52:06
+version 1.140, 2006/05/05 14:35:44
  Line 25
  #
  # http://www.lon-capa.org/
  #
- # (Page Handler
- #
- # (.helper handler
- #
  =pod
- =head1 lonhelper - HTML Helper framework for LON-CAPA
+ =head1 NAME
+ lonhelper - implements helper framework
+ =head1 SYNOPSIS
+ lonhelper implements the helper framework for LON-CAPA, and provides
+     many generally useful components for that framework.
+ Helpers are little programs which present the user with a sequence of
+     simple choices, instead of one monolithic multi-dimensional
+     choice. They are also referred to as "wizards", "druids", and
+     other potentially trademarked or semantically-loaded words.
+ =head1 OVERVIEWX<lonhelper>
- Helpers, often known as "wizards", are well-established UI widgets that users
+ Helpers are well-established UI widgets that users
  feel comfortable with. It can take a complicated multidimensional problem the
  user has and turn it into a series of bite-sized one-dimensional questions.
- Line 46  directory and having the .helper file ex
+ Line 56  directory and having the .helper file ex
  All classes are in the Apache::lonhelper namespace.
- =head2 lonhelper XML file format
+ =head1 lonhelper XML file formatX<lonhelper, XML file format>
  A helper consists of a top-level <helper> tag which contains a series of states.
  Each state contains one or more state elements, which are what the user sees, like
- Line 87  Of course this does nothing. In order fo
+ Line 97  Of course this does nothing. In order fo
  necessary to put actual elements into the wizard. Documentation for each
  of these elements follows.
- =head2 Creating a Helper With Code, Not XML
+ =head1 Creating a Helper With Code, Not XML
  In some situations, such as the printing wizard (see lonprintout.pm),
  writing the helper in XML would be too complicated, because of scope
- Line 146  Normally the machinery in the XML format
+ Line 156  Normally the machinery in the XML format
  adding states can easily be done by wrapping the state in a <condition>
  tag. This should only be used when the code dominates the XML content,
  the code is so complicated that it is difficult to get access to
- all of the information you need because of scoping issues, or so much
+ all of the information you need because of scoping issues, or would-be <exec> or
- of the information used is persistent because would-be <exec> or
+ <eval> blocks using the {DATA} mechanism results in hard-to-read
- <eval> blocks that using the {DATA} mechanism results in hard-to-read
+ and -maintain code. (See course.initialization.helper for a borderline
- and -maintain code.
+ case.)
  It is possible to do some of the work with an XML fragment parsed by
  lonxml; again, see lonprintout.pm for an example. In that case it is
- Line 158  before parsing XML fragments and B<Apach
+ Line 168  before parsing XML fragments and B<Apach
  when you are done. See lonprintout.pm for examples of this usage in the
  printHelper subroutine.
+ =head2 Localization
+ The helper framework tries to handle as much localization as
+ possible. The text is always run through
+ Apache::lonlocal::normalize_string, so be sure to run the keys through
+ that function for maximum usefulness and robustness.
  =cut
  package Apache::lonhelper;
  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
- Line 208  my $paramHash;
+ Line 228  my $paramHash;
  # In the debugger, this means that breakpoints are ignored until you step into
  # a function and get out of what must be a "faked up scope" in the Apache->
  # mod_perl connection. In this code, it was manifesting itself in the existence
- # of two seperate file-scoped $helper variables, one set to the value of the
+ # of two separate file-scoped $helper variables, one set to the value of the
  # helper in the helper constructor, and one referenced by the handler on the
- # "$helper->process()" line. The second was therefore never set, and was still
+ # "$helper->process()" line. Using the debugger, one could actually
+ # see the two different $helper variables, as hashes at completely
+ # different addresses. The second was therefore never set, and was still
  # undefined when I tried to call process on it.
  # By pushing the "real handler" down into the "real scope", everybody except the
  # actual handler function directly below this comment gets the same $helper and
- Line 231  sub real_handler {
+ Line 253  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;
- Line 239  sub real_handler {
+ Line 261  sub real_handler {
      # Send header, don't cache this page
-     if ($r->header_only) {
+     if ($env{'browser.mathml'}) {
-         if ($ENV{'browser.mathml'}) {
+ 	&Apache::loncommon::content_type($r,'text/xml');
-             $r->content_type('text/xml');
-         } else {
-             $r->content_type('text/html');
-         }
-         $r->send_http_header;
-         return OK;
-     }
-     if ($ENV{'browser.mathml'}) {
-         $r->content_type('text/xml');
      } else {
-         $r->content_type('text/html');
+ 	&Apache::loncommon::content_type($r,'text/html');
      }
      $r->send_http_header;
+     return OK if $r->header_only;
      $r->rflush();
      # Discard result, we just want the objects that get created by the
- Line 262  sub real_handler {
+ Line 276  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;
      }
- Line 343  sub end_state {
+ Line 357  sub end_state {
  package Apache::lonhelper::helper;
  use Digest::MD5 qw(md5_hex);
- use HTML::Entities;
+ use HTML::Entities();
  use Apache::loncommon;
  use Apache::File;
+ use Apache::lonlocal;
+ use Apache::lonnet;
  sub new {
      my $proto = shift;
- Line 357  sub new {
+ Line 373  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
- Line 399  sub new {
+ Line 415  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
      {
- Line 437  sub _saveVars {
+ Line 453  sub _saveVars {
      my $self = shift;
      my $result = "";
      $result .= '<input type="hidden" name="CURRENT_STATE" value="' .
-         HTML::Entities::encode($self->{STATE}) . "\" />\n";
+         HTML::Entities::encode($self->{STATE},'<>&"') . "\" />\n";
      $result .= '<input type="hidden" name="TOKEN" value="' .
          $self->{TOKEN} . "\" />\n";
      $result .= '<input type="hidden" name="RETURN_PAGE" value="' .
-         HTML::Entities::encode($self->{RETURN_PAGE}) . "\" />\n";
+         HTML::Entities::encode($self->{RETURN_PAGE},'<>&"') . "\" />\n";
      return $result;
  }
- Line 469  sub declareVar {
+ Line 485  sub declareVar {
      }
      my $envname = 'form.' . $var . '.forminput';
-     if (defined($ENV{$envname})) {
+     if (defined($env{$envname})) {
-         if (ref($ENV{$envname})) {
+         if (ref($env{$envname})) {
-             $self->{VARS}->{$var} = join('|||', @{$ENV{$envname}});
+             $self->{VARS}->{$var} = join('|||', @{$env{$envname}});
          } else {
-             $self->{VARS}->{$var} = $ENV{$envname};
+             $self->{VARS}->{$var} = $env{$envname};
          }
      }
  }
- Line 485  sub allowedCheck {
+ Line 501  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 {
- Line 507  sub process {
+ Line 523  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 "Next ->") {
+     if ($self->{STATE} ne "START" || $env{"form.SUBMIT"} eq &mt("Next ->")) {
  	my $prevState = $self->{STATES}{$self->{STATE}};
          $prevState->postprocess();
      }
- Line 558  sub display {
+ Line 574  sub display {
      }
      # Phase 4: Display.
-     my $stateTitle = $state->title();
+     my $stateTitle=&mt($state->title());
-     my $bodytag = &Apache::loncommon::bodytag("$self->{TITLE}",'','');
+     my $browser_searcher_js =
+ 	'<script type="text/javascript">'."\n".
+ 	&Apache::loncommon::browser_and_searcher_javascript().
+ 	"\n".'</script>';
+     $result .= &Apache::loncommon::start_page($self->{TITLE},
+ 					      $browser_searcher_js);
+     my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
+     my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
+     # FIXME: This should be parameterized, not concatenated - Jeremy
-     $result .= <<HEADER;
- <html>
-     <head>
-         <title>LON-CAPA Helper: $self->{TITLE}</title>
-     </head>
-     $bodytag
- HEADER
      if (!$state->overrideForm()) { $result.="<form name='helpform' method='POST'>"; }
      $result .= <<HEADER;
          <table border="0" width='100%'><tr><td>
- Line 591  HEADER
+ Line 611  HEADER
          }
          if ($self->{DONE}) {
              my $returnPage = $self->{RETURN_PAGE};
-             $result .= "<a href=\"$returnPage\">End Helper</a>";
+             $result .= "<a href=\"$returnPage\">" . &mt("End Helper") . "</a>";
          }
          else {
              $result .= '<nobr><input name="back" type="button" ';
-             $result .= 'value="&lt;- Previous" onclick="history.go(-1)" /> ';
+             $result .= 'value="' . $previous . '" onclick="history.go(-1)" /> ';
-             $result .= '<input name="SUBMIT" type="submit" value="Next -&gt;" /></nobr>';
+             $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></nobr>';
          }
      }
- Line 610  HEADER
+ Line 630  HEADER
          }
          if ($self->{DONE}) {
              my $returnPage = $self->{RETURN_PAGE};
-             $result .= "<a href=\"$returnPage\">End Helper</a>";
+             $result .= "<a href=\"$returnPage\">" . &mt('End Helper') . "</a>";
          }
          else {
              $result .= '<nobr><input name="back" type="button" ';
-             $result .= 'value="&lt;- Previous" onclick="history.go(-1)" /> ';
+             $result .= 'value="' . $previous . '" onclick="history.go(-1)" /> ';
-             $result .= '<input name="SUBMIT" type="submit" value="Next -&gt;" /></nobr>';
+             $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></nobr>';
          }
      }
- Line 630  HEADER
+ Line 650  HEADER
              </tr>
            </table>
          </form>
-     </body>
- </html>
  FOOTER
+     $result .= &Apache::loncommon::end_page();
      # Handle writing out the vars to the file
      my $file = Apache::File->new('>'.$self->{FILENAME});
      print $file $self->_varsInFile();
- Line 748  package Apache::lonhelper::element;
+ Line 767  package Apache::lonhelper::element;
  =pod
- =head2 Element Base Class
+ =head1 Element Base Class
  The Apache::lonhelper::element base class provides support for elements
  and defines some generally useful tags for use in elements.
- B<finalcode tag>
+ =head2 finalcode tagX<finalcode>
  Each element can contain a "finalcode" tag that, when the special FINAL
  helper state is used, will be executed, surrounded by "sub { my $helper = shift;"
- Line 762  may be an empty string. See course initi
+ Line 781  may be an empty string. See course initi
  generally intended for helpers like the course initialization helper, which consist
  of several panels, each of which is performing some sort of bite-sized functionality.
- B<defaultvalue tag>
+ =head2 defaultvalue tagX<defaultvalue>
  Each element that accepts user input can contain a "defaultvalue" tag that,
  when surrounded by "sub { my $helper = shift; my $state = shift; " and "}",
- Line 779  some setting accidentally.
+ Line 798  some setting accidentally.
  Again, see the course initialization helper for examples.
- B<getValue method>
+ =head2 validator tagX<validator>
+ Some elements that accepts user input can contain a "validator" tag that,
+ when surrounded by "sub { my $helper = shift; my $state = shift; my $element = shift; my $val = shift "
+ and "}", where "$val" is the value the user entered, will form a subroutine
+ that when called will verify whether the given input is valid or not. If it
+ is valid, the routine will return a false value. If invalid, the routine
+ will return an error message to be displayed for the user.
+ Consult the documentation for each element to see whether it supports this
+ tag.
+ =head2 getValue methodX<getValue (helper elements)>
  If the element stores the name of the variable in a 'variable' member, which
  the provided ones all do, you can retreive the value of the variable by calling
- Line 790  this method.
+ Line 821  this method.
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::element',
                                   ('nextstate', 'finalcode',
-                                   'defaultvalue'));
+                                   'defaultvalue', 'validator'));
  }
  # Because we use the param hash, this is often a sufficent
- Line 855  sub start_defaultvalue {
+ Line 886  sub start_defaultvalue {
  sub end_defaultvalue { return ''; }
+ # Validators may need to take language specifications
+ sub start_validator {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     $paramHash->{VALIDATOR} = &Apache::lonxml::get_all_text('/validator',
+                                                              $parser);
+     $paramHash->{VALIDATOR} = 'sub { my $helper = shift; my $state = shift; my $element = shift; my $val = shift;' .
+         $paramHash->{VALIDATOR} . '}';
+     return '';
+ }
+ sub end_validator { return ''; }
  sub preprocess {
      return 1;
  }
- Line 882  package Apache::lonhelper::message;
+ Line 930  package Apache::lonhelper::message;
  =pod
- =head2 Element: message
+ =head1 Elements
- Message elements display the contents of their <message_text> tags, and
+ =head2 Element: messageX<message, helper element>
- transition directly to the state in the <nextstate> tag. Example:
-  <message>
+ Message elements display their contents, and
-    <nextstate>GET_NAME</nextstate>
+ transition directly to the state in the <nextstate> attribute. Example:
-    <message_text>This is the <b>message</b> the user will see,
-                  <i>HTML allowed</i>.</message_text>
+  <message nextstate='GET_NAME'>
+    This is the <b>message</b> the user will see,
+                  <i>HTML allowed</i>.
     </message>
- This will display the HTML message and transition to the <nextstate> if
+ This will display the HTML message and transition to the 'nextstate' if
  given. The HTML will be directly inserted into the helper, so if you don't
- want text to run together, you'll need to manually wrap the <message_text>
+ want text to run together, you'll need to manually wrap the message text
  in <p> tags, or whatever is appropriate for your HTML.
  Message tags do not add in whitespace, so if you want it, you'll need to add
- Line 907  within each other.)
+ Line 956  within each other.)
  This is also a good template for creating your own new states, as it has
  very little code beyond the state template.
+ =head3 Localization
+ The contents of the message tag will be run through the
+ normalize_string function and that will be used as a call to &mt.
  =cut
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::message',
- Line 931  sub start_message {
+ Line 986  sub start_message {
          return '';
      }
-     $paramHash->{MESSAGE_TEXT} = &Apache::lonxml::get_all_text('/message',
+     $paramHash->{MESSAGE_TEXT} = &mtn(&Apache::lonxml::get_all_text('/message',
-                                                                $parser);
+                                                                $parser));
      if (defined($token->[2]{'nextstate'})) {
          $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
- Line 953  sub end_message {
+ Line 1008  sub end_message {
  sub render {
      my $self = shift;
-     return $self->{MESSAGE_TEXT};
+     return &mtn($self->{MESSAGE_TEXT});
  }
  # If a NEXTSTATE was given, switch to it
  sub postprocess {
- Line 970  package Apache::lonhelper::choices;
+ Line 1025  package Apache::lonhelper::choices;
  =pod
- =head2 Element: choices
+ =head2 Element: choicesX<choices, helper element>
  Choice states provide a single choice to the user as a text selection box.
  A "choice" is two pieces of text, one which will be displayed to the user
- Line 988  value, will allow the user to select mul
+ Line 1043  value, will allow the user to select mul
  value, will allow the user to select none of the choices without raising
  an error message.
- B<SUB-TAGS>
+ =head3 SUB-TAGS
- <choices> can have the following subtags:
+ <choices> can have the following subtags:X<choice, helper tag>
  =over 4
  =item * <nextstate>state_name</nextstate>: If given, this will cause the
-       choice element to transition to the given state after executing. If
+       choice element to transition to the given state after executing.
-       this is used, do not pass nextstates to the <choice> tag.
+       This will override the <nextstate> passed to <choices> (if any).
  =item * <choice />: If the choices are static,
        this element will allow you to specify them. Each choice
- Line 1005  B<SUB-TAGS>
+ Line 1060  B<SUB-TAGS>
        For example,
        <choice computer='234-12-7312'>Bobby McDormik</choice>.
-       <choice> can take a parameter "eval", which if set to
+ <choice> can take a parameter "eval", which if set to
-       a true value, will cause the contents of the tag to be
+ a true value, will cause the contents of the tag to be
-       evaluated as it would be in an <eval> tag; see <eval> tag
+ evaluated as it would be in an <eval> tag; see <eval> tag
-       below.
+ below.
  <choice> may optionally contain a 'nextstate' attribute, which
- will be the state transisitoned to if the choice is made, if
+ will be the state transistioned to if the choice is made, if
- the choice is not multichoice.
+ the choice is not multichoice. This will override the nextstate
+ passed to the parent C<choices> tag.
+ <choice> may optionally contain a 'relatedvalue' attribute, which
+ if present will cause a text entry to appear to the right of the
+ selection.  The value of the relatedvalue attribute is a variable
+ into which the text entry will be stored e.g.:
+ <choice computer='numberprovided" relatedvalue="num">Type the number in:</choice>
+ <choice> may contain a relatededefault atribute which, if the
+ relatedvalue attribute is present will be the initial value of the input
+ box.
  =back
- Line 1037  You can mix and match methods of creatin
+ Line 1103  You can mix and match methods of creatin
  "push" onto the choice list, rather then wiping it out. (You can even
  remove choices programmatically, but that would probably be bad form.)
- B<defaultvalue support>
+ =head3 defaultvalue support
  Choices supports default values both in multichoice and single choice mode.
  In single choice mode, have the defaultvalue tag's function return the
- Line 1054  tag is stored in the {VARS} hash.
+ Line 1120  tag is stored in the {VARS} hash.
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::choices',
- Line 1100  sub start_choice {
+ Line 1168  sub start_choice {
      }
      my $computer = $token->[2]{'computer'};
-     my $human = &Apache::lonxml::get_all_text('/choice',
+     my $human = &mt(&Apache::lonxml::get_all_text('/choice',
-                                               $parser);
+                                               $parser));
-     my $nextstate = $token->[2]{'nextstate'};
+     my $nextstate  = $token->[2]{'nextstate'};
-     my $evalFlag = $token->[2]{'eval'};
+     my $evalFlag   = $token->[2]{'eval'};
-     push @{$paramHash->{CHOICES}}, [$human, $computer, $nextstate,
+     my $relatedVar = $token->[2]{'relatedvalue'};
-                                     $evalFlag];
+     my $relatedDefault = $token->[2]{'relateddefault'};
+     push @{$paramHash->{CHOICES}}, [&mtn($human), $computer, $nextstate,
+                                     $evalFlag, $relatedVar, $relatedDefault];
      return '';
  }
- Line 1113  sub end_choice {
+ Line 1183  sub end_choice {
      return '';
  }
+ {
+     # used to generate unique id attributes for <input> tags.
+     # internal use only.
+     my $id = 0;
+     sub new_id { return $id++; }
+ }
  sub render {
-     # START HERE: Replace this with correct choices code.
      my $self = shift;
      my $var = $self->{'variable'};
      my $buttons = '';
- Line 1122  sub render {
+ Line 1198  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];
- Line 1131  sub render {
+ Line 1208  sub render {
              }
          }
      }
+ // -->
  </script>
  SCRIPT
      }
- Line 1138  SCRIPT
+ Line 1216  SCRIPT
      # Only print "select all" and "unselect all" if there are five or
      # more choices; fewer then that and it looks silly.
      if ($self->{'multichoice'} && scalar(@{$self->{CHOICES}}) > 4) {
+         my %lt=&Apache::lonlocal::texthash(
+ 			'sa'  => "Select All",
+ 		        'ua'  => "Unselect All");
          $buttons = <<BUTTONS;
  <br />
- <input type="button" onclick="checkall(true, '$var')" value="Select All" />
+ <input type="button" onclick="checkall(true, '$var')" value="$lt{'sa'}" />
- <input type="button" onclick="checkall(false, '$var')" value="Unselect All" />
+ <input type="button" onclick="checkall(false, '$var')" value="$lt{'ua'}" />
  <br />&nbsp;
  BUTTONS
      }
- Line 1193  BUTTONS
+ Line 1274  BUTTONS
      my $type = "radio";
      if ($self->{'multichoice'}) { $type = 'checkbox'; }
      foreach my $choice (@{$self->{CHOICES}}) {
+         my $id = &new_id();
          $result .= "<tr>\n<td width='20'>&nbsp;</td>\n";
          $result .= "<td valign='top'><input type='$type' name='$var.forminput'"
-             . "' value='" .
+             . " value='" .
-             HTML::Entities::encode($choice->[1])
+             HTML::Entities::encode($choice->[1],"<>&\"'")
              . "'";
          if ($checkedChoices{$choice->[1]}) {
-             $result .= " checked ";
+             $result .= " checked='checked' ";
          }
+         $result .= qq{id="id$id"};
          my $choiceLabel = $choice->[0];
-         if ($choice->[4]) {  # if we need to evaluate this choice
+         if ($choice->[3]) {  # if we need to evaluate this choice
              $choiceLabel = "sub { my $helper = shift; my $state = shift;" .
                  $choiceLabel . "}";
              $choiceLabel = eval($choiceLabel);
              $choiceLabel = &$choiceLabel($helper, $self);
          }
-         $result .= "/></td><td> " . $choiceLabel . "</td></tr>\n";
+         $result .= "/></td><td> ".qq{<label for="id$id">}.
+             $choiceLabel. "</label></td>";
+ 	if ($choice->[4]) {
+ 	    $result .='<td><input type="text" size="5" name="'
+ 		.$choice->[4].'.forminput" value="'
+                 .$choice->[5].'" /></td>';
+ 	}
+ 	$result .= "</tr>\n";
      }
      $result .= "</table>\n\n\n";
      $result .= $buttons;
- Line 1220  BUTTONS
+ Line 1310  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} = "You must choose one or more choices to" .
+         $self->{ERROR_MSG} =
-             " continue.";
+ 	    &mt("You must choose one or more choices to continue.");
          return 0;
      }
- Line 1242  sub postprocess {
+ Line 1332  sub postprocess {
                  $helper->changeState($choice->[2]);
              }
          }
+ 	if ($choice->[4]) {
+ 	    my $varname = $choice->[4];
+ 	    $helper->{'VARS'}->{$varname} = $env{'form.'."$varname.forminput"};
+ 	}
+     }
+     return 1;
+ }
+;
+ package Apache::lonhelper::dropdown;
+ =pod
+ =head2 Element: dropdownX<dropdown, helper tag>
+ A drop-down provides a drop-down box instead of a radio button
+ box. Because most people do not know how to use a multi-select
+ drop-down box, that option is not allowed. Otherwise, the arguments
+ are the same as "choices", except "allowempty" is also meaningless.
+ <dropdown> takes an attribute "variable" to control which helper variable
+ the result is stored in.
+ =head3 SUB-TAGS
+ <choice>, which acts just as it does in the "choices" element.
+ =cut
+ # This really ought to be a sibling class to "choice" which is itself
+ # a child of some abstract class.... *shrug*
+ no strict;
+ @ISA = ("Apache::lonhelper::element");
+ use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
+ BEGIN {
+     &Apache::lonhelper::register('Apache::lonhelper::dropdown',
+                               ('dropdown'));
+ }
+ sub new {
+     my $ref = Apache::lonhelper::element->new();
+     bless($ref);
+ }
+ # CONSTRUCTION: Construct the message element from the XML
+ sub start_dropdown {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     # Need to initialize the choices list, so everything can assume it exists
+     $paramHash->{'variable'} = $token->[2]{'variable'} if (!defined($paramHash->{'variable'}));
+     $helper->declareVar($paramHash->{'variable'});
+     $paramHash->{CHOICES} = [];
+     return '';
+ }
+ sub end_dropdown {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     Apache::lonhelper::dropdown->new();
+     return '';
+ }
+ sub render {
+     my $self = shift;
+     my $var = $self->{'variable'};
+     my $result = '';
+     if (defined $self->{ERROR_MSG}) {
+         $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
+     }
+     my %checkedChoices;
+     my $checkedChoicesFunc;
+     if (defined($self->{DEFAULT_VALUE})) {
+         $checkedChoicesFunc = eval ($self->{DEFAULT_VALUE});
+         die 'Error in default value code for variable ' .
+             $self->{'variable'} . ', Perl said: ' . $@ if $@;
+     } else {
+         $checkedChoicesFunc = sub { return ''; };
+     }
+     # single choice
+     my $selectedChoice = &$checkedChoicesFunc($helper, $self);
+     my $foundChoice = 0;
+     # check that the choice is in the list of choices.
+     for my $choice (@{$self->{CHOICES}}) {
+ 	if ($choice->[1] eq $selectedChoice) {
+ 	    $checkedChoices{$choice->[1]} = 1;
+ 	    $foundChoice = 1;
+ 	}
+     }
+     # If we couldn't find the choice, pick the first one
+     if (!$foundChoice) {
+ 	$checkedChoices{$self->{CHOICES}->[0]->[1]} = 1;
+     }
+     $result .= "<select name='${var}.forminput'>\n";
+     foreach my $choice (@{$self->{CHOICES}}) {
+         $result .= "<option value='" .
+             HTML::Entities::encode($choice->[1],"<>&\"'")
+             . "'";
+         if ($checkedChoices{$choice->[1]}) {
+             $result .= " selected='selected' ";
+         }
+         my $choiceLabel = $choice->[0];
+         if ($choice->[4]) {  # if we need to evaluate this choice
+             $choiceLabel = "sub { my $helper = shift; my $state = shift;" .
+                 $choiceLabel . "}";
+             $choiceLabel = eval($choiceLabel);
+             $choiceLabel = &$choiceLabel($helper, $self);
+         }
+         $result .= ">" . &mtn($choiceLabel) . "</option>\n";
+     }
+     $result .= "</select>\n";
+     return $result;
+ }
+ # If a NEXTSTATE was given or a nextstate for this choice was
+ # given, switch to it
+ sub postprocess {
+     my $self = shift;
+     my $chosenValue = $env{'form.' . $self->{'variable'} . '.forminput'};
+     if (!defined($chosenValue) && !$self->{'allowempty'}) {
+         $self->{ERROR_MSG} = "You must choose one or more choices to" .
+             " continue.";
+         return 0;
+     }
+     if (defined($self->{NEXTSTATE})) {
+         $helper->changeState($self->{NEXTSTATE});
+     }
+     foreach my $choice (@{$self->{CHOICES}}) {
+         if ($choice->[1] eq $chosenValue) {
+             if (defined($choice->[2])) {
+                 $helper->changeState($choice->[2]);
+             }
+         }
      }
      return 1;
  }
- Line 1251  package Apache::lonhelper::date;
+ Line 1496  package Apache::lonhelper::date;
  =pod
- =head2 Element: date
+ =head2 Element: dateX<date, helper element>
  Date elements allow the selection of a date with a drop down list.
- Line 1282  Example:
+ Line 1527  Example:
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal; # A localization nightmare
+ use Apache::lonnet;
  use Time::localtime;
  BEGIN {
- Line 1310  sub start_date {
+ Line 1556  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 {
- Line 1328  sub render {
+ Line 1575  sub render {
      my $var = $self->{'variable'};
      my $date;
+     my $time=time;
+     my ($anytime,$onclick);
+     # first check VARS for a valid new value from the user
+     # then check DEFAULT_VALUE for a valid default time value
+     # otherwise pick now as reasonably good time
+     if (defined($helper->{VARS}{$var})
+ 	&&  $helper->{VARS}{$var} > 0) {
+ 	$date = localtime($helper->{VARS}{$var});
+     } elsif (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;
+ 	    $date = localtime(time);
+ 	    $date->min(0);
+ 	} elsif (defined($time) && $time ne 0) {
+ 	    $date = localtime($time);
+ 	} else {
+ 	    # leave date undefined so it'll default to now
+ 	}
+     }
+     if (!defined($date)) {
+ 	$date = localtime(time);
+ 	$date->min(0);
+     }
+     &Apache::lonnet::logthis("date mode ");
+     if ($anytime) {
+ 	$onclick = "onclick=\"javascript:updateCheck(this.form,'${var}anytime',false)\"";
+     }
      # Default date: The current hour.
-     $date = localtime();
-     $date->min(0);
      if (defined $self->{ERROR_MSG}) {
          $result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
- Line 1339  sub render {
+ Line 1621  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'>";
          }
-         $result .= $months[$i] . "</option>\n";
+         $result .= &mt($months[$i]) . "</option>\n";
      }
      $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>';
          }
- Line 1363  sub render {
+ Line 1645  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>";
          }
- Line 1376  sub render {
+ Line 1658  sub render {
      # Display Hours and Minutes if they are called for
      if ($self->{'hoursminutes'}) {
+ 	# This needs parameterization for times.
+ 	my $am = &mt('a.m.');
+ 	my $pm = &mt('p.m.');
          # Build hour
-         $result .= "<select name='${var}hour'>\n";
+         $result .= "<select $onclick name='${var}hour'>\n";
-         $result .= "<option " . ($date->hour == 0 ? 'selected ':'') .
+         $result .= "<option " . ($date->hour == 0 ? 'selected="selected" ':'') .
-             " value='0'>midnight</option>\n";
+             " value='0'>" . &mt('midnight') . "</option>\n";
          for ($i = 1; $i < 12; $i++) {
              if ($date->hour == $i) {
-                 $result .= "<option selected value='$i'>$i a.m.</option>\n";
+                 $result .= "<option selected='selected' value='$i'>$i $am</option>\n";
              } else {
-                 $result .= "<option value='$i'>$i a.m</option>\n";
+                 $result .= "<option value='$i'>$i $am</option>\n";
              }
          }
-         $result .= "<option " . ($date->hour == 12 ? 'selected ':'') .
+         $result .= "<option " . ($date->hour == 12 ? 'selected="selected" ':'') .
-             " value='12'>noon</option>\n";
+             " 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 p.m.</option>\n";
+                 $result .= "<option selected='selected' value='$i'>$printedHour $pm</option>\n";
              } else {
-                 $result .= "<option value='$i'>$printedHour p.m.</option>\n";
+                 $result .= "<option value='$i'>$printedHour $pm</option>\n";
              }
          }
          $result .= "</select> :\n";
-         $result .= "<select name='${var}minute'>\n";
+         $result .= "<select $onclick name='${var}minute'>\n";
-         for ($i = 0; $i < 60; $i++) {
+ 	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) {
+             if (!$selected && $date->min == $i) {
-                 $result .= "<option selected>";
+                 $result .= "<option selected='selected'>";
+ 		$selected=1;
              } else {
                  $result .= "<option>";
              }
- Line 1415  sub render {
+ Line 1702  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('Any time').'</label>'
+     }
      return $result;
  }
- Line 1423  sub render {
+ Line 1726  sub render {
  sub postprocess {
      my $self = shift;
      my $var = $self->{'variable'};
-     my $month = $ENV{'form.' . $var . 'month'};
+     if ($env{'form.' . $var . 'anytime'}) {
-     my $day = $ENV{'form.' . $var . 'day'};
+ 	$helper->{VARS}->{$var} = undef;
-     my $year = $ENV{'form.' . $var . 'year'};
+     } else {
-     my $min = 0;
+ 	my $month = $env{'form.' . $var . 'month'};
-     my $hour = 0;
+ 	my $day = $env{'form.' . $var . 'day'};
-     if ($self->{'hoursminutes'}) {
+ 	my $year = $env{'form.' . $var . 'year'};
-         $min = $ENV{'form.' . $var . 'minute'};
+ 	my $min = 0;
-         $hour = $ENV{'form.' . $var . 'hour'};
+ 	my $hour = 0;
-     }
+ 	if ($self->{'hoursminutes'}) {
+ 	    $min = $env{'form.' . $var . 'minute'};
-     my $chosenDate = Time::Local::timelocal(0, $min, $hour, $day, $month, $year);
+ 	    $hour = $env{'form.' . $var . 'hour'};
-     # 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
+ 	my $chosenDate;
-     # 3, depending on if it's a leapyear
+ 	eval {$chosenDate = Time::Local::timelocal(0, $min, $hour, $day, $month, $year);};
-     my $checkDate = localtime($chosenDate);
+ 	my $error = $@;
-     if ($checkDate->mon != $month || $checkDate->mday != $day ||
+ 	# Check to make sure that the date was not automatically co-erced into a
-         $checkDate->year + 1900 != $year) {
+ 	# valid date, as we want to flag that as an error
-         $self->{ERROR_MSG} = "Can't use " . $months[$month] . " $day, $year as a "
+ 	# This happens for "Feb. 31", for instance, which is coerced to March 2 or
-             . "date because it doesn't exist. Please enter a valid date.";
+ 	# 3, depending on if it's a leap year
-         return 0;
+ 	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;
+     }
+     if (defined($self->{VALIDATOR})) {
+ 	my $validator = eval($self->{VALIDATOR});
+ 	die 'Died during evaluation of validator code; Perl said: ' . $@ if $@;
+ 	my $invalid = &$validator($helper, $state, $self, $self->getValue());
+ 	if ($invalid) {
+ 	    $self->{ERROR_MSG} = $invalid;
+ 	    return 0;
+ 	}
      }
-     $helper->{VARS}->{$var} = $chosenDate;
      if (defined($self->{NEXTSTATE})) {
          $helper->changeState($self->{NEXTSTATE});
      }
- Line 1461  package Apache::lonhelper::resource;
+ Line 1786  package Apache::lonhelper::resource;
  =pod
- =head2 Element: resource
+ =head2 Element: resourceX<resource, helper element>
  <resource> elements allow the user to select one or multiple resources
  from the current course. You can filter out which resources they can view,
- Line 1471  selections across folder openings and cl
+ Line 1796  selections across folder openings and cl
  the user can manipulate the folders.
  <resource> takes the standard variable attribute to control what helper
- variable stores the results. It also takes a "multichoice" attribute,
+ variable stores the results. It also takes a "multichoice"X<multichoice> attribute,
  which controls whether the user can select more then one resource. The
  "toponly" attribute controls whether the resource display shows just the
  resources in that sequence, or recurses into all sub-sequences, defaulting
  to false. The "suppressEmptySequences" attribute reflects the
  suppressEmptySequences argument to the render routine, which will cause
  folders that have all of their contained resources filtered out to also
- be filtered out.
+ be filtered out. The 'addstatus' attribute, if true, will add the icon
+ 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.
- B<SUB-TAGS>
+ =head3 SUB-TAGS
  =over 4
- =item * <filterfunc>: If you want to filter what resources are displayed
+ =item * <filterfunc>X<filterfunc>: If you want to filter what resources are displayed
    to the user, use a filter func. The <filterfunc> tag should contain
    Perl code that when wrapped with "sub { my $res = shift; " and "}" is
    a function that returns true if the resource should be displayed,
- Line 1492  B<SUB-TAGS>
+ Line 1820  B<SUB-TAGS>
    (See Apache::lonnavmaps documentation for information about the
    resource object.)
- =item * <choicefunc>: Same as <filterfunc>, except that controls whether
+ =item * <choicefunc>X<choicefunc>: Same as <filterfunc>, except that controls whether
    the given resource can be chosen. (It is almost always a good idea to
    show the user the folders, for instance, but you do not always want to
    let the user select them.)
  =item * <nextstate>: Standard nextstate behavior.
- =item * <valuefunc>: This function controls what is returned by the resource
+ =item * <valuefunc>X<valuefunc>: This function controls what is returned by the resource
    when the user selects it. Like filterfunc and choicefunc, it should be
    a function fragment that when wrapped by "sub { my $res = shift; " and
    "}" returns a string representing what you want to have as the value. By
    default, the value will be the resource ID of the object ($res->{ID}).
- =item * <mapurl>: If the URL of a map is given here, only that map
+ =item * <mapurl>X<mapurl>: If the URL of a map is given here, only that map
-   will be displayed, instead of the whole course.
+   will be displayed, instead of the whole course. If the attribute
+   "evaluate" is given and is true, the contents of the mapurl will be
+   evaluated with "sub { my $helper = shift; my $state = shift;" and
+   "}", with the return value used as the mapurl.
  =back
- Line 1515  B<SUB-TAGS>
+ Line 1846  B<SUB-TAGS>
  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 {
- Line 1541  sub start_resource {
+ Line 1873  sub start_resource {
      $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
      $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 '';
  }
- Line 1617  sub start_mapurl {
+ Line 1955  sub start_mapurl {
      my $contents = Apache::lonxml::get_all_text('/mapurl',
                                                  $parser);
+     $paramHash->{EVAL_MAP_URL} = $token->[2]{'evaluate'};
      $paramHash->{MAP_URL} = $contents;
  }
  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
- Line 1644  sub render {
+ Line 2019  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];
- Line 1653  sub render {
+ Line 2029  sub render {
              }
          }
      }
+ // -->
  </script>
  SCRIPT
+         my %lt=&Apache::lonlocal::texthash(
+ 			'sar'  => "Select All Resources",
+ 		        'uar'  => "Unselect All Resources");
          $buttons = <<BUTTONS;
  <br /> &nbsp;
- <input type="button" onclick="checkall(true, '$var')" value="Select All Resources" />
+ <input type="button" onclick="checkall(true, '$var')" value="$lt{'sar'}" />
- <input type="button" onclick="checkall(false, '$var')" value="Unselect All Resources" />
+ <input type="button" onclick="checkall(false, '$var')" value="$lt{'uar'}" />
  <br /> &nbsp;
  BUTTONS
      }
- Line 1669  BUTTONS
+ Line 2050  BUTTONS
      $result .= $buttons;
-     my $filterFunc = $self->{FILTER_FUNC};
+     my $filterFunc     = $self->{FILTER_FUNC};
-     my $choiceFunc = $self->{CHOICE_FUNC};
+     my $choiceFunc     = $self->{CHOICE_FUNC};
-     my $valueFunc = $self->{VALUE_FUNC};
+     my $valueFunc      = $self->{VALUE_FUNC};
-     my $mapUrl = $self->{MAP_URL};
+     my $multichoice    = $self->{'multichoice'};
-     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;
+     if ($self->{EVAL_MAP_URL}) {
+ 	my $mapUrlFunc = eval('sub { my $helper = shift; my $state = shift; ' .
+ 	    $self->{MAP_URL} . '}');
+ 	$mapUrl = &$mapUrlFunc($helper, $self);
+     } else {
+ 	$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
- Line 1681  BUTTONS
+ Line 2088  BUTTONS
      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' ";
+ 	    my $col = "";
-             if (!$checked && !$multichoice) {
+ 	    my $raw_name = &$valueFunc($resource);
-                 $col .= "checked ";
+ 	    my $resource_name =
-                 $checked = 1;
+                    HTML::Entities::encode($raw_name,"<>&\"'");
-             }
+ 	    if($option_vars) {
- 	    if ($multichoice) { # all resources start checked; see bug 1174
+ 		foreach my $option_var (@$option_vars) {
- 		$col .= "checked ";
+ 		    my $var_value = "\|\|\|" . $helper->{VARS}->{$option_var} .
- 		$checked = 1;
+ 			"\|\|\|";
+ 		    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))
+             $col .= "<td align='center'><input type='$inputType' name='${var}.forminput' ";
-                 . "' /></td>";
+ 	    if (%defaultSymbs) {
-             return $col;
+ 		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'};
+ 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());
+     }
      $result .=
-         &Apache::lonnavmaps::render( { 'cols' => [$renderColFunc,
+         &Apache::lonnavmaps::render( { 'cols' => $cols,
-                                                   Apache::lonnavmaps::resource()],
                                         'showParts' => 0,
                                         'filterFunc' => $filterFunc,
                                         'resource_no_folder_link' => 1,
+ 				       'closeAllPages' => $self->{'closeallpages'},
                                         'suppressEmptySequences' => $self->{'suppressEmptySequences'},
                                         'iterator_map' => $mapUrl }
                                         );
- Line 1742  package Apache::lonhelper::student;
+ Line 2233  package Apache::lonhelper::student;
  =pod
- =head2 Element: student
+ =head2 Element: studentX<student, helper element>
  Student elements display a choice of students enrolled in the current
  course. Currently it is primitive; this is expected to evolve later.
- Student elements take two attributes: "variable", which means what
+ Student elements take the following attributes:
- it usually does, and "multichoice", which if true allows the user
- to select multiple students.
+ =over 4
+ =item * B<variable>:
+ Does what it usually does: declare which helper variable to put the
+ result in.
+ =item * B<multichoice>:
+ If true allows the user to select multiple students. Defaults to false.
+ =item * B<coursepersonnel>:
+ If true adds the course personnel to the top of the student
+ selection. Defaults to false.
+ =item * B<activeonly>:
+ 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
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
+ #
+ #  Utility function used when rendering the <student> tag.
+ #  This function renders a segment of course personel
+ #  Personel are broken up by the helper into past, current and
+ #  future...each one gets is own subpage of selection.
+ #  This sub renders one of these pages.
+ #  Parameters:
+ #     $sections    - Set of sections in the course (hash reference).
+ #     $students    - Students in the section. (ref to array of references
+ #                    to arrays).
+ #     $formprefix  - form path prefix for form element names
+ #                    This is used to make each form element
+ #                    so that the segments having to do with each
+ #                    set of students won't collide.
+ #     $defaultusers - reference to a hash containng
+ #                     the set of users that should be on or off.
+ #  Returns:
+ #     HTML  text to add to the rendering of the helper.
+ #
+ sub render_student_list {
+     my ($self,
+ 	$sections, $students, $formprefix, $defaultusers) = @_;
+     my $multiselect = $self->{'multichoice'};
+     my $result = "";
+     # If multiple selections are allowed, we have a listbox
+     # at the top which allows quick selections from each section
+     # as well as from categories of personnel.
+     if ($multiselect) {
+ 	$result .= '<table><tr><td>';
+ 	my $size = scalar(keys(%$sections));
+ 	$size += 3;		# We have allstudents allpersonel nosection too.
+ 	if ($size > 5) {
+ 	    $size = 5;
+ 	}
+ 	$result .= '<select multiple name="'.$formprefix
+ 	    .'.chosensections" size="'.$size.'">'."\n";
+ 	$result .= '<option name="allstudents">All Students</option>';
+ 	$result .= '<option name="allpersonnel">All Course Personnel</option>';
+ 	$result .= '<option name="nosection">No Section</option>';
+ 	$result .= "\n";
+ 	foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%$sections))) {
+ 	    $result .= '<option name="'.$sec.'">'.$sec.'</option>'."\n";
+ 	}
+ 	$result .= '</td><td valign="top">';
+ 	$result .= '<input type="button" name="'.$formprefix.'.select" value="Select" onclick='
+ 	    ."'selectSections(\"$formprefix.chosensections\")'".' /></td>';
+ 	$result .= '<td valign="top"><input type="button" name="'.$formprefix
+ 	    .'.unselect" value="Unselect"  onclick='.
+ 	    "'unselectSections(\"$formprefix.chosensections\")' ".' /></td></tr></table>';
+     }
+     #  Now we list the students, but the form element type
+     #  will depend on whether or not multiselect is true.
+     #  True -> checkboxes.
+     #  False -> radiobuttons.
+     $result .= "<table border=\"2\">\n";
+     $result .= '<tr><th></th><th align="center">Name</th>'."\n";
+     $result .= '    <th align="center">Section</th>'."\n";
+     $result .= '    <th align="center">Status</th>'."\n";
+     $result .= '    <th align="center">Role</th>'."\n";
+     $result .= '    <th align="center">Username : Domain</th></tr>'."\n";
+     my $input_type;
+     if ($multiselect) {
+ 	$input_type = "checkbox";
+     } else {
+ 	$input_type = "radio";
+     }
+     my $checked = 0;
+     for my $student (@$students) {
+ 	$result .= '<tr><td><input type="'.$input_type.'"  name="'.
+ 	    $self->{'variable'}.".forminput".'"';
+ 	my $user    = $student->[0];
+ 	# Figure out which students are checked by default...
+ 	if(%$defaultusers) {
+ 	    if (exists ($defaultusers->{$user})) {
+ 		$result .= ' checked ="checked" ';
+ 		$checked = 1;
+ 	    }
+ 	} elsif (!$self->{'multichoice'} && !$checked) {
+ 	    $result .= ' checked="checked" ';
+ 	    $checked = 1;	# First one for radio if no default specified.
+ 	}
+ 	$result .= ' value="'. HTML::Entities::encode($user .          ':'
+ 						      .$student->[2] . ':'
+ 						      .$student->[1] . ':'
+ 						      .$student->[3] . ':'
+ 						      .$student->[4], "<>&\"'")
+ 	    ."\" /></td><td>\n";
+ 	$result .= HTML::Entities::encode($student->[1], '<>&"')
+ 	        . '</td><td align="center" >'."\n";
+ 	$result .= HTML::Entities::encode($student->[2], '<>&"')
+    	        . '</td><td align="center">'."\n";
+ 	$result .= HTML::Entities::encode($student->[3], '<>&"')
+ 	        . '</td><td align="center">'."\n";
+ 	$result .= HTML::Entities::encode($student->[4], '<>&"')
+   	        . '</td><td align="center">'."\n";
+ 	$result .= HTML::Entities::encode($student->[0], '<>&"')
+ 	        . '</td></tr>'."\n";
+     }
+     $result .=" </table> <br /> <hr />\n";
+     return $result;
+ }
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::student',
- Line 1779  sub start_student {
+ Line 2408  sub start_student {
      $paramHash->{'variable'} = $token->[2]{'variable'};
      $helper->declareVar($paramHash->{'variable'});
      $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
+     $paramHash->{'coursepersonnel'} = $token->[2]{'coursepersonnel'};
+     $paramHash->{'activeonly'} = $token->[2]{'activeonly'};
      if (defined($token->[2]{'nextstate'})) {
          $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
      }
+     $paramHash->{'emptyallowed'} = $token->[2]{'emptyallowed'};
  }
- Line 1802  sub render {
+ Line 2434  sub render {
      if ($self->{'multichoice'}) {
          $result = <<SCRIPT;
- <script>
+ <script type="text/javascript">
+ // <!--
+     function findElement(name) {
+ 	var i;
+ 	var ele;
+ 	for(i =0; i < document.forms.helpform.elements.length; i++) {
+ 	    ele = document.forms.helpform.elements[i];
+ 	    if(ele.name == name) {
+ 		return ele;
+ 	    }
+ 	}
+ 	return null;
+     }
+     function isStudent(element) {
+ 	if(element.value.indexOf(":Student") != -1) {
+ 	    return 1;
+ 	}
+ 	return 0;
+     }
+     function section(element) {
+ 	var i;
+ 	var info;
+ 	if (element.value.indexOf(':') != -1) {
+ 	    info = element.value.split(':');
+ 	    return info[2];
+ 	} else {
+ 	    return "";
+ 	}
+     }
+     function setAllStudents(value) {
+ 	var i;
+ 	var ele;
+ 	for (i =0; i < document.forms.helpform.elements.length; i++) {
+ 	    ele = document.forms.helpform.elements[i];
+ 	    if(isStudent(ele)) {
+ 		ele.checked=value;
+ 	    }
+ 	}
+     }
+     function setAllCoursePersonnel(value) {
+ 	var i;
+ 	var ele;
+ 	for (i =0; i < document.forms.helpform.elements.length; i++) {
+ 	    ele = document.forms.helpform.elements[i];
+ 	    if(!isStudent(ele)) {
+ 		ele.checked = value;
+ 	    }
+ 	}
+     }
+     function setSection(which, value) {
+ 	var i;
+ 	var ele;
+ 	for (i =0; i < document.forms.helpform.elements.length; i++) {
+ 	    ele = document.forms.helpform.elements[i];
+ 	    if (ele.value.indexOf(':') != -1) {
+ 		if (section(ele) == which) {
+ 		    ele.checked = value;
+ 		}
+ 	    }
+ 	}
+     }
+     function setCheckboxes(listbox, value) {
+ 	var k;
+ 	var elem;
+ 	var what;
+         elem = findElement(listbox);
+ 	if (elem != null) {
+ 	    for (k = 0; k < elem.length; k++) {
+ 		if (elem.options[k].selected) {
+ 		    what = elem.options[k].text;
+ 		    if (what == 'All Students') {
+ 			setAllStudents(value);
+ 		    } else if (what == 'All Course Personnel') {
+ 			setAllCoursePersonnel(value);
+ 		    } else if (what == 'No Section') {
+ 			setSection('',value);
+ 		    } else {
+ 			setSection(what, value);
+ 		    }
+ 		}
+ 	    }
+ 	}
+     }
+     function selectSections(listbox) {
+ 	setCheckboxes(listbox, true);
+     }
+     function unselectSections(listbox) {
+ 	setCheckboxes(listbox, false);
+     }
+     /* ----------------------------- */
      function checkall(value, checkName) {
  	for (i=0; i<document.forms.helpform.elements.length; i++) {
              ele = document.forms.helpform.elements[i];
- Line 1811  sub render {
+ Line 2537  sub render {
              }
          }
      }
+     function checksec(value) {
+ 	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) {
+ 		if (document.forms.helpform.elements[i].value.indexOf(':Active') != -1) {
+ 		    document.forms.helpform.elements[i].checked=value;
+ 		}
+             }
+         }
+     }
+     function checkactive() {
+ 	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 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) {
+                 document.forms.helpform.elements[i].checked=false;
+             }
+         }
+     }
+     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
+         my %lt=&Apache::lonlocal::texthash(
+                     'ocs'  => "Select Only Current Students",
+                     'ues'  => "Unselect Expired Students",
+                     'sas'  => "Select All Students",
+                     'uas'  => "Unselect All Students",
+                     'sfsg' => "Select Current Students for Section/Group",
+ 		    'ufsg' => "Unselect for Section/Group");
          $buttons = <<BUTTONS;
  <br />
- <input type="button" onclick="checkall(true, '$var')" value="Select All Students" />
+ <table>
- <input type="button" onclick="checkall(false, '$var')" value="Unselect All Students" />
+   <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 />';
      }
-     # Load up the students
+     my %defaultUsers;
-     my $choices = &Apache::loncoursedata::get_classlist();
+     if (defined($self->{DEFAULT_VALUE})) {
-     my @keys = keys %{$choices};
+         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 = [];
+     #
+     #  We need to parcel out the personel in to three arrays:
+     #   $current_members[] - Contains those whose roles are currently active.
+     #   $expired_members[] - Contains those whose roles have expired.
+     #   $future_members[]  - Contains those whose roles will become active in the
+     #                        future.
+     #
      # Constants
-     my $section = Apache::loncoursedata::CL_SECTION();
+     my $section    = &Apache::loncoursedata::CL_SECTION();
-     my $fullname = Apache::loncoursedata::CL_FULLNAME();
+     my $fullname   = &Apache::loncoursedata::CL_FULLNAME();
+     my $status     = &Apache::loncoursedata::CL_STATUS();
+     my $start_date = &Apache::loncoursedata::CL_START();
+     my $current_members = [];
+     my $expired_members = [];
+     my $future_members  = [];
+     # Load up the non-students, if necessary
+     if ($self->{'coursepersonnel'}) {
+ 	my %coursepersonnel = Apache::lonnet::get_course_adv_roles();
+ 	for (sort keys %coursepersonnel) {
+ 	    for my $role (split /,/, $coursepersonnel{$_}) {
+ 		# extract the names so we can sort them
+ 		my @people;
+ 		for (split /,/, $role) {
+ 		    push @people, [split /:/, $role];
+ 		}
+ 		@people = sort { $a->[0] cmp $b->[0] } @people;
+ 		for my $person (@people) {
+ 		    push @$current_members, [join(':', @$person), $person->[0], '', $_];
+ 		}
+ 	    }
+ 	}
+     }
+     # Load up the students
+     my $classlist = &Apache::loncoursedata::get_classlist();
+     my @keys = keys %{$classlist};
      # Sort by: Section, name
      @keys = sort {
-         if ($choices->{$a}->[$section] ne $choices->{$b}->[$section]) {
+         if ($classlist->{$a}->[$section] ne $classlist->{$b}->[$section]) {
-             return $choices->{$a}->[$section] cmp $choices->{$b}->[$section];
+             return $classlist->{$a}->[$section] cmp $classlist->{$b}->[$section];
          }
-         return $choices->{$a}->[$fullname] cmp $choices->{$b}->[$fullname];
+         return $classlist->{$a}->[$fullname] cmp $classlist->{$b}->[$fullname];
      } @keys;
-     my $type = 'radio';
-     if ($self->{'multichoice'}) { $type = 'checkbox'; }
-     $result .= "<table cellspacing='2' cellpadding='2' border='0'>\n";
-     $result .= "<tr><td></td><td align='center'><b>Student Name</b></td>".
-         "<td align='center'><b>Section</b></td></tr>";
-     my $checked = 0;
-     foreach (@keys) {
+     for (@keys) {
-         $result .= "<tr><td><input type='$type' name='" .
-             $self->{'variable'} . '.forminput' . "'";
+ 	if ( $classlist->{$_}->[$status] eq
+ 	    'Active') {
-         if (!$self->{'multichoice'} && !$checked) {
+ 	    push @$current_members, [$_, $classlist->{$_}->[$fullname],
-             $result .= " checked ";
+ 			     $classlist->{$_}->[$section],
-             $checked = 1;
+ 			     $classlist->{$_}->[$status], 'Student'];
-         }
+ 	} else {
-         $result .=
+ 	    #  Need to figure out if this user is future or
-             " value='" . HTML::Entities::encode($_ . ':' . $choices->{$_}->[$section])
+ 	    #  Expired... If the start date is in the future
-             . "' /></td><td>"
+ 	    #  the user is future...else expired.
-             . HTML::Entities::encode($choices->{$_}->[$fullname])
-             . "</td><td align='center'>"
+ 	    my $now = time;
-             . HTML::Entities::encode($choices->{$_}->[$section])
+ 	    if ($classlist->{$_}->[$start_date] > $now) {
-             . "</td></tr>\n";
+ 		push @$future_members, [$_, $classlist->{$_}->[$fullname],
+ 					$classlist->{$_}->[$section],
+ 					"Future", "Student"];
+ 	    } else {
+ 		push @$expired_members, [$_, $classlist->{$_}->[$fullname],
+ 					$classlist->{$_}->[$section],
+ 					"Expired", "Student"];
+ 	    }
+ 	}
      }
-     $result .= "</table>\n\n";
-     $result .= $buttons;
+     # Create a list of the sections that can be used to create the section
+     # selection list boxes:
+     #
+     my %sections;
+     for my $key (@keys) {
+ 	my $section_name = $classlist->{$key}->[$section];
+ 	if ($section_name ne "") {
+ 	    $sections{$section_name} = 1;
+ 	}
+     }
+     if ($self->{'multichoice'}) {
+ 	#  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 $result = '<select multiple name="chosensections" size="'.$size.'">'."\n";
+ 	foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
+ 	    $result .= "<option name=\"$sec\">$sec</option>\n";
+ 	}
+ 	$result .= "<option>none</option></select>\n";
+     }
+     #   Current personel
+     $result .= $self->render_student_list(\%sections,
+ 					  $current_members,
+ 					  "current",
+ 					  \%defaultUsers);
+     # If activeonly is not set then we can also give the expired students:
+     #
+     if (!$self->{'activeonly'} && ((scalar @$expired_members) > 0)) {
+ 	# And future.
+ 	$result .= $self->render_student_list(\%sections,
+ 					      $future_members,
+ 					      "future",
+ 					      \%defaultUsers);
+ 	# Past
+ 	$result .= $self->render_student_list(\%sections,
+ 					      $expired_members,
+ 					      "past",
+ 					      \%defaultUsers);
+     }
      return $result;
  }
  sub postprocess {
      my $self = shift;
-     my $result = $ENV{'form.' . $self->{'variable'} . '.forminput'};
+     my $result = $env{'form.' . $self->{'variable'} . '.forminput'};
-     if (!$result) {
+     if (!$result && !$self->{'emptyallowed'}) {
-         $self->{ERROR_MSG} = 'You must choose at least one student '.
+ 	if ($self->{'coursepersonnel'}) {
-             'to continue.';
+ 	    $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;
      }
- Line 1894  package Apache::lonhelper::files;
+ Line 2823  package Apache::lonhelper::files;
  =pod
- =head2 Element: files
+ =head2 Element: filesX<files, helper element>
  files allows the users to choose files from a given directory on the
  server. It is always multichoice and stores the result as a triple-pipe
- Line 1910  are put. It accepts the attribute "multi
+ Line 2839  are put. It accepts the attribute "multi
  defaulting to false, which if true will allow the user to select more
  then one choice.
- <files> accepts three subtags. One is the "nextstate" sub-tag that works
+ <files> accepts three subtags:
- as it does with the other tags. Another is a <filechoice> sub tag that
- is Perl code that, when surrounded by "sub {" and "}" will return a
+ =over 4
- string representing what directory on the server to allow the user to
- choose files from. Finally, the <filefilter> subtag should contain Perl
+ =item * B<nextstate>: works as it does with the other tags.
- code that when surrounded by "sub { my $filename = shift; " and "}",
- returns a true value if the user can pick that file, or false otherwise.
+ =item * B<filechoice>: When the contents of this tag are surrounded by
- The filename passed to the function will be just the name of the file,
+     "sub {" and "}", will return a string representing what directory
- with no path info.
+     on the server to allow the user to choose files from.
+ =item * B<filefilter>: Should contain Perl code that when surrounded
+     by "sub { my $filename = shift; " and "}", returns a true value if
+     the user can pick that file, or false otherwise. The filename
+     passed to the function will be just the name of the file, with no
+     path info. By default, a filter function will be used that will
+     mask out old versions of files. This function is available as
+     Apache::lonhelper::files::not_old_version if you want to use it to
+     composite your own filters.
+ =back
+ B<General security note>: You should ensure the user can not somehow
+ pass something into your code that would allow them to look places
+ they should not be able to see, like the C</etc/> directory. However,
+ the security impact would be minimal, since it would only expose
+ the existence of files, there should be no way to parlay that into
+ viewing the files.
  =cut
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
  use Apache::lonpubdir; # for getTitleString
  BEGIN {
- Line 1933  BEGIN {
+ Line 2881  BEGIN {
                                   ('files', 'filechoice', 'filefilter'));
  }
+ sub not_old_version {
+     my $file = shift;
+     # Given a file name, return false if it is an "old version" of a
+     # file, or true if it is not.
+     if ($file =~ /^.*\.[0-9]+\.[A-Za-z]+(\.meta)?$/) {
+ 	return 0;
+     }
+     return 1;
+ }
  sub new {
      my $ref = Apache::lonhelper::element->new();
      bless($ref);
- Line 1988  sub start_filefilter {
+ Line 2948  sub start_filefilter {
  sub end_filefilter { return ''; }
+ {
+     # used to generate unique id attributes for <input> tags.
+     # internal use only.
+     my $id=0;
+     sub new_id { return $id++;}
+ }
  sub render {
      my $self = shift;
      my $result = '';
- Line 2000  sub render {
+ Line 2967  sub render {
      my $subdir = &$subdirFunc();
      my $filterFunc = $self->{FILTER_FUNC};
+     if (!defined($filterFunc)) {
+ 	$filterFunc = &not_old_version;
+     }
      my $buttons = '';
      my $type = 'radio';
      if ($self->{'multichoice'}) {
- Line 2008  sub render {
+ Line 2978  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];
- Line 2026  sub render {
+ Line 2997  sub render {
              }
          }
      }
+ // -->
  </script>
  SCRIPT
-         $buttons = <<BUTTONS;
+        my %lt=&Apache::lonlocal::texthash(
+ 			'saf'  => "Select All Files",
+ 		        'uaf'  => "Unselect All Files");
+        $buttons = <<BUTTONS;
  <br /> &nbsp;
- <input type="button" onclick="checkall(true, '$var')" value="Select All Files" />
+ <input type="button" onclick="checkall(true, '$var')" value="$lt{'saf'}" />
- <input type="button" onclick="checkall(false, '$var')" value="Unselect All Files" />
+ <input type="button" onclick="checkall(false, '$var')" value="$lt{'uaf'}" />
  BUTTONS
+        %lt=&Apache::lonlocal::texthash(
+ 			'sap'  => "Select All Published",
+ 		        'uap'  => "Unselect All Published");
          if ($helper->{VARS}->{'construction'}) {
-             $buttons .= <<BUTTONS;
+        $buttons .= <<BUTTONS;
- <input type="button" onclick="checkallclass(true, 'Published')" value="Select All Published" />
+ <input type="button" onclick="checkallclass(true, 'Published')" value="$lt{'sap'}" />
- <input type="button" onclick="checkallclass(false, 'Published')" value="Unselect All Published" />
+ <input type="button" onclick="checkallclass(false, 'Published')" value="$lt{'uap'}" />
  <br /> &nbsp;
  BUTTONS
         }
- Line 2047  BUTTONS
+ Line 3025  BUTTONS
      my @fileList;
      # If the subdirectory is in local CSTR space
-     if ($subdir =~ m|/home/([^/]+)/public_html|) {
+     my $metadir;
-         my $user = $1;
+     if ($subdir =~ m|/home/([^/]+)/public_html/(.*)|) {
-         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,$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
+     @fileList = sort {lc($a) cmp lc($b)} @fileList;
      $result .= $buttons;
      if (defined $self->{ERROR_MSG}) {
- Line 2085  BUTTONS
+ Line 3076  BUTTONS
  	    }
              # Get the title
-             my $title = Apache::lonpubdir::getTitleString($fileName);
+             my $title = Apache::lonpubdir::getTitleString(($metadir?$metadir:$subdir) .'/'. $file);
              # Netscape 4 is stupid and there's nowhere to put the
              # information on the input tag that the file is Published,
- Line 2106  BUTTONS
+ Line 3097  BUTTONS
              if ($status eq 'Published' && $helper->{VARS}->{'construction'}) {
                  $onclick = 'onclick="a=1" ';
              }
+             my $id = &new_id();
              $result .= '<tr><td align="right"' . " bgcolor='$color'>" .
                  "<input $onclick type='$type' name='" . $var
-             . ".forminput' 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'>" . $file . "</td>" .
+             $result .= "/></td><td bgcolor='$color'>".
+                 qq{<label for="$id">}. $file . "</label></td>" .
                  "<td bgcolor='$color'>$title</td>" .
                  "<td bgcolor='$color'>$status</td>" . "</tr>\n";
              $choices++;
- Line 2123  BUTTONS
+ Line 3116  BUTTONS
      $result .= "</table>\n";
      if (!$choices) {
-         $result .= '<font color="#FF0000">There are no files available to select in this directory. Please go back and select another option.</font><br /><br />';
+         $result .= '<font color="#FF0000">There are no files available to select in this directory ('.$subdir.'). Please go back and select another option.</font><br /><br />';
      }
      $result .= $buttons;
- Line 2141  sub fileState {
+ Line 3134  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//;
+     $subdirpart =~ s/^\/home\/$uname\/public_html//;
-     my $resdir = $docroot . '/res/' . $ENV{'user.domain'} . '/' . $ENV{'user.name'} .
+     my $resdir = $docroot . '/res/' . $udom . '/' . $uname .
          $subdirpart;
      my @constructionSpaceFileStat = stat($constructionSpaceDir . '/' . $file);
- Line 2164  sub fileState {
+ Line 3161  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.';
- Line 2184  package Apache::lonhelper::section;
+ Line 3181  package Apache::lonhelper::section;
  =pod
- =head2 Element: section
+ =head2 Element: sectionX<section, helper element>
  <section> allows the user to choose one or more sections from the current
  course.
- It takes the standard attributes "variable", "multichoice", and
+ It takes the standard attributes "variable", "multichoice",
- "nextstate", meaning what they do for most other elements.
+ "allowempty" and "nextstate", meaning what they do for most other
+ elements.
+ also takes a boolean 'onlysections' whcih will restrict this to only
+ have sections and not include groups
  =cut
- Line 2220  sub start_section {
+ Line 3221  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'};
      }
- Line 2239  sub start_section {
+ Line 3241  sub start_section {
      }
      for my $sectionName (sort(keys(%choices))) {
+ 	push @{$paramHash->{CHOICES}}, [$sectionName, $sectionName];
-         push @{$paramHash->{CHOICES}}, [$sectionName, $sectionName];
+     }
+     return if ($token->[2]{'onlysections'});
+     # add in groups to the end of the list
+     my %curr_groups;
+     if (&Apache::loncommon::coursegroups(\%curr_groups)) {
+ 	foreach my $group_name (sort(keys(%curr_groups))) {
+ 	    push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
+ 	}
      }
  }
- Line 2254  sub end_section {
+ Line 3264  sub end_section {
  }
 ;
+ package Apache::lonhelper::group;
+ =pod
+ =head2 Element: groupX<group, helper element>
+ <group> allows the user to choose one or more groups from the current course.
+ It takes the standard attributes "variable", "multichoice",
+  "allowempty" 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 %curr_groups;
+     if (&Apache::loncommon::coursegroups(\%curr_groups)) {
+ 	foreach my $group_name (sort(keys(%curr_groups))) {
+ 	    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();
+ }
+;
  package Apache::lonhelper::string;
  =pod
- =head2 Element: string
+ =head2 Element: stringX<string, helper element>
  string elements provide a string entry field for the user. string elements
  take the usual 'variable' and 'nextstate' parameters. string elements
- Line 2266  also pass through 'maxlength' and 'size'
+ Line 3342  also pass through 'maxlength' and 'size'
  string honors the defaultvalue tag, if given.
+ string honors the validation function, if given.
  =cut
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::string',
- Line 2311  sub end_string {
+ Line 3390  sub end_string {
  sub render {
      my $self = shift;
-     my $result = '<input type="string" name="' . $self->{'variable'} . '.forminput"';
+     my $result = '';
+     if (defined $self->{ERROR_MSG}) {
+         $result .= '<p><font color="#FF0000">' . $self->{ERROR_MSG} . '</font></p>';
+     }
+     $result .= '<input type="string" name="' . $self->{'variable'} . '.forminput"';
      if (defined($self->{'size'})) {
          $result .= ' size="' . $self->{'size'} . '"';
- Line 2335  sub render {
+ Line 3420  sub render {
  # If a NEXTSTATE was given, switch to it
  sub postprocess {
      my $self = shift;
-     if (defined($self->{NEXTSTATE})) {
-         $helper->changeState($self->{NEXTSTATE});
+     if (defined($self->{VALIDATOR})) {
+ 	my $validator = eval($self->{VALIDATOR});
+ 	die 'Died during evaluation of validator code; Perl said: ' . $@ if $@;
+ 	my $invalid = &$validator($helper, $state, $self, $self->getValue());
+ 	if ($invalid) {
+ 	    $self->{ERROR_MSG} = $invalid;
+ 	    return 0;
+ 	}
+     }
+     if (defined($self->{'nextstate'})) {
+         $helper->changeState($self->{'nextstate'});
      }
      return 1;
- Line 2348  package Apache::lonhelper::general;
+ Line 3444  package Apache::lonhelper::general;
  =pod
- =head2 General-purpose tag: <exec>
+ =head2 General-purpose tag: <exec>X<exec, helper tag>
- The contents of the exec tag are executed as Perl code, not inside a
+ 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
- Line 2363  The return value is ignored.
+ Line 3459  The return value is ignored.
  $helper is the helper object. Feel free to add methods to the helper
  object to support whatever manipulation you may need to do (for instance,
  overriding the form location if the state is the final state; see
- lonparm.helper for an example).
+ parameter.helper for an example).
  $state is the $paramHash that has currently been generated and may
  be manipulated by the code in exec. Note that the $state is not yet
- Line 2372  be able to call methods on it.
+ Line 3468  be able to call methods on it.
  =cut
+ use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::general',
                                   'exec', 'condition', 'clause',
- Line 2438  sub end_clause { return ''; }
+ Line 3537  sub end_clause { return ''; }
  =pod
- =head2 General-purpose tag: <eval>
+ =head2 General-purpose tag: <eval>X<eval, helper tag>
  The <eval> tag will be evaluated as a subroutine call passed in the
  current helper object and state hash as described in <condition> above,
- Line 2481  package Apache::lonhelper::final;
+ Line 3580  package Apache::lonhelper::final;
  =pod
- =head2 Element: final
+ =head2 Element: finalX<final, helper tag>
  <final> is a special element that works with helpers that use the <finalcode>
- tag. It goes through all the states and elements, executing the <finalcode>
+ tagX<finalcode, helper tag>. It goes through all the states and elements, executing the <finalcode>
  snippets and collecting the results. Finally, it takes the user out of the
  helper, going to a provided page.
- Line 2493  will make a "Finish Helper" button that
+ Line 3592  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'));
- Line 2574  sub render {
+ Line 3677  sub render {
          }
      }
-     if (scalar(@results) == 0) {
+     my $result;
-         return '';
-     }
-     my $result = "<ul>\n";
-     for my $re (@results) {
-         $result .= '    <li>' . $re . "</li>\n";
-     }
-     if (!@results) {
-         $result .= '    <li>No changes were made to current settings.</li>';
-     }
+     if (scalar(@results) != 0) {
+ 	$result .= "<ul>\n";
+ 	for my $re (@results) {
+ 	    $result .= '    <li>' . $re . "</li>\n";
+ 	}
+ 	if (!@results) {
+ 	    $result .= '    <li>' .
+ 		&mt('No changes were made to current settings.') . '</li>';
+ 	}
+ 	$result .= '</ul>';
+     }
+     my $actionURL = $self->{EXIT_PAGE};
+     my $targetURL = '';
+     my $finish=&mt('Finish');
      if ($self->{'restartCourse'}) {
-         $result .= "<center>\n" .
+ 	$actionURL = '/adm/roles';
-             "<form action='/adm/roles' method='post' target='loncapaclient'>\n" .
+ 	$targetURL = '/adm/menu';
-             "<input type='button' onclick='history.go(-1)' value='&lt;- Previous' />" .
+ 	if ($env{'course.'.$env{'request.course.id'}.'.url'}=~/^uploaded/) {
-             "<input type='hidden' name='orgurl' value='/adm/menu' />" .
+ 	    $targetURL = '/adm/coursedocs';
-             "<input type='hidden' name='selectrole' value='1' />\n" .
+ 	} else {
-             "<input type='hidden' name='" . $ENV{'request.role'} .
+ 	    $targetURL = '/adm/navmaps';
-             "' value='1' />\n<input type='submit' value='Finish Course Initialization' />\n" .
+ 	}
-             "</form></center>";
+ 	if ($env{'course.'.$env{'request.course.id'}.'.clonedfrom'}) {
-     }
+ 	    $targetURL = '/adm/parmset?overview=1';
+ 	}
+ 	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 . '</ul>';
+     return $result;
  }
  sub overrideForm {
-     my $self = shift;
+     return 1;
-     return $self->{'restartCourse'};
  }
 ;
- Line 2618  package Apache::lonhelper::parmwizfinal;
+ Line 3742  package Apache::lonhelper::parmwizfinal;
  no strict;
  @ISA = ('Apache::lonhelper::element');
  use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::parmwizfinal',
- Line 2648  sub render {
+ Line 3774  sub render {
      my $vars = $helper->{VARS};
      # FIXME: Unify my designators with the standard ones
-     my %dateTypeHash = ('open_date' => "Opening Date",
+     my %dateTypeHash = ('open_date' => "opening date",
-                         'due_date' => "Due Date",
+                         'due_date' => "due date",
-                         'answer_date' => "Answer Date");
+                         'answer_date' => "answer date",
+ 			'tries' => 'number of tries',
+ 			'weight' => 'problem weight'
+ 			);
      my %parmTypeHash = ('open_date' => "0_opendate",
                          'due_date' => "0_duedate",
-                         'answer_date' => "0_answerdate");
+                         '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}};
- Line 2661  sub render {
+ Line 3797  sub render {
      my $resourceString;
      my $symb;
      my $paramlevel;
      # Print the granularity, depending on the action
      if ($vars->{GRANULARITY} eq 'whole_course') {
-         $resourceString .= '<li>for <b>all resources in the course</b></li>';
+         $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';
      } elsif ($vars->{GRANULARITY} eq 'map') {
-         my $navmap = Apache::lonnavmaps::navmap->new(
+         my $navmap = Apache::lonnavmaps::navmap->new();
-                            $ENV{"request.course.fn"}.".db",
-                            $ENV{"request.course.fn"}."_parms.db", 0, 0);
          my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
          my $title = $res->compTitle();
          $symb = $res->symb();
-         $navmap->untieHashes();
+         $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
-         $resourceString .= "<li>for the map named <b>$title</b></li>";
+ 	if ($vars->{TARGETS} eq 'course') {
-         $level = 8;
+ 	    $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 $navmap = Apache::lonnavmaps::navmap->new();
-                            $ENV{"request.course.fn"}.".db",
-                            $ENV{"request.course.fn"}."_parms.db", 0, 0);
          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();
-         $navmap->untieHashes();
+         $resourceString .= '<li>'.&mt('for the resource named [_1] part [_2]',"<b>$title</b>","<b>$part</b>").'</li>';
-         $resourceString .= "<li>for the resource named <b>$title</b></li>";
+ 	if ($vars->{TARGETS} eq 'course') {
-         $level = 7;
+ 	    $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 .= '<p>Confirm that this information is correct, then click &quot;Finish Wizard&quot; to complete setting the parameter.<ul>';
+     $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:
-     $result .= '<li>Setting the <b>' . $dateTypeHash{$vars->{ACTION_TYPE}}
+     my $extra;
-                . "</b></li>\n";
+     if ($vars->{ACTION_TYPE} eq 'tries') {
+ 	$extra =  $vars->{TRIES};
+     }
+     if ($vars->{ACTION_TYPE} eq 'weight') {
+ 	$extra =  $vars->{WEIGHT};
+     }
+     $result .= "<li>";
+     my $what = &mt($dateTypeHash{$vars->{ACTION_TYPE}});
+     if ($extra) {
+ 	$result .= &mt('Setting the [_1] to [_2]',"<b>$what</b>",$extra);
+     } else {
+ 	$result .= &mt('Setting the [_1]',"<b>$what</b>");
+     }
+     $result .= "</li>\n";
      if ($vars->{ACTION_TYPE} eq 'due_date' ||
          $vars->{ACTION_TYPE} eq 'answer_date') {
          # for due dates, we default to "date end" type entries
- Line 2717  sub render {
+ Line 3896  sub render {
              "value='" . $vars->{PARM_DATE} . "' />\n";
          $result .= "<input type='hidden' name='pres_type' " .
              "value='date_start' />\n";
-     }
+     } 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";
+     }
      $result .= $resourceString;
      # Print targets
      if ($vars->{TARGETS} eq 'course') {
-         $result .= '<li>for <b>all students in course</b></li>';
+         $result .= '<li>'.&mt('for <b>all students in course</b>').'</li>';
      } elsif ($vars->{TARGETS} eq 'section') {
          my $section = $vars->{SECTION_NAME};
-         $result .= "<li>for section <b>$section</b></li>";
+         $result .= '<li>'.&mt('for section [_1]',"<b>$section</b>").'</li>';
-         $level -= 3;
+ 	$result .= "<input type='hidden' name='csec' value='" .
-         $result .= "<input type='hidden' name='csec' value='" .
+             HTML::Entities::encode($section,"'<>&\"") . "' />\n";
-             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};
+ 	my ($uname,$udom)=split(':',$vars->{USER_NAME});
-         # Chop off everything after the last colon (section)
+         my $name = $classlist->{$uname.':'.$udom}->[6];
-         $username = substr($username, 0, rindex($username, ':'));
+         $result .= '<li>'.&mt('for [_1]',"<b>$name</b>").'</li>';
-         my $name = $classlist->{$username}->[6];
-         $result .= "<li>for <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
-     $result .= "<li>to <b>" . ctime($vars->{PARM_DATE}) . "</b> (" .
+     if ($vars->{ACTION_TYPE} ne 'tries' && $vars->{ACTION_TYPE} ne 'weight') {
-         Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE})
+ 	$result .= '<li>'.&mt('to [_1] ([_2])',"<b>".ctime($vars->{PARM_DATE})."</b>",Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE}))."</li>\n";
-         . ")</li>\n";
+     }
      # print pres_marker
      $result .= "\n<input type='hidden' name='pres_marker'" .
          " value='$affectedResourceId&$parm_name&$level' />\n";
      # 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' />";
-     $result .= "<br /><br /><center><input type='submit' value='Finish Helper' /></center></form>\n";
+     $result .= "<br /><br /><center><input type='submit' value='".&mt('Finish Helper')."' /></center></form>\n";
      return $result;
  }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.37
changed lines
	Added in v.1.140