--- loncom/interface/lonhtmlcommon.pm	2006/06/22 15:53:48	1.135
+++ loncom/interface/lonhtmlcommon.pm	2007/09/05 05:00:24	1.161
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.135 2006/06/22 15:53:48 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.161 2007/09/05 05:00:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,7 +60,6 @@ use Time::Local;
 use Time::HiRes;
 use Apache::lonlocal;
 use Apache::lonnet;
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
 
 ##############################################
@@ -78,7 +77,7 @@ use LONCAPA;
 sub authorbombs {
     my $url=shift;
     $url=&Apache::lonnet::declutter($url);
-    my ($udom,$uname)=($url=~/^(\w+)\/(\w+)\//);
+    my ($udom,$uname)=($url=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)/});
     my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
     foreach (keys %bombs) {
 	if ($_=~/^$udom\/$uname\//) {
@@ -99,25 +98,31 @@ sub recent_filename {
 }
 
 sub store_recent {
-    my ($area,$name,$value)=@_;
+    my ($area,$name,$value,$freeze)=@_;
     my $file=&recent_filename($area);
     my %recent=&Apache::lonnet::dump($file);
     if (scalar(keys(%recent))>20) {
 # remove oldest value
-	my $oldest=time;
+	my $oldest=time();
 	my $delkey='';
-	foreach (keys %recent) {
-	    my $thistime=(split(/\&/,$recent{$_}))[0];
-	    if ($thistime<$oldest) {
+	foreach my $item (keys(%recent)) {
+	    my $thistime=(split(/\&/,$recent{$item}))[0];
+	    if (($thistime ne "always_include") && ($thistime<$oldest)) {
 		$oldest=$thistime;
-		$delkey=$_;
+		$delkey=$item;
 	    }
 	}
 	&Apache::lonnet::del($file,[$delkey]);
     }
 # store new value
+    my $timestamp;
+    if ($freeze) {
+        $timestamp = "always_include";
+    } else {
+        $timestamp = time();
+    }   
     &Apache::lonnet::put($file,{ $name => 
-				 time.'&'.&escape($value) });
+				 $timestamp.'&'.&escape($value) });
 }
 
 sub remove_recent {
@@ -132,11 +137,12 @@ sub select_recent {
     my $return="\n<select name='$fieldname'".
 	($event?" onchange='$event'":'').
 	">\n<option value=''>--- ".&mt('Recent')." ---</option>";
-    foreach (sort keys %recent) {
-	unless ($_=~/^error\:/) {
-	    my $escaped = &Apache::loncommon::escape_url($_);
+    foreach my $value (sort(keys(%recent))) {
+	unless ($value =~/^error\:/) {
+	    my $escaped = &Apache::loncommon::escape_url($value);
+	    &Apache::loncommon::inhibit_menu_check(\$escaped);
 	    $return.="\n<option value='$escaped'>".
-		&unescape((split(/\&/,$recent{$_}))[1]).
+		&unescape((split(/\&/,$recent{$value}))[1]).
 		'</option>';
 	}
     }
@@ -149,29 +155,45 @@ sub get_recent {
     my %recent=&Apache::lonnet::dump(&recent_filename($area));
 
 # Create hash with key as time and recent as value
+# Begin filling return_hash with any 'always_include' option
     my %time_hash = ();
-    my $nfrozen = 0;
-    foreach (keys %recent) {
-        my ($thistime,$thisvalue)=(split(/\&/,$recent{$_}));
-        if (($thisvalue eq 'role_frozen') && ($area='roles')) {
-            $thistime=time+$nfrozen;
-            $nfrozen++;
+    my %return_hash = ();
+    foreach my $item (keys %recent) {
+        my ($thistime,$thisvalue)=(split(/\&/,$recent{$item}));
+        if ($thistime eq 'always_include') {
+            $return_hash{$item} = &unescape($thisvalue);
+            $n--;
+        } else {
+            $time_hash{$thistime} = $item;
         }
-        $time_hash{$thistime} = $_;
     }
 
 # Sort by decreasing time and return key value pairs
-    my %return_hash = ();
     my $idx = 1;
-    foreach (reverse sort keys %time_hash) {
-       $return_hash{$time_hash{$_}} =
-                  &unescape((split(/\&/,$recent{$time_hash{$_}}))[1]);
+    foreach my $item (reverse(sort(keys(%time_hash)))) {
+       $return_hash{$time_hash{$item}} =
+                  &unescape((split(/\&/,$recent{$time_hash{$item}}))[1]);
        if ($n && ($idx++ >= $n)) {last;}
     }
 
     return %return_hash;
 }
 
+sub get_recent_frozen {
+    my ($area) = @_;
+    my %recent=&Apache::lonnet::dump(&recent_filename($area));
+
+# Create hash with all 'frozen' items
+    my %return_hash = ();
+    foreach my $item (keys(%recent)) {
+        my ($thistime,$thisvalue)=(split(/\&/,$recent{$item}));
+        if ($thistime eq 'always_include') {
+            $return_hash{$item} = &unescape($thisvalue);
+        }
+    }
+    return %return_hash;
+}
+
 
 
 =pod
@@ -445,14 +467,14 @@ ENDJS
         $result .= &mt('[_1] [_2] [_3] ',
                        $monthselector,$dayselector,$yearselector);
         if (!$nolink) {
-            $result .= &mt('[_4]Select Date[_5]',$cal_link,'</a>');
+            $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
         }
     } else {
         $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s ',
                       $monthselector,$dayselector,$yearselector,
                       $hourselector,$minuteselector,$secondselector);
         if (!$nolink) {
-            $result .= &mt('[_7]Select Date[_8]',$cal_link,'</a>');
+            $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
         }
     }
     $result .= "</span>\n<!-- end $dname date setting form -->\n";
@@ -667,14 +689,6 @@ sub StatusOptions {
         $status = $env{'form.Status'} if (exists($env{'form.Status'}));
     }
 
-    my $OpSel1 = '';
-    my $OpSel2 = '';
-    my $OpSel3 = '';
-
-    if($status eq 'Any')         { $OpSel3 = ' selected'; }
-    elsif($status eq 'Expired' ) { $OpSel2 = ' selected'; }
-    else                         { $OpSel1 = ' selected'; }
-
     my $Str = '';
     $Str .= '<select name="Status"';
     if(defined($formName) && $formName ne '' && ! defined($onchange)) {
@@ -685,12 +699,18 @@ sub StatusOptions {
     }
     $Str .= ' size="'.$size.'" ';
     $Str .= '>'."\n";
-    $Str .= '<option value="Active" '.$OpSel1.'>'.
-        &mt('Currently Enrolled').'</option>'."\n";
-    $Str .= '<option value="Expired" '.$OpSel2.'>'.
-        &mt('Previously Enrolled').'</option>'."\n";
-    $Str .= '<option value="Any" '.$OpSel3.'>'.
-        &mt('Any Enrollment Status').'</option>'."\n";
+    foreach my $type (['Active',  &mt('Currently Has Access')],
+		      ['Future',  &mt('Will Have Future Access')],
+		      ['Expired', &mt('Previously Had Access')],
+		      ['Any',     &mt('Any Access Status')]) {
+	my ($name,$label) = @$type;
+	$Str .= '<option value="'.$name.'" ';
+	if ($status eq $name) {
+	    $Str .= 'selected="selected" ';
+	}
+	$Str .= '>'.$label.'</option>'."\n";
+    }
+
     $Str .= '</select>'."\n";
 }
 
@@ -833,7 +853,7 @@ sub Create_PrgWin {
          popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
         "popwin.document.writeln(\'".$start_page.
               "<h4>$heading<\/h4>".
-              "<form name=\"popremain\" method=\"post\">".
+              "<form action= \"\" name=\"popremain\" method=\"post\">".
               '<input type="text" size="'.$width.'" name="remaining" value="'.
 	      &mt('Starting').'" /><\\/form>'.$end_page.
               "\');".
@@ -845,7 +865,7 @@ sub Create_PrgWin {
 	$prog_state{'window'}='window';
 	if (!$formname) {
 	    $prog_state{'formname'}=&get_uniq_name();
-	    &r_print($r,'<form name="'.$prog_state{'formname'}.'">');
+	    &r_print($r,'<form action="" name="'.$prog_state{'formname'}.'">');
 	} else {
 	    $prog_state{'formname'}=$formname;
 	}
@@ -872,7 +892,7 @@ sub Create_PrgWin {
 # update progress
 sub Update_PrgWin {
     my ($r,$prog_state,$displayString)=@_;
-    &r_print($r,'<script>'.$$prog_state{'window'}.'.document.'.
+    &r_print($r,'<script type="text/javascript">'.$$prog_state{'window'}.'.document.'.
 	     $$prog_state{'formname'}.'.'.
 	     $$prog_state{'inputname'}.'.value="'.
 	     $displayString.'";</script>');
@@ -983,18 +1003,18 @@ sub crumbs {
 		} 
 	    } else {
 		$path.='/'; 
-	    }
-            my $linkpath = &Apache::loncommon::escape_single($path);
-            if ($form) {
-		$linkpath=
-                    qq{javascript:$form.action='$linkpath';$form.submit();};
-            }
-	    $output.=qq{<a href="$linkpath" $target>$dir</a>/};
+	    }	    
+            my $href_path = &HTML::Entities::encode($path,'<>&"');
+	    &Apache::loncommon::inhibit_menu_check(\$href_path);
+	    $output.=qq{<a href="$href_path" $target>$dir</a>/};
 	}
     } else {
-	$output.=$uri;
+	foreach my $dir (split('/',$uri)) {
+            if (! $dir) { next; }
+	    $output.=$dir.'/';
+	}
     }
-    unless ($uri=~/\/$/) { $output=~s/\/$//; }
+    if ($uri !~ m|/$|) { $output=~s|/$||; }
     return $output.'</font>'.($noformat?'':'</b></tt><br />');
 }
 
@@ -1003,9 +1023,14 @@ sub crumbs {
 sub spellheader {
     my $start_page=
 	&Apache::loncommon::start_page('Speller Suggestions',undef,
-				       {'only_body' => 1,
-					'js_ready'  => 1,
-					'bgcolor'   => '#DDDDDD',});
+				       {'only_body'   => 1,
+					'js_ready'    => 1,
+					'bgcolor'     => '#DDDDDD',
+				        'add_entries' => {
+					    'onload' => 
+                                               'document.forms.spellcheckform.submit()',
+                                             }
+				        });
     my $end_page=
 	&Apache::loncommon::end_page({'js_ready'  => 1}); 
 
@@ -1015,9 +1040,10 @@ sub spellheader {
 //<!-- BEGIN LON-CAPA Internal
 var checkwin;
 
-function spellcheckerwindow() {
+function spellcheckerwindow(string) {
+    var esc_string = string.replace(/\"/g,'&quot;');
     checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
-    checkwin.document.writeln('$start_page<form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /><\\/form>$end_page');
+    checkwin.document.writeln('$start_page<form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="'+esc_string+'" /><\\/form>$end_page');
     checkwin.document.close();
 }
 // END LON-CAPA Internal -->
@@ -1031,7 +1057,7 @@ sub spelllink {
     my ($form,$field)=@_;
     my $linktext=&mt('Check Spelling');
     return (<<ENDLINK);
-<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { if (document.$form.onsubmit!=null) { document.$form.onsubmit();}};spellcheckerwindow();checkwin.document.forms.spellcheckform.text.value=this.document.forms.$form.$field.value;checkwin.document.forms.spellcheckform.submit();">$linktext</a>
+<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { if (document.$form.onsubmit!=null) { document.$form.onsubmit();}};spellcheckerwindow(this.document.forms.$form.$field.value);">$linktext</a>
 ENDLINK
 }
 
@@ -1066,6 +1092,7 @@ _editor_url='/htmlarea/';
 _editor_lang='$lang';
 </script>
 <script type="text/javascript" src="/htmlarea/htmlarea.js"></script>
+<link rel="stylesheet" type="text/css" href="/htmlarea/htmlarea.css" />
 ENDHEADERS
 }
 
@@ -1156,13 +1183,11 @@ A link to help for the component will be
 
 All inputs can be undef without problems.
 
-Inputs: $color (the background color of the table returned),
-        $component (the large text on the right side of the table),
+Inputs: $component (the large text on the right side of the table),
         $component_help
-        $function (role to get colors from)
-        $domain   (domian of role)
         $menulink (boolean, controls whether to include a link to /adm/menu)
-
+        $helplink (if 'nohelp' don't include the orange help link)
+        $css_class (optional name for the class to apply to the table for CSS)
 Returns a string containing breadcrumbs for the current page.
 
 =item clear_breadcrumbs
@@ -1175,7 +1200,8 @@ Pushes a breadcrumb on the stack of crum
 
 input: $breadcrumb, a hash reference.  The keys 'href','title', and 'text'
 are required.  If present the keys 'faq' and 'bug' will be used to provide
-links to the FAQ and bug sites.
+links to the FAQ and bug sites. If the key 'no_mt' is present the 'title' 
+and 'text' values won't be sent through &mt()
 
 returns: nothing    
 
@@ -1187,9 +1213,10 @@ returns: nothing
     my @Crumbs;
     
     sub breadcrumbs {
-        my ($component,$component_help,$menulink,$helplink) = @_;
+        my ($component,$component_help,$menulink,$helplink,$css_class) = @_;
         #
-        my $Str = "\n".'<table id="LC_breadcrumbs"><tr><td>';
+	$css_class ||= 'LC_breadcrumbs';
+        my $Str = "\n".'<table class="'.$css_class.'"><tr><td>';
         #
         # Make the faq and bug data cascade
         my $faq = '';
@@ -1224,13 +1251,22 @@ returns: nothing
                      if (defined($_->{'target'}) && $_->{'target'} ne '') {
                          $result .= 'target="'.$_->{'target'}.'" ';
                      }
-                     $result .='title="'.&mt($_->{'title'}).'">'.
-                         &mt($_->{'text'}).'</a>';
+		     if ($_->{'no_mt'}) {
+			 $result .='title="'.$_->{'title'}.'">'.
+			     $_->{'text'}.'</a>';
+		     } else {
+			 $result .='title="'.&mt($_->{'title'}).'">'.
+			     &mt($_->{'text'}).'</a>';
+		     }
                      $result;
                      } @Crumbs
                  );
         $links .= '-&gt;' if ($links ne '');
-        $links .= '<b>'.&mt($last->{'text'}).'</b>';
+	if ($last->{'no_mt'}) {
+	    $links .= '<b>'.$last->{'text'}.'</b>';
+	} else {
+	    $links .= '<b>'.&mt($last->{'text'}).'</b>';
+	}
         #
         my $icons = '';
         $faq = $last->{'faq'} if (exists($last->{'faq'}));
@@ -1243,20 +1279,21 @@ returns: nothing
 #        if ($bug ne '') {
 #            $icons .= &Apache::loncommon::help_open_bug($bug);
 #        }
-	if ($helplink ne 'nohelp') {
-	    $icons .= &Apache::loncommon::help_open_menu(undef,$component,
+	if ($faq ne '' || $component_help ne '' || $bug ne '') {
+	    $icons .= &Apache::loncommon::help_open_menu($component,
 							 $component_help,
-							 undef,$faq,$bug);
+							 $faq,$bug);
 	}
-        if ($icons ne '') {
-            $Str .= $icons.'&nbsp;';
-        }
         #
         $Str .= $links.'</td>';
         #
         if (defined($component)) {
-            $Str .= '<td class="LC_breadcrumb_component">'.
-                &mt($component).'</td>';
+            $Str .= '<td class="'.$css_class.'_component">'.
+                &mt($component);
+	    if ($icons ne '') {
+		$Str .= '&nbsp;'.$icons;
+	    }
+	    $Str .= '</td>';
         }
         $Str .= '</tr></table>'."\n";
         #
@@ -1292,7 +1329,7 @@ returns: nothing
 # row2
 # row3   ... etc.
 # &submit_row(0
-# &end_pickbox()
+# &end_pick_box()
 #
 # where row1, row 2 etc. are chosen from &role_select_row,&course_select_row,
 # &status_select_row and &email_default_row
@@ -1334,15 +1371,14 @@ returns: nothing
 # needs that are not accommodated by the *_select_row() routines.    
 
 sub start_pick_box {
-    my ($table_width) = @_;
+    my ($css_class) = @_;
+    if (defined($css_class)) {
+	$css_class = 'class="'.$css_class.'"';
+    } else {
+	$css_class= 'class="LC_pick_box"';
+    }
     my $output = <<"END";
- <table width="$table_width" border="0" cellpadding="0" cellspacing="1" bgcolor="#000000">
-  <tr>
-      <td>
-       <table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#ffffff">
-        <tr>
-         <td>
-          <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">
+ <table $css_class>
 END
     return $output;
 }
@@ -1350,69 +1386,78 @@ END
 sub end_pick_box {
     my $output = <<"END";
        </table>
-      </td>
-     </tr>
-    </table>
-   </td>
-  </tr>
- </table>
 END
     return $output;
 }
 
 sub row_title {
-    my ($col_width,$tablecolor,$title) = @_;
+    my ($title,$css_title_class,$css_value_class) = @_;
+    $css_title_class ||= 'LC_pick_box_title';
+    $css_title_class = 'class="'.$css_title_class.'"';
+
+    $css_value_class ||= 'LC_pick_box_value';
+    $css_value_class = 'class="'.$css_value_class.'"';
+
     my $output = <<"ENDONE";
-           <tr>
-            <td width="$col_width" bgcolor="$tablecolor">
-             <table width="$col_width" border="0" cellpadding="8" cellspacing="0">
-              <tr>
-               <td align="right"><b>$title:</b>
-               </td>
-              </tr>
-             </table>
+           <tr class="LC_pick_box_row">
+            <td $css_title_class>
+	       $title:
             </td>
-            <td width="100%" valign="top">
-             <table width="100%" border="0" cellpadding="8" cellspacing="0">
-              <tr>
+            <td $css_value_class>
 ENDONE
     return $output;
 }
 
 sub row_closure {
+    my ($no_separator) =@_;
     my $output = <<"ENDTWO";
-              </tr>
-             </table>
             </td>
            </tr>
+ENDTWO
+    if (!$no_separator) {
+        $output .= <<"ENDTWO";
            <tr>
-            <td width="100%" colspan="2" bgcolor="#000000">
-             <img src="/adm/lonMisc/blackdot.gif" /><br />
+            <td colspan="2" class="LC_pick_box_separator">
             </td>
            </tr>
 ENDTWO
+    }
     return $output;
 }
 
 sub role_select_row {
-    my ($roles,$col_width,$tablecolor,$title) = @_;
+    my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;
     my $output;
     if (defined($title)) {
-        $output = &row_title($col_width,$tablecolor,$title);
+        $output = &row_title($title,$css_class);
     }
-    $output .= qq|               <td valign="top">
+    $output .= qq|
                                   <select name="roles" multiple >\n|;
     foreach my $role (@$roles) {
         my $plrole;
         if ($role eq 'ow') {
             $plrole = &mt('Course Owner');
+        } elsif ($role eq 'cr') {
+            if ($show_separate_custom) {
+                if ($cdom ne '' && $cnum ne '') {
+                    my %course_customroles = &course_custom_roles($cdom,$cnum);
+                    foreach my $crrole (sort(keys(%course_customroles))) {
+                        my ($plcrrole) = ($crrole =~ m|^cr/[^/]+/[^/]+/(.+)$|);
+                        $output .= '  <option value="'.$crrole.'">'.$plcrrole.
+                                   '</option>';
+                    }
+                }
+            } else {
+                $plrole = &mt('Custom Role');
+            }
         } else {
             $plrole=&Apache::lonnet::plaintext($role);
         }
-        $output .= '  <option value="'.$role.'">'.$plrole.'</option>';
+        if (($role ne 'cr') || (!$show_separate_custom)) {
+            $output .= '  <option value="'.$role.'">'.$plrole.'</option>';
+        }
     }
-    $output .= qq|                </select>
-                                 </td>\n|;
+    $output .= qq|                </select>\n|;
     if (defined($title)) {
         $output .= &row_closure();
     }
@@ -1420,11 +1465,11 @@ sub role_select_row {
 }
 
 sub course_select_row {
-    my ($col_width,$tablecolor,$title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_;
-    my $output = &row_title($col_width,$tablecolor,$title);
-    $output .= "          <td>\n";
+    my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles,
+	$css_class) = @_;
+    my $output = &row_title($title,$css_class);
     $output .= qq|
-<script type="text/javascript" language="Javascript" >
+<script type="text/javascript">
     function coursePick (formname) {
         for  (var i=0; i<formname.coursepick.length; i++) {
             if (formname.coursepick[i].value == 'category') {
@@ -1496,24 +1541,23 @@ sub course_select_row {
             $output .= '</tr></table><br />';
         }
     }
-    $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."','','1'".')" />'.&mt('Pick specific course(s):').' '.$courseform.'&nbsp;&nbsp;<input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br /></td>'."\n";
+    $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."','','1'".')" />'.&mt('Pick specific course(s):').' '.$courseform.'&nbsp;&nbsp;<input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br />'."\n";
     $output .= &row_closure();
     return $output;
 }
 
 sub status_select_row {
-    my ($types,$col_width,$tablecolor,$title) = @_;
+    my ($types,$title,$css_class) = @_;
     my $output; 
     if (defined($title)) {
-        $output = &row_title($col_width,$tablecolor,$title);
+        $output = &row_title($title,$css_class,'LC_pick_box_select');
     }
-    $output .= qq|              <td valign="top">
+    $output .= qq|
                                     <select name="types" multiple>\n|;
     foreach my $status_type (sort(keys(%{$types}))) {
         $output .= '  <option value="'.$status_type.'">'.$$types{$status_type}.'</option>';
     }
-    $output .= qq|                   </select>
-                                    </td>\n|; 
+    $output .= qq|                   </select>\n|; 
     if (defined($title)) {
         $output .= &row_closure();
     }
@@ -1521,18 +1565,17 @@ sub status_select_row {
 }
 
 sub email_default_row {
-    my ($authtypes,$col_width,$tablecolor,$title,$descrip) = @_;
-    my $output = &row_title($col_width,$tablecolor,$title);
-    my @rowcols = ('#eeeeee','#dddddd');
-    $output .= '              <td>'.$descrip;
-    $output .= &start_pick_box(''); 
-    $output .= '                <tr bgcolor="'.$tablecolor.'">
-                                 <td><b>'.&mt('Authentication Method').'</b></td><td align="right"><b>'.&mt('Username -> e-mail conversion').'</b></td>
-                                </tr>'."\n";
+    my ($authtypes,$title,$descrip,$css_class) = @_;
+    my $output = &row_title($title,$css_class);
+    $output .= $descrip.
+	&Apache::loncommon::start_data_table().
+	&Apache::loncommon::start_data_table_header_row().
+	'<th>'.&mt('Authentication Method').'</th>'.
+	'<th align="right">'.&mt('Username -> e-mail conversion').'</th>'."\n".
+	&Apache::loncommon::end_data_table_header_row();
     my $rownum = 0;
     foreach my $auth (sort(keys(%{$authtypes}))) {
         my ($userentry,$size);
-        my $rowiter = $rownum%2;
         if ($auth =~ /^krb/) {
             $userentry = '';
             $size = 25;
@@ -1540,29 +1583,48 @@ sub email_default_row {
             $userentry = 'username@';
             $size = 15;
         }
-        $output .= '<tr bgcolor="'.$rowcols[$rowiter].'"><td>  '.$$authtypes{$auth}.'</td><td align="right">'.$userentry.'<input type="text" name="'.$auth.'" size="'.$size.'" /></td></tr>';
-        $rownum ++;
+        $output .= &Apache::loncommon::start_data_table_row().
+	    '<td>  '.$$authtypes{$auth}.'</td>'.
+	    '<td align="right">'.$userentry.
+	    '<input type="text" name="'.$auth.'" size="'.$size.'" /></td>'.
+	    &Apache::loncommon::end_data_table_row();
     }
-    $output .= &end_pick_box();
-    $output .= "                   <br /></td>\n"; 
+    $output .= &Apache::loncommon::end_data_table();
     $output .= &row_closure();
     return $output;
 }
 
 
 sub submit_row {
-    my ($col_width,$tablecolor,$title,$cmd,$submit_text) = @_;
-    my $output = &row_title($col_width,$tablecolor,$title);
+    my ($title,$cmd,$submit_text,$css_class) = @_;
+    my $output = &row_title($title,$css_class,'LC_pick_box_submit');
     $output .= qq|
-            <td width="100%" valign="top" align="right">
              <br />
              <input type="hidden" name="command" value="$cmd" />
              <input type="submit" value="$submit_text"/> &nbsp;
              <br /><br />
-            </td>\n|;
+            \n|;
     return $output;
 }
 
+sub course_custom_roles {
+    my ($cdom,$cnum) = @_;
+    my %returnhash=();
+    my %coursepersonnel=&Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
+    foreach my $person (sort(keys(%coursepersonnel))) {
+        my ($role) = ($person =~ /^([^:]+):/);
+        my ($end,$start) = split(/:/,$coursepersonnel{$person});
+        if ($end == -1 && $start == -1) {
+            next;
+        }
+        if ($role =~ m|^cr/[^/]+/[^/]+/[^/]|) {
+            $returnhash{$role} ++;
+        }
+    }
+    return %returnhash;
+}
+
+
 ##############################################
 ##############################################
                                                                              
@@ -1701,66 +1763,66 @@ sub set_form_elements {
                 my $valuestring = join('","',@{$values{$name}});
                 $output .= qq|
   var textvalues = new Array ("$valuestring");
-  var total = courseForm.$name.length;
+  var total = courseForm.elements['$name'].length;
   if (total > $numvalues) {
       total = $numvalues;
   }    
   for (var i=0; i<total; i++) {
-      courseForm.$name\[i].value = textvalues[i];
+      courseForm.elements['$name']\[i].value = textvalues[i];
   }
 |;
             } else {
                 $output .= qq|
-  courseForm.$name.value = "$values{$name}[0]";
+  courseForm.elements['$name'].value = "$values{$name}[0]";
 |;
             }
         } else {
             $output .=  qq|
-  var elementLength = courseForm.$name.length;
+  var elementLength = courseForm.elements['$name'].length;
   if (elementLength==undefined) {
 |;
             foreach my $value (@{$values{$name}}) {
                 if ($$elements{$name} eq 'selectbox') {
                     $output .=  qq|
-      if (courseForm.$name.options[0].value == "$value") {
-          courseForm.$name.options[0].selected = true;
+      if (courseForm.elements['$name'].options[0].value == "$value") {
+          courseForm.elements['$name'].options[0].selected = true;
       }|;
                 } elsif (($$elements{$name} eq 'radio') ||
                          ($$elements{$name} eq 'checkbox')) {
                     $output .= qq|
-      if (courseForm.$name.value == "$value") {
-          courseForm.$name.checked = true;
+      if (courseForm.elements['$name'].value == "$value") {
+          courseForm.elements['$name'].checked = true;
       }|;
                 }
             }
             $output .= qq|
   }
   else {
-      for (var i=0; i<courseForm.$name.length; i++) {
+      for (var i=0; i<courseForm.elements['$name'].length; i++) {
 |;
             if ($$elements{$name} eq 'selectbox') {
                 $output .=  qq|
-          courseForm.$name.options[i].selected = false;|;
+          courseForm.elements['$name'].options[i].selected = false;|;
             } elsif (($$elements{$name} eq 'radio') || 
                      ($$elements{$name} eq 'checkbox')) {
                 $output .= qq|
-          courseForm.$name\[i].checked = false;|; 
+          courseForm.elements['$name']\[i].checked = false;|; 
             }
             $output .= qq|
       }
-      for (var j=0; j<courseForm.$name.length; j++) {
+      for (var j=0; j<courseForm.elements['$name'].length; j++) {
 |;
             foreach my $value (@{$values{$name}}) {
                 if ($$elements{$name} eq 'selectbox') {
                     $output .=  qq|
-          if (courseForm.$name.options[j].value == "$value") {
-              courseForm.$name.options[j].selected = true;
+          if (courseForm.elements['$name'].options[j].value == "$value") {
+              courseForm.elements['$name'].options[j].selected = true;
           }|;
                 } elsif (($$elements{$name} eq 'radio') ||
                          ($$elements{$name} eq 'checkbox')) { 
                       $output .= qq|
-          if (courseForm.$name\[j].value == "$value") {
-              courseForm.$name\[j].checked = true;
+          if (courseForm.elements['$name']\[j].value == "$value") {
+              courseForm.elements['$name']\[j].checked = true;
           }|;
                 }
             }
@@ -1775,6 +1837,43 @@ sub set_form_elements {
     return $output;
 }
 
+##############################################
+##############################################
+
+# javascript_valid_email
+#
+# Generates javascript to validate an e-mail address.
+# Returns a javascript function which accetps a form field as argumnent, and
+# returns false if field.value does not satisfy two regular expression matches
+# for a valid e-mail address.  Backwards compatible with old browsers without
+# support for javascript RegExp (just checks for @ in field.value in this case). 
+
+sub javascript_valid_email {
+    my $scripttag .= <<'END';
+function validmail(field) {
+    var str = field.value;
+    if (window.RegExp) {
+        var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)";
+        var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; //"
+        var reg1 = new RegExp(reg1str);
+        var reg2 = new RegExp(reg2str);
+        if (!reg1.test(str) && reg2.test(str)) {
+            return true;
+        }
+        return false;
+    }
+    else
+    {
+        if(str.indexOf("@") >= 0) {
+            return true;
+        }
+        return false;
+    }
+}
+END
+    return $scripttag;
+}
+
 1;
 
 __END__