X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Memories%2FPhoto.pm;h=76375a576dd9bf26774836e36f37f8315da42404;hb=4eced18604f4137a3685d4176a5294d56b6534df;hp=5ce8d956145728a8906e6f6418b78aba0893cd95;hpb=2fbbd5523381d92d751d9930ccd2993449a508da;p=memories.git

diff --git a/Memories/Photo.pm b/Memories/Photo.pm
index 5ce8d95..76375a5 100644
--- a/Memories/Photo.pm
+++ b/Memories/Photo.pm
@@ -165,7 +165,7 @@ sub upload_jpeg {
     Memories->zap_cache();
     # Add system tags here
     my $tag = "date:".$photo->shot->ymd;
-    $photo->add_to_system_tags({tag => Memories::SystemTag->find_or_create({name =>$tag}) });
+    $photo->add_to_system_tags({system_tag => Memories::SystemTag->find_or_create({name =>$tag}) });
     return $photo;
 }
 
@@ -179,7 +179,7 @@ sub add_rating :Exported {
     my ($self, $r) = @_;
     my $photo = $r->{objects}[0];
     my $delta = $r->{params}{rating};
-    if ($delta < 0 or $delta > 5) { return; } # Scammer
+    if ($delta <= 0 or $delta > 5) { return; } # Scammer
     # XXX Race
     $photo->rating($photo->rating() + $delta);
     $photo->rated($photo->rated() + 1);
@@ -211,6 +211,16 @@ sub comment :Exported {}
 sub tagedit :Exported {}
 sub similar :Exported {}
 sub sized :Exported {}
+sub delete :Exported {
+    my ($self, $r, $photo) = @_;
+    if ($r) { 
+    if ($photo and $photo->uploader == $r->user) {
+        $photo->delete;
+        $r->message("Photo deleted!");
+    }
+    $r->template("frontpage");
+    } else { $self->SUPER::delete() } 
+}
 
 use Class::DBI::Plugin::Pager;
 use Class::DBI::Plugin::AbstractCount;
@@ -233,10 +243,12 @@ sub view_paged_ordered {
 sub add_comment :Exported {
     my ($self, $r, $photo) = @_;
     $r->template("view");
+    if ($r->params->{content} =~ /\S/) {
     $r->objects->[0]->add_to_comments({
         name => $r->params->{name},
         content => $r->params->{content}
     });
+    }
 }
 
 use Cache::MemoryCache;