Merge branch 'rel-10_1' into rel-11_0

RotherOSS · Nov 5, 2024 · 3eb47cd · 3eb47cd
2 parents 40e15a8 + 6aab3eb
commit 3eb47cd
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 0 deletions.
diff --git a/Kernel/System/Web/InterfaceAgent.pm b/Kernel/System/Web/InterfaceAgent.pm
@@ -980,6 +980,27 @@ sub Content {
                 );
 
                 if ( $PreAuth && $PreAuth->{RedirectURL} ) {
+
+                    if ( $ConfigObject->Get('SessionUseCookie') ) {
+
+                        # always set a cookie, so that
+                        # we know already if the browser supports cookies.
+                        # ( the session cookie isn't available at that time ).
+
+                        my $Expires = '+' . $ConfigObject->Get('SessionMaxTime') . 's';
+                        if ( !$ConfigObject->Get('SessionUseCookieAfterBrowserClose') ) {
+                            $Expires = '';
+                        }
+
+                        # set a cookie tentatively for checking cookie support
+                        $LayoutObject->SetCookie(
+                            Key     => 'OTOBOBrowserHasCookie',
+                            Name    => 'OTOBOBrowserHasCookie',
+                            Value   => 1,
+                            Expires => $Expires,
+                        );
+                    }
+
                     $LayoutObject->Redirect(
                         ExtURL => $PreAuth->{RedirectURL},
                     );    # throws a Kernel::System::Web::Exception

diff --git a/Kernel/System/Web/InterfaceCustomer.pm b/Kernel/System/Web/InterfaceCustomer.pm
@@ -1136,6 +1136,27 @@ sub Content {
                 );
 
                 if ( $PreAuth && $PreAuth->{RedirectURL} ) {
+
+                    if ( $ConfigObject->Get('SessionUseCookie') ) {
+
+                        # always set a cookie, so that
+                        # we know already if the browser supports cookies.
+                        # ( the session cookie isn't available at that time ).
+
+                        my $Expires = '+' . $ConfigObject->Get('SessionMaxTime') . 's';
+                        if ( !$ConfigObject->Get('SessionUseCookieAfterBrowserClose') ) {
+                            $Expires = '';
+                        }
+
+                        # set a cookie tentatively for checking cookie support
+                        $LayoutObject->SetCookie(
+                            Key     => 'OTOBOBrowserHasCookie',
+                            Name    => 'OTOBOBrowserHasCookie',
+                            Value   => 1,
+                            Expires => $Expires,
+                        );
+                    }
+
                     $LayoutObject->Redirect(
                         ExtURL => $PreAuth->{RedirectURL},
                     );    # throws a Kernel::System::Web::Exception