--- loncom/interface/lonhtmlcommon.pm	2005/02/17 08:29:42	1.103
+++ loncom/interface/lonhtmlcommon.pm	2005/06/18 17:23:25	1.109
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.103 2005/02/17 08:29:42 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.109 2005/06/18 17:23:25 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;
 
 ##############################################
 ##############################################
@@ -257,7 +258,8 @@ The method used to restrict user input w
 ##############################################
 sub date_setter {
     my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
-        $no_hh_mm_ss) = @_;
+        $no_hh_mm_ss,$defhour,$defmin,$defsec) = @_;
+    my $wasdefined=1;
     if (! defined($state) || $state ne 'disabled') {
         $state = '';
     }
@@ -267,6 +269,7 @@ sub date_setter {
     if (! defined($currentvalue) || $currentvalue eq 'now') {
 	unless ($includeempty) {
 	    $currentvalue = time;
+	    $wasdefined=0;
 	} else {
 	    $currentvalue = 0;
 	}
@@ -278,6 +281,11 @@ sub date_setter {
 	    localtime($currentvalue);
 	$year += 1900;
     }
+    unless ($wasdefined) {
+	$sec=($defsec?$defsec:0);
+	$min=($defmin?$defmin:0);
+        $hour=($defhour?$defhour:0);
+    }
     my $result = "\n<!-- $dname date setting form -->\n";
     $result .= <<ENDJS;
 <script language="Javascript">
@@ -435,8 +443,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;
         }
@@ -444,8 +452,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;
         }
@@ -453,28 +461,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;
         }
@@ -505,11 +513,13 @@ parameter setting wizard.
 ##############################################
 sub pjump_javascript_definition {
     my $Str = <<END;
-    function pjump(type,dis,value,marker,ret,call) {
+    function pjump(type,dis,value,marker,ret,call,hour,min,sec) {
         parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
                  +"&value="+escape(value)+"&marker="+escape(marker)
                  +"&return="+escape(ret)
-                 +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms",
+                 +"&call="+escape(call)+"&name="+escape(dis)
+                 +"&defhour="+escape(hour)+"&defmin="+escape(min)
+                 +"&defsec="+escape(sec),"LONCAPAparms",
                  "height=350,width=350,scrollbars=no,menubar=no");
     }
 END
@@ -536,8 +546,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();
@@ -555,8 +565,8 @@ sub javascript_docopen {
     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();
@@ -583,7 +593,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
@@ -605,7 +615,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 = '';
@@ -855,8 +865,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();
@@ -907,7 +917,7 @@ sub crumbs {
     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 my $dir (split('/',$uri)) {
             if (! $dir) { next; }
@@ -931,13 +941,14 @@ sub crumbs {
 
 sub spellheader {
     my $html=&Apache::lonxml::xmlbegin();
+    my $nothing=&javascript_nothing();
     return (<<ENDCHECK);
 <script type="text/javascript"> 
 //<!-- BEGIN LON-CAPA Internal
 var checkwin;
 
 function spellcheckerwindow() {
-    checkwin=window.open('/adm/rat/empty.html','spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+    checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
     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();
 }
@@ -952,7 +963,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
 }
 
@@ -1035,7 +1046,7 @@ sub htmlareaselectactive {
 # --------------------------------------------------------------------- Blocked
 
 sub htmlareablocked {
-    unless ($ENV{'environment.wysiwygeditor'} eq 'on') { return 1; }
+    unless ($env{'environment.wysiwygeditor'} eq 'on') { return 1; }
     return 0;
 }
 
@@ -1110,6 +1121,7 @@ returns: nothing
         # Make the faq and bug data cascade
         my $faq = '';
         my $bug = '';
+	my $help='';
         # The last breadcrumb does not have a link, so handle it separately.
         my $last = pop(@Crumbs);
         #
@@ -1117,10 +1129,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',
@@ -1134,6 +1146,7 @@ returns: nothing
                  map {
                      $faq = $_->{'faq'} if (exists($_->{'faq'}));
                      $bug = $_->{'bug'} if (exists($_->{'bug'}));
+                     $help = $_->{'help'} if (exists($_->{'help'}));
                      my $result = '<a href="'.$_->{'href'}.'" ';
                      if (defined($_->{'target'}) && $_->{'target'} ne '') {
                          $result .= 'target="'.$_->{'target'}.'" ';
@@ -1149,6 +1162,8 @@ returns: nothing
         my $icons = '';
         $faq = $last->{'faq'} if (exists($last->{'faq'}));
         $bug = $last->{'bug'} if (exists($last->{'bug'}));
+        $help = $last->{'help'} if (exists($last->{'help'}));
+        $component_help=($component_help?$component_help:$help);
 #        if ($faq ne '') {
 #            $icons .= &Apache::loncommon::help_open_faq($faq);
 #        }