--- loncom/interface/lonhtmlcommon.pm	2004/09/10 17:58:01	1.89
+++ loncom/interface/lonhtmlcommon.pm	2005/05/28 00:35:47	1.105
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.89 2004/09/10 17:58:01 banghart Exp $
+# $Id: lonhtmlcommon.pm,v 1.105 2005/05/28 00:35:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,10 +55,11 @@ html.
 
 package Apache::lonhtmlcommon;
 
+use strict;
 use Time::Local;
 use Time::HiRes;
 use Apache::lonlocal;
-use strict;
+use Apache::lonnet;
 
 ##############################################
 ##############################################
@@ -80,7 +81,7 @@ sub authorbombs {
     foreach (keys %bombs) {
 	if ($_=~/^$udom\/$uname\//) {
 	    return '<a href="/adm/bombs/'.$url.
-		'"><img src="/adm/lonMisc/bomb.gif" border="0" /></a>'.
+		'"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/bomb.gif').'" border="0" /></a>'.
 		&Apache::loncommon::help_open_topic('About_Bombs');
 	}
     }
@@ -127,11 +128,12 @@ sub select_recent {
     my ($area,$fieldname,$event)=@_;
     my %recent=&Apache::lonnet::dump(&recent_filename($area));
     my $return="\n<select name='$fieldname'".
-	($event?" onChange='$event'":'').
+	($event?" onchange='$event'":'').
 	">\n<option value=''>--- ".&mt('Recent')." ---</option>";
     foreach (sort keys %recent) {
 	unless ($_=~/^error\:/) {
-	    $return.="\n<option value='$_'>".
+	    my $escaped = &Apache::loncommon::escape_url($_);
+	    $return.="\n<option value='$escaped'>".
 		&Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).
 		'</option>';
 	}
@@ -140,6 +142,30 @@ sub select_recent {
     return $return;
 }
 
+sub get_recent {
+    my ($area, $n) = @_;
+    my %recent=&Apache::lonnet::dump(&recent_filename($area));
+
+# Create hash with key as time and recent as value
+    my %time_hash = ();
+    foreach (keys %recent) {
+        my $thistime=(split(/\&/,$recent{$_}))[0];
+        $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{$_}} =
+                  &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]);
+       if ($n && ($idx++ >= $n)) {last;}
+    }
+
+    return %return_hash;
+}
+
+
 
 =pod
 
@@ -286,7 +312,7 @@ sub date_setter {
             document.$formname.$dname\_day.value = 30;
         }
     }
-
+    
     function $dname\_disable() {
         document.$formname.$dname\_month.disabled=true;
         document.$formname.$dname\_day.disabled=true;
@@ -318,64 +344,62 @@ document.$formname.$dname\_year.value,
     }
 </script>
 ENDJS
-    $result .= "  <nobr><select name=\"$dname\_month\" ".$special.' '.
-        $state.' '.
-        "onChange=\"javascript:$dname\_checkday()\" >\n";
+    $result .= '  <nobr>';
+    my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
     # Month
     my @Months = qw/January February  March     April   May      June 
                     July    August    September October November December/;
     # Pad @Months with a bogus value to make indexing easier
     unshift(@Months,'If you can read this an error occurred');
-    if ($includeempty) { $result.="<option value=''></option>"; }
+    if ($includeempty) { $monthselector.="<option value=''></option>"; }
     for(my $m = 1;$m <=$#Months;$m++) {
-        $result .= "      <option value=\"$m\" ";
-        $result .= "selected " if ($m-1 eq $month);
-        $result .= "> ".&mt($Months[$m])." </option>\n";
+        $monthselector .= qq{      <option value="$m" };
+        $monthselector .= "selected " if ($m-1 eq $month);
+        $monthselector .= '> '.&mt($Months[$m]).' </option>';
     }
-    $result .= "  </select>\n";
+    $monthselector.= '  </select>';
     # Day
-    $result .= "  <input type=\"text\" name=\"$dname\_day\" ".$state.' '.
-            "value=\"$mday\" size=\"3\" ".$special.' '.
-            "onChange=\"javascript:$dname\_checkday()\" />\n";
+    my $dayselector = qq{<input type="text" name="$dname\_day" $state value="$mday" size="3" $special onchange="javascript:$dname\_checkday()" />};
     # Year
