--- loncom/interface/lonpickcourse.pm	2005/02/17 08:29:43	1.26
+++ loncom/interface/lonpickcourse.pm	2005/04/07 06:56:23	1.27
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.26 2005/02/17 08:29:43 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.27 2005/04/07 06:56:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,25 +56,25 @@ ENDDOCUMENT
 			       'cdomelement','cnameelement','roleelement',
                                'pickedcourse','instcodefilter','ownerfilter']);
 # domain filter and selection
-    my $domainfilter=$ENV{'form.domainfilter'};
+    my $domainfilter=$env{'form.domainfilter'};
     $domainfilter=~s/\W//g;
     unless ($domainfilter) { $domainfilter=''; }
     my $domainselectform=&Apache::loncommon::select_dom_form($domainfilter,
                                                           'domainfilter',1);
 # description filter
-    my $descriptfilter=$ENV{'form.descriptfilter'};
+    my $descriptfilter=$env{'form.descriptfilter'};
     unless ($descriptfilter) { $descriptfilter=''; }
     my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"');
 # institutional code filter
-    my $instcodefilter=$ENV{'form.instcodefilter'};
+    my $instcodefilter=$env{'form.instcodefilter'};
     unless ($instcodefilter) { $instcodefilter=''; }
     my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"');
 # course owner filter
-    my $ownerfilter=$ENV{'form.ownerfilter'};
+    my $ownerfilter=$env{'form.ownerfilter'};
     unless ($ownerfilter) { $ownerfilter=''; }
     my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"');
 # last course activity filter and selection
