--- loncom/interface/domainprefs.pm	2021/09/01 00:21:52	1.385
+++ loncom/interface/domainprefs.pm	2021/10/07 15:51:15	1.388
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.385 2021/09/01 00:21:52 raeburn Exp $
+# $Id: domainprefs.pm,v 1.388 2021/10/07 15:51:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -297,7 +297,10 @@ sub handler {
                                  {col1 => 'Log-in Help',
                                   col2 => 'Value'},
                                  {col1 => 'Custom HTML in document head',
-                                  col2 => 'Value'}],
+                                  col2 => 'Value'},
+                                 {col1 => 'SSO',
+                                  col2 => 'Dual login: SSO and non-SSO options'},
+                                ],
                       print => \&print_login,
                       modify => \&modify_login,
                     },
@@ -632,7 +635,10 @@ sub handler {
                                        {col1 => 'Log-in Help',
                                         col2 => 'Value'},
                                        {col1 => 'Custom HTML in document head',
-                                        col2 => 'Value'}],
+                                        col2 => 'Value'},
+                                       {col1 => 'SSO',
+                                        col2 => 'Dual login: SSO and non-SSO options'},
+                                      ],
                             print => \&print_login,
                             modify => \&modify_login,
                            };
@@ -859,6 +865,8 @@ sub print_config_box {
         $output .= &wafproxy_javascript($dom);
     } elsif ($action eq 'autoupdate') {
         $output .= &autoupdate_javascript();
+    } elsif ($action eq 'login') {
+        $output .= &saml_javascript();
     }
     $output .=
          '<table class="LC_nested_outer">
