From 467b74c3106558d1656301b9c73236417d4421ac Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sun, 27 Sep 2009 15:24:51 -0700 Subject: This path requires the upgrader to be run and applies the following changes: * moves the composite method back into core * requires that the operation be fully qualified i.e. gallery_graphics::resize * caches the graphics rules on each request --- modules/watermark/helpers/watermark_graphics.php | 75 ----------------------- modules/watermark/helpers/watermark_installer.php | 22 ++++++- 2 files changed, 21 insertions(+), 76 deletions(-) delete mode 100644 modules/watermark/helpers/watermark_graphics.php (limited to 'modules/watermark/helpers') diff --git a/modules/watermark/helpers/watermark_graphics.php b/modules/watermark/helpers/watermark_graphics.php deleted file mode 100644 index aef7586b..00000000 --- a/modules/watermark/helpers/watermark_graphics.php +++ /dev/null @@ -1,75 +0,0 @@ -composite($options["file"], $x, $y, $options["transparency"]) - ->quality(module::get_var("gallery", "image_quality")) - ->save($output_file); - - module::event("graphics_composite_completed", $input_file, $output_file, $options); - } catch (ErrorException $e) { - Kohana::log("error", $e->get_message()); - } - } -} diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php index b3e91044..5c7dfdab 100644 --- a/modules/watermark/helpers/watermark_installer.php +++ b/modules/watermark/helpers/watermark_installer.php @@ -33,11 +33,31 @@ class watermark_installer { DEFAULT CHARSET=utf8;"); @mkdir(VARPATH . "modules/watermark"); - module::set_version("watermark", 1); + module::set_version("watermark", 2); } static function uninstall() { Database::instance()->query("DROP TABLE {watermarks}"); dir::unlink(VARPATH . "modules/watermark"); } + + static function upgrade($version) { + $db = Database::instance(); + if ($version == 1) { + graphics::remove_rules("watermark"); + if ($name = module::get_var("watermark", "name")) { + foreach (array("thumb", "resize") as $target) { + graphics::add_rule( + "watermark", $target, "gallery_graphics::composite", + array("file" => VARPATH . "modules/watermark/$name", + "width" => module::get_var("watermark", "width"), + "height" => module::get_var("watermark", "height"), + "position" => module::get_var("watermark", "position"), + "transparency" => 101 - module::get_var("watermark", "transparency")), + 1000); + } + } + module::set_version("watermark", $version = 2); + } + } } -- cgit v1.2.3 From c97a88599eb7b199294edbfae382353456061bef Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sun, 27 Sep 2009 17:55:48 -0700 Subject: Change gallery installer to do a direct update to the database, preppending gallery_graphics:: to each of the defined rules operations --- installer/install.sql | 2 +- modules/gallery/helpers/gallery_installer.php | 12 ++---------- modules/watermark/helpers/watermark_installer.php | 22 +--------------------- 3 files changed, 4 insertions(+), 32 deletions(-) (limited to 'modules/watermark/helpers') diff --git a/installer/install.sql b/installer/install.sql index 80042b10..da349c36 100755 --- a/installer/install.sql +++ b/installer/install.sql @@ -228,7 +228,7 @@ CREATE TABLE {modules} ( UNIQUE KEY `name` (`name`) ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; -INSERT INTO {modules} VALUES (1,1,'gallery',13); +INSERT INTO {modules} VALUES (1,1,'gallery',14); INSERT INTO {modules} VALUES (2,1,'user',1); INSERT INTO {modules} VALUES (3,1,'comment',2); INSERT INTO {modules} VALUES (4,1,'organize',1); diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php index f995b606..49bd9bb7 100644 --- a/modules/gallery/helpers/gallery_installer.php +++ b/modules/gallery/helpers/gallery_installer.php @@ -377,16 +377,8 @@ class gallery_installer { if ($version == 13) { // Add rules for generating our thumbnails and resizes - graphics::remove_rule("gallery", "thumb", "gallery_graphics::resize"); - graphics::remove_rule("gallery", "resize", "gallery_graphics::resize"); - graphics::add_rule( - "gallery", "thumb", "gallery_graphics::resize", - array("width" => 200, "height" => 200, "master" => Image::AUTO), - 100); - graphics::add_rule( - "gallery", "resize", "gallery_graphics::resize", - array("width" => 640, "height" => 480, "master" => Image::AUTO), - 100); + Database::instance()->query("update g3_graphics_rules g + set operation=concat(\"gallery_graphics::\", g.operation);"); module::set_version("gallery", $version = 14); } diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php index 5c7dfdab..b3e91044 100644 --- a/modules/watermark/helpers/watermark_installer.php +++ b/modules/watermark/helpers/watermark_installer.php @@ -33,31 +33,11 @@ class watermark_installer { DEFAULT CHARSET=utf8;"); @mkdir(VARPATH . "modules/watermark"); - module::set_version("watermark", 2); + module::set_version("watermark", 1); } static function uninstall() { Database::instance()->query("DROP TABLE {watermarks}"); dir::unlink(VARPATH . "modules/watermark"); } - - static function upgrade($version) { - $db = Database::instance(); - if ($version == 1) { - graphics::remove_rules("watermark"); - if ($name = module::get_var("watermark", "name")) { - foreach (array("thumb", "resize") as $target) { - graphics::add_rule( - "watermark", $target, "gallery_graphics::composite", - array("file" => VARPATH . "modules/watermark/$name", - "width" => module::get_var("watermark", "width"), - "height" => module::get_var("watermark", "height"), - "position" => module::get_var("watermark", "position"), - "transparency" => 101 - module::get_var("watermark", "transparency")), - 1000); - } - } - module::set_version("watermark", $version = 2); - } - } } -- cgit v1.2.3