-    my $sincefilter=$ENV{'form.sincefilter'};
+    my $sincefilter=$env{'form.sincefilter'};
     $sincefilter=~s/[^\d-]//g;
     unless ($sincefilter) { $sincefilter=-1; }
     my $sincefilterform=&Apache::loncommon::select_form($sincefilter,
@@ -91,9 +91,9 @@ ENDDOCUMENT
 # if called from loncreateuser, report sections, then close
     my ($loaditem,$seclist);
     my $num_sections = 0;
-    if ($ENV{'form.form'} eq 'cu' && $ENV{'form.pickedcourse'}) {
+    if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) {
         $loaditem = 'onLoad="setSections()"';
-        my ($cdom,$cnum) = split/_/,$ENV{'form.pickedcourse'};
+        my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'};
         my %sections_count = ();
         $num_sections = &Apache::loncommon::get_sections($cdom,$cnum,\%sections_count);
         my @sections = ();
@@ -110,20 +110,20 @@ ENDDOCUMENT
                                        'cin' => 'Course Institutional Code',
                                        'cow' => "Course Owner's usename");
     my ($name_code,$name_input);
-    if (defined($ENV{'form.cnameelement'}) && $ENV{'form.cnameelement'} ne '') {
-	$name_code = "opener.document.$ENV{'form.form'}.$ENV{'form.cnameelement'}.value=cdesc;";
+    if (defined($env{'form.cnameelement'}) && $env{'form.cnameelement'} ne '') {
+	$name_code = "opener.document.$env{'form.form'}.$env{'form.cnameelement'}.value=cdesc;";
 	$name_input ='<input type="hidden" name="cnameelement" value="'.
-	    $ENV{'form.cnameelement'}.'" />';
+	    $env{'form.cnameelement'}.'" />';
     }
     my $submitopener = '';
     my $autosubmit = '';
     my $roleelement = '';
     my $lastaction = 'self.close()';
-    if ($ENV{'form.form'} eq 'cu') {
+    if ($env{'form.form'} eq 'cu') {
         $lastaction = 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n".
                       'document.courselist.submit();';
     }
-    my $roledom = $ENV{'form.roleelement'};
+    my $roledom = $env{'form.roleelement'};
     if ($roledom) {
         $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
         $submitopener = &Apache::lonroles::processpick($roledom);
@@ -133,13 +133,13 @@ ENDDOCUMENT
 <script>
 function gochoose(cname,cdom,cdesc) {
     $name_code
-    var openerForm = "$ENV{'form.form'}";
-    opener.document.$ENV{'form.form'}.$ENV{'form.cnumelement'}.value=cname;
+    var openerForm = "$env{'form.form'}";
+    opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname;
     if (openerForm == 'cu' || openerForm == 'rolechoice') {
-         opener.document.$ENV{'form.form'}.$ENV{'form.cdomelement'}.value=cdom;
+         opener.document.$env{'form.form'}.$env{'form.cdomelement'}.value=cdom;
     }
     else {
-        var slct=opener.document.$ENV{'form.form'}.$ENV{'form.cdomelement'};
+        var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'};
         var i;
         for (i=0;i<slct.length;i++) {
             if (slct.options[i].value==cdom) { slct.selectedIndex=i; }
@@ -152,32 +152,32 @@ function gochoose(cname,cdom,cdesc) {
 function setSections() {
     var numSections = $num_sections
     var sectionsArray = new Array("$seclist")
-    opener.document.$ENV{"form.form"}.currsec.length = 0
+    opener.document.$env{"form.form"}.currsec.length = 0
     if (numSections == 0) {
-        opener.document.$ENV{"form.form"}.currsec.multiple=false
-        opener.document.$ENV{"form.form"}.currsec.size=1;
-        opener.document.$ENV{"form.form"}.currsec.options[0] = new Option('No existing sections','',false,false)
+        opener.document.$env{"form.form"}.currsec.multiple=false
+        opener.document.$env{"form.form"}.currsec.size=1;
+        opener.document.$env{"form.form"}.currsec.options[0] = new Option('No existing sections','',false,false)
     }
     else {
         if (numSections == 1) {
-            opener.document.$ENV{"form.form"}.currsec.multiple=false;
-            opener.document.$ENV{"form.form"}.currsec.size=1;
-            opener.document.$ENV{"form.form"}.currsec.options[0] = new Option('Select','',true,true);
-            opener.document.$ENV{"form.form"}.currsec.options[1] = new Option('No section','',false,false) 
-            opener.document.$ENV{"form.form"}.currsec.options[2] = new Option(sectionsArray[0],sectionsArray[0],false,false);
+            opener.document.$env{"form.form"}.currsec.multiple=false;
+            opener.document.$env{"form.form"}.currsec.size=1;
+            opener.document.$env{"form.form"}.currsec.options[0] = new Option('Select','',true,true);
+            opener.document.$env{"form.form"}.currsec.options[1] = new Option('No section','',false,false) 
+            opener.document.$env{"form.form"}.currsec.options[2] = new Option(sectionsArray[0],sectionsArray[0],false,false);
         }
         else {
             for (var i=0; i<numSections; i++) {
-                opener.document.$ENV{"form.form"}.currsec.options[i] = new Option(sectionsArray[i],sectionsArray[i],false,false)
+                opener.document.$env{"form.form"}.currsec.options[i] = new Option(sectionsArray[i],sectionsArray[i],false,false)
             }
-            opener.document.$ENV{"form.form"}.currsec.multiple=true
+            opener.document.$env{"form.form"}.currsec.multiple=true
             if (numSections < 3) {
-                opener.document.$ENV{"form.form"}.currsec.size=numSections;
+                opener.document.$env{"form.form"}.currsec.size=numSections;
             }
             else {
-                opener.document.$ENV{"form.form"}.currsec.size=3;
+                opener.document.$env{"form.form"}.currsec.size=3;
             }
-            opener.document.$ENV{"form.form"}.currsec.options[0].selected = false
+            opener.document.$env{"form.form"}.currsec.options[0].selected = false
         }
     }
     self.close()
@@ -185,10 +185,10 @@ function setSections() {
 </script>
 $submitopener
 <form method="post">
-<input type="hidden" name="cnumelement" value="$ENV{'form.cnumelement'}" />
-<input type="hidden" name="cdomelement" value="$ENV{'form.cdomelement'}" />
+<input type="hidden" name="cnumelement" value="$env{'form.cnumelement'}" />
+<input type="hidden" name="cdomelement" value="$env{'form.cdomelement'}" />
 $name_input
-<input type="hidden" name="form" value="$ENV{'form.form'}" />
+<input type="hidden" name="form" value="$env{'form.form'}" />
 $roleelement
 $lt{'cac'}: $sincefilterform
 <br />
@@ -207,7 +207,7 @@ $lt{'cde'}:
 <hr />
 ENDSCRIPT
 # ---------------------------------------------------------------- Get the data
-    if ($ENV{'form.gosearch'}) {
+    if ($env{'form.gosearch'}) {
         $r->print(&mt('Searching').' ...<br />&nbsp;<br />');
         $r->rflush();
 	unless ($descriptfilter) { $descriptfilter='.'; }
@@ -249,10 +249,10 @@ ENDSCRIPT
             }
 	}
 	if (!%courses) { $r->print(&mt('None found')); }
-        $r->print('<input type="hidden" name="form" value="'.$ENV{'form.form'}.'" />'."\n".
+        $r->print('<input type="hidden" name="form" value="'.$env{'form.form'}.'" />'."\n".
                    '<input type="hidden" name="pickedcourse" value="" />'."\n".
-                   '<input type="hidden" name="cnumelement" value="'.$ENV{'form.cnumelement'}.'" />'."\n".
-                   '<input type="hidden" name="cdomelement" value="'.$ENV{'form.cdomelement'}.'" />'."\n".
+                   '<input type="hidden" name="cnumelement" value="'.$env{'form.cnumelement'}.'" />'."\n".
+                   '<input type="hidden" name="cdomelement" value="'.$env{'form.cdomelement'}.'" />'."\n".
                    '</form>');
     }
     $r->print('</body></html>');