stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-03 18:29:09 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve the graphics toolkit detection code so that properly

Browse Source 
identifies situations where its restricted by open_basedir.

We now track more informatoin about the toolkit including the version
and any errors we encountered while doing the detection so that we can
provide more info downstream.  This makes graphics::detect_toolkits()
a little heavier, but that's ok because it should not be called very
often.

In the process, refactor the controller and view hierarchy so that
it's a little more straightforward in the code.

Fixes ticket #616.
This commit is contained in:
Bharat Mediratta
2009-08-08 20:31:16 -07:00
parent e4fb6959af
commit c9f5000e65
7 changed files with 127 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
modules/gallery/controllers/admin_graphics.php
View File

@@ -21,41 +21,24 @@ class Admin_Graphics_Controller extends Admin_Controller {
public function index() {
$view = new Admin_View("admin.html");
$view->content = new View("admin_graphics.html");
$view->content->available = "";
$tk = new ArrayObject(graphics::detect_toolkits(), ArrayObject::ARRAY_AS_PROPS);
$active = module::get_var("gallery", "graphics_toolkit", "none");
foreach (array("gd", "imagemagick", "graphicsmagick", "none") as $id) {
if ($id == $active) {
$view->content->active = new View("admin_graphics_$id.html");
$view->content->active->tk = $tk;
$view->content->active->is_active = true;
} else if ($id != "none") {
$v = new View("admin_graphics_$id.html");
$v->tk = $tk;
$v->is_active = false;
$view->content->available .= $v;
}
}
$view->content->tk = graphics::detect_toolkits();
$view->content->active = module::get_var("gallery", "graphics_toolkit", "none");
print $view;
}
public function choose($toolkit) {
public function choose($toolkit_id) {
access::verify_csrf();
if ($toolkit != module::get_var("gallery", "graphics_toolkit")) {
module::set_var("gallery", "graphics_toolkit", $toolkit);
$toolkit_info = graphics::detect_toolkits();
if ($toolkit == "graphicsmagick" || $toolkit == "imagemagick") {
module::set_var("gallery", "graphics_toolkit_path", $toolkit_info[$toolkit]);
}
if ($toolkit_id != module::get_var("gallery", "graphics_toolkit")) {
$tk = graphics::detect_toolkits();
module::set_var("gallery", "graphics_toolkit", $toolkit_id);
module::set_var("gallery", "graphics_toolkit_path", dirname($tk->$toolkit_id->dir));
site_status::clear("missing_graphics_toolkit");
message::success(t("Updated Graphics Toolkit"));
log::success("graphics", t("Changed graphics toolkit to: %toolkit",
array("toolkit" => $toolkit)));
$msg = t("Changed graphics toolkit to: %toolkit", array("toolkit" => $tk->$toolkit_id->name));
message::success($msg);
log::success("graphics", $msg);
}
url::redirect("admin/graphics");