Use configured lock directory, not hard-coded.

[memories.git] / Memories.pm

diff --git a/Memories.pm b/Memories.pm
index a789fabf524497765120d66a42bf8ee85a5bb29a..1a0b994edd3a96dc15f0a68b23443608421b5be8 100644 (file)
--- a/Memories.pm
+++ b/Memories.pm
@@ -1,7 +1,7 @@
 package Memories;
 use strict;
 our $VERSION = "1.2";
-use Maypole::Application qw(Upload Authentication::UserSessionCookie);
+use Maypole::Application qw(Authentication::UserSessionCookie);
 use HTML::TagCloud;
 use URI;
 use Memories::Config;
@@ -81,7 +81,7 @@ sub additional_data {
     }
     $r->{template_args}{now} = Time::Piece->new;
     if ($r->session) {
-        (tied %{$r->session})->{lock_manager}->clean('/var/lib/memories/sessionlock', 3600) #remove files older than 1 hour
+        (tied %{$r->session})->{lock_manager}->clean(Memories->config->{auth}{session_args}{LockDirectory}, 3600) #remove files older than 1 hour
     }
     return $r->do_rss if ($r->params->{format} =~ /rss/)
 }
@@ -93,8 +93,7 @@ sub authenticate {
    $r->get_user;
    if (!$r->user and $self->path =~ /upload/) { $r->template("login"); }
    # Don't let 'em go until they've fixed it
-   warn "Quarantine is : ".$r->session->{quarantined};
-   if ($r->session->{quarantined} and $self->path !~ /js$/) { 
+   if ($r->session and $r->session->{quarantined} and $self->path !~ /js$/) { 
        $r->table("photo"); $r->action("quarantine");
        $r->model_class("Memories::Photo");
    }