public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Add a site status warning for when dcraw is not installed.

Browse Source
This commit is contained in:
Chad Parry 2011-04-25 20:33:11 -06:00
parent e1a15fbff3
commit 9796ea6ac8
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3.0/modules/rawphoto/controllers/admin_rawphoto.php
View File

@ -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");

11
3.0/modules/rawphoto/helpers/rawphoto_graphics.php
View File

@ -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 <a href="%dcraw_url">dcraw</a> 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");

3
3.0/modules/rawphoto/helpers/rawphoto_installer.php
View File

@ -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");
}
}