@@ -878,7 +886,7 @@ sub print_config_box {
         my $leftnobr = '';
         if (($action eq 'rolecolors') || ($action eq 'defaults') ||
             ($action eq 'directorysrch') ||
-            (($action eq 'login') && ($numheaders < 4))) {
+            (($action eq 'login') && ($numheaders < 5))) {
             $colspan = ' colspan="2"';
         }
         if ($action eq 'usersessions') {
@@ -909,7 +917,7 @@ sub print_config_box {
         } elsif ($action eq 'scantron') {
             $output .= $item->{'print'}->($r,'top',$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
-            if ($numheaders == 4) {
+            if ($numheaders == 5) {
                 $colspan = ' colspan="2"';
                 $output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal);
             } else {
@@ -1050,7 +1058,7 @@ sub print_config_box {
               <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'.
                            $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
-            if ($numheaders == 4) {
+            if ($numheaders == 5) {
                 $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
            </table>
           </td>
@@ -1074,7 +1082,7 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">';
-            if ($numheaders == 4) {
+            if ($numheaders == 5) {
                 $output .= '
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
               <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td>
@@ -1086,7 +1094,27 @@ sub print_config_box {
              </tr>';
             }
             $rowtotal ++;
-            $output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal);
+            $output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal).'
+           </table>
+          </td>
+         </tr>
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">';
+            if ($numheaders == 5) {
+                $output .= '
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[4]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[4]->{'col2'}).'</td>
+             </tr>';
+            } else {
+                $output .= '
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td>
+             </tr>';
+            }
+            $rowtotal ++;
+            $output .= &print_login('saml',$dom,$confname,$phase,$settings,\$rowtotal);
         } elsif ($action eq 'requestcourses') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
             $rowtotal ++;
@@ -1221,9 +1249,12 @@ sub print_config_box {
 
 sub print_login {
     my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_;
-    my ($css_class,$datatable);
+    my ($css_class,$datatable,$switchserver,%lt);
     my %choices = &login_choices();
-
+    if (($caller eq 'help') || ($caller eq 'headtag') || ($caller eq 'saml')) {
+        %lt = &login_file_options();
+        $switchserver = &check_switchserver($dom,$confname);
+    }
     if ($caller eq 'service') {
         my %servers = &Apache::lonnet::internet_dom_servers($dom);
         my $choice = $choices{'disallowlogin'};
@@ -1417,18 +1448,10 @@ sub print_login {
         $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext);
         $datatable .= '</tr></table></td></tr>';
     } elsif ($caller eq 'help') {
-        my ($defaulturl,$defaulttype,%url,%type,%lt,%langchoices);
-        my $switchserver = &check_switchserver($dom,$confname);
+        my ($defaulturl,$defaulttype,%url,%type,%langchoices);
         my $itemcount = 1;
         $defaulturl = '/adm/loginproblems.html';
         $defaulttype = 'default';
-        %lt = &Apache::lonlocal::texthash (
-                     del     => 'Delete?',
-                     rep     => 'Replace:',
-                     upl     => 'Upload:',
-                     default => 'Default',
-                     custom  => 'Custom',
-                                             );
         %langchoices = &Apache::lonlocal::texthash(&get_languages_hash());
         my @currlangs;
         if (ref($settings) eq 'HASH') {
@@ -1525,14 +1548,6 @@ sub print_login {
                 }
             }
         }
-        my %lt = &Apache::lonlocal::texthash(
-                                               del  => 'Delete?',
-                                               rep  => 'Replace:',
-                                               upl  => 'Upload:',
-                                               curr => 'View contents',
-                                               none => 'None',
-        );
-        my $switchserver = &check_switchserver($dom,$confname);
         foreach my $lonhost (sort(keys(%domservers))) {
             my $exempt = &check_exempt_addresses($currexempt{$lonhost});
             $datatable .= '<tr><td>'.$domservers{$lonhost}.'</td>';
@@ -1556,6 +1571,88 @@ sub print_login {
             $datatable .= '</td><td><input type="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>';
         }
         $datatable .= '</table></td></tr>';
+    } elsif ($caller eq 'saml') {
+        my %domservers = &Apache::lonnet::get_servers($dom);
+        $datatable .= '<tr><td colspan="3" style="text-align: left">'.
+                      '<table><tr><th>'.$choices{'hostid'}.'</th>'.
+                      '<th>'.$choices{'samllanding'}.'</th>'.
+                      '<th>'.$choices{'samloptions'}.'</th></tr>'."\n";
+        my (%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlnotsso,%styleon,%styleoff);
+        foreach my $lonhost (keys(%domservers)) {
+            $samlurl{$lonhost} = '/adm/sso';
+            $styleon{$lonhost} = 'display:none';
+            $styleoff{$lonhost} = '';
+        }
+        if (ref($settings->{'saml'}) eq 'HASH') {
+            foreach my $lonhost (keys(%{$settings->{'saml'}})) {
+                if (ref($settings->{'saml'}{$lonhost}) eq 'HASH') {
+                    $saml{$lonhost} = 1;
+                    $samltext{$lonhost} = $settings->{'saml'}{$lonhost}{'text'};
+                    $samlimg{$lonhost} = $settings->{'saml'}{$lonhost}{'img'};
+                    $samlalt{$lonhost} = $settings->{'saml'}{$lonhost}{'alt'};
+                    $samlurl{$lonhost} = $settings->{'saml'}{$lonhost}{'url'};
+                    $samltitle{$lonhost} = $settings->{'saml'}{$lonhost}{'title'};
+                    $samlnotsso{$lonhost} = $settings->{'saml'}{$lonhost}{'notsso'};
+                    $styleon{$lonhost} = '';
+                    $styleoff{$lonhost} = 'display:none';
+                } else {
+                    $styleon{$lonhost} = 'display:none';
+                    $styleoff{$lonhost} = '';
+                }
+            }
+        }
+        my $itemcount = 1;
+        foreach my $lonhost (sort(keys(%domservers))) {
+            my $samlon = ' ';
+            my $samloff = ' checked="checked" ';
+            if ($saml{$lonhost}) {
+                $samlon = $samloff;
+                $samloff = ' ';
+            }
+            my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+            $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.$domservers{$lonhost}.'</span></td>'.
+                          '<td><span class="LC_nobreak"><label><input type="radio" name="saml_'.$lonhost.'"'.$samloff.
+                          'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="0" />'.
+                          &mt('No').'</label>'.('&nbsp;'x2).
+                          '<label><input type="radio" name="saml_'.$lonhost.'"'.$samlon.
+                          'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="1" />'.
+                          &mt('Yes').'</label></span></td>'.
+                          '<td id="samloptionson_'.$lonhost.'" style="'.$styleon{$lonhost}.'" width="100%">'.
+                          '<table><tr><th colspan="5" align="center">'.&mt('SSO').'</th><th align="center">'.
+                          '<span class="LC_nobreak">'.&mt('Non-SSO').'</span></th></tr>'.
+                          '<tr><th>'.&mt('Text').'</th><th>'.&mt('Image').'</th>'.
+                          '<th>'.&mt('Alt Text').'</th><th>'.&mt('URL').'</th>'.
+                          '<th>'.&mt('Tool Tip').'</th><th>'.&mt('Text').'</th></tr>'.
+                          '<tr'.$css_class.'><td><input type="text" name="saml_text_'.$lonhost.'" size="8" value="'.
+                          $samltext{$lonhost}.'" /></td><td>';
+            if ($samlimg{$lonhost}) {
+                $datatable .= '<img src="'.$samlimg{$lonhost}.'" /><br />'.
+                              '<span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="saml_img_del" value="'.$lonhost.'" />'.
+                              $lt{'del'}.'</label>&nbsp;'.$lt{'rep'}.'</span>';
+            } else {
+                $datatable .= $lt{'upl'};
+            }
+            $datatable .='<br />';
+            if ($switchserver) {
+                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+            } else {
+                $datatable .= '<input type="file" name="saml_img_'.$lonhost.'" />';
+            }
+            $datatable .= '</td>'.
+                          '<td><input type="text" name="saml_alt_'.$lonhost.'" size="20" '.
+                          'value="'.$samlalt{$lonhost}.'" /></td>'.
+                          '<td><input type="text" name="saml_url_'.$lonhost.'" size="8" '.
+                          'value="'.$samlurl{$lonhost}.'" /></td>'.
+                          '<td><textarea name="saml_title_'.$lonhost.'" rows="3" cols="15">'.
+                          $samltitle{$lonhost}.'</textarea></td>'.
+                          '<td><input type="text" name="saml_notsso_'.$lonhost.'" size="8" '.
+                          'value="'.$samlnotsso{$lonhost}.'" /></td></tr>'.
+                          '</table></td>'.
+                          '<td id="samloptionsoff_'.$lonhost.'" style="'.$styleoff{$lonhost}.'" width="100%">&nbsp;</td></tr>';
+           $itemcount ++;
+        }
+        $datatable .= '</table></td></tr>';
     }
     return $datatable;
 }
@@ -1592,10 +1689,24 @@ sub login_choices {
             headtag       => "Custom markup",
             action        => "Action",
             current       => "Current",
+            samllanding   => "Dual login?",
+            samloptions   => "Options",
         );
     return %choices;
 }
 
+sub login_file_options {
+      return &Apache::lonlocal::texthash(
+                                           del     => 'Delete?',
+                                           rep     => 'Replace:',
+                                           upl     => 'Upload:',
+                                           curr    => 'View contents',
+                                           default => 'Default',
+                                           custom  => 'Custom',
+                                           none    => 'None',
+      );
+}
+
 sub print_rolecolors {
     my ($phase,$role,$dom,$confname,$settings,$rowtotal) = @_;
     my %choices = &color_font_choices();
@@ -3348,6 +3459,48 @@ function toggleLastActiveDays(form) {
 ENDSCRIPT
 }
 
+sub saml_javascript {
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function toggleSamlOptions(form,hostid) { 
+    var radioname = 'saml_'+hostid;
+    var tablecellon = 'samloptionson_'+hostid;
+    var tablecelloff = 'samloptionsoff_'+hostid;
+    var num = form.elements[radioname].length;
+    if (num) {
+        var setvis = ''; 
+        for (var i=0; i<num; i++) {
+            if (form.elements[radioname][i].checked) {
+                if (form.elements[radioname][i].value == '1') { 
+                    if (document.getElementById(tablecellon)) {
+                        document.getElementById(tablecellon).style.display='';
+                    }
+                    if (document.getElementById(tablecelloff)) {
+                        document.getElementById(tablecelloff).style.display='none';
+                    }
+                    setvis = 1;
+                }
+                break;
+            }
+        }
+        if (!setvis) {
+            if (document.getElementById(tablecellon)) {
+                document.getElementById(tablecellon).style.display='none';
+            }
+            if (document.getElementById(tablecelloff)) {
+                document.getElementById(tablecelloff).style.display='';
+            }
+        }
+    }
+    return;
+}
+// ]]>
+</script>
+
+ENDSCRIPT
+}
+
 sub print_autoenroll {
     my ($dom,$settings,$rowtotal) = @_;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
@@ -7365,7 +7518,7 @@ sub print_wafproxy {
     my $itemcount = 0;
     my $datatable;
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
-    my (%othercontrol,%otherdoms,%aliases,%values,$setdom,$showdom);
+    my (%othercontrol,%otherdoms,%aliases,%saml,%values,$setdom,$showdom);
     my %lt = &wafproxy_titles();
     foreach my $server (sort(keys(%servers))) {
         my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server});
@@ -7390,6 +7543,9 @@ sub print_wafproxy {
                             $showdom = 1;
                         }
                     }
+                    if (ref($settings->{'saml'}) eq 'HASH') {
+                        $saml{$dom} = $settings->{'saml'};
+                    }
                 }
             }
         }
@@ -7409,6 +7565,9 @@ sub print_wafproxy {
             my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain);
             if (ref($config{'wafproxy'}) eq 'HASH') {
                 $aliases{$domain} = $config{'wafproxy'}{'alias'};
+                if (exists($config{'wafproxy'}{'saml'})) { 
+                    $saml{$domain} = $config{'wafproxy'}{'saml'};
+                }
                 foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') {
                     $values{$domain}{$item} = $config{'wafproxy'}{$item};
                 }
@@ -7427,14 +7586,22 @@ sub print_wafproxy {
                             '<i>'.&Apache::lonnet::hostname($server).'</i></td><td>&nbsp;</td>';
             if ($othercontrol{$server}) {
                 $dom_in_effect = $othercontrol{$server};
-                my $current;
+                my ($current,$forsaml);
                 if (ref($aliases{$dom_in_effect}) eq 'HASH') {
                     $current = $aliases{$dom_in_effect}{$server};
                 }
+                if (ref($saml{$dom_in_effect}) eq 'HASH') {
+                    if ($saml{$dom_in_effect}{$server}) {
+                        $forsaml = 1;
+                    }
+                }
                 $aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'.
                               &mt('Alias').':&nbsp';
                 if ($current) {
                     $aliasrows .= $current;
+                    if ($forsaml) {
+                         $aliasrows .= '&nbsp;('.&mt('also for Shibboleth').')';
+                    }
                 } else {
                     $aliasrows .= &mt('None');
                 }
@@ -7443,16 +7610,30 @@ sub print_wafproxy {
                                   '<b>'.$dom_in_effect.'</b>').')</span></td>';
             } else {
                 $dom_in_effect = $dom;
-                my $current;
+                my ($current,$samlon,$samloff);
+                $samloff = ' checked="checked"';
                 if (ref($aliases{$dom}) eq 'HASH') {
                     if ($aliases{$dom}{$server}) {
                         $current = $aliases{$dom}{$server};
                     }
                 }
+                if (ref($saml{$dom}) eq 'HASH') {
+                    if ($saml{$dom}{$server}) {
+                        $samlon = $samloff;
+                        undef($samloff);
+                    }
+                }
                 $aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'.
                               &mt('Alias').':&nbsp;'.
                               '<input type="text" name="wafproxy_alias_'.$server.'" '.
-                              'value="'.$current.'" size="30" /></td>';
+                              'value="'.$current.'" size="30" />'.
+                              ('&nbsp;'x2).'<span class="LC_nobreak">'.
+                              &mt('Alias used for Shibboleth').':&nbsp;<label>'.
+                              '<input type="radio" value="0"'.$samloff.' name="wafproxy_alias_saml_'.$server.'" />'.
+                              &mt('No').'</label>&nbsp;<label>'. 
+                              '<input type="radio" value="1"'.$samlon.' name="wafproxy_alias_saml_'.$server.'" />'.
+                              &mt('Yes').'</label></span>'.
+                              '</td>'; 
             }
             $aliasrows .= '</tr>';
             $aliasinfo{$dom_in_effect} .= $aliasrows;
@@ -11251,12 +11432,14 @@ sub usertype_update_row {
 sub modify_login {
     my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
     my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl,
-        %curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon);
+        %curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon,
+        %currsaml,%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlnotsso);
     %title = ( coursecatalog => 'Display course catalog',
                adminmail => 'Display administrator E-mail address',
                helpdesk  => 'Display "Contact Helpdesk" link',
                newuser => 'Link for visitors to create a user account',
-               loginheader => 'Log-in box header');
+               loginheader => 'Log-in box header',
+               saml => 'Dual SSO and non-SSO login');
     @offon = ('off','on');
     if (ref($domconfig{login}) eq 'HASH') {
         if (ref($domconfig{login}{loginvia}) eq 'HASH') {
@@ -11264,6 +11447,20 @@ sub modify_login {
                 $curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost};
             }
         }
+        if (ref($domconfig{login}{'saml'}) eq 'HASH') {
+            foreach my $lonhost (keys(%{$domconfig{login}{'saml'}})) {
+                if (ref($domconfig{login}{'saml'}{$lonhost}) eq 'HASH') {
+                    $currsaml{$lonhost} = $domconfig{login}{'saml'}{$lonhost};
+                    $saml{$lonhost} = 1;
+                    $samltext{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'text'};
+                    $samlurl{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'url'};
+                    $samlalt{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'alt'};
+                    $samlimg{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'img'};
+                    $samltitle{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'title'};
+                    $samlnotsso{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'notsso'};
+                }
+            }
+        }
     }
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
@@ -11510,6 +11707,86 @@ sub modify_login {
             $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
         }
     }
+    my @delsamlimg = &Apache::loncommon::get_env_multiple('form.saml_img_del');
+    my @newsamlimgs;
+    foreach my $lonhost (keys(%domservers)) {
+        if ($env{'form.saml_'.$lonhost}) {
+            if ($env{'form.saml_img_'.$lonhost.'.filename'}) {
+                push(@newsamlimgs,$lonhost);
+            }
+            foreach my $item ('text','alt','url','title','notsso') {
+                $env{'form.saml_'.$item.'_'.$lonhost} =~ s/^\s+|\s+$//g;
+            }
+            if ($saml{$lonhost}) {
+                if (grep(/^\Q$lonhost\E$/,@delsamlimg)) {
+#FIXME Need to obsolete published image
+                    delete($currsaml{$lonhost}{'img'});
+                    $changes{'saml'}{$lonhost} = 1;
+                }
+                if ($env{'form.saml_alt_'.$lonhost} ne $samlalt{$lonhost}) {
+                    $changes{'saml'}{$lonhost} = 1;
+                }
+                if ($env{'form.saml_text_'.$lonhost} ne $samltext{$lonhost}) {
+                    $changes{'saml'}{$lonhost} = 1;
+                }
+                if ($env{'form.saml_url_'.$lonhost} ne $samlurl{$lonhost}) {
+                    $changes{'saml'}{$lonhost} = 1;
+                }
+                if ($env{'form.saml_title_'.$lonhost} ne $samltitle{$lonhost}) {
+                    $changes{'saml'}{$lonhost} = 1;
+                }
+                if ($env{'form.saml_notsso_'.$lonhost} ne $samlnotsso{$lonhost}) {
+                    $changes{'saml'}{$lonhost} = 1;
+                }
+            } else {
+                $changes{'saml'}{$lonhost} = 1;
+            }
+            foreach my $item ('text','alt','url','title','notsso') {
+                $currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost};
+            }
+        } else {
+            delete($currsaml{$lonhost});
+        }
+    }
+    foreach my $posshost (keys(%currsaml)) {
+        unless (exists($domservers{$posshost})) { 
+            delete($currsaml{$posshost}); 
+        }
+    }
+    %{$loginhash{'login'}{'saml'}} = %currsaml;
+    if (@newsamlimgs) {
+        my $error;
+        my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
+        if ($configuserok eq 'ok') {
+            if ($switchserver) {
+                $error = &mt("Upload of SSO Button Image is not permitted to this server: [_1].",$switchserver);
+            } elsif ($author_ok eq 'ok') {
+                foreach my $lonhost (@newsamlimgs) {
+                    my $formelem = 'saml_img_'.$lonhost;
+                    my ($result,$imgurl) = &publishlogo($r,'upload',$formelem,$dom,$confname,
+                                                        "login/saml/$lonhost",'','',
+                                                        $env{'form.saml_img_'.$lonhost.'.filename'});
+                    if ($result eq 'ok') {
+                        $currsaml{$lonhost}{'img'} = $imgurl;
+                        $loginhash{'login'}{'saml'}{$lonhost}{'img'} = $imgurl;
+                        $changes{'saml'}{$lonhost} = 1;
+                    } else {
+                        my $puberror = &mt("Upload of SSO button image failed for [_1] because an error occurred publishing the file in RES space. Error was: [_2].",
+                                           $lonhost,$result);
+                        $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';
+                    }
+                }
+            } else {
+                $error = &mt("Upload of SSO button image file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2].  Error was: [_3].",$confname,$dom,$author_ok);
+            }
+        } else {
+            $error = &mt("Upload of SSO button image file(s) failed because a Domain Configuration user ([_1]) could not be created in domain: [_2].  Error was: [_3].",$confname,$dom,$configuserok);
+        }
+        if ($error) {
+            &Apache::lonnet::logthis($error);
+            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+        }
+    }
     &process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'});
 
     my $defaulthelpfile = '/adm/loginproblems.html';
@@ -11550,6 +11827,31 @@ sub modify_login {
         }
         if (keys(%changes) > 0 || $colchgtext) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
+            if (exists($changes{'saml'})) {
+                my $hostid_in_use;
+                my @hosts = &Apache::lonnet::current_machine_ids();
+                if (@hosts > 1) {
+                    foreach my $hostid (@hosts) {
+                        if (&Apache::lonnet::host_domain($hostid) eq $dom) {
+                            $hostid_in_use = $hostid;
+                            last;
+                        }
+                    }
+                } else {
+                    $hostid_in_use = $r->dir_config('lonHostID');
+                }
+                if (($hostid_in_use) &&
+                    (&Apache::lonnet::host_domain($hostid_in_use) eq $dom)) {
+                    &Apache::lonnet::devalidate_cache_new('samllanding',$hostid_in_use);
+                }
+                if (ref($lastactref) eq 'HASH') {
+                    if (ref($changes{'saml'}) eq 'HASH') {
+                        my %updates;
+                        map { $updates{$_} = 1; } keys(%{$changes{'saml'}});
+                        $lastactref->{'samllanding'} = \%updates;
+                    }
+                }
+            }
             if (ref($lastactref) eq 'HASH') {
                 $lastactref->{'domainconfig'} = 1;
             }
@@ -11629,6 +11931,38 @@ sub modify_login {
                             }
                         }
                     }
