From 181b82b27317722f0701eda072943b9d2e7b6cb1 Mon Sep 17 00:00:00 2001
From: Cash Costello
Date: Wed, 26 Aug 2009 01:13:57 +0000
Subject: added a tab to admin page for testing image magick location
---
actions/imtest.php | 19 ++++++++++
languages/en.php | 2 +-
views/default/tidypics/admin/imagelib.php | 60 +++++++++++++++++++++++++++++++
views/default/tidypics/admin/tidypics.php | 8 +++++
views/default/tidypics/forms/settings.php | 2 +-
5 files changed, 89 insertions(+), 2 deletions(-)
create mode 100644 actions/imtest.php
create mode 100644 views/default/tidypics/admin/imagelib.php
diff --git a/actions/imtest.php b/actions/imtest.php
new file mode 100644
index 000000000..6ab2b7b8f
--- /dev/null
+++ b/actions/imtest.php
@@ -0,0 +1,19 @@
+
diff --git a/languages/en.php b/languages/en.php
index 82305d2aa..674c71207 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -51,7 +51,7 @@
//settings
'tidypics:settings' => 'Settings',
'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
- 'tidypics:settings:image_lib' => "Image Library: ",
+ 'tidypics:settings:image_lib' => "Image Library",
'tidypics:settings:download_link' => "Show download link",
'tidypics:settings:tagging' => "Enable photo tagging",
'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
diff --git a/views/default/tidypics/admin/imagelib.php b/views/default/tidypics/admin/imagelib.php
new file mode 100644
index 000000000..8f71c75f2
--- /dev/null
+++ b/views/default/tidypics/admin/imagelib.php
@@ -0,0 +1,60 @@
+dbprefix}entities where subtype={$img_type}";
+ $total = get_data_row($query);
+ $num_images = $total->total;
+
+ $img_type = get_subtype_id('object', 'album');
+ $query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}";
+ $total = get_data_row($query);
+ $num_albums = $total->total;
+
+ $num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment');
+ $num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment');
+
+ $num_views = count_annotations(0, 'object', 'image', 'tp_view');
+
+ if (get_plugin_setting('tagging', 'tidypics') != "disabled")
+ $num_tags = count_annotations(0, 'object', 'image', 'phototag');
+?>
+
+
+An image library is required by Tidypics to perform various manipulations: resizing on upload, watermarking, rotation, and cropping.
+There are three image library options with Tidypics: PHP extension GD,
+ImageMagick called via a system call, and the PHP extension
+imagick. GD is the most common of the three on hosted servers but suffers
+from serious memory usage problems when resizing photos. If you have access to ImageMagick (whether through system calls or the
+PHP extension), we recommend that you use that.
+
+
Testing ImageMagick Commandline
+To use the ImageMagick executables, PHP must be configured to allow calls to exec(). You can check our
+server analysis page to find out the
+configuration of your server. Next, you need to determine the path to ImageMagick on your server. Your hosting service should
+be able to provide this to you. You can test if the location is correct below. If successful, it should display the version of
+ImageMagick installed on your server.
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/views/default/tidypics/admin/tidypics.php b/views/default/tidypics/admin/tidypics.php
index 7d6aa220c..3d31bd52e 100644
--- a/views/default/tidypics/admin/tidypics.php
+++ b/views/default/tidypics/admin/tidypics.php
@@ -6,6 +6,7 @@
$settingsselect = '';
$statsselect = '';
+ $imagelibselect = '';
switch($tab) {
case 'settings':
$settingsselect = 'class="selected"';
@@ -13,6 +14,9 @@
case 'stats':
$statsselect = 'class="selected"';
break;
+ case 'imagelib':
+ $imagelibselect = 'class="selected"';
+ break;
}
?>
@@ -21,6 +25,7 @@