--- loncom/interface/courseprefs.pm	2016/10/24 18:10:08	1.49.2.21
+++ loncom/interface/courseprefs.pm	2022/01/16 18:27:09	1.49.2.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.49.2.21 2016/10/24 18:10:08 raeburn Exp $
+# $Id: courseprefs.pm,v 1.49.2.29 2022/01/16 18:27:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -375,7 +375,7 @@ sub handler {
                      help => 'Course_Prefs_General',
                      ordered => ['owner','co-owners','loncaparev','description',
                                  'clonedfrom','courseid','uniquecode','categories',
-                                 'hidefromcat','externalsyllabus','cloners','url',
+                                 'hidefromcat','syllabus','cloners','url',
                                  'rolenames'],
                      itemtext => {
                                    'owner'            => $lt{'ownr'},
@@ -386,7 +386,7 @@ sub handler {
                                    'categories'       => $lt{'catg'},
                                    'hidefromcat'      => $lt{'excc'},
                                    'cloners'          => $lt{'clon'}, 
-                                   'externalsyllabus' => 'Syllabus status',
+                                   'syllabus'         => 'Syllabus status',
                                    'url'              => 'Top Level Map',
                                    'rolenames'        => $lt{'rept'},
                                    'loncaparev'       => $lt{'lcrv'},
@@ -464,7 +464,7 @@ sub handler {
                      help => 'Course_Prefs_Display',
                      ordered => ['default_xml_style','pageseparators',
                                  'disable_receipt_display','texengine',
-                                 'tthoptions','uselcmath','usejsme'],
+                                 'tthoptions','uselcmath','usejsme','inline_chem'],
                       itemtext => {
                           default_xml_style       => 'Default XML style file',
                           pageseparators          => 'Visibly Separate Items on Pages',
@@ -473,6 +473,7 @@ sub handler {
                           tthoptions              => 'Default set of options to pass to tth/m when converting TeX',
                           uselcmath               => 'Student formula entry uses inline preview, not DragMath pop-up',
                           usejsme                 => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
+                          inline_chem             => 'Chemical reaction response uses inline preview, not pop-up',
                                   },
                   },
         'grading' =>
@@ -763,7 +764,8 @@ sub process_changes {
                                  (!$can_categorize));
                         next if (($entry eq 'loncaparev') || 
                                 ($entry eq 'owner') ||
-                                ($entry eq 'clonedfrom'));
+                                ($entry eq 'clonedfrom') ||
+                                ($entry eq 'syllabus'));
                         push(@ordered,$entry);
                     }
                 } elsif ($action eq 'classlists') {
@@ -942,7 +944,9 @@ sub process_changes {
                                         $autocoowner = $domconf{'autoenroll'}{'co-owners'};
                                     }
                                 }
