X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Session-State-Cookie.git;a=blobdiff_plain;f=lib%2FCatalyst%2FPlugin%2FSession%2FState%2FCookie.pm;h=0bef033433cf8dbec9dbe96d6aad6f7295716b89;hp=ebe362b1cf47446b5574f29a81ca114ffef00810;hb=1e986fd57422a13babc4305f9f95f1d50b71c2cd;hpb=724a61732700d4e8e7de83b3665c7611dafc204b

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index ebe362b..0bef033 100644
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -5,51 +5,64 @@ use strict;
 use warnings;
 
 use NEXT;
+use Catalyst::Utils ();
 
-our $VERSION = "0.01";
+our $VERSION = "0.02";
 
 sub setup_session {
     my $c = shift;
 
     $c->NEXT::setup_session(@_);
-
-    $c->config->{session}{cookie_name} ||= "session";
+    $c->config->{session}{cookie_name}
+        ||= Catalyst::Utils::appprefix($c) . '_session';
 }
 
 sub finalize_cookies {
     my $c = shift;
 
-    if ( $c->sessionid) {
-		$c->update_session_cookie( $c->make_session_cookie );
-	}
+    if ( $c->sessionid ) {
+        $c->update_session_cookie( $c->make_session_cookie );
+    }
 
     return $c->NEXT::finalize_cookies(@_);
 }
 
 sub update_session_cookie {
-	my ( $c, $updated ) = @_;
+    my ( $c, $updated ) = @_;
     my $cookie_name = $c->config->{session}{cookie_name};
-	$c->response->cookies->{$cookie_name} = $updated;
+    $c->response->cookies->{$cookie_name} = $updated;
 }
 
 sub make_session_cookie {
-	my $c = shift;
-
-	my $cfg = $c->config->{session};
-	my $cookie = {
-		value   => $c->sessionid,
-		($cfg->{cookie_domain} ? (domain => $cfg->{cookie_domain}) : ()),
-	};
-
-	if ( exists $cfg->{cookie_expires} ) {
-		if ( my $ttl = $cfg->{cookie_expires} ) {
-			$cookie->{expires} = time() + $ttl;
-		} # else { cookie is non-persistent }
-	} else {
-		$cookie->{expires} = $c->session->{__expires};
-	}
+    my $c = shift;
+
+    my $cfg    = $c->config->{session};
+    my $cookie = {
+        value => $c->sessionid,
+        ( $cfg->{cookie_domain} ? ( domain => $cfg->{cookie_domain} ) : () ),
+    };
+
+    $cookie->{expires}=$c->calc_expiry();
 
-	return $cookie;
+    return $cookie;
+}
+
+sub calc_expiry {
+    my $c=shift;
+    my $cfg    = $c->config->{session};
+    my $value= $c->NEXT::calc_expiry(@_);
+    return $value if $value;
+    if ( exists $cfg->{cookie_expires} ) {
+        if ( $cfg->{cookie_expires} > 0 ) {
+            return time() + $cfg->{cookie_expires};
+        }
+        else {
+            return undef;
+        }
+    }
+    else {
+       return $c->session_expires;
+    }
 }
 
 sub prepare_cookies {
@@ -76,7 +89,7 @@ __END__
 
 =head1 NAME
 
-Catalyst::Plugin::Session::State::Cookie - A session ID 
+Catalyst::Plugin::Session::State::Cookie - Maintain session IDs using cookies.
 
 =head1 SYNOPSIS
 
@@ -128,12 +141,18 @@ Will set the C<cookie_name> parameter to it's default value if it isn't set.
 
 =item cookie_name
 
-The name of the cookie to store (defaults to C<session>).
+The name of the cookie to store (defaults to C<Catalyst::Utils::apprefix($c) . '_session'>).
 
 =item cookie_domain
 
 The name of the domain to store in the cookie (defaults to current host)
 
+=item cookie_expires
+
+Number of seconds from now you want to elapse before cookie will expire. 
+Set to 0 to create a session cookie, ie one which will die when the 
+user's browser is shut down.
+
 =back
 
 =head1 CAVEATS
@@ -154,12 +173,17 @@ actually created the headers have already been sent to the client.
 
 L<Catalyst>, L<Catalyst::Plugin::Session>.
 
-=head1 AUTHOR
+=head1 AUTHORS
+
+This module is derived from L<Catalyst::Plugin::Session::FastMmap> code, and
+has been heavily modified since.
 
-Sebastian Riedel E<lt>C<sri@cpan.org>E<gt>,
-Marcus Ramberg E<lt>C<mramberg@cpan.org>E<gt>,
-Andrew Ford E<lt>C<andrewf@cpan.org>E<gt>,
-Yuval Kogman E<lt>C<nothingmuch@woobling.org>E<gt>
+Andrew Ford
+Andy Grundman
+Christian Hansen
+Yuval Kogman, C<nothingmuch@woobling.org>
+Marcus Ramberg
+Sebastian Riedel
 
 =head1 COPYRIGHT