--- loncom/auth/lonacc.pm	2023/01/23 00:32:03	1.159.2.21.2.4
+++ loncom/auth/lonacc.pm	2023/07/05 17:31:46	1.159.2.21.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.21.2.4 2023/01/23 00:32:03 raeburn Exp $
+# $Id: lonacc.pm,v 1.159.2.21.2.5 2023/07/05 17:31:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,7 +306,6 @@ sub sso_login {
     my $query = $r->args;
     my %form;
     if ($query) {
-
         my @items = ('role','symb','iptoken','origurl','ttoken',
                      'ltoken','linkkey','logtoken','sso','lcssowin');
         &Apache::loncommon::get_unprocessed_cgi($query,\@items);
@@ -326,7 +325,8 @@ sub sso_login {
         }
     }
 
-    my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl);
+    my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl,
+        $linkprotpbid,$linkprotpburl);
 
 #
 # If Shibboleth auth is in use, and a dual SSO and non-SSO login page
@@ -366,6 +366,8 @@ sub sso_login {
             $linkprot = $info{'linkprot'};
             $linkprotuser = $info{'linkprotuser'};
             $linkprotexit = $info{'linkprotexit'};
+            $linkprotpbid = $info{'linkprotpbid'};
+            $linkprotpburl = $info{'linkprotpburl'};
         } elsif ($info{'linkkey'} ne '') {
             $linkkey = $info{'linkkey'};
         }
@@ -394,6 +396,8 @@ sub sso_login {
                 $linkprot = $form{'linkprot'};
                 $linkprotuser = $form{'linkprotuser'};
                 $linkprotexit = $form{'linkprotexit'};
+                $linkprotpbid = $form{'linkprotpbid'};
+                $linkprotpburl = $form{'linkprotpburl'};
             } elsif ($form{'linkkey'} ne '') {
                 $linkkey = $form{'linkkey'};
             }
@@ -423,6 +427,8 @@ sub sso_login {
                 $linkprot = $form{'linkprot'};
                 $linkprotuser = $form{'linkprotuser'};
                 $linkprotexit = $form{'linkprotexit'};
+                $linkprotpbid = $form{'linkprotpbid'};
+                $linkprotpburl = $form{'linkprotpburl'};
             } elsif ($form{'linkkey'} ne '') {
                 $linkkey = $form{'linkkey'};
             }
@@ -437,6 +443,12 @@ sub sso_login {
             if ($link_info{'linkprotexit'} ne '') {
                 $linkprotexit = $link_info{'linkprotexit'};
             }
+            if ($link_info{'linkprotpbid'} ne '') {
+                $linkprotpbid = $link_info{'linkprotpbid'};
+            }
+            if ($link_info{'linkprotpburl'} ne '') {
+                $linkprotpburl = $link_info{'linkprotpburl'};
+            }
         }
         my $delete = &Apache::lonnet::tmpdel($form{'ltoken'});
         delete($form{'ltoken'});
@@ -459,6 +471,8 @@ sub sso_login {
                            linkprot => $linkprot,
                            linkprotuser => $linkprotuser,
                            linkprotexit => $linkprotexit,
+                           linkprotpbid => $linkprotpbid,
+                           linkprotpburl => $linkprotpburl,
                        );
             if ($env{'form.lcssowin'}) {
                 $data{'lcssowin'} = $env{'form.lcssowin'};
@@ -531,6 +545,12 @@ sub sso_login {
                     if ($linkprotexit ne '') {
                         $env{'request.linkprotexit'} = $linkprotexit;
                     }
+                    if ($linkprotpbid ne '') {
+                        $env{'request.linkprotpbid'} = $linkprotpbid;
+                    }
+                    if ($linkprotpburl ne '') {
+                        $env{'request.linkprotpburl'} = $linkprotpburl;
+                    }
                 } elsif ($linkkey ne '') {
                     $env{'request.linkkey'} = $linkkey;
                 }
@@ -591,6 +611,12 @@ sub sso_login {
                     if ($linkprotexit ne '') {
                         $info{'linkprotexit'} = $linkprotexit;
                     }
+                    if ($linkprotpbid ne '') {
+                        $info{'linkprotpbid'} = $linkprotpbid;
+                    }
+                    if ($linkprotpburl ne '') {
+                        $info{'linkprotpburl'} = $linkprotpburl;
+                    }
                 } elsif ($linkkey ne '') {
                     $info{'linkkey'} = $linkkey;
                 }
@@ -735,7 +761,8 @@ sub handler {
             }
         } elsif ($env{'request.course.id'} &&
                  (($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) ||
-                  ($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) {
+                  ($requrl eq "/public/$cdom/$cnum/syllabus") ||
+                  ($requrl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}))) {
             my $query = $r->args;
             if ($query) {
                 foreach my $pair (split(/&/,$query)) {
@@ -815,6 +842,8 @@ sub handler {
                                 linkprot => $info{'linkprot'},
                                 linkprotuser => $info{'linkprotuser'},
                                 linkprotexit => $info{'linkprotexit'},
+                                linkprotpbid => $info{'linkprotpbid'},
+                                linkprotpburl => $info{'linkprotpburl'},
                             );
                         } elsif ($info{'ltoken'} ne '') {
                             my %ltoken_info = &Apache::lonnet::tmpget($info{'ltoken'});
@@ -825,6 +854,8 @@ sub handler {
                                     linkprot => $ltoken_info{'linkprot'},
                                     linkprotuser => $ltoken_info{'linkprotuser'},
                                     linkprotexit => $ltoken_info{'linkprotexit'},
+                                    linkprotpbid => $ltoken_info{'linkprotpbid'},
+                                    linkprotpburl => $ltoken_info{'linkprotpburl'},
                                 );
                             }
                         }
@@ -948,7 +979,7 @@ sub handler {
                 &Apache::blockedaccess::setup_handler($r);
                 return OK;
             }
-        } elsif ($check_access) { 
+        } elsif ($check_access) {
             if ($handle eq '') {
                 unless ($access eq 'F') {
                     if ($requrl =~ m{^/res/$match_domain/$match_username/}) {