diff --git a/3.0/modules/rawphoto/controllers/admin_rawphoto.php b/3.0/modules/rawphoto/controllers/admin_rawphoto.php index c2e1bfb6..d5a315bf 100644 --- a/3.0/modules/rawphoto/controllers/admin_rawphoto.php +++ b/3.0/modules/rawphoto/controllers/admin_rawphoto.php @@ -23,10 +23,13 @@ class Admin_RawPhoto_Controller extends Admin_Controller { } private function _get_view($errors = array(), $icc_path = null) { + $dcraw = rawphoto_graphics::detect_dcraw(); + rawphoto_graphics::report_dcraw_support($dcraw); + $view = new Admin_View("admin.html"); $view->content = new View("admin_rawphoto.html"); $view->content->is_keeporiginal_active = module::is_active("keeporiginal"); - $view->content->dcraw = rawphoto_graphics::detect_dcraw(); + $view->content->dcraw = $dcraw; $toolkit_names = array("imagemagick" => "ImageMagick", "graphicsmagick" => "GraphicsMagick"); $toolkit_id = module::get_var("gallery", "graphics_toolkit"); diff --git a/3.0/modules/rawphoto/helpers/rawphoto_graphics.php b/3.0/modules/rawphoto/helpers/rawphoto_graphics.php index 550b3c36..2406e384 100644 --- a/3.0/modules/rawphoto/helpers/rawphoto_graphics.php +++ b/3.0/modules/rawphoto/helpers/rawphoto_graphics.php @@ -44,6 +44,17 @@ class rawphoto_graphics { "graphicsmagick" => "GraphicsMagick"); } + static function report_dcraw_support($dcraw) { + if ($dcraw->installed) { + site_status::clear("rawphoto_needs_dcraw"); + } else { + site_status::warning( + t('The Raw Photos module requires the dcraw tool to be installed.', + array("dcraw_url" => "http://www.cybercom.net/~dcoffin/dcraw/")), + "rawphoto_needs_dcraw"); + } + } + static function report_ppm_support($toolkit_id) { if (array_key_exists($toolkit_id, self::get_supported_toolkits())) { site_status::clear("rawphoto_needs_ppm_support"); diff --git a/3.0/modules/rawphoto/helpers/rawphoto_installer.php b/3.0/modules/rawphoto/helpers/rawphoto_installer.php index 73ab31f2..f0e9d358 100644 --- a/3.0/modules/rawphoto/helpers/rawphoto_installer.php +++ b/3.0/modules/rawphoto/helpers/rawphoto_installer.php @@ -23,11 +23,14 @@ class rawphoto_installer { } static function activate() { + $dcraw = rawphoto_graphics::detect_dcraw() + rawphoto_graphics::report_dcraw_support($dcraw); $toolkit_id = module::get_var("gallery", "graphics_toolkit"); rawphoto_graphics::report_ppm_support($toolkit_id); } static function deactivate() { + site_status::clear("rawphoto_needs_dcraw"); site_status::clear("rawphoto_needs_ppm_support"); } }