-                                unless ($autocoowner) {
+                                if ($autocoowner) {
+                                    $newvalues{'co-owners'} = $values->{'internal.co-owners'}; 
+                                } else {
                                     my @keepcoowners = &Apache::loncommon::get_env_multiple('form.coowners');
                                     my @pendingcoowners = &Apache::loncommon::get_env_multiple('form.pendingcoowners');
                                     my @invitecoowners =  &Apache::loncommon::get_env_multiple('form.invitecoowners');
@@ -966,19 +970,19 @@ sub process_changes {
                                 my $udom = $env{'user.domain'};
                                 my $pendingcoowners = $values->{'internal.pendingco-owners'};
                                 my @pendingcoown = split(',',$pendingcoowners);
-                                if ($env{'form.pending_coowoner'}) {
+                                if ($env{'form.pending_coowner'}) {
                                     foreach my $item (@pendingcoown) {
                                         unless ($item eq $uname.':'.$udom) {
                                             push(@newpending,$item);
                                         }
                                     }
                                     @newcoown = @currcoown;
-                                    if ($env{'form.pending_coowoner'} eq 'accept') {
+                                    if ($env{'form.pending_coowner'} eq 'accept') {
                                         unless (grep(/^\Q$uname\E:\Q$udom\E$/,@currcoown)) {
                                             push(@newcoown,$uname.':'.$udom);
                                         }
                                     }
-                                } elsif ($env{'form.remove_coowoner'}) {
+                                } elsif ($env{'form.remove_coowner'}) {
                                     foreach my $item (@currcoown) {
                                         unless ($item eq $uname.':'.$udom) {
                                             push(@newcoown,$item);
@@ -987,6 +991,8 @@ sub process_changes {
                                     if ($pendingcoowners ne '') {
                                         @newpending = @pendingcoown;
                                     }
+                                } else {
+                                    @newcoown = @currcoown;
                                 }
                                 $newvalues{'pendingco-owners'} = join(',',sort(@newpending));
                                 $newvalues{'co-owners'} = join(',',sort(@newcoown));
@@ -1474,7 +1480,8 @@ sub store_changes {
                                         $displayval = &Apache::lonlocal::locallocaltime($displayval);
                                     } elsif ($key eq 'categories') {
                                         $displayval = $env{'form.categories_display'};
-                                    } elsif (($key eq 'canuse_pdfforms') || ($key eq 'usejsme') || ($key eq 'uselcmath')) {
+                                    } elsif (($key eq 'canuse_pdfforms') || ($key eq 'usejsme') ||
+                                             ($key eq 'uselcmath') || ($key eq 'inline_chem')) {
                                         if ($changes->{$item}{$key} eq '1') {
                                             $displayval = &mt('Yes');
                                         } elsif ($changes->{$item}{$key} eq '0') {
@@ -1506,12 +1513,12 @@ sub store_changes {
                                                 }
                                             }
                                             unless (&Apache::lonnet::is_course_owner($cdom,$cnum)) {
-                                                if ($env{'form.pending_coowoner'} eq 'accept') {
+                                                if ($env{'form.pending_coowner'} eq 'accept') {
                                                         $displayval = &mt('on');
-                                                } elsif ($env{'form.pending_coowoner'} eq 'decline') {
+                                                } elsif ($env{'form.pending_coowner'} eq 'decline') {
                                                         $displayval = '';
                                                         $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Invitation to be co-owner declined')).'</li>';
-                                                } elsif ($env{'form.remove_coowoner'}) {
+                                                } elsif ($env{'form.remove_coowner'}) {
                                                     $displayval = &mt('off');
                                                 }
                                                 if ($displayval) {
@@ -1973,7 +1980,10 @@ sub print_courseinfo {
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
-    my ($cathash,$categoriesform,$autocoowner,$clonedefaults);
+    my ($cathash,$categoriesform,$autocoowner,$clonedefaults,$disabled);
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
     my %domconf = 
         &Apache::lonnet::get_dom('configuration',
                                  ['coursecategories','autoenroll','coursedefaults'],$cdom);
@@ -1982,7 +1992,7 @@ sub print_courseinfo {
         if (ref($cathash) eq 'HASH') {
             $categoriesform = 
                 &Apache::loncommon::assign_categories_table($cathash,
-                                                $settings->{'categories'},$crstype)."\n";
+                                                $settings->{'categories'},$crstype,$disabled)."\n";
         }
     }
     if (ref($domconf{'autoenroll'}) eq 'HASH') {
@@ -2049,14 +2059,20 @@ sub print_courseinfo {
     } else {
         $replace = &mt('To replace the standard title for a course role, enter a title, otherwise leave blank');
     }
+    my ($editmap,$editsyllabus);
+    unless ($noedit) {
+        $editmap = ('&nbsp;'x2).
+                   '<a href="javascript:openbrowser'.
+                   "('display','url','sequence')\">".
+                   &mt('Select Map').'</a><br /><span class="LC_warning"> '.
+                   &mt('Modification may make assessment data inaccessible!').
+                   '</span>';
+        $editsyllabus = &mt('[_1]Edit[_2]','<a href="/public/'.$cdom.'/'.$cnum.'/syllabus?forceedit=1">',
+                            '</a>');
+    }
     my %items = (
         'url' => {
-                   text => '<b>'.&mt($itemtext->{'url'}).'</b>'.('&nbsp;'x2).
-                           '<a href="javascript:openbrowser'.
-                           "('display','url','sequence')\">".
-                           &mt('Select Map').'</a><br /><span class="LC_warning"> '.
-                           &mt('Modification may make assessment data inaccessible!').
-                           '</span>',
+                   text => '<b>'.&mt($itemtext->{'url'}).'</b>'.$editmap,
                    input => 'textbox',
                    size  => '55',
                    advanced => 1
@@ -2098,11 +2114,10 @@ sub print_courseinfo {
                    size  => '20',
                    advanced => 1
                         },
-        'externalsyllabus' => {
-                   text => '<b>'.&mt($itemtext->{'externalsyllabus'}).'</b><br />'.
+        'syllabus' => {
+                   text => '<b>'.&mt($itemtext->{'syllabus'}).'</b><br />'.
                            &mt('(Syllabus type in use)').('&nbsp;' x2).
-                           &mt('[_1]Edit[_2]','<a href="/public/'.$cdom.'/'.$cnum.'/syllabus?forceedit=1">',
-                               '</a>'),
+                           $editsyllabus,
                         },
         'hidefromcat' => {
                    text => '<b>'.&mt($itemtext->{'hidefromcat'}).'</b><br />'.
@@ -2124,10 +2139,6 @@ sub print_courseinfo {
     );
     my $datatable;
     my $count = 0;
-    my $disabled;
-    if ($noedit) {
-        $disabled = ' disabled="disabled"';
-    }
     foreach my $item (@{$ordered}) {
         my $colspan;
         if ($item eq 'hidefromcat') {
@@ -2349,7 +2360,7 @@ sub print_courseinfo {
                     $datatable .= &manage_coownership($cnum,$cdom,\@currcoown,$noedit);
                 }
             }
-        } elsif ($item eq 'externalsyllabus') {
+        } elsif ($item eq 'syllabus') {
             my $external = $env{'course.'.$env{'request.course.id'}.'.externalsyllabus'};
             my $uploaded = $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'};
             my $minimal =  $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'};
@@ -3166,7 +3177,7 @@ sub coowner_invitations {
         @pendingcoown = split(',',$pendingcoowners);
     }
     if (ref($currcoownref) eq 'ARRAY') {
-        @currcoown == @{$currcoownref};
+        @currcoown = @{$currcoownref};
     }
     my $disabled;
     if ($noedit) {
@@ -3230,7 +3241,7 @@ sub manage_coownership  {
         @pendingcoown = split(',',$pendingcoowners);
     }
     if (ref($currcoownref) eq 'ARRAY') {
-        @currcoown == @{$currcoownref};
+        @currcoown = @{$currcoownref};
     }
     my $disabled;
     if ($noedit) {
@@ -3265,10 +3276,10 @@ sub manage_coownership  {
         }
         $output .= '<span class="LC_nobreak">';
         if ($is_coowner) {
-            $output .= &mt('You are currently a co-owner:').'&nbsp;<label><input type="checkbox" name="remove_coowoner" value="'.$uname.':'.$udom.'" />'.&mt('Discontinue?').'</label>';
+            $output .= &mt('You are currently a co-owner:').'&nbsp;<label><input type="checkbox" name="remove_coowner" value="'.$uname.':'.$udom.'" />'.&mt('Discontinue?').'</label>';
         } else {
-            $output .= &mt('The course owner has invited you to become a co-owner:').'&nbsp;<label><input type="radio" name="pending_coowoner" value="accept"'.$disabled.' />'.&mt('Accept?').'</label>'.('&nbsp;'x2).
-                       '<label><input type="radio" name=pending_coowoner" value="decline"'.$disabled.' />'.&mt('Decline?').'</label>';
+            $output .= &mt('The course owner has invited you to become a co-owner:').'&nbsp;<label><input type="radio" name="pending_coowner" value="accept"'.$disabled.' />'.&mt('Accept?').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" name=pending_coowner" value="decline"'.$disabled.' />'.&mt('Decline?').'</label>';
         }
         $output .= '</span>';
         if (@currcoown) {
@@ -3526,7 +3537,7 @@ sub select_recipient {
     my $domform = &Apache::loncommon::select_dom_form($cdom,$item.'_udom_'.$num,$includeempty);
     my $selectlink =
         &Apache::loncommon::selectstudent_link('display',$item.'_uname_'.$num,
-                                               $item.'_udom_'.$num,1);
+                                               $item.'_udom_'.$num,'only');
     my $output = 
         '<table><tr><td align="center">'.&mt('Username').'<br />'.
         '<input type="text" name="'.$item.'_uname_'.$num.'" value="" /></td>'.
@@ -4011,6 +4022,10 @@ sub print_appearance {
                    text => '<b>'.&mt($itemtext->{'usejsme'}).'</b>',
                    input => 'radio',
                  },
+         'inline_chem' => {
+                   text => '<b>'.&mt($itemtext->{'inline_chem'}).'</b>',
+                   input => 'radio',
+                 },
     );
     return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance',$noedit);
 }
@@ -4223,7 +4238,7 @@ sub print_other {
                             input => 'textbox',
                             size  => '30',
                            };
-    my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other',$noedit);
+    return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other',$noedit);
 }
 
 sub get_other_items {
@@ -4393,7 +4408,7 @@ sub make_item_rows {
                                                        $settings->{$item},$disabled);
             } elsif ($items->{$item}{input} eq 'radio') {
                 my ($unsetdefault,$valueyes,$valueno);
-                if (($item eq 'usejsme') || ($item eq 'uselcmath')) {
+                if (($item eq 'usejsme') || ($item eq 'uselcmath') || ($item eq 'inline_chem')) {
                      my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
                      unless ($domdefs{$item} eq '0') {
                          $unsetdefault = 1;