+                } elsif ($item eq 'saml') {
+                    if (ref($changes{$item}) eq 'HASH') {
+                        my %notlt = (
+                                       text   => 'Text for log-in by SSO',
+                                       img    => 'SSO button image',
+                                       alt    => 'Alt text for button image',
+                                       url    => 'SSO URL',
+                                       title  => 'Tooltip for SSO link',
+                                       notsso => 'Text for non-SSO log-in',
+                                    );
+                        foreach my $lonhost (sort(keys(%{$changes{$item}}))) {
+                            if (ref($currsaml{$lonhost}) eq 'HASH') {
+                                $resulttext .= '<li>'.&mt("$title{$item} in use for [_1]","<b>$lonhost</b>").
+                                               '<ul>';
+                                foreach my $key ('text','img','alt','url','title','notsso') {
+                                    if ($currsaml{$lonhost}{$key} eq '') {
+                                        $resulttext .= '<li>'.&mt("$notlt{$key} not in use").'</li>';
+                                    } else {
+                                        my $value = "'$currsaml{$lonhost}{$key}'";
+                                        if ($key eq 'img') {
+                                            $value = '<img src="'.$currsaml{$lonhost}{$key}.'" />';
+                                        }
+                                        $resulttext .= '<li>'.&mt("$notlt{$key} set to: [_1]",
+                                                                  $value).'</li>';
+                                    }
+                                }
+                                $resulttext .= '</ul></li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt("$title{$item} not in use for [_1]",$lonhost).'</li>';
+                            }
+                        }
+                    }
                 } elsif ($item eq 'captcha') {
                     if (ref($loginhash{'login'}) eq 'HASH') {
                         my $chgtxt;
@@ -19930,8 +20264,8 @@ sub modify_selfenrollment {
 sub modify_wafproxy {
     my ($dom,$action,$lastactref,%domconfig) = @_;
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
-    my (%othercontrol,%canset,%values,%curralias,%currvalue,@warnings,%wafproxy,
-        %changes,%expirecache);
+    my (%othercontrol,%canset,%values,%curralias,%currsaml,%currvalue,@warnings,
+        %wafproxy,%changes,%expirecache,%expiresaml);
     foreach my $server (sort(keys(%servers))) {
         my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server});
         if ($serverhome eq $server) {
@@ -19946,6 +20280,9 @@ sub modify_wafproxy {
         if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') {
             %curralias = %{$domconfig{'wafproxy'}{'alias'}};
         }
+        if (ref($domconfig{'wafproxy'}{'saml'}) eq 'HASH') {
+            %currsaml = %{$domconfig{'wafproxy'}{'saml'}};
+        }
         foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
             $currvalue{$item} = $domconfig{'wafproxy'}{$item};
         }
@@ -19953,6 +20290,7 @@ sub modify_wafproxy {
     my $output;
     if (keys(%canset)) {
         %{$wafproxy{'alias'}} = ();
+        %{$wafproxy{'saml'}} = ();
         foreach my $key (sort(keys(%canset))) {
             if ($env{'form.wafproxy_'.$dom}) {
                 $wafproxy{'alias'}{$key} = $env{'form.wafproxy_alias_'.$key};
@@ -19960,11 +20298,21 @@ sub modify_wafproxy {
                 if ($wafproxy{'alias'}{$key} ne $curralias{$key}) {
                     $changes{'alias'} = 1;
                 }
+                if ($env{'form.wafproxy_alias_saml_'.$key}) {
+                    $wafproxy{'saml'}{$key} = 1;
+                }
+                if ($wafproxy{'saml'}{$key} ne $currsaml{$key}) {
+                    $changes{'saml'} = 1;
+                }
             } else {
                 $wafproxy{'alias'}{$key} = '';
+                $wafproxy{'saml'}{$key} = '';
                 if ($curralias{$key}) {
                     $changes{'alias'} = 1;
                 }
+                if ($currsaml{$key}) {
+                    $changes{'saml'} = 1;
+                }
             }
             if ($wafproxy{'alias'}{$key} eq '') {
                 if ($curralias{$key}) {
@@ -19972,11 +20320,20 @@ sub modify_wafproxy {
                 }
                 delete($wafproxy{'alias'}{$key});
             }
+            if ($wafproxy{'saml'}{$key} eq '') {
+                if ($currsaml{$key}) {
+                    $expiresaml{$key} = 1;
+                }
+                delete($wafproxy{'saml'}{$key});
+            }
         }
         unless (keys(%{$wafproxy{'alias'}})) {
             delete($wafproxy{'alias'});
         }
-        # Localization for values in %warn occus in &mt() calls separately.
+        unless (keys(%{$wafproxy{'saml'}})) {
+            delete($wafproxy{'saml'});
+        }
+        # Localization for values in %warn occurs in &mt() calls separately.
         my %warn = (
                      trusted => 'trusted IP range(s)',
                      vpnint => 'internal IP range(s) for VPN sessions(s)',
@@ -20044,6 +20401,9 @@ sub modify_wafproxy {
     } else {
         if (keys(%curralias)) {
             $changes{'alias'} = 1;
+        }
+        if (keys(%currsaml)) {
+            $changes{'saml'} = 1;
         } 
         if (keys(%currvalue)) {
             foreach my $key (keys(%currvalue)) {
@@ -20096,6 +20456,23 @@ sub modify_wafproxy {
                     $lastactref->{'proxyalias'} = \%updates;
                 }
             }
+            if ((exists($wafproxy{'saml'})) || (keys(%expiresaml))) {
+                my %samlupdates = %expiresaml;
+                foreach my $key (keys(%expiresaml)) {
+                    &Apache::lonnet::devalidate_cache_new('proxysaml',$key);
+                }
+                if (ref($wafproxy{'saml'}) eq 'HASH') {
+                    my $cachetime = 24*60*60;
+                    foreach my $key (keys(%{$wafproxy{'saml'}})) {
+                        $samlupdates{$key} = 1;
+                        &Apache::lonnet::do_cache_new('proxysaml',$key,$wafproxy{'saml'}{$key},
+                                                      $cachetime);
+                    }
+                }
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'proxysaml'} = \%samlupdates;
+                }
+            }
             $output = &mt('Changes were made to Web Application Firewall/Reverse Proxy').'<ul>';
             foreach my $item ('alias','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') {
                 if ($changes{$item}) {
@@ -20119,6 +20496,19 @@ sub modify_wafproxy {
                         unless ($numaliased) {
                             $output .= '<li>'.&mt('Aliases deleted for hostnames').'</li>';
                         }
+                    } elsif ($item eq 'saml') {
+                        my $shown; 
+                        if (ref($wafproxy{'saml'}) eq 'HASH') {
+                            if (keys(%{$wafproxy{'saml'}})) {
+                                $shown = join(', ',sort(keys(%{$wafproxy{'saml'}})));
+                            }
+                        }
+                        if ($shown) {
+                            $output .= '<li>'.&mt('Alias used by Shibboleth for: [_1]',
+                                                  $shown).'</li>';
+                        } else {
+                            $output .= '<li>'.&mt('No alias used for Shibboleth').'</li>';
+                        }
                     } else {
                         if ($item eq 'remoteip') {
                             my %ip_methods = &remoteip_methods();
@@ -21912,15 +22302,34 @@ sub devalidate_remote_domconfs {
     my %thismachine;
     map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
     my @posscached = ('domainconfig','domdefaults','ltitools','usersessions',
-                      'directorysrch','passwdconf','cats','proxyalias');
+                      'directorysrch','passwdconf','cats','proxyalias','proxysaml');
+    my %cache_by_lonhost;
+    if (exists($cachekeys->{'samllanding'})) {
+        if (ref($cachekeys->{'samllanding'}) eq 'HASH') {
+            my %landing = %{$cachekeys->{'samllanding'}};
+            my %domservers = &Apache::lonnet::get_servers($dom);
+            if (keys(%domservers)) {
+                foreach my $server (keys(%domservers)) {
+                    my @cached;
+                    next if ($thismachine{$server});
+                    if ($landing{$server}) {
+                        push(@cached,&escape('samllanding').':'.&escape($server));
+                    }
+                    if (@cached) {
+                        $cache_by_lonhost{$server} = \@cached;
+                    }
+                }
+            }
+        }
+    }
     if (keys(%servers)) {
         foreach my $server (keys(%servers)) {
             next if ($thismachine{$server});
             my @cached;
             foreach my $name (@posscached) {
                 if ($cachekeys->{$name}) {
-                    if ($name eq 'proxyalias') {
-                        if (ref($cachekeys->{$name}) eq 'HASH') {  
+                    if (($name eq 'proxyalias') || ($name eq 'proxysaml')) {
+                        if (ref($cachekeys->{$name}) eq 'HASH') {
                             foreach my $key (keys(%{$cachekeys->{$name}})) {
                                 push(@cached,&escape($name).':'.&escape($key));
                             }
@@ -21930,6 +22339,10 @@ sub devalidate_remote_domconfs {
                     }
                 }
             }
+            if ((exists($cache_by_lonhost{$server})) &&
+                (ref($cache_by_lonhost{$server}) eq 'ARRAY')) {
+                push(@cached,@{$cache_by_lonhost{$server}});
+            }
             if (@cached) {
                 &Apache::lonnet::remote_devalidate_cache($server,\@cached);
             }