From 40e27e128e34601380079a02dca9346aed54c3bf Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 24 Jun 2009 13:11:53 -0700
Subject: Create a maintenance task that allows the administrator to remove any
 proxy requests that are still active after 10 days.  Digibug requires that
 the image be available for 5 days, so we'll give them an extra 5 days.

Also correct a few issues with the protocol.
---
 modules/digibug/controllers/digibug.php  |  4 +-
 modules/digibug/helpers/digibug_task.php | 68 ++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 modules/digibug/helpers/digibug_task.php

(limited to 'modules')

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 609da875..3a427149 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -41,7 +41,7 @@ class Digibug_Controller extends Controller {
       "digibug_api_version" => "100",
       "company_id" => $company_id,
       "event_id" => $event_id,
-      "cmd" => "adding",
+      "cmd" => "addimg",
       "return_url" => url::abs_site("digibug/close_window"),
       "num_images" => "1",
       "image_1" => $url,
@@ -50,7 +50,7 @@ class Digibug_Controller extends Controller {
       "image_width_1" => $item->width,
       "thumb_height_1" => $item->thumb_height,
       "thumb_width_1" => $item->thumb_width,
-      "title" => $item->title);
+      "title_1" => $item->title);
 
     print $v;
   }
diff --git a/modules/digibug/helpers/digibug_task.php b/modules/digibug/helpers/digibug_task.php
new file mode 100644
index 00000000..98f79731
--- /dev/null
+++ b/modules/digibug/helpers/digibug_task.php
@@ -0,0 +1,68 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class digibug_task_Core {
+  static function available_tasks() {
+    // Delete extra exif_records
+    $expired_request_count = Database::instance()->query(
+      "SELECT count(*) as print_requests
+         FROM {proxies}
+        WHERE `request_date` <= (CURDATE() - INTERVAL 10 DAY)")->current()->print_requests;
+
+    return array(Task_Definition::factory()
+                 ->callback("digibug_task::remove_expired")
+                 ->name(t("Remove Digibug print requests"))
+                 ->description($expired_request_count
+                               ? t2("1 Digibug print request has expired",
+                                    "%count Digibug print requests have expired",
+                                    $expired_request_count)
+                               : t("All print requests are current"))
+                 ->severity($expired_request_count ? log::WARNING : log::SUCCESS));
+  }
+
+  static function remove_expired($task) {
+    $completed = $task->get("completed", 0);
+    $expired = ORM::factory("proxy")
+      ->where("request_date <= (CURDATE() - INTERVAL 10 DAY)")
+      ->find_all();
+    $remaining = $expired->count();
+
+    $start = microtime(true);
+    foreach ($expired as $proxy) {
+      if (microtime(true) - $start > 1.5) {
+        break;
+      }
+      $proxy->delete();
+      $completed++;
+      $remaining--;
+    }
+
+    if ($completed + $remaining > 0) {
+      $task->percent_complete = (int)(100 * $completed / ($completed + $remaining));
+    } else {
+      $task->percent_complete = 100;
+    }
+
+    $task->set("completed", $completed);
+    if ($remaining == 0) {
+      $task->done = true;
+      $task->state = "success";
+    }
+  }
+}
-- 
cgit v1.2.3