loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.131 and 1.171

-version 1.131, 2003/10/16 20:03:31
+version 1.171, 2004/01/13 15:48:25
  Line 25
  #
  # http://www.lon-capa.org/
  #
- # YEAR=2001
- # 2/13-12/7 Guy Albertelli
- # 12/21 Gerd Kortemeyer
- # 12/25,12/28 Gerd Kortemeyer
- # YEAR=2002
- # 1/4 Gerd Kortemeyer
- # 6/24,7/2 H. K. Ng
  # Makes a table out of the previous attempts
  # Inputs result_from_symbread, user, domain, course_id
- Line 69  use Apache::Constants qw(:common :http :
+ Line 62  use Apache::Constants qw(:common :http :
  use Apache::lonmsg();
  use Apache::lonmenu();
  use Apache::lonlocal;
+ use HTML::Entities;
  my $readit;
- =pod
+ ##
+ ## Global Variables
- =head1 Global Variables
+ ##
- =cut
  # ----------------------------------------------- Filetypes/Languages/Copyright
  my %language;
- Line 90  my %category_extensions;
+ Line 82  my %category_extensions;
  my %designhash;
  # ---------------------------------------------- Thesaurus variables
+ #
- # FIXME: I don't think it's necessary to document these things;
+ # %Keywords:
- # they're privately used - Jeremy
+ #      A hash used by &keyword to determine if a word is considered a keyword.
+ # $thesaurus_db_file
- =pod
+ #      Scalar containing the full path to the thesaurus database.
- =over 4
- =item * %Keywords
- A hash used by &keyword to determine if a word is considered a keyword.
- =item * $thesaurus_db_file
- Scalar containing the full path to the thesaurus database.
- =back
- =cut
  my %Keywords;
  my $thesaurus_db_file;
- # ----------------------------------------------------------------------- BEGIN
+ #
+ # Initialize values from language.tab, copyright.tab, filetypes.tab,
- # FIXME: I don't think this needs to be documented, it prepares
+ # thesaurus.tab, and filecategories.tab.
- # private data structures - Jeremy
+ #
- =pod
- =head1 General Subroutines
- =over 4
- =item * BEGIN()
- Initialize values from language.tab, copyright.tab, filetypes.tab,
- thesaurus.tab, and filecategories.tab.
- =back
- =cut
- # ----------------------------------------------------------------------- BEGIN
  BEGIN {
      # Variable initialization
      $thesaurus_db_file = $Apache::lonnet::perlvar{'lonTabDir'}."/thesaurus.db";
- Line 141  BEGIN {
+ Line 102  BEGIN {
      unless ($readit) {
  # ------------------------------------------------------------------- languages
      {
- 	my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
+         my $langtabfile = $Apache::lonnet::perlvar{'lonTabDir'}.
- 				 '/language.tab');
+                                    '/language.tab';
- 	if ($fh) {
+         if ( open(my $fh,"<$langtabfile") ) {
- 	    while (<$fh>) {
+             while (<$fh>) {
- 		next if /^\#/;
+                 next if /^\#/;
- 		chomp;
+                 chomp;
- 		my ($key,$two,$country,$three,$enc,$val,$sup)=(split(/\t/,$_));
+                 my ($key,$two,$country,$three,$enc,$val,$sup)=(split(/\t/,$_));
- 		$language{$key}=$val.' - '.$enc;
+                 $language{$key}=$val.' - '.$enc;
- 		if ($sup) {
+                 if ($sup) {
- 		    $supported_language{$key}=$sup;
+                     $supported_language{$key}=$sup;
- 		}
+                 }
- 	    }
+             }
- 	}
+             close($fh);
+         }
      }
  # ------------------------------------------------------------------ copyrights
      {
- 	my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonIncludes'}.
+         my $copyrightfile = $Apache::lonnet::perlvar{'lonIncludes'}.
- 				  '/copyright.tab');
+                                   '/copyright.tab';
- 	if ($fh) {
+         if ( open (my $fh,"<$copyrightfile") ) {
- 	    while (<$fh>) {
+             while (<$fh>) {
- 		next if /^\#/;
+                 next if /^\#/;
- 		chomp;
+                 chomp;
- 		my ($key,$val)=(split(/\s+/,$_,2));
+                 my ($key,$val)=(split(/\s+/,$_,2));
- 		$cprtag{$key}=$val;
+                 $cprtag{$key}=$val;
- 	    }
+             }
- 	}
+             close($fh);
+         }
      }
  # -------------------------------------------------------------- domain designs
- Line 177  BEGIN {
+ Line 140  BEGIN {
      while ($filename=readdir(DIR)) {
  	my ($domain)=($filename=~/^(\w+)\./);
      {
- 	my $fh=Apache::File->new($designdir.'/'.$filename);
+         my $designfile = $designdir.'/'.$filename;
- 	if ($fh) {
+         if ( open (my $fh,"<$designfile") ) {
- 	    while (<$fh>) {
+             while (<$fh>) {
- 		next if /^\#/;
+                 next if /^\#/;
- 		chomp;
+                 chomp;
- 		my ($key,$val)=(split(/\=/,$_));
+                 my ($key,$val)=(split(/\=/,$_));
- 		if ($val) { $designhash{$domain.'.'.$key}=$val; }
+                 if ($val) { $designhash{$domain.'.'.$key}=$val; }
- 	    }
+             }
- 	}
+             close($fh);
+         }
      }
      }
- Line 194  BEGIN {
+ Line 158  BEGIN {
  # ------------------------------------------------------------- file categories
      {
- 	my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
+         my $categoryfile = $Apache::lonnet::perlvar{'lonTabDir'}.
- 				  '/filecategories.tab');
+                                   '/filecategories.tab';
- 	if ($fh) {
+         if ( open (my $fh,"<$categoryfile") ) {
- 	    while (<$fh>) {
+             while (<$fh>) {
- 		next if /^\#/;
+                 next if /^\#/;
- 		chomp;
+                 chomp;
- 		my ($extension,$category)=(split(/\s+/,$_,2));
+                 my ($extension,$category)=(split(/\s+/,$_,2));
- 		push @{$category_extensions{lc($category)}},$extension;
+                 push @{$category_extensions{lc($category)}},$extension;
- 	    }
+             }
- 	}
+             close($fh);
+         }
      }
  # ------------------------------------------------------------------ file types
      {
- 	my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
+         my $typesfile = $Apache::lonnet::perlvar{'lonTabDir'}.
- 	       '/filetypes.tab');
+                '/filetypes.tab';
- 	if ($fh) {
+         if ( open (my $fh,"<$typesfile") ) {
              while (<$fh>) {
- 		next if (/^\#/);
+                 next if (/^\#/);
- 		chomp;
+                 chomp;
- 		my ($ending,$emb,$descr)=split(/\s+/,$_,3);
+                 my ($ending,$emb,$descr)=split(/\s+/,$_,3);
- 		if ($descr ne '') {
+                 if ($descr ne '') {
- 		    $fe{$ending}=lc($emb);
+                     $fe{$ending}=lc($emb);
- 		    $fd{$ending}=$descr;
+                     $fd{$ending}=$descr;
- 		}
+                 }
- 	    }
+             }
- 	}
+             close($fh);
+         }
      }
      &Apache::lonnet::logthis(
                "<font color=yellow>INFO: Read file types</font>");
- Line 245  containing javascript with two functions
+ Line 212  containing javascript with two functions
  C<opensearcher>. Returned string does not contain E<lt>scriptE<gt>
  tags.
- =over 4
  =item * openbrowser(formname,elementname,only,omit) [javascript]
  inputs: formname, elementname, only, omit
- Line 267  Inputs: formname, elementname
+ Line 232  Inputs: formname, elementname
  formname and elementname specify the name of the html form and the name
  of the element the selection from the search results will be placed in.
- =back
  =cut
  sub browser_and_searcher_javascript {
+     my $resurl=&lastresurl();
      return <<END;
      var editbrowser = null;
-     function openbrowser(formname,elementname,only,omit) {
+     function openbrowser(formname,elementname,only,omit,titleelement) {
-         var url = '/res/?';
+         var url = '$resurl/?';
          if (editbrowser == null) {
              url += 'launch=1&';
          }
- Line 288  sub browser_and_searcher_javascript {
+ Line 252  sub browser_and_searcher_javascript {
          if (omit != null) {
              url += 'omit=' + omit + '&';
          }
+         if (titleelement != null) {
+             url += 'titleelement=' + titleelement + '&';
+         }
          url += 'element=' + elementname + '';
          var title = 'Browser';
          var options = 'scrollbars=1,resizable=1,menubar=0';
- Line 296  sub browser_and_searcher_javascript {
+ Line 263  sub browser_and_searcher_javascript {
          editbrowser.focus();
      }
      var editsearcher;
-     function opensearcher(formname,elementname) {
+     function opensearcher(formname,elementname,titleelement) {
          var url = '/adm/searchcat?';
          if (editsearcher == null) {
              url += 'launch=1&';
- Line 304  sub browser_and_searcher_javascript {
+ Line 271  sub browser_and_searcher_javascript {
          url += 'catalogmode=interactive&';
          url += 'mode=edit&';
          url += 'form=' + formname + '&';
+         if (titleelement != null) {
+             url += 'titleelement=' + titleelement + '&';
+         }
          url += 'element=' + elementname + '';
          var title = 'Search';
          var options = 'scrollbars=1,resizable=1,menubar=0';
- Line 314  sub browser_and_searcher_javascript {
+ Line 284  sub browser_and_searcher_javascript {
  END
  }
+ sub lastresurl {
+     if ($ENV{'environment.lastresurl'}) {
+ 	return $ENV{'environment.lastresurl'}
+     } else {
+ 	return '/res';
+     }
+ }
+ sub storeresurl {
+     my $resurl=&Apache::lonnet::clutter(shift);
+     unless ($resurl=~/^\/res/) { return 0; }
+     $resurl=~s/\/$//;
+     &Apache::lonnet::put('environment',{'lastresurl' => $resurl});
+     &Apache::lonnet::appenv('environment.lastresurl' => $resurl);
+     return 1;
+ }
  sub studentbrowser_javascript {
     unless (
              (($ENV{'request.course.id'}) &&
- Line 514  function select1_changed() {
+ Line 501  function select1_changed() {
      // in with the nuclear
      for (i=0;i<values.length; i++) {
          $second.options[i] = new Option(values[i]);
+         $second.options[i].value = values[i];
          $second.options[i].text = texts[i];
          if (values[i] == select2def) {
              $second.options[i].selected = true;
- Line 584  sub help_open_topic {
+ Line 572  sub help_open_topic {
      my $template = "";
      my $link;
+     $topic=~s/\W/\_/g;
      if (!$stayOnPage)
      {
  	$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
- Line 754  sub get_domains {
+ Line 744  sub get_domains {
      my @domains;
      my %seen;
      foreach (sort values(%Apache::lonnet::hostdom)) {
-         push (@domains,$_) unless $seen{$_}++;
+ 	push (@domains,$_) unless $seen{$_}++;
      }
      return @domains;
  }
+ # ------------------------------------------
+ sub domain_select {
+     my ($name,$value,$multiple)=@_;
+     my %domains=map {
+ 	$_ => $_.' '.$Apache::lonnet::domaindescription{$_}
+     } &get_domains;
+     if ($multiple) {
+ 	$domains{''}=&mt('Any domain');
+ 	return &multiple_select_form($name,$value,%domains);
+     } else {
+ 	return &select_form($name,$value,%domains);
+     }
+ }
+ sub multiple_select_form {
+     my ($name,$value,%hash)=@_;
+     my %selected = map { $_ => 1 } ref($value)?@{$value}:($value);
+     my $output='';
+     my $size =(scalar keys %hash<4?scalar keys %hash:4);
+     $output.="\n<select name='$name' size='$size' multiple='1'>";
+     foreach (sort keys %hash) {
+         $output.="<option name='$_'".
+             ($selected{$_}?' selected="1"' :'').">$hash{$_}</option>\n";
+     }
+     $output.="</select>\n";
+     return $output;
+ }
  #-------------------------------------------
  =pod
- Line 790  sub select_form {
+ Line 809  sub select_form {
      return $selectform;
  }
+ sub gradeleveldescription {
+     my $gradelevel=shift;
+     my %gradelevels=(0 => 'Not specified',
+=> 'Grade 1',
+=> 'Grade 2',
+=> 'Grade 3',
+=> 'Grade 4',
+=> 'Grade 5',
+=> 'Grade 6',
+=> 'Grade 7',
+=> 'Grade 8',
+=> 'Grade 9',
+=> 'Grade 10',
+=> 'Grade 11',
+=> 'Grade 12',
+=> 'Grade 13',
+=> '100 Level',
+=> '200 Level',
+=> '300 Level',
+=> '400 Level',
+=> 'Graduate Level');
+     return &mt($gradelevels{$gradelevel});
+ }
+ sub select_level_form {
+     my ($deflevel,$name)=@_;
+     unless ($deflevel) { $deflevel=0; }
+     my $selectform = "<select name=\"$name\" size=\"1\">\n";
+     for (my $i=0; $i<=18; $i++) {
+         $selectform.="<option value=\"$i\" ".
+             ($i==$deflevel ? 'selected' : '').
+                 ">".&gradeleveldescription($i)."</option>\n";
+     }
+     $selectform.="</select>";
+     return $selectform;
+ }
  #-------------------------------------------
- Line 906  Outputs:
+ Line 961  Outputs:
  =back
+ =back
  =cut
  ###############################################################
- Line 944  sub decode_user_agent {
+ Line 1001  sub decode_user_agent {
              $clientunicode,$clientos,);
  }
- =pod
- =back
- =cut
  ###############################################################
  ##    Authentication changing form generation subroutines    ##
  ###############################################################
- Line 990  See loncreateuser.pm for invocation and
+ Line 1041  See loncreateuser.pm for invocation and
  =back
+ =back
  =cut
  #-------------------------------------------
- Line 1017  END
+ Line 1070  END
          $Javascript_toUpperCase = "";
      }
+     my $radioval = "'nochange'";
+     my $argfield = 'null';
+     if ( grep/^mode$/,(keys %in) ) {
+         if ($in{'mode'} eq 'modifycourse')  {
+             if ( grep/^curr_authtype$/,(keys %in) ) {
+                 $radioval = "'$in{'curr_authtype'}'";
+             }
+             if ( grep/^curr_autharg$/,(keys %in) ) {
+                 unless ($in{'curr_autharg'} eq '') {
+                     $argfield = "'$in{'curr_autharg'}'";
+                 }
+             }
+         }
+     }
      $result.=<<"END";
  var current = new Object();
- current.radiovalue = 'nochange';
+ current.radiovalue = $radioval;
- current.argfield = null;
+ current.argfield = $argfield;
  function changed_radio(choice,currentform) {
      var choicearg = choice + 'arg';
- Line 1080  END
+ Line 1148  END
  sub authform_authorwarning{
      my $result='';
-     $result=<<"END";
+     $result='<i>'.
- <i>As a general rule, only authors or co-authors should be filesystem
+         &mt('As a general rule, only authors or co-authors should be '.
- authenticated (which allows access to the server filesystem).</i>
+             'filesystem authenticated '.
- END
+             '(which allows access to the server filesystem).')."</i>\n";
      return $result;
  }
- Line 1093  sub authform_nochange{
+ Line 1161  sub authform_nochange{
                kerb_def_dom => 'MSU.EDU',
                @_,
            );
-     my $result='';
+     my $result = &mt('[_1] Do not change login data',
-     $result.=<<"END";
+                      '<input type="radio" name="login" value="nochange" '.
- <input type="radio" name="login" value="nochange" checked="checked"
+                      'checked="checked" onclick="'.
-        onclick="javascript:changed_radio('nochange',$in{'formname'});" />
+             "javascript:changed_radio('nochange',$in{'formname'});".'" />');
- Do not change login data
- END
      return $result;
  }
- Line 1109  sub authform_kerberos{
+ Line 1175  sub authform_kerberos{
                kerb_def_auth => 'krb4',
                @_,
                );
-     my $result='';
+     my ($check4,$check5,$krbarg);
-     my $check4;
-     my $check5;
      if ($in{'kerb_def_auth'} eq 'krb5') {
         $check5 = " checked=\"on\"";
      } else {
         $check4 = " checked=\"on\"";
      }
-     $result.=<<"END";
+     $krbarg = $in{'kerb_def_dom'};
- <input type="radio" name="login" value="krb"
-        onclick="javascript:changed_radio('krb',$in{'formname'});"
+     my $krbcheck = "";
-        onchange="javascript:changed_radio('krb',$in{'formname'});" />
+     if ( grep/^curr_authtype$/,(keys %in) ) {
- Kerberos authenticated with domain
+         if ($in{'curr_authtype'} =~ m/^krb/) {
- <input type="text" size="10" name="krbarg" value="$in{'kerb_def_dom'}"
+             $krbcheck = " checked=\"on\"";
-        onchange="javascript:changed_text('krb',$in{'formname'});" />
+             if ( grep/^curr_autharg$/,(keys %in) ) {
- <input type="radio" name="krbver" value="4" $check4 />Version 4
+                 $krbarg = $in{'curr_autharg'};
- <input type="radio" name="krbver" value="5" $check5 />Version 5
+             }
- END
+         }
+     }
+     my $jscall = "javascript:changed_radio('krb',$in{'formname'});";
+     my $result .= &mt
+         ('[_1] Kerberos authenticated with domain [_2] '.
+          '[_3] Version 4 [_4] Version 5',
+          '<input type="radio" name="login" value="krb" '.
+              'onclick="'.$jscall.'" onchange="'.$jscall.'"'.$krbcheck.' />',
+          '<input type="text" size="10" name="krbarg" '.
+              'value="'.$krbarg.'" '.
+              'onchange="'.$jscall.'" />',
+          '<input type="radio" name="krbver" value="4" '.$check4.' />',
+          '<input type="radio" name="krbver" value="5" '.$check5.' />');
      return $result;
  }
- Line 1136  sub authform_internal{
+ Line 1213  sub authform_internal{
                  kerb_def_dom => 'MSU.EDU',
                  @_,
                  );
-     my $result='';
-     $result.=<<"END";
+     my $intcheck = "";
- <input type="radio" name="login" value="int"
+     my $intarg = 'value=""';
-        onchange="javascript:changed_radio('int',$args{'formname'});"
+     if ( grep/^curr_authtype$/,(keys %args) ) {
-        onclick="javascript:changed_radio('int',$args{'formname'});" />
+         if ($args{'curr_authtype'} eq 'int') {
- Internally authenticated (with initial password
+             $intcheck = " checked=\"on\"";
- <input type="text" size="10" name="intarg" value=""
+             if ( grep/^curr_autharg$/,(keys %args) ) {
-        onchange="javascript:changed_text('int',$args{'formname'});" />)
+                 $intarg = "value=\"$args{'curr_autharg'}\"";
- END
+             }
+         }
+     }
+     my $jscall = "javascript:changed_radio('int',$args{'formname'});";
+     my $result.=&mt
+         ('[_1] Internally authenticated (with initial password [_2])',
+          '<input type="radio" name="login" value="int" '.$intcheck.
+              ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+          '<input type="text" size="10" name="intarg" '.$intarg.
+              ' onchange="'.$jscall.'" />');
      return $result;
  }
- Line 1154  sub authform_local{
+ Line 1241  sub authform_local{
                kerb_def_dom => 'MSU.EDU',
                @_,
                );
-     my $result='';
-     $result.=<<"END";
+     my $loccheck = "";
- <input type="radio" name="login" value="loc"
+     my $locarg = 'value=""';
-        onchange="javascript:changed_radio('loc',$in{'formname'});"
+     if ( grep/^curr_authtype$/,(keys %in) ) {
-        onclick="javascript:changed_radio('loc',$in{'formname'});" />
+         if ($in{'curr_authtype'} eq 'loc') {
- Local Authentication with argument
+             $loccheck = " checked=\"on\"";
- <input type="text" size="10" name="locarg" value=""
+             if ( grep/^curr_autharg$/,(keys %in) ) {
-        onchange="javascript:changed_text('loc',$in{'formname'});" />
+                 $locarg = "value=\"$in{'curr_autharg'}\"";
- END
+             }
+         }
+     }
+     my $jscall = "javascript:changed_radio('loc',$in{'formname'});";
+     my $result.=&mt('[_1] Local Authentication with argument [_2]',
+                     '<input type="radio" name="login" value="loc" '.$loccheck.
+                         ' onchange="'.$jscall.'" onclick="'.$jscall.'" />',
+                     '<input type="text" size="10" name="locarg" '.$locarg.
+                         ' onchange="'.$jscall.'" />');
      return $result;
  }
- Line 1172  sub authform_filesystem{
+ Line 1268  sub authform_filesystem{
                kerb_def_dom => 'MSU.EDU',
                @_,
                );
-     my $result='';
+     my $jscall = "javascript:changed_radio('fsys',$in{'formname'});";
-     $result.=<<"END";
+     my $result.= &mt
- <input type="radio" name="login" value="fsys"
+         ('[_1] Filesystem Authenticated (with initial password [_2])',
-        onchange="javascript:changed_radio('fsys',$in{'formname'});"
+          '<input type="radio" name="login" value="fsys" '.
-        onclick="javascript:changed_radio('fsys',$in{'formname'});" />
+          'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
- Filesystem authenticated (with initial password
+          '<input type="text" size="10" name="fsysarg" value="" '.
- <input type="text" size="10" name="fsysarg" value=""
+                   'onchange="'.$jscall.'" />');
-        onchange="javascript:changed_text('fsys',$in{'formname'});">)
- END
      return $result;
  }
- =pod
- =back
- =cut
  ###############################################################
  ##    Get Authentication Defaults for Domain                 ##
  ###############################################################
- Line 1344  sub keyword {
+ Line 1432  sub keyword {
  =item * get_related_words
- Look up a word in the thesaurus.  Takes a scalar arguement and returns
+ Look up a word in the thesaurus.  Takes a scalar argument and returns
  an array of words.  If the keyword is not in the thesaurus, an empty array
  will be returned.  The order of the words returned is determined by the
  database which holds them.
- Line 1480  sub noteswrapper {
+ Line 1568  sub noteswrapper {
  # ------------------------------------------------------------- Aboutme Wrapper
  sub aboutmewrapper {
-     my ($link,$username,$domain)=@_;
+     my ($link,$username,$domain,$target)=@_;
-     return "<a href='/adm/$domain/$username/aboutme'>$link</a>";
+     return "<a href='/adm/$domain/$username/aboutme'".
+ 	($target?" target='$target'":'').">$link</a>";
  }
  # ------------------------------------------------------------ Syllabus Wrapper
- Line 1528  sub languagedescription {
+ Line 1617  sub languagedescription {
  	    ($supported_language{$code}?' ('.&mt('interface available').')':'');
  }
+ sub plainlanguagedescription {
+     my $code=shift;
+     return $language{$code};
+ }
+ sub supportedlanguagecode {
+     my $code=shift;
+     return $supported_language{$code};
+ }
  =pod
  =item * copyrightids()
- Line 1549  returns description of a specified copyr
+ Line 1648  returns description of a specified copyr
  =cut
  sub copyrightdescription {
-     return $cprtag{shift(@_)};
+     return &mt($cprtag{shift(@_)});
  }
  =pod
- Line 1589  sub fileembstyle {
+ Line 1688  sub fileembstyle {
      return $fe{lc(shift(@_))};
  }
+ sub filecategoryselect {
+     my ($name,$value)=@_;
+     return &select_form($name,$value,
+ 			'' => &mt('Any category'),
+ 			map { $_,$_ } sort(keys(%category_extensions)));
+ }
  =pod
  =item * filedescription()
- Line 1598  returns description for a specified file
+ Line 1705  returns description for a specified file
  =cut
  sub filedescription {
-     return $fd{lc(shift(@_))};
+     return &mt($fd{lc(shift(@_))});
  }
  =pod
- Line 1612  extra formatting
+ Line 1719  extra formatting
  sub filedescriptionex {
      my $ex=shift;
-     return '.'.$ex.' '.$fd{lc($ex)};
+     return '.'.$ex.' '.&mt($fd{lc($ex)});
  }
  # End of .tab access
- Line 1764  sub get_previous_attempt {
+ Line 1871  sub get_previous_attempt {
  	       } else {
  		  $value=$returnhash{$version.':'.$_};
  	       }
- 	       $prevattempts.='<td>'.$value.'&nbsp;</td>';
+ 	       $prevattempts.='<td>'.&Apache::lonnet::unescape($value).'&nbsp;</td>';
  	    }
  	 }
        }
- Line 1776  sub get_previous_attempt {
+ Line 1883  sub get_previous_attempt {
  	} else {
  	  $value=$lasthash{$_};
  	}
+ 	$value=&Apache::lonnet::unescape($value);
  	if ($_ =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
  	$prevattempts.='<td>'.$value.'&nbsp;</td>';
        }
- Line 1939  sub maketime {
+ Line 2047  sub maketime {
           $th{'day'},$th{'month'}-1,$th{'year'}-1900,0,0,$th{'dlsav'}));
  }
- #########################################
- #
- # Retro-fixing of un-backward-compatible time format
- sub unsqltime {
-     my $timestamp=shift;
-     if ($timestamp=~/^(\d+)\-(\d+)\-(\d+)\s+(\d+)\:(\d+)\:(\d+)$/) {
-        $timestamp=&maketime(
- 	   'year'=>$1,'month'=>$2,'day'=>$3,
-            'hours'=>$4,'minutes'=>$5,'seconds'=>$6);
-     }
-     return $timestamp;
- }
  #########################################
  sub findallcourses {
- Line 2025  sub domainlogo {
+ Line 2118  sub domainlogo {
  	my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
  	if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
          return '<img src="http://'.$ENV{'HTTP_HOST'}.':'.$lonhttpdPort.
- 	    '/adm/lonDomLogos/'.$domain.'.gif" />';
+ 	    '/adm/lonDomLogos/'.$domain.'.gif" alt="'.$domain.'" />';
      } elsif(exists($Apache::lonnet::domaindescription{$domain})) {
          return $Apache::lonnet::domaindescription{$domain};
      } else {
- Line 2136  sub bodytag {
+ Line 2229  sub bodytag {
      my $sidebg=&designparm($function.'.sidebg',$domain);
  # Accessibility font enhance
      unless ($addentries) { $addentries=''; }
+     my $addstyle='';
      if ($ENV{'browser.fontenhance'} eq 'on') {
- 	$addentries.=' style="font-size: x-large"';
+ 	$addstyle=' font-size: x-large;';
      }
   # role and realm
      my ($role,$realm)
- Line 2155  sub bodytag {
+ Line 2249  sub bodytag {
      if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
  # construct main body tag
      my $bodytag = <<END;
+ <style>
+ h1, h2, h3, th { font-family: Arial, Helvetica, sans-serif }
+ a:focus { color: red; background: yellow }
+ </style>
  <body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
- $addentries>
+ style="margin-top: 0px;$addstyle" $addentries>
  END
      my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
-                    $lonhttpdPort.$img.'" />';
+                    $lonhttpdPort.$img.'" alt="'.$function.'" />';
      if ($bodyonly) {
          return $bodytag;
      } elsif ($ENV{'browser.interface'} eq 'textual') {
- Line 2171  END
+ Line 2269  END
  # No Remote
          return $bodytag.&Apache::lonmenu::menubuttons($forcereg,'web',
                                                        $forcereg).
-                '<table bgcolor="'.$pgbg.'" width="100%" border="0" cellspacing="3" cellpadding="3"><tr><td bgcolor="'.$tabbg.'"><font size="+3" color="'.$font.'"><b>'.$title.
+       '<table bgcolor="'.$pgbg.'" width="100%" border="0" cellspacing="3" cellpadding="3"><tr><td bgcolor="'.$tabbg.'"><font face="Arial, Helvetica, sans-serif" size="+3" color="'.$font.'"><b>'.$title.
  '</b></font></td></tr></table>';
      }
- Line 2187  $upperleft</td>
+ Line 2285  $upperleft</td>
  </tr>
  <tr>
  <td rowspan="3" bgcolor="$tabbg">
- &nbsp;<font size="5"><b>$title</b></font>
+ &nbsp;<font size="5" face="Arial, Helvetica, sans-serif"><b>$title</b></font>
- <td bgcolor="$tabbg"  align="right">
+ <td bgcolor="$tabbg" align="right">
- <font size="2">
+ <font size="2" face="Arial, Helvetica, sans-serif">
      $ENV{'environment.firstname'}
      $ENV{'environment.middlename'}
      $ENV{'environment.lastname'}
- Line 2198  $upperleft</td>
+ Line 2296  $upperleft</td>
  </td>
  </tr>
  <tr><td bgcolor="$tabbg" align="right">
- <font size="2">$role</font>&nbsp;
+ <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
  </td></tr>
  <tr>
- <td bgcolor="$tabbg" align="right"><font size="2">$realm</font>&nbsp;</td></tr>
+ <td bgcolor="$tabbg" align="right"><font size="2" face="Arial, Helvetica, sans-serif">$realm</font>&nbsp;</td></tr>
  </table><br>
  ENDBODY
  }
- Line 2378  sub add_to_env {
+ Line 2476  sub add_to_env {
  =pod
+ =item * get_env_multiple($name)
+ gets $name from the %ENV hash, it seemlessly handles the cases where multiple
+ values may be defined and end up as an array ref.
+ returns an array of values
+ =cut
+ sub get_env_multiple {
+     my ($name) = @_;
+     my @values;
+     if (defined($ENV{$name})) {
+         # exists is it an array
+         if (ref($ENV{$name})) {
+             @values=@{ $ENV{$name} };
+         } else {
+             $values[0]=$ENV{$name};
+         }
+     }
+     return(@values);
+ }
+ =pod
  =back
  =head1 CSV Upload/Handling functions
- Line 2402  sub upfile_store {
+ Line 2526  sub upfile_store {
      my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
  	'_enroll_'.$ENV{'request.course.id'}.'_'.time.'_'.$$;
      {
- 	my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons').
+         my $datafile = $r->dir_config('lonDaemons').
- 				 '/tmp/'.$datatoken.'.tmp');
+                            '/tmp/'.$datatoken.'.tmp';
- 	print $fh $ENV{'form.upfile'};
+         if ( open(my $fh,">$datafile") ) {
+             print $fh $ENV{'form.upfile'};
+             close($fh);
+         }
      }
      return $datatoken;
  }
- Line 2423  sub load_tmp_file {
+ Line 2550  sub load_tmp_file {
      my $r=shift;
      my @studentdata=();
      {
- 	my $fh;
+         my $studentfile = $r->dir_config('lonDaemons').
- 	if ($fh=Apache::File->new($r->dir_config('lonDaemons').
+                               '/tmp/'.$ENV{'form.datatoken'}.'.tmp';
- 				  '/tmp/'.$ENV{'form.datatoken'}.'.tmp')) {
+         if ( open(my $fh,"<$studentfile") ) {
- 	    @studentdata=<$fh>;
+             @studentdata=<$fh>;
- 	}
+             close($fh);
+         }
      }
      $ENV{'form.upfile'}=join('',@studentdata);
  }
- Line 2472  sub record_sep {
+ Line 2600  sub record_sep {
          }
      } elsif ($ENV{'form.upfiletype'} eq 'tab') {
          my $i=0;
-         foreach (split(/\t+/,$record)) {
+         foreach (split(/\t/,$record)) {
              my $field=$_;
              $field=~s/^(\"|\')//;
              $field=~s/(\"|\')$//;
- Line 2501  sub record_sep {
+ Line 2629  sub record_sep {
      return %components;
  }
+ ######################################################
+ ######################################################
  =pod
  =item * upfile_select_html()
- return HTML code to select file and specify its type
+ Return HTML code to select a file from the users machine and specify
+ the file type.
  =cut
+ ######################################################
+ ######################################################
  sub upfile_select_html {
-     return (<<'ENDUPFORM');
+     my %Types = (
- <input type="file" name="upfile" size="50" />
+                  csv   => &mt('CSV (comma separated values, spreadsheet)'),
- <br />Type: <select name="upfiletype">
+                  space => &mt('Space separated'),
- <option value="csv">CSV (comma separated values, spreadsheet)</option>
+                  tab   => &mt('Tabulator separated'),
- <option value="space">Space separated</option>
+ #                 xml   => &mt('HTML/XML'),
- <option value="tab">Tabulator separated</option>
+                  );
- <option value="xml">HTML/XML</option>
+     my $Str = '<input type="file" name="upfile" size="50" />'.
- </select>
+         '<br />Type: <select name="upfiletype">';
- ENDUPFORM
+     foreach my $type (sort(keys(%Types))) {
+         $Str .= '<option value="'.$type.'" >'.$Types{$type}."</option>\n";
+     }
+     $Str .= "</select>\n";
+     return $Str;
  }
+ ######################################################
+ ######################################################
  =pod
  =item * csv_print_samples($r,$records)
- Line 2531  Apache Request ref, $records is an array
+ Line 2672  Apache Request ref, $records is an array
  =cut
+ ######################################################
+ ######################################################
  sub csv_print_samples {
      my ($r,$records) = @_;
      my (%sone,%stwo,%sthree);
      %sone=&record_sep($$records[0]);
      if (defined($$records[1])) {%stwo=&record_sep($$records[1]);}
      if (defined($$records[2])) {%sthree=&record_sep($$records[2]);}
+     #
-     $r->print('Samples<br /><table border="2"><tr>');
+     $r->print(&mt('Samples').'<br /><table border="2"><tr>');
-     foreach (sort({$a <=> $b} keys(%sone))) { $r->print('<th>Column&nbsp;'.($_+1).'</th>'); }
+     foreach (sort({$a <=> $b} keys(%sone))) {
+         $r->print('<th>'.&mt('Column&nbsp;[_1]',($_+1)).'</th>'); }
      $r->print('</tr>');
      foreach my $hash (\%sone,\%stwo,\%sthree) {
  	$r->print('<tr>');
- Line 2553  sub csv_print_samples {
+ Line 2697  sub csv_print_samples {
      $r->print('</tr></table><br />'."\n");
  }
+ ######################################################
+ ######################################################
  =pod
  =item * csv_print_select_table($r,$records,$d)
  Prints a table to create associations between values and table columns.
  $r is an Apache Request ref,
  $records is an arrayref from &Apache::loncommon::upfile_record_sep,
  $d is an array of 2 element arrays (internal name, displayed name)
  =cut
+ ######################################################
+ ######################################################
  sub csv_print_select_table {
      my ($r,$records,$d) = @_;
      my $i=0;my %sone;
      %sone=&record_sep($$records[0]);
-     $r->print('Associate columns with student attributes.'."\n".
+     $r->print(&mt('Associate columns with student attributes.')."\n".
- 	     '<table border="2"><tr><th>Attribute</th><th>Column</th></tr>'."\n");
+ 	     '<table border="2"><tr>'.
+               '<th>'.&mt('Attribute').'</th>'.
+               '<th>'.&mt('Column').'</th></tr>'."\n");
      foreach (@$d) {
  	my ($value,$display)=@{ $_ };
  	$r->print('<tr><td>'.$display.'</td>');
- Line 2587  sub csv_print_select_table {
+ Line 2739  sub csv_print_select_table {
      return $i;
  }
+ ######################################################
+ ######################################################
  =pod
  =item * csv_samples_select_table($r,$records,$d)
- Line 2599  $d is an array of 2 element arrays (inte
+ Line 2754  $d is an array of 2 element arrays (inte
  =cut
+ ######################################################
+ ######################################################
  sub csv_samples_select_table {
      my ($r,$records,$d) = @_;
      my %sone; my %stwo; my %sthree;
      my $i=0;
+     #
-     $r->print('<table border=2><tr><th>Field</th><th>Samples</th></tr>');
+     $r->print('<table border=2><tr><th>'.
+               &mt('Field').'</th><th>'.&mt('Samples').'</th></tr>');
      %sone=&record_sep($$records[0]);
      if (defined($$records[1])) {%stwo=&record_sep($$records[1]);}
      if (defined($$records[2])) {%sthree=&record_sep($$records[2]);}
+     #
      foreach (sort keys %sone) {
- 	$r->print('<tr><td><select name=f'.$i.
+ 	$r->print('<tr><td><select name="f'.$i.'"'.
  		  ' onchange="javascript:flip(this.form,'.$i.');">');
  	foreach (@$d) {
  	    my ($value,$display)=@{ $_ };
- 	    $r->print('<option value='.$value.'>'.$display.'</option>');
+ 	    $r->print('<option value="'.$value.'">'.$display.'</option>');
  	}
  	$r->print('</select></td><td>');
  	if (defined($sone{$_})) { $r->print($sone{$_}."</br>\n"); }
- Line 2627  sub csv_samples_select_table {
+ Line 2785  sub csv_samples_select_table {
      return($i);
  }
+ ######################################################
+ ######################################################
  =pod
  =item clean_excel_name($name)
- Line 2635  Returns a replacement for $name which do
+ Line 2796  Returns a replacement for $name which do
  =cut
+ ######################################################
+ ######################################################
  sub clean_excel_name {
      my ($name) = @_;
      $name =~ s/[:\*\?\/\\]//g;
- Line 2663  $uname, optional the username of the use
+ Line 2826  $uname, optional the username of the use
  sub check_if_partid_hidden {
      my ($id,$symb,$udom,$uname) = @_;
-     my $hiddenparts=&Apache::lonnet::EXT('resource.0.parameter_hiddenparts',
+     my $hiddenparts=&Apache::lonnet::EXT('resource.0.hiddenparts',
  					 $symb,$udom,$uname);
+     my $truth=1;
+     #if the string starts with !, then the list is the list to show not hide
+     if ($hiddenparts=~s/^\s*!//) { $truth=undef; }
      my @hiddenlist=split(/,/,$hiddenparts);
      foreach my $checkid (@hiddenlist) {
- 	if ($checkid =~ /^\s*\Q$id\E\s*$/) { return 1; }
+ 	if ($checkid =~ /^\s*\Q$id\E\s*$/) { return $truth; }
      }
-     return undef;
+     return !$truth;
  }
  ############################################################
  ############################################################
  =pod
- =item DrawGraph
+ =back
+ =head1 cgi-bin script and graphing routines
+ =over 4
- Returns a link to cgi-bin/graph
+ =item get_cgi_id
+ Inputs: none
+ Returns an id which can be used to pass environment variables
+ to various cgi-bin scripts.  These environment variables will
+ be removed from the users environment after a given time by
+ the routine &Apache::lonnet::transfer_profile_to_env.
+ =cut
+ ############################################################
+ ############################################################
+ my $uniq=0;
+ sub get_cgi_id {
+     $uniq=($uniq+1)%100000;
+     return (time.'_'.$uniq);
+ }
+ ############################################################
+ ############################################################
+ =pod
+ =item DrawBarGraph
+ Facilitates the plotting of data in a (stacked) bar graph.
+ Puts plot definition data into the users environment in order for
+ graph.png to plot it.  Returns an <img> tag for the plot.
+ The bars on the plot are labeled '1','2',...,'n'.
+ Inputs:
+ =over 4
+ =item $Title: string, the title of the plot
+ =item $xlabel: string, text describing the X-axis of the plot
+ =item $ylabel: string, text describing the Y-axis of the plot
+ =item $Max: scalar, the maximum Y value to use in the plot
+ If $Max is < any data point, the graph will not be rendered.
+ =item $colors: array ref holding the colors to be used for the data sets when
+ they are plotted.  If undefined, default values will be used.
+ =item @Values: An array of array references.  Each array reference holds data
+ to be plotted in a stacked bar chart.
+ =back
+ Returns:
+ An <img> tag which references graph.png and the appropriate identifying
+ information for the plot.
  =cut
  ############################################################
  ############################################################
- sub DrawGraph {
+ sub DrawBarGraph {
      my ($Title,$xlabel,$ylabel,$Max,$colors,@Values)=@_;
      #
-     my $identifier = time.'_'.int(rand(1000));
+     if (! defined($colors)) {
+         $colors = ['#33ff00',
+                   '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933',
+                   '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66',
+                   ];
+     }
+     #
+     my $identifier = &get_cgi_id();
+     my $id = 'cgi.'.$identifier;
      if (! @Values || ref($Values[0]) ne 'ARRAY') {
          return '';
      }
- Line 2697  sub DrawGraph {
+ Line 2931  sub DrawGraph {
      my $NumSets=1;
      foreach my $array (@Values) {
          next if (! ref($array));
-         $ValuesHash{$identifier.'.data.'.$NumSets++} = join(',',@$array);
+         $ValuesHash{$id.'.data.'.$NumSets++} =
+             join(',',@$array);
      }
      #
-     $Title  = '' if (! defined($Title));
+     my ($height,$width,$xskip,$bar_width) = (200,120,1,15);
-     $xlabel = '' if (! defined($xlabel));
+     if ($NumBars < 10) {
-     $ylabel = '' if (! defined($ylabel));
+         $width = 120+$NumBars*15;
-     $Title  = &Apache::lonnet::escape($Title);
+         $xskip = 1;
-     $xlabel = &Apache::lonnet::escape($xlabel);
+         $bar_width = 15;
-     $ylabel = &Apache::lonnet::escape($ylabel);
+     } elsif ($NumBars <= 25) {
+         $width = 120+$NumBars*11;
+         $xskip = 5;
+         $bar_width = 8;
+     } elsif ($NumBars <= 50) {
+         $width = 120+$NumBars*8;
+         $xskip = 5;
+         $bar_width = 4;
+     } else {
+         $width = 120+$NumBars*8;
+         $xskip = 5;
+         $bar_width = 4;
+     }
+     #
+     my @Labels;
+     for (my $i=0;$i<@{$Values[0]};$i++) {
+         push (@Labels,$i+1);
+     }
      #
      $Max = 1 if ($Max < 1);
      if ( int($Max) < $Max ) {
          $Max++;
          $Max = int($Max);
      }
+     $Title  = '' if (! defined($Title));
+     $xlabel = '' if (! defined($xlabel));
+     $ylabel = '' if (! defined($ylabel));
+     $ValuesHash{$id.'.title'}    = &Apache::lonnet::escape($Title);
+     $ValuesHash{$id.'.xlabel'}   = &Apache::lonnet::escape($xlabel);
+     $ValuesHash{$id.'.ylabel'}   = &Apache::lonnet::escape($ylabel);
+     $ValuesHash{$id.'.y_max_value'} = $Max;
+     $ValuesHash{$id.'.NumBars'}  = $NumBars;
+     $ValuesHash{$id.'.NumSets'}  = $NumSets;
+     $ValuesHash{$id.'.PlotType'} = 'bar';
+     $ValuesHash{$id.'.Colors'}   = join(',',@{$colors});
+     $ValuesHash{$id.'.height'}   = $height;
+     $ValuesHash{$id.'.width'}    = $width;
+     $ValuesHash{$id.'.xskip'}    = $xskip;
+     $ValuesHash{$id.'.bar_width'} = $bar_width;
+     $ValuesHash{$id.'.labels'} = join(',',@Labels);
+     #
+     &Apache::lonnet::appenv(%ValuesHash);
+     return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
+ }
+ ############################################################
+ ############################################################
+ =pod
+ =item DrawXYGraph
+ Facilitates the plotting of data in an XY graph.
+ Puts plot definition data into the users environment in order for
+ graph.png to plot it.  Returns an <img> tag for the plot.
+ Inputs:
+ =over 4
+ =item $Title: string, the title of the plot
+ =item $xlabel: string, text describing the X-axis of the plot
+ =item $ylabel: string, text describing the Y-axis of the plot
+ =item $Max: scalar, the maximum Y value to use in the plot
+ If $Max is < any data point, the graph will not be rendered.
+ =item $colors: Array ref containing the hex color codes for the data to be
+ plotted in.  If undefined, default values will be used.
+ =item $Xlabels: Array ref containing the labels to be used for the X-axis.
+ =item $Ydata: Array ref containing Array refs.
+ Each of the contained arrays will be plotted as a seperate curve.
+ =item %Values: hash indicating or overriding any default values which are
+ passed to graph.png.
+ Possible values are: width, xskip, x_ticks, x_tick_offset, among others.
+ =back
+ Returns:
+ An <img> tag which references graph.png and the appropriate identifying
+ information for the plot.
+ =cut
+ ############################################################
+ ############################################################
+ sub DrawXYGraph {
+     my ($Title,$xlabel,$ylabel,$Max,$colors,$Xlabels,$Ydata,%Values)=@_;
+     #
+     # Create the identifier for the graph
+     my $identifier = &get_cgi_id();
+     my $id = 'cgi.'.$identifier;
+     #
+     $Title  = '' if (! defined($Title));
+     $xlabel = '' if (! defined($xlabel));
+     $ylabel = '' if (! defined($ylabel));
+     my %ValuesHash =
+         (
+          $id.'.title'  => &Apache::lonnet::escape($Title),
+          $id.'.xlabel' => &Apache::lonnet::escape($xlabel),
+          $id.'.ylabel' => &Apache::lonnet::escape($ylabel),
+          $id.'.y_max_value'=> $Max,
+          $id.'.labels'     => join(',',@$Xlabels),
+          $id.'.PlotType'   => 'XY',
+          );
+     #
+     if (defined($colors) && ref($colors) eq 'ARRAY') {
+         $ValuesHash{$id.'.Colors'}   = join(',',@{$colors});
+     }
+     #
+     if (! ref($Ydata) || ref($Ydata) ne 'ARRAY') {
+         return '';
+     }
+     my $NumSets=1;
+     foreach my $array (@{$Ydata}){
+         next if (! ref($array));
+         $ValuesHash{$id.'.data.'.$NumSets++} = join(',',@$array);
+     }
+     $ValuesHash{$id.'.NumSets'} = $NumSets-1;
+     #
+     # Deal with other parameters
+     while (my ($key,$value) = each(%Values)) {
+         $ValuesHash{$id.'.'.$key} = $value;
+     }
+     #
+     &Apache::lonnet::appenv(%ValuesHash);
+     return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
+ }
+ ############################################################
+ ############################################################
+ =pod
+ =item DrawXYYGraph
+ Facilitates the plotting of data in an XY graph with two Y axes.
+ Puts plot definition data into the users environment in order for
+ graph.png to plot it.  Returns an <img> tag for the plot.
+ Inputs:
+ =over 4
+ =item $Title: string, the title of the plot
+ =item $xlabel: string, text describing the X-axis of the plot
+ =item $ylabel: string, text describing the Y-axis of the plot
+ =item $colors: Array ref containing the hex color codes for the data to be
+ plotted in.  If undefined, default values will be used.
+ =item $Xlabels: Array ref containing the labels to be used for the X-axis.
+ =item $Ydata1: The first data set
+ =item $Min1: The minimum value of the left Y-axis
+ =item $Max1: The maximum value of the left Y-axis
+ =item $Ydata2: The second data set
+ =item $Min2: The minimum value of the right Y-axis
+ =item $Max2: The maximum value of the left Y-axis
+ =item %Values: hash indicating or overriding any default values which are
+ passed to graph.png.
+ Possible values are: width, xskip, x_ticks, x_tick_offset, among others.
+ =back
+ Returns:
+ An <img> tag which references graph.png and the appropriate identifying
+ information for the plot.
+ =cut
+ ############################################################
+ ############################################################
+ sub DrawXYYGraph {
+     my ($Title,$xlabel,$ylabel,$colors,$Xlabels,$Ydata1,$Min1,$Max1,
+                                         $Ydata2,$Min2,$Max2,%Values)=@_;
+     #
+     # Create the identifier for the graph
+     my $identifier = &get_cgi_id();
+     my $id = 'cgi.'.$identifier;
+     #
+     $Title  = '' if (! defined($Title));
+     $xlabel = '' if (! defined($xlabel));
+     $ylabel = '' if (! defined($ylabel));
+     my %ValuesHash =
+         (
+          $id.'.title'  => &Apache::lonnet::escape($Title),
+          $id.'.xlabel' => &Apache::lonnet::escape($xlabel),
+          $id.'.ylabel' => &Apache::lonnet::escape($ylabel),
+          $id.'.labels' => join(',',@$Xlabels),
+          $id.'.PlotType' => 'XY',
+          $id.'.NumSets' => 2,
+          $id.'.two_axes' => 1,
+          $id.'.y1_max_value' => $Max1,
+          $id.'.y1_min_value' => $Min1,
+          $id.'.y2_max_value' => $Max2,
+          $id.'.y2_min_value' => $Min2,
+          );
+     #
+     if (defined($colors) && ref($colors) eq 'ARRAY') {
+         $ValuesHash{$id.'.Colors'}   = join(',',@{$colors});
+     }
+     #
+     if (! ref($Ydata1) || ref($Ydata1) ne 'ARRAY' ||
+         ! ref($Ydata2) || ref($Ydata2) ne 'ARRAY'){
+         return '';
+     }
+     my $NumSets=1;
+     foreach my $array ($Ydata1,$Ydata2){
+         next if (! ref($array));
+         $ValuesHash{$id.'.data.'.$NumSets++} = join(',',@$array);
+     }
      #
-     &Apache::lonnet::appenv('cgi.'.$identifier.'.title'   => $Title,
+     # Deal with other parameters
-                             'cgi.'.$identifier.'.xlabel'  => $xlabel,
+     while (my ($key,$value) = each(%Values)) {
-                             'cgi.'.$identifier.'.ylabel'  => $ylabel,
+         $ValuesHash{$id.'.'.$key} = $value;
-                             'cgi.'.$identifier.'.Max'     => $Max,
+     }
-                             'cgi.'.$identifier.'.NumBars' => $NumBars,
+     #
-                             'cgi.'.$identifier.'.NumSets' => $NumSets,
+     &Apache::lonnet::appenv(%ValuesHash);
-                             'cgi.'.$identifier.'.Colors'  => join(',',@{$colors}),
-                             %ValuesHash);
      return '<img src="/cgi-bin/graph.png?'.$identifier.'" border="1" />';
  }
- Line 2729  sub DrawGraph {
+ Line 3182  sub DrawGraph {
  =pod
+ =back
+ =head1 Statistics helper routines?
+ Bad place for them but what the hell.
+ =over 4
+ =item &chartlink
+ Returns a link to the chart for a specific student.
+ Inputs:
+ =over 4
+ =item $linktext: The text of the link
+ =item $sname: The students username
+ =item $sdomain: The students domain
+ =back
+ =back
+ =cut
+ ############################################################
+ ############################################################
+ sub chartlink {
+     my ($linktext, $sname, $sdomain) = @_;
+     my $link = '<a href="/adm/statistics?reportSelected=student_assessment'.
+         '&SelectedStudent='.&Apache::lonnet::escape($sname.':'.$sdomain).
+         '&chartoutputmode='.HTML::Entities::encode('html, with all links').
+        '">'.$linktext.'</a>';
+ }
+ #######################################################
+ #######################################################
+ =pod
+ =head1 Course Environment Routines
+ =over 4
+ =item &restore_course_settings
+ =item &store_course_settings
+ Restores/Store indicated form parameters from the course environment.
+ Will not overwrite existing values of the form parameters.
+ Inputs:
+ a scalar describing the data (e.g. 'chart', 'problem_analysis')
+ a hash ref describing the data to be stored.  For example:
+ %Save_Parameters = ('Status' => 'scalar',
+     'chartoutputmode' => 'scalar',
+     'chartoutputdata' => 'scalar',
+     'Section' => 'array',
+     'StudentData' => 'array',
+     'Maps' => 'array');
+ Returns: both routines return nothing
+ =cut
+ #######################################################
+ #######################################################
+ sub store_course_settings {
+     # save to the environment
+     # appenv the same items, just to be safe
+     my $courseid = $ENV{'request.course.id'};
+     my $coursedom = $ENV{'course.'.$courseid.'.domain'};
+     my ($prefix,$Settings) = @_;
+     my %SaveHash;
+     my %AppHash;
+     while (my ($setting,$type) = each(%$Settings)) {
+         my $basename = 'env.internal.'.$prefix.'.'.$setting;
+         my $envname = 'course.'.$courseid.'.'.$basename;
+         if (exists($ENV{'form.'.$setting})) {
+             # Save this value away
+             if ($type eq 'scalar' &&
+                 (! exists($ENV{$envname}) ||
+                  $ENV{$envname} ne $ENV{'form.'.$setting})) {
+                 $SaveHash{$basename} = $ENV{'form.'.$setting};
+                 $AppHash{$envname}   = $ENV{'form.'.$setting};
+             } elsif ($type eq 'array') {
+                 my $stored_form;
+                 if (ref($ENV{'form.'.$setting})) {
+                     $stored_form = join(',',
+                                         map {
+                                             &Apache::lonnet::escape($_);
+                                         } sort(@{$ENV{'form.'.$setting}}));
+                 } else {
+                     $stored_form =
+                         &Apache::lonnet::escape($ENV{'form.'.$setting});
+                 }
+                 # Determine if the array contents are the same.
+                 if ($stored_form ne $ENV{$envname}) {
+                     $SaveHash{$basename} = $stored_form;
+                     $AppHash{$envname}   = $stored_form;
+                 }
+             }
+         }
+     }
+     my $put_result = &Apache::lonnet::put('environment',\%SaveHash,
+                                           $coursedom,
+                                           $ENV{'course.'.$courseid.'.num'});
+     if ($put_result !~ /^(ok|delayed)/) {
+         &Apache::lonnet::logthis('unable to save form parameters, '.
+                                  'got error:'.$put_result);
+     }
+     # Make sure these settings stick around in this session, too
+     &Apache::lonnet::appenv(%AppHash);
+     return;
+ }
+ sub restore_course_settings {
+     my $courseid = $ENV{'request.course.id'};
+     my ($prefix,$Settings) = @_;
+     while (my ($setting,$type) = each(%$Settings)) {
+         next if (exists($ENV{'form.'.$setting}));
+         my $envname = 'course.'.$courseid.'.env.internal.'.$prefix.
+             '.'.$setting;
+         if (exists($ENV{$envname})) {
+             if ($type eq 'scalar') {
+                 $ENV{'form.'.$setting} = $ENV{$envname};
+             } elsif ($type eq 'array') {
+                 $ENV{'form.'.$setting} = [
+                                            map {
+                                                &Apache::lonnet::unescape($_);
+                                            } split(',',$ENV{$envname})
+                                            ];
+             }
+         }
+     }
+ }
+ ############################################################
+ ############################################################
+ sub propath {
+     my ($udom,$uname)=@_;
+     $udom=~s/\W//g;
+     $uname=~s/\W//g;
+     my $subdir=$uname.'__';
+     $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+     my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
+     return $proname;
+ }
+ sub icon {
+     my ($file)=@_;
+     my $curfext = (split(/\./,$file))[-1];
+     my $iconname=$Apache::lonnet::perlvar{'lonIconsURL'}.'/unknown.gif';
+     my $embstyle = &Apache::loncommon::fileembstyle($curfext);
+     if (!(!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn')) {
+ 	if (-e  $Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
+ 	          $Apache::lonnet::perlvar{'lonIconsURL'}.'/'.
+ 	            $curfext.".gif") {
+ 	    $iconname=$Apache::lonnet::perlvar{'lonIconsURL'}.'/'.
+ 		$curfext.".gif";
+ 	}
+     }
+     return $iconname;
+ }
+ =pod
  =back
  =cut

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

Removed from v.1.131
changed lines
	Added in v.1.171