--- loncom/interface/domainprefs.pm	2021/10/07 15:51:15	1.388
+++ loncom/interface/domainprefs.pm	2021/11/22 22:19:58	1.390
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.388 2021/10/07 15:51:15 raeburn Exp $
+# $Id: domainprefs.pm,v 1.390 2021/11/22 22:19:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3177,14 +3177,16 @@ sub lti_javascript {
         return $togglejs;
     }
     my (%ordered,$total,%jstext);
-    $total = 0;
+    $total = scalar(keys(%{$settings}));
     foreach my $item (keys(%{$settings})) {
         if (ref($settings->{$item}) eq 'HASH') {
             my $num = $settings->{$item}{'order'};
+            if ($num eq '') {
+                $num = $total - 1;
+            }
             $ordered{$num} = $item;
         }
     }
-    $total = scalar(keys(%{$settings}));
     my @jsarray = ();
     foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
         push(@jsarray,$ordered{$item});
@@ -5937,6 +5939,9 @@ sub print_lti {
         foreach my $item (keys(%{$settings})) {
             if (ref($settings->{$item}) eq 'HASH') {
                 my $num = $settings->{$item}{'order'};
+                if ($num eq '') {
+                    $num = scalar(keys(%{$settings}));
+                }
                 $ordered{$num} = $item;
             }
         }
@@ -11745,7 +11750,10 @@ sub modify_login {
                 $currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost};
             }
         } else {
-            delete($currsaml{$lonhost});
+            if ($saml{$lonhost}) {  
+                $changes{'saml'}{$lonhost} = 1;
+                delete($currsaml{$lonhost});
+            }
         }
     }
     foreach my $posshost (keys(%currsaml)) {
@@ -14744,15 +14752,15 @@ sub modify_lti {
             map { $deletions{$_} = 1; } @todelete;
         }
         my $maxnum = $env{'form.lti_maxnum'};
-        for (my $i=0; $i<=$maxnum; $i++) {
+        for (my $i=0; $i<$maxnum; $i++) {
             my $itemid = $env{'form.lti_id_'.$i};
             $itemid =~ s/\D+//g;
             if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
                 if ($deletions{$itemid}) {
                     $changes{$itemid} = $domconfig{$action}{$itemid}{'consumer'};
                 } else {
-                   push(@items,$i);
-                   $itemids{$i} = $itemid;
+                    push(@items,$i);
+                    $itemids{$i} = $itemid;
                 }
             }
         }
@@ -14760,7 +14768,7 @@ sub modify_lti {
     foreach my $idx (@items) {
         my $itemid = $itemids{$idx};
         next unless ($itemid);
-        my $position = $env{'form.lti_pos_'.$idx};
+        my $position = $env{'form.lti_pos_'.$itemid};
         $position =~ s/\D+//g;
         if ($position ne '') {
             $allpos[$position] = $itemid;
@@ -15023,7 +15031,7 @@ sub modify_lti {
                 if (ref($confhash{$itemid}) ne 'HASH') {
                     $resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>';
                 } else {
-                    $resulttext .= '<li><b>'.$confhash{$itemid}{'consumer'}.'</b></li><ul>';
+                    $resulttext .= '<li><b>'.$confhash{$itemid}{'consumer'}.'</b><ul>';
                     my $position = $pos + 1;
                     $resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>';
                     foreach my $item ('version','lifetime') {
@@ -21521,8 +21529,13 @@ sub modify_loadbalancing {
                             }
                         }
                         if ($changes{'curr'}{$balancer}{'cookie'}) {
-                            $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled',
-                                                      $balancer).'</li>'; 
+                            if ($currcookies{$balancer}) {
+                                $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use disabled',
+                                                          $balancer).'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled',
+                                                          $balancer).'</li>';
+                            }
                         }
                     }
                 }