From a9908508d0826ed6d448a98766a2bfe95b4f1fdf Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Thu, 12 Jul 2007 08:39:13 +0000
Subject: [PATCH] veto API

git-svn-id: file:///home/shish/svn/shimmie2/trunk@269 7f39781d-f577-437e-ae19-be835c7a54ca
---
 ext/bulk_add/main.php | 5 +++--
 ext/image/main.php    | 3 ++-
 ext/upload/main.php   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ext/bulk_add/main.php b/ext/bulk_add/main.php
index 1a077481..949cb1b7 100644
--- a/ext/bulk_add/main.php
+++ b/ext/bulk_add/main.php
@@ -41,8 +41,9 @@ class BulkAdd extends Extension {
 			$image = new Image($tmpname, $filename, $tags);
 		
 			if($image->is_ok()) {
-				send_event(new UploadingImageEvent($image));
-				$ok = true;
+				$uie = new UploadingImageEvent($image);
+				send_event($uie);
+				$ok = $uie->_live;
 			}
 		}
 
diff --git a/ext/image/main.php b/ext/image/main.php
index e339fae6..5dbfc6d3 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -22,7 +22,8 @@ class ImageIO extends Extension {
 		}
 
 		if(is_a($event, 'UploadingImageEvent')) {
-			$event->ok = $this->add_image($event->image);
+			$ok = $this->add_image($event->image);
+			if(!$ok) $event->veto();
 		}
 
 		if(is_a($event, 'ImageDeletionEvent')) {
diff --git a/ext/upload/main.php b/ext/upload/main.php
index 1ba5367c..cf79a7cf 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -71,7 +71,7 @@ class Upload extends Extension {
 			if($image->is_ok()) {
 				$event = new UploadingImageEvent($image);
 				send_event($event);
-				$ok = $event->ok;
+				$ok = $event->_live;
 			}
 			else {
 				$this->theme->display_upload_error("Error with ".html_escape($file['name']),