projects / freeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e9b2a0d)
fix per-agent portal branding on logout, RT#32139
authorIvan Kohler <ivan@freeside.biz>
Wed, 19 Nov 2014 05:01:38 +0000 (21:01 -0800)
committerIvan Kohler <ivan@freeside.biz>
Wed, 19 Nov 2014 05:01:38 +0000 (21:01 -0800)
FS/FS/ClientAPI/MyAccount.pm patch | blob | history
fs_selfservice/FS-SelfService/cgi/logout.html patch | blob | history

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 61082bd..e02378d 100644 (file)
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -308,11 +308,12 @@ sub login {
 
 sub logout {
   my $p = shift;
+  my $skin_info = skin_info($p);
   if ( $p->{'session_id'} ) {
     _cache->remove($p->{'session_id'});
-    return { %{ skin_info($p) }, 'error' => '' };
+    return { %$skin_info, 'error' => '' };
   } else {
-    return { %{ skin_info($p) }, 'error' => "Can't resume session" }; #better error message
+    return { %$skin_info, 'error' => "Can't resume session" }; #better error message
   }
 }
 
diff --git a/fs_selfservice/FS-SelfService/cgi/logout.html b/fs_selfservice/FS-SelfService/cgi/logout.html
index 834ef13..540b6c9 100644 (file)
--- a/fs_selfservice/FS-SelfService/cgi/logout.html
+++ b/fs_selfservice/FS-SelfService/cgi/logout.html
@@ -1,6 +1,6 @@
 <HTML>
   <HEAD>
-    <META HTTP-EQUIV="refresh" CONTENT="5;URL=<%= $cgi->url(-absolute => 1) %>">
+    <META HTTP-EQUIV="refresh" CONTENT="5;URL=<%= $cgi->url(-absolute => 1). "?agentnum=$agentnum" %>">
     <TITLE>MyAccount</TITLE>
     <%= $head %>
   </HEAD>
Freeside billing, trouble ticketing, network monitoring and provisioning