From 512a532650670fa38fd4ef79f124ce237e4474a7 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sun, 1 Mar 2009 19:11:01 +0000 Subject: Simplify the batch api by having the core event handlers for start_batch and end_batch add and remove the batch id from the session. Modules wishing to do batch processing, just need to fire the start_batch and end_batch events. Other modules that need to be aware of batches (i.e. notifications) just check the session for "batch_id". --- core/controllers/simple_uploader.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'core/controllers/simple_uploader.php') diff --git a/core/controllers/simple_uploader.php b/core/controllers/simple_uploader.php index 005071b0..5ae4bb2a 100644 --- a/core/controllers/simple_uploader.php +++ b/core/controllers/simple_uploader.php @@ -48,12 +48,7 @@ class Simple_Uploader_Controller extends Controller { $file_validation = new Validation($_FILES); $file_validation->add_rules("file", "upload::valid", "upload::type[gif,jpg,png,flv,mp4]"); if ($file_validation->validate()) { - $batch_id = Session::instance()->get("batch_id"); - if (empty($batch_id)) { - $batch_id = mt_rand(); - module::event("start_add_batch", $batch_id); - Session::instance()->set("batch_id", $batch_id); - } + module::event("start_batch"); $temp_filename = upload::save("file"); $title = substr(basename($temp_filename), 10); // Skip unique identifier Kohana adds $path_info = pathinfo($temp_filename); @@ -70,10 +65,8 @@ class Simple_Uploader_Controller extends Controller { } public function finish() { - $batch_id = Session::instance()->get_once("batch_id"); - if (!empty($batch_id)) { - module::event("end_add_batch", $batch_id); - } + module::event("end_batch"); + print json_encode(array("result" => "success")); } } -- cgit v1.2.3