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.69 and 1.178

-version 1.69, 2004/04/20 15:08:26
+version 1.178, 2010/01/26 11:34:47
  Line 25
  #
  # http://www.lon-capa.org/
  #
- # (Page Handler
- #
- # (.helper handler
- #
  =pod
- Line 85  State tags are also required to have an
+ Line 81  State tags are also required to have an
  human name of the state, and will be displayed as the header on top of
  the screen for the user.
+ State tags may also optionally have an attribute "help" which should be
+ the filename of a help file, this will add a blue ? to the title.
  =head2 Example Helper Skeleton
  An example of the tags so far:
   <helper title="Example Helper">
     <state name="START" title="Demonstrating the Example Helper">
-      <!-- notice this is the START state the wizard requires -->
+      <!-- notice this is the START state the helper requires -->
       </state>
     <state name="GET_NAME" title="Enter Student Name">
       </state>
     </helper>
- Of course this does nothing. In order for the wizard to do something, it is
+ Of course this does nothing. In order for the helper to do something, it is
- necessary to put actual elements into the wizard. Documentation for each
+ necessary to put actual elements into the helper. Documentation for each
  of these elements follows.
  =head1 Creating a Helper With Code, Not XML
- In some situations, such as the printing wizard (see lonprintout.pm),
+ In some situations, such as the printing helper (see lonprintout.pm),
  writing the helper in XML would be too complicated, because of scope
  issues or the fact that the code actually outweighs the XML. It is
  possible to create a helper via code, though it is a little odd.
- Line 186  use Apache::Constants qw(:common);
+ Line 185  use Apache::Constants qw(:common);
  use Apache::File;
  use Apache::lonxml;
  use Apache::lonlocal;
+ use Apache::lonnet;
+ use Apache::longroup;
+ use Apache::lonselstudent;
+ use LONCAPA;
  # Register all the tags with the helper, so the helper can
  # push and pop them
