1) rename the model proxy to digibug proxy

2) corresponding table name change to digibug_proxies
3) change the generate of a unique id to md5(rand())
3) Remove the helper function as digibug::uuid is no longer required.

5 files changed, 9 insertions, 66 deletions

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 3a427149..72b57242 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -23,8 +23,8 @@ class Digibug_Controller extends Controller {
 
     $item = ORM::factory("item", $id);
 
-    $proxy = ORM::factory("proxy");
-    $proxy->uuid = digibug::uuid();
+    $proxy = ORM::factory("digibug_proxy");
+    $proxy->uuid =  md5(rand());
     $proxy->item_id = $item->id;
     $proxy->save();
 
@@ -56,7 +56,7 @@ class Digibug_Controller extends Controller {
   }
 
   public function print_proxy($id, $thumb=null) {
-    $proxy = ORM::factory("proxy")
+    $proxy = ORM::factory("digibug_proxy")
       ->where("uuid", $id)
       ->find();
 
diff --git a/modules/digibug/helpers/digibug.php b/modules/digibug/helpers/digibug.php
deleted file mode 100644
index 46c9d945..00000000
--- a/modules/digibug/helpers/digibug.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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_Core {
-  /**
-   * Get a unique id for a print request.
-   * Its a good thing we only support linux as this won't work on Windows
-   */
-  static function uuid() {
-    $fp = @fopen("/dev/urandom", "rb");
-    $bits = @fread($fp, 16);
-    @fclose($fp);
-
-    $time_low = bin2hex(substr($bits, 0, 4));
-    $time_mid = bin2hex(substr($bits, 4, 2));
-    $time_hi_and_version = bin2hex(substr($bits, 6, 2));
-    $clock_seq_hi_and_reserved = bin2hex(substr($bits, 8, 2));
-    $node = bin2hex ( substr ( $bits, 10, 6 ) );
-
-    /**
-     * Set the four most significant bits (bits 12 through 15) of the
-     * time_hi_and_version field to the 4-bit version number from
-     * Section 4.1.3.
-     * @see http://tools.ietf.org/html/rfc4122#section-4.1.3
-     */
-    $time_hi_and_version = hexdec ( $time_hi_and_version );
-    $time_hi_and_version = $time_hi_and_version >> 4;
-    $time_hi_and_version = $time_hi_and_version | 0x4000;
-
-    /**
-     * Set the two most significant bits (bits 6 and 7) of the
-     * clock_seq_hi_and_reserved to zero and one, respectively.
-     */
-    $clock_seq_hi_and_reserved = hexdec ( $clock_seq_hi_and_reserved );
-    $clock_seq_hi_and_reserved = $clock_seq_hi_and_reserved >> 2;
-    $clock_seq_hi_and_reserved = $clock_seq_hi_and_reserved | 0x8000;
-
-    return sprintf ('%08s-%04s-%04x-%04x-%012s',
-                    $time_low, $time_mid, $time_hi_and_version, $clock_seq_hi_and_reserved, $node);
-  }
-}
diff --git a/modules/digibug/helpers/digibug_installer.php b/modules/digibug/helpers/digibug_installer.php
index baff2075..120bd3ef 100644
--- a/modules/digibug/helpers/digibug_installer.php
+++ b/modules/digibug/helpers/digibug_installer.php
@@ -22,9 +22,9 @@ class digibug_installer {
     $version = module::get_version("digibug");
     if ($version == 0) {
       Database::instance()
-        ->query("CREATE TABLE {proxies} (
+        ->query("CREATE TABLE {digibug_proxies} (
                    `id` int(9) NOT NULL AUTO_INCREMENT,
-                   `uuid` char(36) NOT NULL,
+                   `uuid` char(32) NOT NULL,
                    `request_date` TIMESTAMP NOT NULL DEFAULT current_timestamp,
                    `item_id` int(9) NOT NULL,
                    PRIMARY KEY (`id`))
@@ -39,7 +39,7 @@ class digibug_installer {
   }
 
   static function uninstall() {
-    Database::instance()->query("DROP TABLE IF EXISTS {proxies}");
+    Database::instance()->query("DROP TABLE IF EXISTS {digibug_proxies}");
     module::delete("digibug");
   }
 }
diff --git a/modules/digibug/helpers/digibug_task.php b/modules/digibug/helpers/digibug_task.php
index 98f79731..08cd6feb 100644
--- a/modules/digibug/helpers/digibug_task.php
+++ b/modules/digibug/helpers/digibug_task.php
@@ -22,7 +22,7 @@ class digibug_task_Core {
     // Delete extra exif_records
     $expired_request_count = Database::instance()->query(
       "SELECT count(*) as print_requests
-         FROM {proxies}
+         FROM {digibug_proxies}
         WHERE `request_date` <= (CURDATE() - INTERVAL 10 DAY)")->current()->print_requests;
 
     return array(Task_Definition::factory()
@@ -38,7 +38,7 @@ class digibug_task_Core {
 
   static function remove_expired($task) {
     $completed = $task->get("completed", 0);
-    $expired = ORM::factory("proxy")
+    $expired = ORM::factory("digibug_proxy")
       ->where("request_date <= (CURDATE() - INTERVAL 10 DAY)")
       ->find_all();
     $remaining = $expired->count();
diff --git a/modules/digibug/models/proxy.php b/modules/digibug/models/digibug_proxy.php
index ce10c592..c76afdae 100644
--- a/modules/digibug/models/proxy.php
+++ b/modules/digibug/models/digibug_proxy.php
@@ -17,6 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Proxy_Model extends ORM {
+class Digibug_Proxy_Model extends ORM {
   protected $has_one = array("item");
 }