-    $result .= "  <input type=\"year\" name=\"$dname\_year\" ".$state.' '.
-            "value=\"$year\" size=\"5\" ".$special.' '.
-            "onChange=\"javascript:$dname\_checkday()\" />\n";
-    $result .= "&nbsp;&nbsp;";
-    if (! $no_hh_mm_ss) {
-        # Hours
-        $result .= "  <select name=\"$dname\_hour\" ".$special." ".$state.' '.
-            ">\n";
-        if ($includeempty) { $result.="<option value=''></option>"; }
-        for (my $h = 0;$h<24;$h++) {
-            $result .= "      <option value=\"$h\" ";
-            $result .= "selected " if (defined($hour) && $hour == $h);
-            $result .= "> ";
-            my $timest='';
-            if ($h == 0) {
-                $timest .= "12 am";
-            } elsif($h == 12) {
-                $timest .= "12 noon";
-            } elsif($h < 12) {
-                $timest .= "$h am";
-            } else {
-                $timest .= $h-12 ." pm";
-            }
-            $timest=&mt($timest);
-            $result .= $timest." </option>\n";
-        } 
-        $result .= "  </select>\n";
-        $result .= "  <input type=\"text\" name=\"$dname\_minute\" ".
-            $special.' '.
-            $state.' '.
-            "value=\"$min\" size=\"3\" /> m\n";
-        $result .= "  <input type=\"text\" name=\"$dname\_second\" ".
-            $special.' '.
-            $state.' '.
-            "value=\"$sec\" size=\"3\" /> s\n";
+    my $yearselector = qq{<input type="year" name="$dname\_year" $state value="$year" size="5" $special onchange="javascript:$dname\_checkday()" />};
+    #
+    my $hourselector = qq{<select name="$dname\_hour" $special $state >};
+    if ($includeempty) { 
+        $hourselector.=qq{<option value=''></option>};
+    }
+    for (my $h = 0;$h<24;$h++) {
+        $hourselector .= qq{<option value="$h" };
+        $hourselector .= "selected " if (defined($hour) && $hour == $h);
+        $hourselector .= ">";
+        my $timest='';
+        if ($h == 0) {
+            $timest .= "12 am";
+        } elsif($h == 12) {
+            $timest .= "12 noon";
+        } elsif($h < 12) {
+            $timest .= "$h am";
+        } else {
+            $timest .= $h-12 ." pm";
+        }
+        $timest=&mt($timest);
+        $hourselector .= $timest." </option>\n";
+    }
+    $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()">};
+    #
+    if ($no_hh_mm_ss) {
+        $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]',
+                       $monthselector,$dayselector,$yearselector,
+                       $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 .= "<a href=\"javascript:$dname\_opencalendar()\">".
-    &mt('Select Date')."</a></nobr>\n<!-- end $dname date setting form -->\n";
+    $result .= "</nobr>\n<!-- end $dname date setting form -->\n";
     return $result;
 }
 
