diff --git a/installer/web.php b/installer/web.php
index 61f26f7d..78784539 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -81,7 +81,7 @@ function oops($error) {
function check_environment() {
if (!function_exists("mysql_query") && !function_exists("mysqli_set_charset")) {
- $errors[] = "Gallery 3 requires a MySQL database, but PHP doesn't have either the the MySQL or the MySQLi extension.";
+ $errors[] = "Gallery 3 requires a MySQL database, but PHP doesn't have either the MySQL or the MySQLi extension.";
}
if (!@preg_match("/^.$/u", utf8_encode("\xF1"))) {
diff --git a/modules/digibug/controllers/admin_digibug.php b/modules/digibug/controllers/admin_digibug.php
new file mode 100644
index 00000000..8263fc83
--- /dev/null
+++ b/modules/digibug/controllers/admin_digibug.php
@@ -0,0 +1,74 @@
+_get_view();
+ }
+
+ public function basic() {
+ access::verify_csrf();
+
+ module::set_var("digibug", "mode", "basic");
+ message::success(t("Successfully set Digibug mode to basic"));
+
+ url::redirect("admin/digibug");
+ }
+
+ public function advanced() {
+ access::verify_csrf();
+
+ $form = $this->_get_form();
+ if ($form->validate()) {
+ module::set_var("digibug", "company_id", $form->group->company_id->value);
+ module::set_var("digibug", "event_id", $form->group->event_id->value);
+ module::set_var("digibug", "mode", "advanced");
+ message::success(t("Successfully set Digibug mode to advanced"));
+
+ url::redirect("admin/digibug");
+ }
+
+ print $this->_get_view($form);
+ }
+
+ private function _get_view($form=null) {
+ $v = new Admin_View("admin.html");
+ $v->content = new View("admin_digibug.html");
+ $v->content->mode = module::get_var("digibug", "mode", "basic");
+ $v->content->form = empty($form) ? $this->_get_form() : $form;
+ return $v;
+ }
+
+ private function _get_form() {
+ $form = new Forge("admin/digibug/advanced", "", "post",
+ array("id" => "gAdminForm"));
+ $group = $form->group("group");
+ $group->input("company_id")
+ ->label(t("Company Id"))
+ ->rules("required")
+ ->value(module::get_var("digibug", "company_id", ""));
+ $group->input("event_id")
+ ->label(t("Event Id"))
+ ->rules("required")
+ ->value(module::get_var("digibug", "event_id", ""));
+ $group->submit("submit")->value(t("Submit"));
+
+ return $form;
+ }
+}
\ No newline at end of file
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
new file mode 100644
index 00000000..3a427149
--- /dev/null
+++ b/modules/digibug/controllers/digibug.php
@@ -0,0 +1,95 @@
+uuid = digibug::uuid();
+ $proxy->item_id = $item->id;
+ $proxy->save();
+
+ $url = url::abs_site("digibug/print_proxy/{$proxy->uuid}");
+ if (module::get_var("digibug", "mode", "basic")) {
+ $company_id = module::get_var("digibug", "basic_company_id");
+ $event_id = module::get_var("digibug", "basic_event_id");
+ } else {
+ $company_id = module::get_var("digibug", "company_id");
+ $event_id = module::get_var("digibug", "event_id");
+ }
+ $v = new View("digibug_form.html");
+ $v->order_parms = array(
+ "digibug_api_version" => "100",
+ "company_id" => $company_id,
+ "event_id" => $event_id,
+ "cmd" => "addimg",
+ "return_url" => url::abs_site("digibug/close_window"),
+ "num_images" => "1",
+ "image_1" => $url,
+ "thumb_1" => "$url/thumb",
+ "image_height_1" => $item->height,
+ "image_width_1" => $item->width,
+ "thumb_height_1" => $item->thumb_height,
+ "thumb_width_1" => $item->thumb_width,
+ "title_1" => $item->title);
+
+ print $v;
+ }
+
+ public function print_proxy($id, $thumb=null) {
+ $proxy = ORM::factory("proxy")
+ ->where("uuid", $id)
+ ->find();
+
+ if (!$proxy->loaded) {
+ Kohana::show_404();
+ }
+
+ if (!$proxy->item->loaded) {
+ Kohana::show_404();
+ }
+
+ $file = empty($thumb) ? $proxy->item->file_path() : $proxy->item->thumb_path();
+ if (!file_exists($file)) {
+ kohana::show_404();
+ }
+
+ // We don't need to save the session for this request
+ Session::abort_save();
+
+ // Dump out the image
+ header("Content-Type: $proxy->item->mime_type");
+ Kohana::close_buffers(false);
+ $fd = fopen($file, "rb");
+ fpassthru($fd);
+ fclose($fd);
+
+ // If the request was for the image and not the thumb, then delete the proxy.
+ if (empty($thumb)) {
+ $proxy->delete();
+ }
+ }
+
+ public function close_window() {
+ print "";
+ }
+}
\ No newline at end of file
diff --git a/modules/digibug/css/digibug.css b/modules/digibug/css/digibug.css
new file mode 100644
index 00000000..a09e4551
--- /dev/null
+++ b/modules/digibug/css/digibug.css
@@ -0,0 +1,91 @@
+.gAdminDigibugIntro {
+ background-image: url(logo.png);
+ background-repeat: no-repeat;
+ padding-bottom: 20px;
+ width: 820px;
+}
+
+.gAdminDigibugIntro p {
+ font-family: Trebuchet MS,Arial,Verdana,Helvetica,sans-serif;
+ font-size: 1.3em;
+ font-weight: bold;
+ padding-left: 110px;
+ padding-top: 15px;
+}
+
+.gDigibugTab {
+ width: 820px;
+ height: 420px;
+}
+
+.gDigibugTab .gDigibugTitle {
+ font-family: Georgia;
+ font-size: 20px;
+ font-weight: bold;
+ padding-bottom: 10px;
+}
+
+.gDigibugTab .gDigibugText {
+ font-size: 12px;
+ font-weight: bold;
+ line-height: 17px;
+ padding-bottom: 15px;
+}
+
+.gDigibugListItems ul {
+ list-style-type: disc;
+ padding-left: 20px;
+ font-size: 12px;
+ font-weight: bold;
+ line-height: 15px;
+}
+
+.gDigibugListItems ul li{
+ padding-top: 10px;
+}
+
+.gDigibugRounded {
+ background-color:#5C9CCC;
+ color: white;
+ width: 308px;
+ height: 45px;
+ text-align: center;
+ line-height: 15px;
+ margin-top: 10px;
+ font-weight: bold;
+ font-size: 12px;
+ margin-left: 60px;
+ margin-right: -50px;
+ margin-left: 20px;
+ margin-right: 0px;
+}
+
+.gDigibugRounded a {
+ color: white !important;
+ font-weight: bold;
+ text-decoration: underline;
+}
+
+.gDigibugSignIn {
+ width: 115px;
+ float: left;
+}
+
+.gDigibugSignIn a {
+ color: black;
+ font-size: 16px;
+ font-weight: bold;
+ text-decoration: underline;
+}
+
+.gDigibugAdvancedForm {
+ float: left;
+ padding-left: 30px;
+ width: 180px;
+}
+
+.gDigibugPrintButton {
+ float: left;
+}
+
+
diff --git a/modules/digibug/css/logo.png b/modules/digibug/css/logo.png
new file mode 100644
index 00000000..5eac2c7d
Binary files /dev/null and b/modules/digibug/css/logo.png differ
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 @@
+> 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
new file mode 100644
index 00000000..baff2075
--- /dev/null
+++ b/modules/digibug/helpers/digibug_installer.php
@@ -0,0 +1,45 @@
+query("CREATE TABLE {proxies} (
+ `id` int(9) NOT NULL AUTO_INCREMENT,
+ `uuid` char(36) NOT NULL,
+ `request_date` TIMESTAMP NOT NULL DEFAULT current_timestamp,
+ `item_id` int(9) NOT NULL,
+ PRIMARY KEY (`id`))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+
+ module::set_var("digibug", "basic_company_id", "3153");
+ module::set_var("digibug", "basic_event_id", "8491");
+ module::set_var("digibug", "mode", "basic");
+
+ module::set_version("digibug", 1);
+ }
+ }
+
+ static function uninstall() {
+ Database::instance()->query("DROP TABLE IF EXISTS {proxies}");
+ module::delete("digibug");
+ }
+}
diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php
new file mode 100644
index 00000000..1ff0f6bf
--- /dev/null
+++ b/modules/digibug/helpers/digibug_menu.php
@@ -0,0 +1,43 @@
+get("settings_menu")
+ ->append(Menu::factory("link")
+ ->id("digibug_menu")
+ ->label(t("Digibug Administration"))
+ ->url(url::site("admin/digibug")));
+ }
+
+ static function photo($menu, $theme) {
+ }
+
+ static function site($menu, $theme) {
+ $item = $theme->item();
+
+ if ($item && access::can("edit", $item)) {
+ $options_menu = $menu->get("options_menu")
+ ->append(Menu::factory("dialog")
+ ->id("digibug")
+ ->label(t("Peform Digibug Processing"))
+ ->url(url::site("digibug/index/$item->id")));
+ }
+ }
+}
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 @@
+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";
+ }
+ }
+}
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
new file mode 100644
index 00000000..e52fcc7f
--- /dev/null
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -0,0 +1,42 @@
+";
+ $head[] = html::script("modules/digibug/js/digibug.js");;
+ return implode("\n", $head);
+ }
+
+ static function admin_head($theme) {
+ return "";
+ }
+
+ static function thumb_bottom($theme, $child) {
+ if ($theme->page_type() == "album" && $child->type == "photo") {
+ $v = new View("digibug_album.html");
+ $v->id = $child->id;
+ $v->title = t("Print photo with Digibug");
+ return $v->render();
+ }
+ return "";
+ }
+}
diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js
new file mode 100644
index 00000000..e9e8933e
--- /dev/null
+++ b/modules/digibug/js/digibug.js
@@ -0,0 +1,46 @@
+$(document).ready(function() {
+ $(".gDigibugPrintButton a").click(function(e) {
+ e.preventDefault();
+ queue_print(e);
+ });
+});
+
+function popUp(url, options) {
+ options = $.extend({
+ /* default options */
+ width: 400,
+ height: 400,
+ target: 'dbPopWin',
+ scrollbars: 'yes',
+ resizable: 'no',
+ menuBar: 'no',
+ addressBar: 'yes'}, options);
+
+ /* center the window by default. */
+ if (!options.winY) {
+ options.winY = screen.height / 2 - options.height / 2;
+ };
+ if (!options.winX) {
+ options.winX = screen.width / 2 - options.width / 2;
+ };
+
+ open(
+ url,
+ options['target'],
+ 'width= ' + options.width +
+ ',height=' + options.height +
+ ',top=' + options.winY +
+ ',left=' + options.winX +
+ ',scrollbars=' + options.scrollbars +
+ ',resizable=' + options.resizable +
+ ',menubar=' + options.menuBar +
+ ',location=' + options.addressBar
+ );
+
+ return false;
+
+}
+
+function queue_print(e) {
+ return popUp(e.currentTarget.href, { width: 800, height: 600 } );
+};
diff --git a/modules/digibug/models/proxy.php b/modules/digibug/models/proxy.php
new file mode 100644
index 00000000..ce10c592
--- /dev/null
+++ b/modules/digibug/models/proxy.php
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+