diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-08-08 20:31:16 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-08-08 20:31:16 -0700 |
| commit | c9f5000e65f66b3342f2cc6e2e9623eac72ff223 (patch) | |
| tree | 8547b552d4db1b80bbcee8d0dd8c026451f2cb71 /modules/gallery/views/admin_graphics_graphicsmagick.html.php | |
| parent | e4fb6959aff3d688db9821eadd0d24006c9c77d6 (diff) | |
Improve the graphics toolkit detection code so that properly
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.
Diffstat (limited to 'modules/gallery/views/admin_graphics_graphicsmagick.html.php')
| -rw-r--r-- | modules/gallery/views/admin_graphics_graphicsmagick.html.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/gallery/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php index e2cd0777..bf3ad339 100644 --- a/modules/gallery/views/admin_graphics_graphicsmagick.html.php +++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php @@ -1,21 +1,21 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="graphicsmagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->graphicsmagick ? " gInstalledToolkit" : " gUnavailable" ?>"> +<div id="graphicsmagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->installed ? " gInstalledToolkit" : " gUnavailable" ?>"> <h3> <?= t("GraphicsMagick") ?> </h3> <img class="logo" width="107" height="76" src="<?= url::file("modules/gallery/images/graphicsmagick.png"); ?>" alt="<? t("Visit the GraphicsMagick project site") ?>" /> <p> <?= t("GraphicsMagick is a standalone graphics program available on most Linux systems. Please refer to the <a href=\"%url\">GraphicsMagick website</a> for more information.", array("url" => "http://www.graphicsmagick.org")) ?> </p> - <? if ($tk->graphicsmagick): ?> + <? if ($tk->installed): ?> <p class="gSuccess"> - <?= t("GraphicsMagick is available in %path", array("path" => $tk->graphicsmagick)) ?> + <?= t("GraphicsMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?> </p> <p> <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate Graphics Magic") ?></a> </p> <? else: ?> - <p class="gInfo"> - <?= t("GraphicsMagick is not available on your system.") ?> + <p class="gWarning"> + <?= $tk->error ?> </p> <? endif ?> </div> |