@@ -412,8 +436,8 @@ sub get_date_from_form {
     my ($dname) = @_;
     my ($sec,$min,$hour,$day,$month,$year);
     #
-    if (defined($ENV{'form.'.$dname.'_second'})) {
-        my $tmpsec = $ENV{'form.'.$dname.'_second'};
+    if (defined($env{'form.'.$dname.'_second'})) {
+        my $tmpsec = $env{'form.'.$dname.'_second'};
         if (($tmpsec =~ /^\d+$/) && ($tmpsec >= 0) && ($tmpsec < 60)) {
             $sec = $tmpsec;
         }
@@ -421,8 +445,8 @@ sub get_date_from_form {
     } else {
         $sec = 0;
     }
-    if (defined($ENV{'form.'.$dname.'_minute'})) {
-        my $tmpmin = $ENV{'form.'.$dname.'_minute'};
+    if (defined($env{'form.'.$dname.'_minute'})) {
+        my $tmpmin = $env{'form.'.$dname.'_minute'};
         if (($tmpmin =~ /^\d+$/) && ($tmpmin >= 0) && ($tmpmin < 60)) {
             $min = $tmpmin;
         }
@@ -430,28 +454,28 @@ sub get_date_from_form {
     } else {
         $min = 0;
     }
-    if (defined($ENV{'form.'.$dname.'_hour'})) {
-        my $tmphour = $ENV{'form.'.$dname.'_hour'};
+    if (defined($env{'form.'.$dname.'_hour'})) {
+        my $tmphour = $env{'form.'.$dname.'_hour'};
         if (($tmphour =~ /^\d+$/) && ($tmphour >= 0) && ($tmphour < 24)) {
             $hour = $tmphour;
         }
     } else {
         $hour = 0;
     }
-    if (defined($ENV{'form.'.$dname.'_day'})) {
-        my $tmpday = $ENV{'form.'.$dname.'_day'};
+    if (defined($env{'form.'.$dname.'_day'})) {
+        my $tmpday = $env{'form.'.$dname.'_day'};
         if (($tmpday =~ /^\d+$/) && ($tmpday > 0) && ($tmpday < 32)) {
             $day = $tmpday;
         }
     }
-    if (defined($ENV{'form.'.$dname.'_month'})) {
-        my $tmpmonth = $ENV{'form.'.$dname.'_month'};
+    if (defined($env{'form.'.$dname.'_month'})) {
+        my $tmpmonth = $env{'form.'.$dname.'_month'};
         if (($tmpmonth =~ /^\d+$/) && ($tmpmonth > 0) && ($tmpmonth < 13)) {
             $month = $tmpmonth - 1;
         }
     }
-    if (defined($ENV{'form.'.$dname.'_year'})) {
-        my $tmpyear = $ENV{'form.'.$dname.'_year'};
+    if (defined($env{'form.'.$dname.'_year'})) {
+        my $tmpyear = $env{'form.'.$dname.'_year'};
         if (($tmpyear =~ /^\d+$/) && ($tmpyear > 1900)) {
             $year = $tmpyear - 1900;
         }
@@ -513,8 +537,8 @@ sub javascript_nothing {
     my $nothing = "''";
     my $user_browser;
     my $user_os;
-    $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
-    $user_os      = $ENV{'browser.os'}   if (exists($ENV{'browser.os'}));
+    $user_browser = $env{'browser.type'} if (exists($env{'browser.type'}));
+    $user_os      = $env{'browser.os'}   if (exists($env{'browser.os'}));
     if (! defined($user_browser) || ! defined($user_os)) {
         (undef,$user_browser,undef,undef,undef,$user_os) = 
                            &Apache::loncommon::decode_user_agent();
@@ -525,6 +549,27 @@ sub javascript_nothing {
     return $nothing;
 }
 
+##############################################
+##############################################
+sub javascript_docopen {
+    # safari does not understand document.open() and loads "text/html"
+    my $nothing = "''";
+    my $user_browser;
+    my $user_os;
+    $user_browser = $env{'browser.type'} if (exists($env{'browser.type'}));
+    $user_os      = $env{'browser.os'}   if (exists($env{'browser.os'}));
+    if (! defined($user_browser) || ! defined($user_os)) {
+        (undef,$user_browser,undef,undef,undef,$user_os) = 
+                           &Apache::loncommon::decode_user_agent();
+    }
+    if ($user_browser eq 'safari' && $user_os =~ 'mac') {
+        $nothing = "document.clear()";
+    } else {
+	$nothing = "document.open('text/html','replace')";
+    }
+    return $nothing;
+}
+
 
 ##############################################
 ##############################################
@@ -539,7 +584,7 @@ enrollment status of students.  The sele
 Inputs:
 
 $status: the currently selected status.  If undefined the value of
-$ENV{'form.Status'} is taken.  If that is undefined, a value of 'Active'
+$env{'form.Status'} is taken.  If that is undefined, a value of 'Active'
 is used.
 
 $formname: The name of the form.  If defined the onchange attribute of
@@ -561,7 +606,7 @@ sub StatusOptions {
     $size = 1 if (!defined($size));
     if (! defined($status)) {
         $status = 'Active';
-        $status = $ENV{'form.Status'} if (exists($ENV{'form.Status'}));
+        $status = $env{'form.Status'} if (exists($env{'form.Status'}));
     }
 
     my $OpSel1 = '';
@@ -715,13 +760,14 @@ sub Create_PrgWin {
     $prog_state{'type'}=$type;
     if ($type eq 'popup') {
 	$prog_state{'window'}='popwin';
+	my $html=&Apache::lonxml::xmlbegin();
 	#the whole function called through timeout is due to issues
 	#in mozilla Read BUG #2665 if you want to know the whole story
 	&r_print($r,'<script>'.
         "var popwin;
          function openpopwin () {
          popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
-        "popwin.document.writeln(\'<html><head><title>$title</title></head>".
+        "popwin.document.writeln(\'".$html."<head><title>$title</title></head>".
 	      "<body bgcolor=\"#88DDFF\">".
               "<h4>$heading</h4>".
               "<form name=popremain>".
@@ -783,8 +829,10 @@ sub Increment_PrgWin {
     my $sec = $time_est % 60;
     # 
     my $str;
-    if ($min == 1 && $sec > 1) {
+    if ($min == 0 && $sec > 1) {
         $str = '[_2] seconds';
+    } elsif ($min == 1 && $sec > 1) {
+        $str = '1 minute [_2] seconds';
     } elsif ($min == 1 && $sec < 2) {
         $str = '1 minute';
     } elsif ($min < 10 && $sec > 1) {
@@ -808,8 +856,8 @@ sub Increment_PrgWin {
         $lasttime = '('.$lasttime.' '.&mt('seconds for').' '.$extraInfo.')';
     }
     #
-    my $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
-    my $user_os      = $ENV{'browser.os'}   if (exists($ENV{'browser.os'}));
+    my $user_browser = $env{'browser.type'} if (exists($env{'browser.type'}));
+    my $user_os      = $env{'browser.os'}   if (exists($env{'browser.os'}));
     if (! defined($user_browser) || ! defined($user_os)) {
         (undef,$user_browser,undef,undef,undef,$user_os) = 
                            &Apache::loncommon::decode_user_agent();
@@ -853,20 +901,25 @@ sub crumbs {
     if (! defined($size)) {
         $size = '+2';
     }
+    if ($target) {
+        $target = ' target="'.
+                  &Apache::loncommon::escape_single($target).'"';
+    }
     my $output='';
     unless ($noformat) { $output.='<br /><tt><b>'; }
     $output.='<font size="'.$size.'">'.$prefix.'/';
-    if ($ENV{'user.adv'}) {
+    if ($env{'user.adv'}) {
 	my $path=$prefix.'/';
-	foreach (split('/',$uri)) {
-	    unless ($_) { next; }
-	    $path.=$_;
+	foreach my $dir (split('/',$uri)) {
+            if (! $dir) { next; }
+            $path .= $dir;
 	    unless ($path eq $uri) { $path.='/'; }
-	    my $linkpath=$path;
-	    if ($form) {
-		$linkpath="javascript:$form.action='$path';$form.submit();";
-	    }
-	    $output.='<a href="'.$linkpath.'"'.($target?' target="'.$target.'"':'').'>'.$_.'</a>/';
+            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>/};
 	}
     } else {
 	$output.=$uri;
@@ -878,18 +931,19 @@ sub crumbs {
 # --------------------- A function that generates a window for the spellchecker
 
 sub spellheader {
-    my $nothing = &javascript_nothing();
+    my $html=&Apache::lonxml::xmlbegin();
+    my $nothing=&javascript_nothing();
     return (<<ENDCHECK);
 <script type="text/javascript"> 
-// BEGIN LON-CAPA Internal
+//<!-- BEGIN LON-CAPA Internal
 var checkwin;
 
 function spellcheckerwindow() {
     checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
-    checkwin.document.writeln('<html><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
+    checkwin.document.writeln('$html<head></head><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
     checkwin.document.close();
 }
-// END LON-CAPA Internal
+// END LON-CAPA Internal -->
 </script>
 ENDCHECK
 }
@@ -900,7 +954,7 @@ sub spelllink {
     my ($form,$field)=@_;
     my $linktext=&mt('Check Spelling');
     return (<<ENDLINK);
-<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { 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();checkwin.document.forms.spellcheckform.text.value=this.document.forms.$form.$field.value;checkwin.document.forms.spellcheckform.submit();">$linktext</a>
 ENDLINK
 }
 
@@ -953,7 +1007,7 @@ sub disablelink {
     if (defined($#fields)) {
 	unless ($#fields>=0) { return ''; }
     }
-    return '<a href="/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=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
 }
 
 sub enablelink {
@@ -961,7 +1015,7 @@ sub enablelink {
     if (defined($#fields)) {
 	unless ($#fields>=0) { return ''; }
     }
-    return '<a href="/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=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
 }
 
 # ----------------------------------------- Script to activate only some fields
@@ -983,7 +1037,7 @@ sub htmlareaselectactive {
 # --------------------------------------------------------------------- Blocked
 
 sub htmlareablocked {
-    unless ($ENV{'environment.wysiwygeditor'} eq 'on') { return 1; }
+    unless ($env{'environment.wysiwygeditor'} eq 'on') { return 1; }
     return 0;
 }
 
@@ -1065,10 +1119,10 @@ returns: nothing
 	if (!defined($menulink)) { $menulink=1; }
         if ($menulink) {
             my $description = 'Menu';
-            if (exists($ENV{'request.course.id'}) && 
-                $ENV{'request.course.id'} ne '') {
+            if (exists($env{'request.course.id'}) && 
+                $env{'request.course.id'} ne '') {
                 $description = 
-                    $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+                    $env{'course.'.$env{'request.course.id'}.'.description'};
             }
             unshift(@Crumbs,{
                     href   =>'/adm/menu',