From 58d5624e401f1c369cbbf913008775bc5a165570 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 22 Jun 2009 21:51:22 -0700
Subject: This commit moves a little further along the path: 1) moves the print
 button from the quick pane to thumb_bottom 2) Creates an entry into the proxy
 table

---
 modules/digibug/helpers/digibug.php           | 57 +++++++++++++++++++++++++++
 modules/digibug/helpers/digibug_installer.php |  6 +--
 modules/digibug/helpers/digibug_quick.php     | 34 ----------------
 modules/digibug/helpers/digibug_theme.php     | 23 +++++++++++
 4 files changed, 83 insertions(+), 37 deletions(-)
 create mode 100644 modules/digibug/helpers/digibug.php
 delete mode 100644 modules/digibug/helpers/digibug_quick.php

(limited to 'modules/digibug/helpers')

diff --git a/modules/digibug/helpers/digibug.php b/modules/digibug/helpers/digibug.php
new file mode 100644
index 00000000..46c9d945
--- /dev/null
+++ b/modules/digibug/helpers/digibug.php
@@ -0,0 +1,57 @@
+<?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 33b5107b..73645eb7 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 {print_proxy} (
+        ->query("CREATE TABLE {proxies} (
                    `id` int(9) NOT NULL auto_increment,
-                   `proxy_id` char(55) NOT NULL,
+                   `uuid` char(32) NOT NULL,
                    `item_id` int(9),
                    PRIMARY KEY (`id`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
@@ -38,7 +38,7 @@ class digibug_installer {
   }
 
   static function uninstall() {
-    Database::instance()->query("DROP TABLE IF EXISTS {print_proxy}");
+    Database::instance()->query("DROP TABLE IF EXISTS {proxys}");
     module::delete("digibug");
   }
 }
diff --git a/modules/digibug/helpers/digibug_quick.php b/modules/digibug/helpers/digibug_quick.php
deleted file mode 100644
index dce0c519..00000000
--- a/modules/digibug/helpers/digibug_quick.php
+++ /dev/null
@@ -1,34 +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_quick_Core {
-  static function buttons($item, $page_type) {
-    $elements["center"] = array();
-    if (access::can("view", $item) && $item->type == "photo") {
-      $csrf = access::csrf_token();
-      $elements["center"][] = (object)array(
-        "title" => t("Print photo with Digibug"),
-        "class" => "gButtonLink",
-        "icon" => "ui-icon-print",
-        "href" => url::site("digibug/print/$item->id?csrf=$csrf"));
-    }
-
-    return $elements;
-  }
-}
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index 06d656c8..2e44b115 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -18,8 +18,31 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class digibug_theme_Core {
+  static function head($theme) {
+    $head[] = "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
+      url::file("modules/digibug/css/digibug.css") . "\" />";
+    $head[] = html::script("modules/digibug/js/digibug.js");;
+    return implode("\n", $head);
+  }
+
   static function admin_head($theme) {
     return "<link media=\"screen, projection\" rel=\"stylesheet\" type=\"text/css\" href=\"" .
       url::file("modules/digibug/css/digibug.css") . "\" />";
   }
+
+  static function thumb_bottom($theme, $child) {
+    if ($theme->page_type() == "album" && $child->type == "photo") {
+      $csrf = access::csrf_token();
+      $return = "album/{$child->parent()->id}";
+      $href = url::site("digibug/print_photo/$child->id?csrf={$csrf}&return=$return");
+      $title = t("Print photo with Digibug");
+      return "<div class=\"gDigibugPrintButton\">
+                <a class=\"gButtonLink ui-corner-all ui-state-default ui-icon-left\" href=\"$href\"
+                   title=\"$title\">
+                  <span class=\"ui-icon ui-icon-print\">$title</span>
+                </a>
+             </div>";
+    }
+    return "";
+  }
 }
-- 
cgit v1.2.3