Applying patch 2013331 from Jeffk on configurable cookie names

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2261 4979c152-3d1c-0410-bac9-87ea11338e46

3 files changed, 11 insertions, 7 deletions

diff --git a/LedgerSMB/Auth/DB.pm b/LedgerSMB/Auth/DB.pm
index 7febf0b1..9afc8675 100755
--- a/LedgerSMB/Auth/DB.pm
+++ b/LedgerSMB/Auth/DB.pm
@@ -89,7 +89,7 @@ sub session_check {
               $session_ref->{session_id} . ':' . $session_ref->{token} . ':' . $form->{company};
 
             #now update the cookie in the browser
-            print qq|Set-Cookie: LedgerSMB=$newCookieValue; path=$path;\n|;
+            print qq|Set-Cookie: ${LedgerSMB::Sysconfig::cookie_name}=$newCookieValue; path=$path;\n|;
             return 1;
 
         }
@@ -100,7 +100,7 @@ sub session_check {
             my $sessionDestroy = $dbh->prepare("");
 
             #delete the cookie in the browser
-            print qq|Set-Cookie: LedgerSMB=; path=$path;\n|;
+            print qq|Set-Cookie: ${LedgerSMB::Sysconfig::cookie_name}=; path=$path;\n|;
             return 0;
         }
 
@@ -109,7 +109,7 @@ sub session_check {
 
         #cookie is not valid
         #delete the cookie in the browser
-        print qq|Set-Cookie: LedgerSMB=; path=$path;\n|;
+        print qq|Set-Cookie: ${LedgerSMB::Sysconfig::cookie_name}=; path=$path;\n|;
         return 0;
     }
 }
@@ -197,7 +197,7 @@ sub session_create {
 
     #now set the cookie in the browser
     #TODO set domain from ENV, also set path to install path
-    print qq|Set-Cookie: LedgerSMB=$newCookieValue; path=$path;\n|;
+    print qq|Set-Cookie: ${LedgerSMB::Sysconfig::cookie_name}=$newCookieValue; path=$path;\n|;
     $lsmb->{LedgerSMB} = $newCookieValue;
     $lsmb->{dbh}->commit;
 }
@@ -222,7 +222,7 @@ sub session_destroy {
         __FILE__ . ':' . __LINE__ . ': Delete from session: ' );
 
     #delete the cookie in the browser
-    print qq|Set-Cookie: LedgerSMB=; path=/;\n|;
+    print qq|Set-Cookie: ${LedgerSMB::Sysconfig::cookie_name}=; path=/;\n|;
 
 }
 
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index 3d43b8a6..f9ae6ad5 100644
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -127,7 +127,7 @@ sub new {
             my ( $name, $value ) = split /=/, $_, 2;
             $cookie{$name} = $value;
         }
-         my $ccookie = $cookie{LedgerSMB};
+         my $ccookie = $cookie{${LedgerSMB::Sysconfig::cookie_name}};
          $ccookie =~ s/.*:([^:]*)$/$1/;
          $self->{company} = $ccookie;
     }
diff --git a/LedgerSMB/Sysconfig.pm b/LedgerSMB/Sysconfig.pm
index f14b3f01..b2fc1a93 100644
--- a/LedgerSMB/Sysconfig.pm
+++ b/LedgerSMB/Sysconfig.pm
@@ -39,6 +39,10 @@ $max_post_size = 1024 * 1024;
 
 # defaults to 2-- default number of places to round amounts to
 $decimal_places = 2;
+
+# defaults to LedgerSMB-1.3 - default spelling of cookie
+$cookie_name = "LedgerSMB-1.3";
+
 # spool directory for batch printing
 $spool = "spool";
 
@@ -88,7 +92,7 @@ read_config( 'ledgersmb.conf' => %config ) or die;
 # Root variables
 for $var (
     qw(pathsep logging check_max_invoices language auth latex
-    db_autoupdate force_username_case max_post_size decimal_places)
+    db_autoupdate force_username_case max_post_size decimal_places cookie_name)
   )
 {
     ${$var} = $config{''}{$var} if $config{''}{$var};