X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Memories.pm;h=c3f1127d1c41189a19daac1262415337d1d03bcc;hb=3b371b0c2e584c3b9164fef7df7faae8d58401d0;hp=a789fabf524497765120d66a42bf8ee85a5bb29a;hpb=6e690feb2f60fc95145b4f6d83821da896505eb5;p=memories.git

diff --git a/Memories.pm b/Memories.pm
index a789fab..c3f1127 100644
--- a/Memories.pm
+++ b/Memories.pm
@@ -1,9 +1,10 @@
 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 Tagtools;
 use Memories::Config;
 use Memories::DBI;
 use Memories::Photo;
@@ -13,14 +14,14 @@ use Memories::SystemTag;
 use Memories::User;
 use Memories::Album;
 use URI::Escape;
-use Calendar::Simple;
 use XML::RSS;
-use Tagtools;
 
 Memories->config->auth->{ user_field } = "name";
 Memories->config->model("Maypole::Model::CDBI::Plain");
 Memories->setup([qw/ Memories::Photo Memories::User Memories::Tag
 Memories::Album Memories::SystemTag/]);
+Memories->setup_tagging("photo");
+Memories->setup_tagging("photo", "system_tag");
 
 sub message {
     my ($self, $message) = @_;
@@ -81,7 +82,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 +94,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");
    }