- Line 255  sub real_handler {
+ Line 260  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 263  sub real_handler {
+ Line 268  sub real_handler {
      # Send header, don't cache this page
+     if ($env{'browser.mathml'}) {
-     if (&Apache::lonhomework::setupheader($r)) { return OK; }
+ 	&Apache::loncommon::content_type($r,'text/xml');
+     } else {
+ 	&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 273  sub real_handler {
+ Line 283  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 329  sub start_state {
+ Line 339  sub start_state {
      }
      Apache::lonhelper::state->new($token->[2]{'name'},
-                                   $token->[2]{'title'});
+                                   $token->[2]{'title'},
+ 				  $token->[2]{'help'});
      return '';
  }
- Line 358  use HTML::Entities();
+ Line 369  use HTML::Entities();
  use Apache::loncommon;
  use Apache::File;
  use Apache::lonlocal;
+ use Apache::lonnet;
+ use LONCAPA;
  sub new {
      my $proto = shift;
- Line 369  sub new {
+ Line 382  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 411  sub new {
+ Line 424  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 463  sub _saveVars {
+ Line 476  sub _saveVars {
  sub _varsInFile {
      my $self = shift;
      my @vars = ();
-     for my $key (keys %{$self->{VARS}}) {
+     for my $key (keys(%{$self->{VARS}})) {
-         push @vars, &Apache::lonnet::escape($key) . '=' .
+         push(@vars, &escape($key) . '=' . &escape($self->{VARS}->{$key}));
-             &Apache::lonnet::escape($self->{VARS}->{$key});
      }
      return join ('&', @vars);
  }
- Line 480  sub declareVar {
+ Line 492  sub declareVar {
          $self->{VARS}->{$var} = '';
      }
-     my $envname = 'form.' . $var . '.forminput';
+     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 497  sub allowedCheck {
+ Line 509  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 519  sub process {
+ Line 531  sub process {
      # Phase 1: Post processing for state of previous screen (which is actually
      # the "current state" in terms of the helper variables), if it wasn't the
      # beginning state.
-     if ($self->{STATE} ne "START" || $ENV{"form.SUBMIT"} eq &mt("Next ->")) {
+     if ($self->{STATE} ne "START" || $env{"form.SUBMIT"} eq &mt("Next")) {
  	my $prevState = $self->{STATES}{$self->{STATE}};
          $prevState->postprocess();
      }
- Line 571  sub display {
+ Line 583  sub display {
      # Phase 4: Display.
      my $stateTitle=&mt($state->title());
-     my $helperTitle = &mt($self->{TITLE});
+     my $stateHelp=     $state->help();
-     my $bodytag = &Apache::loncommon::bodytag($helperTitle,'','');
+     my $browser_searcher_js =
-     my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
+ 	'<script type="text/javascript">'."\n".
-     my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
+ 	&Apache::loncommon::browser_and_searcher_javascript().
-     # FIXME: This should be parameterized, not concatenated - Jeremy
+ 	"\n".'</script>';
-     my $loncapaHelper = &mt("LON-CAPA Helper:");
+     # Breadcrumbs
+     my $brcrum = [{'href' => '',
+                    'text' => 'Helper'}];
+     # FIXME: Dynamically add context sensitive breadcrumbs
+     #        depending on the caller,
+     #        e.g. printing, parametrization, etc.
+     # FIXME: Add breadcrumbs to reflect current helper state
+     $result .= &Apache::loncommon::start_page($self->{TITLE},
+                                               $browser_searcher_js,
+                                               {'bread_crumbs' => $brcrum,});
-     $result .= <<HEADER;
+     my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
- <html>
+     my $next = HTML::Entities::encode(&mt("Next"), '<>&"');
- <script type="text/javascript" language="Javascript" >
+     # FIXME: This should be parameterized, not concatenated - Jeremy
-     var editbrowser;
-     function openbrowser(formname,elementname,only,omit) {
-         var url = '/res/?';
-         if (editbrowser == null) {
-             url += 'launch=1&';
-         }
-         url += 'catalogmode=interactive&';
-         url += 'mode=parmset&';
-         url += 'form=' + formname + '&';
-         if (only != null) {
-             url += 'only=' + only + '&';
-         }
-         if (omit != null) {
-             url += 'omit=' + omit + '&';
-         }
-         url += 'element=' + elementname + '';
-         var title = 'Browser';
-         var options = 'scrollbars=1,resizable=1,menubar=0';
-         options += ',width=700,height=600';
-         editbrowser = open(url,title,options,'1');
-         editbrowser.focus();
-     }
- </script>
-     <head>
-         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-         <title>$loncapaHelper: $helperTitle</title>
-     </head>
-     $bodytag
- HEADER
-     if (!$state->overrideForm()) { $result.="<form name='helpform' method='POST'>"; }
-     $result .= <<HEADER;
-         <table border="0" width='100%'><tr><td>
-         <h2><i>$stateTitle</i></h2>
- HEADER
-     $result .= "<table cellpadding='10' width='100%'><tr><td rowspan='2' valign='top'>";
-     if (!$state->overrideForm()) {
+     if (!$state->overrideForm()) { $result.='<form name="helpform" method="post">'; }
-         $result .= $self->_saveVars();
+     if ($stateHelp) {
+         $stateHelp = &Apache::loncommon::help_open_topic($stateHelp);
      }
-     $result .= $state->render();
-     $result .= "</td><td valign='top' align='right'>";
-     # Warning: Copy and pasted from below, because it's too much trouble to
+     # Prepare buttons
-     # turn this into a subroutine
+     my $buttons;
      if (!$state->overrideForm()) {
          if ($self->{STATE} ne $self->{START_STATE}) {
              #$result .= '<input name="SUBMIT" type="submit" value="&lt;- Previous" />&nbsp;&nbsp;';
          }
+         $buttons = '<p>'; # '<fieldset>';
          if ($self->{DONE}) {
              my $returnPage = $self->{RETURN_PAGE};
-             $result .= "<a href=\"$returnPage\">" . &mt("End Helper") . "</a>";
+             $buttons .= '<a href="'.$returnPage.'">'.&mt('End Helper').'</a>';
          }
          else {
-             $result .= '<nobr><input name="back" type="button" ';
+             $buttons .= '<span class="LC_nobreak">'
-             $result .= 'value="' . $previous . '" onclick="history.go(-1)" /> ';
+                        .'<input name="back" type="button" '
-             $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></nobr>';
+                        .'value="'.$previous.'" onclick="history.go(-1)" /> '
+                        .'<input name="SUBMIT" type="submit" value="'.$next.'" />'
+                        .'</span>';
          }
+     $buttons .= '</p>'; # '</fieldset>';
      }
-     $result .= "</td></tr><tr><td valign='bottom' align='right'>";
-     # Warning: Copy and pasted from above, because it's too much trouble to
-     # turn this into a subroutine
+     $result .= '<h2>'.$stateTitle.$stateHelp.'</h2>';
+ #   $result .= '<div>';
+     # Top buttons
+     $result .= $buttons;
+     # Main content of current helper screen
      if (!$state->overrideForm()) {
-         if ($self->{STATE} ne $self->{START_STATE}) {
+         $result .= $self->_saveVars();
-             #$result .= '<input name="SUBMIT" type="submit" value="&lt;- Previous" />&nbsp;&nbsp;';
-         }
-         if ($self->{DONE}) {
-             my $returnPage = $self->{RETURN_PAGE};
-             $result .= "<a href=\"$returnPage\">" . &mt('End Helper') . "</a>";
-         }
-         else {
-             $result .= '<nobr><input name="back" type="button" ';
-             $result .= 'value="' . $previous . '" onclick="history.go(-1)" /> ';
-             $result .= '<input name="SUBMIT" type="submit" value="' . $next . '" /></nobr>';
-         }
      }
+     $result .= $state->render();
+     # Bottom buttons
+     $result .= $buttons;
      #foreach my $key (keys %{$self->{VARS}}) {
      #    $result .= "|$key| -> " . $self->{VARS}->{$key} . "<br />";
      #}
-     $result .= "</td></tr></table>";
+ #   $result .= '</div>';
      $result .= <<FOOTER;
-               </td>
-             </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 701  sub new {
+ Line 687  sub new {
      $self->{NAME} = shift;
      $self->{TITLE} = shift;
+     $self->{HELP} = shift;
      $self->{ELEMENTS} = [];
      bless($self, $class);
- Line 722  sub title {
+ Line 709  sub title {
      return $self->{TITLE};
  }
+ sub help {
+     my $self = shift;
+     return $self->{HELP};
+ }
  sub preprocess {
      my $self = shift;
      for my $element (@{$self->{ELEMENTS}}) {
- Line 813  the element. How this value is interpret
+ Line 805  the element. How this value is interpret
  the element itself, and possibly the settings the element has (such as
  multichoice vs. single choice for <choices> tags).
- This is also intended for things like the course initialization wizard, where the
+ This is also intended for things like the course initialization helper, where the
  user is setting various parameters. By correctly grabbing current settings
  and including them into the helper, it allows the user to come back to the
  helper later and re-execute it, without needing to worry about overwriting
- Line 1015  sub start_message {
+ Line 1007  sub start_message {
      if (defined($token->[2]{'nextstate'})) {
          $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
      }
+     if (defined($token->[2]{'type'})) {
+         $paramHash->{TYPE} = $token->[2]{'type'};
+     }
      return '';
  }
- Line 1030  sub end_message {
+ Line 1025  sub end_message {
  sub render {
      my $self = shift;
-     return &mtn($self->{MESSAGE_TEXT});
+     if ($self->{TYPE} =~ /^\s*warning\s*$/i) {
+ 	 $self->{MESSAGE_TEXT} =
+ 	     '<span class="LC_warning">'. $self->{MESSAGE_TEXT}.'</span>';
+     }
+     if ($self->{TYPE} =~ /^\s*error\s*$/i) {
+ 	 $self->{MESSAGE_TEXT} =
+ 	     '<span class="LC_error">'. $self->{MESSAGE_TEXT}.'</span>';
+     }
+     return $self->{MESSAGE_TEXT};
  }
  # If a NEXTSTATE was given, switch to it
  sub postprocess {
- Line 1044  sub postprocess {
+ Line 1047  sub postprocess {
  }
 ;
+ package Apache::lonhelper::helpicon;
+ =pod
+ =head1 Elements
+ =head2 Element: helpiconX<helpicon, helper element>
+ Helpicon elements add a help icon at the current location.
+ Example:
+    <helpicon file="Help">
+      General Help
+    </helpicon>
+ In this example will generate a help icon to the Help.hlp url with a
+ description of 'General Help'. The description is not required and if
+ left out (Example: <helpicon file="Help" /> only the icon will be
+ added.)
+ =head3 Localization
+ The description text 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::helpicon',
+ 				 ('helpicon'));
+ }
+ sub new {
+     my $ref = Apache::lonhelper::element->new();
+     bless($ref);
+ }
+ # CONSTRUCTION: Construct the message element from the XML
+ sub start_helpicon {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     $paramHash->{HELP_TEXT} = &mtn(&Apache::lonxml::get_all_text('/helpicon',
+ 								 $parser));
+     $paramHash->{HELP_TEXT} =~s/^\s+//;
+     $paramHash->{HELP_TEXT} =~s/\s+$//;
+     if (defined($token->[2]{'file'})) {
+         $paramHash->{HELP_FILE} = $token->[2]{'file'};
+     }
+     return '';
+ }
+ sub end_helpicon {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     Apache::lonhelper::helpicon->new();
+     return '';
+ }
+ sub render {
+     my $self = shift;
+     my $text;
+     if ( $self->{HELP_TEXT} ne '') {
+ 	$text=&mtn($self->{HELP_TEXT});
+     }
+     return &Apache::loncommon::help_open_topic($self->{HELP_FILE},
+ 					       $text);
+ }
+ sub postprocess {
+     my $self = shift;
+     if (defined($self->{NEXTSTATE})) {
+         $helper->changeState($self->{NEXTSTATE});
+     }
+     return 1;
+ }
+;
+ package Apache::lonhelper::skip;
+ =pod
+ =head1 Elements
+ =head2 Element: skipX<skip>
+ The <skip> tag allows you define conditions under which the current state
+ should be skipped over and define what state to skip to.
+   <state name="SKIP">
+     <skip>
+        <clause>
+          #some code that decides whether to skip the state or not
+        </clause>
+        <nextstate>FINISH</nextstate>
+     </skip>
+     <message nextstate="FINISH">A possibly skipped state</message>
+   </state>
+ =cut
+ no strict;
+ @ISA = ("Apache::lonhelper::element");
+ use strict;
+ BEGIN {
+     &Apache::lonhelper::register('Apache::lonhelper::skip',
+ 				 ('skip'));
+ }
+ sub new {
+     my $ref = Apache::lonhelper::element->new();
+     bless($ref);
+ }
+ sub start_skip {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     # let <cluase> know what text to skip to
+     $paramHash->{SKIPTAG}='/skip';
+     return '';
+ }
+ sub end_skip {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target ne 'helper') {
+         return '';
+     }
+     Apache::lonhelper::skip->new();
+     return '';
+ }
+ sub render {
+     my $self = shift;
+     return '';
+ }
+ # If a NEXTSTATE is set, switch to it
+ sub preprocess {
+     my ($self) = @_;
+     if (defined($self->{NEXTSTATE})) {
+         $helper->changeState($self->{NEXTSTATE});
+     }
+     return 1;
+ }
+;
  package Apache::lonhelper::choices;
  =pod
- Line 1093  will be the state transistioned to if th
+ Line 1265  will be the state transistioned to if th
  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
  To create the choices programmatically, either wrap the choices in
- Line 1134  no strict;
+ Line 1316  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
  use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::choices',
- Line 1182  sub start_choice {
+ Line 1365  sub start_choice {
      my $computer = $token->[2]{'computer'};
      my $human = &mt(&Apache::lonxml::get_all_text('/choice',
                                                $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 1193  sub end_choice {
+ Line 1378  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 {
      my $self = shift;
      my $var = $self->{'variable'};
- Line 1201  sub render {
+ Line 1393  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];
-             if (ele.name == checkName + '.forminput') {
+             if (ele.name == checkName + '_forminput') {
                  document.forms.helpform.elements[i].checked=value;
              }
          }
      }
+ // -->
  </script>
  SCRIPT
      }
- Line 1275  BUTTONS
+ Line 1469  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'"
+         $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);
          }
- 	&Apache::lonnet::logthis("TITLE TRANSLATION >$choiceLabel<");
+         $result .= "/></td><td> ".qq{<label for="id$id">}.
-         $result .= "/></td><td> " . &mtn($choiceLabel) . "</td></tr>\n";
+ 	    $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 1303  BUTTONS
+ Line 1505  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} =
- Line 1311  sub postprocess {
+ Line 1514  sub postprocess {
          return 0;
      }
      if (ref($chosenValue)) {
          $helper->{VARS}->{$self->{'variable'}} = join('|||', @$chosenValue);
      }
- Line 1325  sub postprocess {
+ Line 1530  sub postprocess {
                  $helper->changeState($choice->[2]);
              }
          }
+ 	if ($choice->[4]) {
+ 	    my $varname = $choice->[4];
+ 	    $helper->{'VARS'}->{$varname} = $env{'form.'."${varname}_forminput"};
+ 	}
      }
      return 1;
  }
- Line 1357  no strict;
+ Line 1566  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
  use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::dropdown',
- Line 1431  sub render {
+ Line 1641  sub render {
  	$checkedChoices{$self->{CHOICES}->[0]->[1]} = 1;
      }
-     $result .= "<select name='${var}.forminput'>\n";
+     $result .= "<select name='${var}_forminput'>\n";
      foreach my $choice (@{$self->{CHOICES}}) {
          $result .= "<option value='" .
-             HTML::Entities::encode($choice->[1],'<>&"')
+             HTML::Entities::encode($choice->[1],"<>&\"'")
              . "'";
          if ($checkedChoices{$choice->[1]}) {
-             $result .= " selected";
+             $result .= " selected='selected' ";
          }
          my $choiceLabel = $choice->[0];
          if ($choice->[4]) {  # if we need to evaluate this choice
- Line 1446  sub render {
+ Line 1656  sub render {
              $choiceLabel = eval($choiceLabel);
              $choiceLabel = &$choiceLabel($helper, $self);
          }
-         $result .= ">" . &mtn($choiceLabel) . "\n";
+         $result .= ">" . &mtn($choiceLabel) . "</option>\n";
      }
      $result .= "</select>\n";
- Line 1457  sub render {
+ Line 1667  sub render {
  # given, switch to it
  sub postprocess {
      my $self = shift;
-     my $chosenValue = $ENV{'form.' . $self->{'variable'} . '.forminput'};
+     my $chosenValue = $env{'form.' . $self->{'variable'} . '_forminput'};
      if (!defined($chosenValue) && !$self->{'allowempty'}) {
          $self->{ERROR_MSG} = "You must choose one or more choices to" .
- Line 1516  no strict;
+ Line 1726  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
  use Apache::lonlocal; # A localization nightmare
+ use Apache::lonnet;
- use Time::localtime;
+ use DateTime;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::date',
- Line 1544  sub start_date {
+ Line 1754  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 1562  sub render {
+ Line 1773  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 = &get_date_object($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 = &get_date_object(time);
+ 	    $date->min(0);
+ 	} elsif (defined($time) && $time ne 0) {
+ 	    $date = &get_date_object($time);
+ 	} else {
+ 	    # leave date undefined so it'll default to now
+ 	}
+     }
+     if (!defined($date)) {
+ 	$date = &get_date_object(time);
+ 	$date->min(0);
+     }
+     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 1573  sub render {
+ Line 1816  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) {
+         if (($i + 1) == $date->mon) {
-             $result .= "<option value='$i' selected>";
+             $result .= "<option value='$i' selected='selected'>";
          } else {
              $result .= "<option value='$i'>";
          }
-         $result .= &mt($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 1597  sub render {
+ Line 1840  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) {
+         if ($date->year == $i) {
-             $result .= "<option selected>";
+             $result .= "<option selected='selected'>";
          } else {
              $result .= "<option>";
          }
- Line 1614  sub render {
+ Line 1857  sub render {
  	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'>" . &mt('midnight') . "</option>\n";
          for ($i = 1; $i < 12; $i++) {
              if ($date->hour == $i) {
-                 $result .= "<option selected value='$i'>$i $am</option>\n";
+                 $result .= "<option selected='selected' value='$i'>$i $am</option>\n";
              } else {
                  $result .= "<option value='$i'>$i $am</option>\n";
              }
          }
-         $result .= "<option " . ($date->hour == 12 ? 'selected ':'') .
+         $result .= "<option " . ($date->hour == 12 ? 'selected="selected" ':'') .
              " value='12'>" . &mt('noon') . "</option>\n";
          for ($i = 13; $i < 24; $i++) {
              my $printedHour = $i - 12;
              if ($date->hour == $i) {
-                 $result .= "<option selected value='$i'>$printedHour $pm</option>\n";
+                 $result .= "<option selected='selected' value='$i'>$printedHour $pm</option>\n";
              } else {
                  $result .= "<option value='$i'>$printedHour $pm</option>\n";
              }
- Line 1637  sub render {
+ Line 1880  sub render {
          $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 1652  sub render {
+ Line 1897  sub render {
          }
          $result .= "</select>\n";
      }
+     $result  .= ' '.$date->time_zone_short_name().' ';
+     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 1660  sub render {
+ Line 1922  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;
+         $month ++;
-     if ($self->{'hoursminutes'}) {
+ 	my $day = $env{'form.' . $var . 'day'};
-         $min = $ENV{'form.' . $var . 'minute'};
+ 	my $year = $env{'form.' . $var . 'year'};
-         $hour = $ENV{'form.' . $var . 'hour'};
+ 	my $min = 0;
-     }
+ 	my $hour = 0;
+ 	if ($self->{'hoursminutes'}) {
+ 	    $min = $env{'form.' . $var . 'minute'};
+ 	    $hour = $env{'form.' . $var . 'hour'};
+ 	}
+ 	my ($chosenDate,$checkDate);
+         my $timezone = &Apache::lonlocal::gettimezone();
+         my $dt;
+ 	eval {
+                $dt = DateTime->new( year   => $year,
+                                     month  => $month,
+                                     day    => $day,
+                                     hour   => $hour,
+                                     minute => $min,
+                                     second => 0,
+                                     time_zone => $timezone,
+                              );
+         };
+ 	my $error = $@;
+         if (!$error) {
+             $chosenDate  = $dt->epoch;
+             $checkDate = &get_date_object($chosenDate);
+         }
+ 	# Check to make sure that the date was not automatically co-erced into a
+ 	# valid date, as we want to flag that as an error
+ 	# This happens for "Feb. 31", for instance, which is coerced to March 2 or
+ 	# 3, depending on if it's a leap year
+ 	if ($error || $checkDate->mon != $month || $checkDate->mday != $day ||
+ 	    $checkDate->year != $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[$env{'form.'.$var.'month'}].                                 " $day, $year as a ".
+ 		                 "date because it doesn't exist. Please enter a valid date.";
-     my $chosenDate;
-     eval {$chosenDate = Time::Local::timelocal(0, $min, $hour, $day, $month, $year);};
-     my $error = $@;
-     # Check to make sure that the date was not automatically co-erced into a
-     # valid date, as we want to flag that as an error
-     # This happens for "Feb. 31", for instance, which is coerced to March 2 or
-     # 3, depending on if it's a leap year
-     my $checkDate = localtime($chosenDate);
-     if ($error || $checkDate->mon != $month || $checkDate->mday != $day ||
-         $checkDate->year + 1900 != $year) {
- 	unless (Apache::lonlocal::current_language()== ~/^en/) {
- 	    $self->{ERROR_MSG} = &mt("Invalid date entry");
  	    return 0;
  	}
- 	# LOCALIZATION FIXME: Needs to be parameterized
+ 	$helper->{VARS}->{$var} = $chosenDate;
-         $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;
+ 	}
+     }
      if (defined($self->{NEXTSTATE})) {
          $helper->changeState($self->{NEXTSTATE});
- Line 1701  sub postprocess {
+ Line 1992  sub postprocess {
      return 1;
  }
+ sub get_date_object {
+     my ($epoch) = @_;
+     my $dt = DateTime->from_epoch(epoch => $epoch)
+                      ->set_time_zone(&Apache::lonlocal::gettimezone());
+     my $lang = Apache::lonlocal::current_language();
+     if ($lang ne '') {
+         eval {
+             $dt->set_locale($lang);
+         };
+     }
+     return $dt;
+ }
 ;
  package Apache::lonhelper::resource;
- Line 1725  to false. The "suppressEmptySequences" a
+ Line 2030  to false. The "suppressEmptySequences" a
  suppressEmptySequences argument to the render routine, which will cause
  folders that have all of their contained resources filtered out to also
  be filtered out. The 'addstatus' attribute, if true, will add the icon
- and long status display columns to the display.
+ and long status display columns to the display. The 'addparts'
+ attribute will add in a part selector beside problems that have more
+ than 1 part. The 'includecourse' attribute if true, will include
+ the toplevel default.sequence in the results.
  =head3 SUB-TAGS
- Line 1758  and long status display columns to the d
+ Line 2066  and long status display columns to the d
    evaluated with "sub { my $helper = shift; my $state = shift;" and
    "}", with the return value used as the mapurl.
+ =item * <option />: Allows you to add optional elements to the
+   resource chooser currently these can be a checkbox, or a text entry
+   or hidden (see the 'type' attribute below).
+   the following attributes are supported by this tag:
+ =over 4
+ =item * type=control-type : determines the type of control displayed.
+   This can be one of the following types: 'checkbox' provides a true/false
+   checkbox.  'text' provides a text entry control. 'hidden' provides a
+   hidden form element that returns the name of the resource for each
+   element of the text box.
+ =item * text=header-text : provides column header text for the option.
+ =item * variable=helpervar : provides a helper variable to contain the
+   value of the input control for each resource.  In general, the result
+   will be a set of values separated by |||  for the checkbox the value between
+   the |||'s will either be empty, if the box is not checked, or the resource
+   name if checked.  For the text entry, the values will be the text in the
+   text box.  This could be empty.  Hidden elements unconditionally provide
+   the resource name for each row of the chooser and allow you to therefore
+   correlate text entries to their resources.
+   The helper variable can be initialized by the user code to pre-load values
+   into the controls:
+ =over 4
+ =item * Preloading checkboxes : Set the helper variable to the value you
+    would have gotten from the control if it had been manually set as desired.
+ =item * Preloading text entries : Set the helper variable to triple pipe
+    separated values where each value is of the form resource-name=value
+ =item * Preloading hidden fields : These cannot be pre-loaded and will always
+   be pipe separated resource names.
+ =back
+ =back
  =back
  =cut
- Line 1765  and long status display columns to the d
+ Line 2116  and long status display columns to the d
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::resource',
                                ('resource', 'filterfunc',
                                 'choicefunc', 'valuefunc',
-                                'mapurl'));
+                                'mapurl','option'));
  }
  sub new {
- Line 1792  sub start_resource {
+ Line 2144  sub start_resource {
      $paramHash->{'suppressEmptySequences'} = $token->[2]{'suppressEmptySequences'};
      $paramHash->{'toponly'} = $token->[2]{'toponly'};
      $paramHash->{'addstatus'} = $token->[2]{'addstatus'};
+     $paramHash->{'addparts'} = $token->[2]{'addparts'};
+     if ($paramHash->{'addparts'}) {
+ 	$helper->declareVar($paramHash->{'variable'}.'_part');
+     }
      $paramHash->{'closeallpages'} = $token->[2]{'closeallpages'};
+     $paramHash->{'include_top_level_map'} = $token->[2]{'includecourse'};
      return '';
  }
- Line 1875  sub start_mapurl {
+ Line 2232  sub start_mapurl {
  sub end_mapurl { return ''; }
+ sub start_option {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if (!defined($paramHash->{OPTION_TEXTS})) {
+ 	$paramHash->{OPTION_TEXTS} = [ ];
+ 	$paramHash->{OPTION_VARS}  = [ ];
+ 	$paramHash->{OPTION_TYPES} = [ ];
+     }
+     #  We can have an attribute: type which can have the
+     #  values: "checkbox" or "text" which defaults to
+     #           checkbox allowing us to change the type of input
+     #           for the option:
+     #
+     my $input_widget_type = 'checkbox';
+     if(defined($token->[2]{'type'})) {
+ 	my $widget_type  = $token->[2]{'type'};
+ 	if ($widget_type eq 'text') {          # only accept legal alternatives
+ 	    $input_widget_type = $widget_type; # Illegals are checks.
+ 	} elsif ($widget_type eq 'hidden') {
+ 	    $input_widget_type = $widget_type;
+ 	}
+     }
+     # 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.
+     # OPTION_TYPES is a list of the option types:
+     #
+     #  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};
+     my $option_types   = $paramHash->{OPTION_TYPES};
+     push(@$option_texts,  $token->[2]{'text'});
+     push(@$option_vars,   $token->[2]{'variable'});
+     push(@$option_types,   $input_widget_type);
+     #  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 1897  sub render {
+ Line 2312  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];
-             if (ele.name == checkName + '.forminput') {
+             if (ele.name == checkName + '_forminput') {
                  document.forms.helpform.elements[i].checked=value;
              }
          }
      }
+ // -->
  </script>
  SCRIPT
          my %lt=&Apache::lonlocal::texthash(
- Line 1926  BUTTONS
+ Line 2343  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 $multichoice = $self->{'multichoice'};
+     my $multichoice    = $self->{'multichoice'};
+     my $option_vars    = $self->{OPTION_VARS};
+     my $option_texts   = $self->{OPTION_TEXTS};
+     my $option_types   = $self->{OPTION_TYPES};
+     my $addparts       = $self->{'addparts'};
+     my $headings_done  = 0;
      # Evaluate the map url as needed
      my $mapUrl;
- Line 1941  BUTTONS
+ Line 2363  BUTTONS
  	$mapUrl = $self->{MAP_URL};
      }
+     my %defaultSymbs;
+     if (defined($self->{DEFAULT_VALUE})) {
+         my $valueFunc = eval($self->{DEFAULT_VALUE});
+         die 'Error in default value code for variable ' .
+             $self->{'variable'} . ', Perl said: ' . $@ if $@;
+         my @defaultSymbs = &$valueFunc($helper, $self);
+ 	if (!$multichoice && @defaultSymbs) { # only allowed 1
+ 	    @defaultSymbs = ($defaultSymbs[0]);
+ 	}
+ 	%defaultSymbs = map { if ($_) {($_,1) } } @defaultSymbs;
+ 	delete($defaultSymbs{''});
+     }
      # Create the composite function that renders the column on the nav map
      # have to admit any language that lets me do this can't be all bad
      #  - Jeremy (Pythonista) ;-)
      my $checked = 0;
      my $renderColFunc = sub {
          my ($resource, $part, $params) = @_;
+ 	my $result = "";
+ 	if(!$headings_done) {
+ 	    if ($option_texts) {
+ 		foreach my $text (@$option_texts) {
+ 		    $result .= "<th>$text</th>";
+ 		}
+ 	    }
+ 	    $result .= "<th>Select</th>";
+ 	    $result .= "</tr><tr>"; # Close off the extra row and start a new one.
+ 	    $headings_done = 1;
+ 	}
          my $inputType;
          if ($multichoice) { $inputType = 'checkbox'; }
          else {$inputType = 'radio'; }
          if (!&$choiceFunc($resource)) {
-             return '<td>&nbsp;</td>';
+ 	    $result .= '<td>&nbsp;</td>';
+             return $result;
          } else {
-             my $col = "<td><input type='$inputType' name='${var}.forminput' ";
+ 	    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
+ 		my $option_num = 0;
- 		$col .= "checked ";
+ 		foreach my $option_var (@$option_vars) {
- 		$checked = 1;
+ 		    my $option_type = $option_types->[$option_num];
+ 		    $option_num++;
+ 		    my $var_value = "\|\|\|" . $helper->{VARS}->{$option_var} .
+ 			"\|\|\|";
+ 		    my $checked ="";
+ 		    if($var_value =~ /\Q|||$raw_name|||\E/) {
+ 			$checked = "checked='checked'";
+ 		    }
+ 		    if ($option_type eq 'text') {
+ 			#
+ 			# For text's the variable value is a ||| separated set of
+ 			# resource_name=value
+ 			#
+ 			my @values = split(/\|\|\|/, $helper->{VARS}->{$option_var});
+ 			# Normal practice would be to toss this in a hash but
+ 			# the only thing that saves is the compare in the loop
+ 			# below and for all but one case we'll break out of the loop
+ 			# before it completes.
+ 			my $text_value = '';    # In case there's no match.
+ 			foreach my $value (@values) {
+ 			    my ($res, $skip) = split(/=/, $value);
+ 			    if($res eq $resource_name) {
+ 				$text_value = $skip;
+ 				last;
+ 			    }
+ 			}
+ 			# TODO: add an attribute to <option> that allows the
+ 			#       programmer to set the width of the tex entry box.
+ 			$col .=
+ 			    "<td align='center'><input type='text' name ='$option_var".
+ 			    "_forminput' value='".$text_value."' size='5' /> </td>";
+ 		    } elsif ($option_type eq 'hidden') {
+  			$col .= "<td align='center'><input type='hidden' name ='$option_var".
+ 			    "_forminput' value='".
+ 			    $resource_name . "'/> </td>";
+ 		    } else {
+ 			$col .=
+ 			    "<td align='center'><input type=$option_type 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
-     my $cols = [$renderColFunc, Apache::lonnavmaps::resource()];
+     $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());
- Line 1984  BUTTONS
+ Line 2533  BUTTONS
                                         'resource_no_folder_link' => 1,
  				       'closeAllPages' => $self->{'closeallpages'},
                                         'suppressEmptySequences' => $self->{'suppressEmptySequences'},
+ 				       'include_top_level_map' => $self->{'include_top_level_map'},
                                         'iterator_map' => $mapUrl }
                                         );
- Line 1999  sub postprocess {
+ Line 2549  sub postprocess {
          $self->{ERROR_MSG} = 'You must choose at least one resource to continue.';
          return 0;
      }
+     # For each of the attached options.  If it's env var is undefined, set it to
+     # an empty string instead.. an undef'd env var means no choices selected.
+     #
+     my $option_vars = $self->{OPTION_VARS};
+     if ($option_vars) {
+ 	foreach my $var (@$option_vars) {
+ 	    my $env_name = "form.".$var."_forminput";
+ 	    if (!defined($env{$env_name})) {
+ 		$env{$env_name} = '';
+ 		$helper->{VARS}->{$var} = '';
+ 	    }
+ 	}
+     }
      if (defined($self->{NEXTSTATE})) {
          $helper->changeState($self->{NEXTSTATE});
- Line 2041  selection. Defaults to false.
+ Line 2606  selection. Defaults to false.
  If true, only active students and course personnel will be
  shown. Defaults to false.
+ =item * B<emptyallowed>:
+ If true, the selection of no users is allowed. Defaults to false.
  =back
  =cut
- Line 2049  no strict;
+ Line 2618  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
  use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::student',
- Line 2072  sub start_student {
+ Line 2641  sub start_student {
      $helper->declareVar($paramHash->{'variable'});
      $paramHash->{'multichoice'} = $token->[2]{'multichoice'};
      $paramHash->{'coursepersonnel'} = $token->[2]{'coursepersonnel'};
-     $paramHash->{'sctiveonly'} = $token->[2]{'activeonly'};
+     $paramHash->{'activeonly'} = $token->[2]{'activeonly'};
      if (defined($token->[2]{'nextstate'})) {
          $paramHash->{NEXTSTATE} = $token->[2]{'nextstate'};
      }
+     $paramHash->{'emptyallowed'} = $token->[2]{'emptyallowed'};
  }
- Line 2094  sub render {
+ Line 2664  sub render {
      my $buttons = '';
      my $var = $self->{'variable'};
-     if ($self->{'multichoice'}) {
-         $result = <<SCRIPT;
- <script>
-     function checkall(value, checkName) {
- 	for (i=0; i<document.forms.helpform.elements.length; i++) {
-             ele = document.forms.helpform.elements[i];
-             if (ele.name == checkName + '.forminput') {
-                 document.forms.helpform.elements[i].checked=value;
-             }
-         }
-     }
-     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) {
-                 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;
-             }
-         }
-     }
- </script>
- SCRIPT
-         my %lt=&Apache::lonlocal::texthash(
-                     'ocs'  => "Select Only Current Students",
-                     'sas'  => "Select All Students",
-                     'uas'  => "Unselect All Students",
-                     'sfsg' => "Select for Section/Group",
- 		    'ufsg' => "Unselect for Section/Group");
-         $buttons = <<BUTTONS;
- <br />
- <input type="button" onclick="checkactive()" value="$lt{'ocs'}" />
- <input type="button" onclick="checkall(true, '$var')" value="$lt{'sas'}" />
- <input type="button" onclick="checkall(false, '$var')" value="$lt{'uas'}" />
- <input type="button" onclick="checksec(true)" value="$lt{'sfsg'}">
- <input type="text" size="5" name="chksec">&nbsp;
- <input type="button" onclick="checksec(false)" value="$lt{'ufsg'}">
- <br />
- BUTTONS
-     }
      if (defined $self->{ERROR_MSG}) {
          $result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
      }
-     my $choices = [];
+     my %defaultUsers;
+     if (defined($self->{DEFAULT_VALUE})) {
+         my $valueFunc = eval($self->{DEFAULT_VALUE});
+         die 'Error in default value code for variable ' .
+             $self->{'variable'} . ', Perl said: ' . $@ if $@;
+         my @defaultUsers = &$valueFunc($helper, $self);
+ 	if (!$self->{'multichoice'} && @defaultUsers) { # only allowed 1
+ 	    @defaultUsers = ($defaultUsers[0]);
+ 	}
+ 	%defaultUsers = map { if ($_) {($_,1) } } @defaultUsers;
+ 	delete($defaultUsers{''});
+     }
+     my ($course_personnel,
+ 	$current_members,
+ 	$expired_members,
+ 	$future_members) =
+ 	    &Apache::lonselstudent::get_people_in_class($env{'request.course.sec'});
      # Load up the non-students, if necessary
      if ($self->{'coursepersonnel'}) {
- 	my %coursepersonnel = Apache::lonnet::get_course_adv_roles();
+ 	unshift @$current_members, (@$course_personnel);
- 	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 @$choices, [join(':', @$person), $person->[0], '', $_];
- 		}
- 	    }
- 	}
      }
-     # Constants
-     my $section = Apache::loncoursedata::CL_SECTION();
-     my $fullname = Apache::loncoursedata::CL_FULLNAME();
-     my $status = Apache::loncoursedata::CL_STATUS();
-     # Load up the students
+     #   Current personel
-     my $classlist = &Apache::loncoursedata::get_classlist();
-     my @keys = keys %{$classlist};
+     $result .= '<h4>'.&mt('Select Currently Enrolled Students and Active Course Personnel').'</h4>';
-     # Sort by: Section, name
+     $result .= &Apache::lonselstudent::render_student_list( $current_members,
-     @keys = sort {
+ 							    "helpform",
-         if ($classlist->{$a}->[$section] ne $classlist->{$b}->[$section]) {
+ 							    "current",
-             return $classlist->{$a}->[$section] cmp $classlist->{$b}->[$section];
+ 							    \%defaultUsers,
-         }
+ 							    $self->{'multichoice'},
-         return $classlist->{$a}->[$fullname] cmp $classlist->{$b}->[$fullname];
+ 							    $self->{'variable'},
-     } @keys;
+);
-     # username, fullname, section, type
-     for (@keys) {
+     # If activeonly is not set then we can also give the expired students:
- 	# Filter out inactive students if we've set "activeonly"
+     #
- 	if (!$self->{'activeonly'} || $classlist->{$_}->[$status] eq
+     if (!$self->{'activeonly'} && ((scalar(@$future_members)) > 0)) {
- 	    'Active') {
- 	    push @$choices, [$_, $classlist->{$_}->[$fullname],
+ 	# And future.
- 			     $classlist->{$_}->[$section],
- 			     $classlist->{$_}->[$status], 'Student'];
+ 	$result .= '<h4>'.&mt('Select Future Enrolled Students and Future Course Personnel').'</h4>';
- 	}
+ 	$result .= &Apache::lonselstudent::render_student_list( $future_members,
+ 								"helpform",
+ 								"future",
+ 								\%defaultUsers,
+ 								$self->{'multichoice'},
+ 								$self->{'variable'},
+);
+     }
+     if (!$self->{'activeonly'} && ((scalar(@$expired_members)) > 0)) {
+ 	# Past
+ 	$result .= '<h4>'.&mt('Select Previously Enrolled Students and Inactive Course Personnel').'</h4>';
+ 	$result .= &Apache::lonselstudent::render_student_list($expired_members,
+ 							       "helpform",
+ 							       "past",
+ 							       \%defaultUsers,
+ 							       $self->{'multichoice'},
+ 							       $self->{'variable'},
+);
      }
-     my $name = $self->{'coursepersonnel'} ? &mt('Name') : &mt('Student Name');
-     &Apache::lonnet::logthis("THE NAME IS >$name<");
-     my $type = 'radio';
-     if ($self->{'multichoice'}) { $type = 'checkbox'; }
-     $result .= "<table cellspacing='2' cellpadding='2' border='0'>\n";
-     $result .= "<tr><td></td><td align='center'><b>$name</b></td>".
-         "<td align='center'><b>" . &mt('Section') . "</b></td>" .
- 	"<td align='center'><b>".&mt('Status')."</b></td>" .
- 	"<td align='center'><b>" . &mt("Role") . "</b></td>" .
- 	"<td align='center'><b>".&mt('Username').":".&mt('Domain')."</b></td></tr>";
-     my $checked = 0;
-     for my $choice (@$choices) {
-         $result .= "<tr><td><input type='$type' name='" .
-             $self->{'variable'} . '.forminput' . "'";
-         if (!$self->{'multichoice'} && !$checked) {
-             $result .= " checked ";
-             $checked = 1;
-         }
-         $result .=
-             " value='" . HTML::Entities::encode($choice->[0] . ':' . $choice->[2] . ':' . $choice->[1] . ':' . $choice->[3],'<>&"')
-             . "' /></td><td>"
-             . HTML::Entities::encode($choice->[1],'<>&"')
-             . "</td><td align='center'>"
-             . HTML::Entities::encode($choice->[2],'<>&"')
-             . "</td>\n<td>"
- 	    . HTML::Entities::encode($choice->[3],'<>&"')
-             . "</td>\n<td>"
- 	    . HTML::Entities::encode($choice->[4],'<>&"')
-             . "</td>\n<td>"
- 	    . HTML::Entities::encode($choice->[0],'<>&"')
- 	    . "</td></tr>\n";
-     }
-     $result .= "</table>\n\n";
-     $result .= $buttons;
      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} =
+ 	if ($self->{'coursepersonnel'}) {
- 	    &mt('You must choose at least one student 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 2310  no strict;
+ Line 2822  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
  use Apache::lonlocal;
+ use Apache::lonnet;
  use Apache::lonpubdir; # for getTitleString
  BEGIN {
- Line 2385  sub start_filefilter {
+ Line 2897  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 2408  sub render {
+ Line 2927  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];
-             if (ele.name == checkName + '.forminput') {
+             if (ele.name == checkName + '_forminput') {
                  document.forms.helpform.elements[i].checked=value;
              }
          }
- Line 2426  sub render {
+ Line 2946  sub render {
              }
          }
      }
+ // -->
  </script>
  SCRIPT
         my %lt=&Apache::lonlocal::texthash(
- Line 2455  BUTTONS
+ Line 2976  BUTTONS
      # If the subdirectory is in local CSTR space
      my $metadir;
      if ($subdir =~ m|/home/([^/]+)/public_html/(.*)|) {
-         my $user = $1;
+ 	my ($user,$domain)=
-         my $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+ 	    &Apache::loncacc::constructaccess($subdir,
+ 				     $Apache::lonnet::perlvar{'lonDefDomain'});
  	$metadir='/res/'.$domain.'/'.$user.'/'.$2;
-         @fileList = &Apache::lonnet::dirlist($subdir, $domain, $user, '');
+         @fileList = &Apache::lonnet::dirlist($subdir,$domain,$user,undef,undef,'/');
      } elsif ($subdir =~ m|^~([^/]+)/(.*)$|) {
  	$subdir='/home/'.$1.'/public_html/'.$2;
-         my $user = $1;
+ 	my ($user,$domain)=
-         my $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+ 	    &Apache::loncacc::constructaccess($subdir,
+ 				     $Apache::lonnet::perlvar{'lonDefDomain'});
  	$metadir='/res/'.$domain.'/'.$user.'/'.$2;
-         @fileList = &Apache::lonnet::dirlist($subdir, $domain, $user, '');
+         @fileList = &Apache::lonnet::dirlist($subdir,$domain,$user,undef,undef,'/');
      } 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'},undef,undef,'/');
      }
      # Sort the fileList into order
-     @fileList = sort @fileList;
+     @fileList = sort {lc($a) cmp lc($b)} @fileList;
      $result .= $buttons;
- Line 2523  BUTTONS
+ Line 3046  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 2558  sub fileState {
+ Line 3083  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 2581  sub fileState {
+ Line 3110  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 2606  package Apache::lonhelper::section;
+ Line 3135  package Apache::lonhelper::section;
  <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 2637  sub start_section {
+ Line 3170  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 2646  sub start_section {
+ Line 3180  sub start_section {
      my $section = Apache::loncoursedata::CL_SECTION();
      my $classlist = Apache::loncoursedata::get_classlist();
-     foreach (keys %$classlist) {
+     foreach my $user (keys(%$classlist)) {
-         my $sectionName = $classlist->{$_}->[$section];
+         my $section_name = $classlist->{$user}[$section];
-         if (!$sectionName) {
+         if (!$section_name) {
              $choices{"No section assigned"} = "";
          } else {
-             $choices{$sectionName} = $sectionName;
+             $choices{$section_name} = $section_name;
          }
      }
-     for my $sectionName (sort(keys(%choices))) {
+     if (exists($choices{"No section assigned"})) {
+ 	push(@{$paramHash->{CHOICES}},
-         push @{$paramHash->{CHOICES}}, [$sectionName, $sectionName];
+ 	     ['No section assigned','No section assigned']);
+ 	delete($choices{"No section assigned"});
+     }
+     for my $section_name (sort {lc($a) cmp lc($b) } (keys(%choices))) {
+ 	push @{$paramHash->{CHOICES}}, [$section_name, $section_name];
+     }
+     return if ($token->[2]{'onlysections'});
+     # add in groups to the end of the list
+     my %curr_groups = &Apache::longroup::coursegroups();
+     foreach my $group_name (sort(keys(%curr_groups))) {
+ 	push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
      }
  }
- Line 2671  sub end_section {
+ Line 3216  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 = &Apache::longroup::coursegroups();
+     foreach my $group_name (sort {lc($a) cmp lc($b)} (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
- Line 2690  string honors the validation function, i
+ Line 3299  string honors the validation function, i
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::string',
- Line 2733  sub render {
+ Line 3343  sub render {
      my $result = '';
      if (defined $self->{ERROR_MSG}) {
-         $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
+         $result .= '<p><font color="#FF0000">' . $self->{ERROR_MSG} . '</font></p>';
      }
-     $result .= '<input type="string" name="' . $self->{'variable'} . '.forminput"';
+     $result .= '<input type="string" name="' . $self->{'variable'} . '_forminput"';
      if (defined($self->{'size'})) {
          $result .= ' size="' . $self->{'size'} . '"';
- Line 2763  sub postprocess {
+ Line 3373  sub postprocess {
      if (defined($self->{VALIDATOR})) {
  	my $validator = eval($self->{VALIDATOR});
- 	die 'Died during evaluation of evaulation code; Perl said: ' . $@ if $@;
+ 	die 'Died during evaluation of validator code; Perl said: ' . $@ if $@;
  	my $invalid = &$validator($helper, $state, $self, $self->getValue());
  	if ($invalid) {
  	    $self->{ERROR_MSG} = $invalid;
- Line 2787  package Apache::lonhelper::general;
+ Line 3397  package Apache::lonhelper::general;
  =head2 General-purpose tag: <exec>X<exec, helper tag>
  The contents of the exec tag are executed as Perl code, B<not> inside a
- safe space, so the full range of $ENV and such is available. The code
+ safe space, so the full range of $env and such is available. The code
  will be executed as a subroutine wrapped with the following code:
  "sub { my $helper = shift; my $state = shift;" and
- Line 2808  be able to call methods on it.
+ Line 3418  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 2866  sub start_clause {
+ Line 3479  sub start_clause {
      die 'Error in clause of condition, Perl said: ' . $@ if $@;
      if (!&$clause($helper, $paramHash)) {
          # Discard all text until the /condition.
-         &Apache::lonxml::get_all_text('/condition', $parser);
+ 	my $end_tag = $paramHash->{SKIPTAG} || '/condition';
+         &Apache::lonxml::get_all_text($end_tag, $parser);
      }
  }
- Line 2925  snippets and collecting the results. Fin
+ Line 3539  snippets and collecting the results. Fin
  helper, going to a provided page.
  If the parameter "restartCourse" is true, this will override the buttons and
- will make a "Finish Helper" button that will re-initialize the course for them,
+ will make a Save button (Finish Helper) that will re-initialize the course for them,
  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 3026  sub render {
+ Line 3644  sub render {
  	$result .= '</ul>';
      }
+     my $actionURL = $self->{EXIT_PAGE};
+     my $targetURL = '';
+ 	my $finish=&mt('Save');
      if ($self->{'restartCourse'}) {
- 	my $targetURL = '/adm/menu';
+ 	$actionURL = '/adm/roles';
- 	if ($ENV{'course.'.$ENV{'request.course.id'}.'.url'}=~/^uploaded/) {
+ 	$targetURL = '/adm/menu';
+ 	if ($env{'course.'.$env{'request.course.id'}.'.url'}=~/^uploaded/) {
  	    $targetURL = '/adm/coursedocs';
  	} else {
  	    $targetURL = '/adm/navmaps';
  	}
- 	if ($ENV{'course.'.$ENV{'request.course.id'}.'.clonedfrom'}) {
+ 	if ($env{'course.'.$env{'request.course.id'}.'.clonedfrom'}) {
  	    $targetURL = '/adm/parmset?overview=1';
  	}
- 	my $previous = HTML::Entities::encode(&mt("<- Previous"), '<>&"');
- 	my $next = HTML::Entities::encode(&mt("Next ->"), '<>&"');
-         $result .= "<center>\n" .
-             "<form action='/adm/roles' method='post' target='loncapaclient'>\n" .
-             "<input type='button' onclick='history.go(-1)' value='$previous' />" .
-             "<input type='hidden' name='orgurl' value='$targetURL' />" .
-             "<input type='hidden' name='selectrole' value='1' />\n" .
-             "<input type='hidden' name='" . $ENV{'request.role'} .
-             "' value='1' />\n<input type='submit' value='" .
- 	    &mt('Finish Course Initialization') . "' />\n" .
-             "</form></center>";
      }
+     my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
+     my $next = HTML::Entities::encode(&mt("Next"), '<>&"');
+     my $target = " target='loncapaclient'";
+     if ($env{'environment.remote'} eq 'off') {  $target='';  }
+     $result .= "<p>\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></p>\n";
      return $result;
  }
  sub overrideForm {
-     my $self = shift;
+     return 1;
-     return $self->{'restartCourse'};
  }
 ;
  package Apache::lonhelper::parmwizfinal;
- # This is the final state for the parmwizard. It is not generally useful,
+ # This is the final state for the parm helper. It is not generally useful,
  # so it is not perldoc'ed. It does its own processing.
  # It is represented with <parmwizfinal />, and
  # should later be moved to lonparmset.pm .
- Line 3070  no strict;
+ Line 3692  no strict;
  @ISA = ('Apache::lonhelper::element');
  use strict;
  use Apache::lonlocal;
+ use Apache::lonnet;
  BEGIN {
      &Apache::lonhelper::register('Apache::lonhelper::parmwizfinal',
- Line 3111  sub render {
+ Line 3734  sub render {
                          'answer_date' => "0_answerdate",
  			'tries' => '0_maxtries',
  			'weight' => '0_weight' );
+     my %realParmName = ('open_date' => "opendate",
+                         'due_date' => "duedate",
+                         'answer_date' => "answerdate",
+ 			'tries' => 'maxtries',
+ 			'weight' => 'weight' );
      my $affectedResourceId = "";
      my $parm_name = $parmTypeHash{$vars->{ACTION_TYPE}};
- Line 3118  sub render {
+ Line 3746  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 [_1]all resources in the course[_2]','<b>','</b>').'</li>';
-         $level = 9; # general course, see lonparmset.pm perldoc
+ 	if ($vars->{TARGETS} eq 'course') {
+ 	    $level = 14; # general course, see lonparmset.pm perldoc
+ 	} elsif ($vars->{TARGETS} eq 'section') {
+ 	    $level = 9;
+ 	} elsif ($vars->{TARGETS} eq 'group') {
+ 	    $level = 6;
+ 	} else {
+ 	    $level = 3;
+ 	}
          $affectedResourceId = "0.0";
          $symb = 'a';
          $paramlevel = 'general';
      } elsif ($vars->{GRANULARITY} eq 'map') {
          my $navmap = Apache::lonnavmaps::navmap->new();
-         my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
+         if (defined($navmap)) {
-         my $title = $res->compTitle();
+              my $res = $navmap->getByMapPc($vars->{RESOURCE_ID});
-         $symb = $res->symb();
+              my $title = $res->compTitle();
-         $navmap->untieHashes();
+              $symb = $res->symb();
-         $resourceString .= "<li>for the map named <b>$title</b></li>";
+              $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
-         $level = 8;
+         } else {
+             $resourceString .= '<li>'.&mt('for the map ID [_1] (name unavailable)','<b>'.$vars->{RESOURCE_ID}.'</b>').'</li>';
+             &Apache::lonnet::logthis('Retrieval of map title failed in lonhelper.pm - could not create navmap object for course.');
+         }
+ 	if ($vars->{TARGETS} eq 'course') {
+ 	    $level = 13; # general course, see lonparmset.pm perldoc
+ 	} elsif ($vars->{TARGETS} eq 'section') {
+ 	    $level = 8;
+ 	} elsif ($vars->{TARGETS} eq 'group') {
+ 	    $level = 5;
+ 	} else {
+ 	    $level = 2;
+ 	}
          $affectedResourceId = $vars->{RESOURCE_ID};
          $paramlevel = 'map';
      } else {
+         my $part = $vars->{RESOURCE_ID_part};
+ 	if ($part ne 'All Parts' && $part) { $parm_name=~s/^0/$part/; } else { $part=&mt('All Parts'); }
          my $navmap = Apache::lonnavmaps::navmap->new();
-         my $res = $navmap->getById($vars->{RESOURCE_ID});
+         if (defined($navmap)) {
-         $symb = $res->symb();
+             my $res = $navmap->getById($vars->{RESOURCE_ID});
-         my $title = $res->compTitle();
+             $symb = $res->symb();
-         $navmap->untieHashes();
+             my $title = $res->compTitle();
-         $resourceString .= "<li>for the resource named <b>$title</b></li>";
+             $resourceString .= '<li>'.&mt('for the resource named [_1], part [_2]',"<b>$title</b>","<b>$part</b>").'</li>';
-         $level = 7;
+         } else {
+             $resourceString .= '<li>'.&mt('for the resource ID [_1] (name unavailable), part [_2]','<b>'.$vars->{RESOURCE_ID}.'</b>',"<b>$part</b>").'</li>';
+             &Apache::lonnet::logthis('Retrieval of resource title failed in lonhelper.pm - could not create navmap object for course.');
+         }
+ 	if ($vars->{TARGETS} eq 'course') {
+ 	    $level = 10; # general course, see lonparmset.pm perldoc
+ 	} elsif ($vars->{TARGETS} eq 'section') {
+ 	    $level = 7;
+ 	} elsif ($vars->{TARGETS} eq 'group') {
+ 	    $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>'.&mt('Confirm that this information is correct, then click &quot;Finish Helper&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 class="LC_info">'
+               .&mt('Confirm that this information is correct, then click &quot;Save&quot; to complete setting the parameter.')
+               .'</p>'
+               .'<ul>';
      # Print the type of manipulation:
-     $result .= '<li>Setting the <b>' . $dateTypeHash{$vars->{ACTION_TYPE}} . '</b>';
+     my $extra;
      if ($vars->{ACTION_TYPE} eq 'tries') {
- 	$result .= ' to <b>' . $vars->{TRIES} . '</b>';
+ 	$extra =  $vars->{TRIES};
      }
      if ($vars->{ACTION_TYPE} eq 'weight') {
- 	$result .= ' to <b>' . $vars->{WEIGHT} . '</b>';
+ 	$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' ||
- Line 3179  sub render {
+ Line 3868  sub render {
      } elsif ($vars->{ACTION_TYPE} eq 'tries') {
  	$result .= "<input type='hidden' name='pres_value' " .
  	    "value='" . $vars->{TRIES} . "' />\n";
+         $result .= "<input type='hidden' name='pres_type' " .
+             "value='int_pos' />\n";
      } elsif ($vars->{ACTION_TYPE} eq 'weight') {
  	$result .= "<input type='hidden' name='pres_value' " .
  	    "value='" . $vars->{WEIGHT} . "' />\n";
- Line 3188  sub render {
+ Line 3879  sub render {
      # Print targets
      if ($vars->{TARGETS} eq 'course') {
-         $result .= '<li>for <b>all students in course</b></li>';
+         $result .= '<li>'.&mt('for [_1]all students in course[_2]','<b>','</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
      if ($vars->{ACTION_TYPE} ne 'tries' && $vars->{ACTION_TYPE} ne 'weight') {
- 	$result .= "<li>to <b>" . ctime($vars->{PARM_DATE}) . "</b> (" .
+         my $showdate = &Apache::lonlocal::locallocaltime($vars->{PARM_DATE});
- 	    Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE})
+ 	$result .= '<li>'.&mt('to [_1] ([_2])',"<b>".$showdate."</b>",Apache::lonnavmaps::timeToHumanString($vars->{PARM_DATE}))."</li>\n";
- 	    . ")</li>\n";
      }
+ 	$result .= '</ul>';
+ # FIXME: Make previous button working
+ #        Found to be dysfunctional when used to change the selected student
+ #   my $previous = HTML::Entities::encode(&mt("Back"), '<>&"');
+     my $buttons .= '<p><span class="LC_nobreak">'
+ #                 .'<input name="back" type="button"'
+ #                 .' value="'.$previous.'" onclick="history.go(-1)" />'
+                   .' <input type="submit" value="'.&mt('Save').'" />' # Finish Helper
+                   .'</span></p>'."\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 .= $buttons;
      return $result;
  }

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

Removed from v.1.69
changed lines
	Added in v.1.178