--- loncom/interface/lonhtmlcommon.pm	2006/05/01 19:28:21	1.127
+++ loncom/interface/lonhtmlcommon.pm	2006/07/03 20:00:20	1.140
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.127 2006/05/01 19:28:21 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.140 2006/07/03 20:00:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,6 +60,8 @@ use Time::Local;
 use Time::HiRes;
 use Apache::lonlocal;
 use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 ##############################################
 ##############################################
@@ -93,29 +95,35 @@ sub authorbombs {
 
 sub recent_filename {
     my $area=shift;
-    return 'nohist_recent_'.&Apache::lonnet::escape($area);
+    return 'nohist_recent_'.&escape($area);
 }
 
 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.'&'.&Apache::lonnet::escape($value) });
+				 $timestamp.'&'.&escape($value) });
 }
 
 sub remove_recent {
@@ -130,11 +138,11 @@ 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);
 	    $return.="\n<option value='$escaped'>".
-		&Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).
+		&unescape((split(/\&/,$recent{$value}))[1]).
 		'</option>';
 	}
     }
@@ -147,24 +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 = ();
-    foreach (keys %recent) {
-        my $thistime=(split(/\&/,$recent{$_}))[0];
-        $time_hash{$thistime} = $_;
+    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;
+        }
     }
 
 # 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{$_}} =
-                  &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[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
@@ -178,6 +207,7 @@ sub get_recent {
 sub textbox {
     my ($name,$value,$size,$special) = @_;
     $size = 40 if (! defined($size));
+    $value = &HTML::Entities::encode($value,'<>&"');
     my $Str = '<input type="text" name="'.$name.'" size="'.$size.'" '.
         'value="'.$value.'" '.$special.' />';
     return $Str;
@@ -280,7 +310,7 @@ The method used to restrict user input w
 ##############################################
 sub date_setter {
     my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
-        $no_hh_mm_ss,$defhour,$defmin,$defsec) = @_;
+        $no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink) = @_;
     my $wasdefined=1;
     if (! defined($state) || $state ne 'disabled') {
         $state = '';
@@ -322,7 +352,7 @@ sub date_setter {
     }
     my $result = "\n<!-- $dname date setting form -->\n";
     $result .= <<ENDJS;
-<script language="Javascript">
+<script type="text/javascript">
     function $dname\_checkday() {
         var day   = document.$formname.$dname\_day.value;
         var month = document.$formname.$dname\_month.value;
@@ -385,7 +415,7 @@ document.$formname.$dname\_year.value,
     }
 </script>
 ENDJS
-    $result .= '  <nobr>';
+    $result .= '  <span style="white-space: nowrap;">';
     my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
     # Month
     my @Months = qw/January February  March     April   May      June 
@@ -428,19 +458,26 @@ ENDJS
     $hourselector .= "  </select>\n";
     my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />};
     my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />};
-    my $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
+    my $cal_link;
+    if (!$nolink) {
+        $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
+    }
     #
     if ($no_hh_mm_ss) {
-        $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]',
-                       $monthselector,$dayselector,$yearselector,
-                       $cal_link,'</a>');
+        $result .= &mt('[_1] [_2] [_3] ',
+                       $monthselector,$dayselector,$yearselector);
+        if (!$nolink) {
+            $result .= &mt('[_4]Select Date[_5]',$cal_link,'</a>');
+        }
     } else {
-        $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s [_7]Select Date[_8]',
-                       $monthselector,$dayselector,$yearselector,
-                       $hourselector,$minuteselector,$secondselector,
-                       $cal_link,'</a>');
+        $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 .= "</nobr>\n<!-- end $dname date setting form -->\n";
+    $result .= "</span>\n<!-- end $dname date setting form -->\n";
     return $result;
 }
 
@@ -817,10 +854,10 @@ sub Create_PrgWin {
          function openpopwin () {
          popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
         "popwin.document.writeln(\'".$start_page.
-              "<h4>$heading</h4>".
-              "<form name=popremain>".
+              "<h4>$heading<\/h4>".
+              "<form name=\"popremain\" method=\"post\">".
               '<input type="text" size="'.$width.'" name="remaining" value="'.
-	      &mt('Starting').'"></form>'.$end_page.
+	      &mt('Starting').'" /><\\/form>'.$end_page.
               "\');".
         "popwin.document.close();}".
         "\nwindow.setTimeout(openpopwin,0)</script>");
@@ -945,7 +982,7 @@ sub r_print {
 # ------------------------------------------------------- Puts directory header
 
 sub crumbs {
-    my ($uri,$target,$prefix,$form,$size,$noformat)=@_;
+    my ($uri,$target,$prefix,$form,$size,$noformat,$skiplast)=@_;
     if (! defined($size)) {
         $size = '+2';
     }
@@ -961,7 +998,14 @@ sub crumbs {
 	foreach my $dir (split('/',$uri)) {
             if (! $dir) { next; }
             $path .= $dir;
-	    unless ($path eq $uri) { $path.='/'; }
+	    if ($path eq $uri) {
+		if ($skiplast) {
+		    $output.=$dir;
+                    last;
+		} 
+	    } else {
+		$path.='/'; 
+	    }
             my $linkpath = &Apache::loncommon::escape_single($path);
             if ($form) {
 		$linkpath=
@@ -981,9 +1025,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}); 
 
@@ -993,9 +1042,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 -->
@@ -1009,7 +1059,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
 }
 
@@ -1078,7 +1128,7 @@ sub disablelink {
     if (defined($#fields)) {
 	unless ($#fields>=0) { return ''; }
     }
-    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
+    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
 }
 
 sub enablelink {
@@ -1086,7 +1136,7 @@ sub enablelink {
     if (defined($#fields)) {
 	unless ($#fields>=0) { return ''; }
     }
-    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
+    return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
 }
 
 # ----------------------------------------- Script to activate only some fields
@@ -1134,13 +1184,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
@@ -1165,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 = '';
@@ -1222,9 +1271,9 @@ returns: nothing
 #            $icons .= &Apache::loncommon::help_open_bug($bug);
 #        }
 	if ($helplink ne 'nohelp') {
-	    $icons .= &Apache::loncommon::help_open_menu(undef,$component,
+	    $icons .= &Apache::loncommon::help_open_menu($component,
 							 $component_help,
-							 undef,$faq,$bug);
+							 $faq,$bug);
 	}
         if ($icons ne '') {
             $Str .= $icons.'&nbsp;';
@@ -1233,7 +1282,7 @@ returns: nothing
         $Str .= $links.'</td>';
         #
         if (defined($component)) {
-            $Str .= '<td class="LC_breadcrumb_component">'.
+            $Str .= '<td class="'.$css_class.'_component">'.
                 &mt($component).'</td>';
         }
         $Str .= '</tr></table>'."\n";
@@ -1429,11 +1478,11 @@ sub course_select_row {
     |;
     my $courseform='<b>'.&Apache::loncommon::selectcourse_link
                      ($formname,'pickcourse','pickdomain','coursedesc','',1).'</b>';
+        $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses').'<br />';
     if ($totcodes > 0) {
-        $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses');
         my $numtitles = @$codetitles;
         if ($numtitles > 0) {
-            $output .= '<br /><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />';
+            $output .= '<input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />';
             $output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".
                '<select name="'.$$codetitles[0].
                '" onChange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".