From 4e593af0c167b0ec48799f569dced56058e5e8aa Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Tue, 7 Feb 2012 19:04:35 -0800
Subject: Refs #16. Added image lib tester to utilities.

---
 .../administer_utilities/tidypics_server_info.php  | 130 ----------------
 .../admin/administer_utilities/tidypics_tools.php  | 166 +++++++++++++++++++++
 views/default/tidypics/admin/imagelib.php          |  62 --------
 3 files changed, 166 insertions(+), 192 deletions(-)
 delete mode 100644 views/default/admin/administer_utilities/tidypics_server_info.php
 create mode 100644 views/default/admin/administer_utilities/tidypics_tools.php
 delete mode 100644 views/default/tidypics/admin/imagelib.php

(limited to 'views')

diff --git a/views/default/admin/administer_utilities/tidypics_server_info.php b/views/default/admin/administer_utilities/tidypics_server_info.php
deleted file mode 100644
index 6a034a561..000000000
--- a/views/default/admin/administer_utilities/tidypics_server_info.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Tidypics server analysis
- */
-
-$title = elgg_echo('admin:administer_utilities:tidypics_server_info');
-
-function tp_readable_size($bytes) {
-	if (strpos($bytes, 'M')) {
-		return $bytes . 'B';
-	}
-
-	$size = $bytes / 1024;
-	if ($size < 1024) {
-		$size = number_format($size, 2);
-		$size .= ' KB';
-	} else {
-		$size = $size / 1024;
-		if ($size < 1024) {
-			$size = number_format($size, 2);
-			$size .= ' MB';
-		} else {
-			$size = $size / 1024;
-			$size = number_format($size, 2);
-			$size .= ' GB';
-		}
-	}
-	return $size;
-}
-
-$disablefunc = explode(',', ini_get('disable_functions'));
-$exec_avail = elgg_echo('tidypics:disabled');
-if (is_callable('exec') && !in_array('exec',$disablefunc)) {
-	$exec_avail = elgg_echo('tidypics:enabled');
-}
-
-ob_start();
-
-?>
-<table class="elgg-table-alt">
-	<tr>
-		<td><?php echo elgg_echo('tidypics:server_info:php_version'); ?></td>
-		<td><?php echo phpversion(); ?></td>
-		<td></td>
-	</tr>
-	<tr>
-		<td>GD</td>
-		<td><?php echo (extension_loaded('gd')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
-		<td><?php echo elgg_echo('tidypics:server_info:gd_desc'); ?></td>
-	</tr>
-	<tr>
-		<td>IMagick</td>
-		<td><?php echo (extension_loaded('imagick')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
-		<td></td>
-	</tr>
-	<tr>
-		<td>exec()</td>
-		<td><?php echo $exec_avail; ?></td>
-		<td><?php echo elgg_echo('tidypics:server_info:exec_desc'); ?></td>
-	</tr>
-	<tr>
-		<td><?php echo elgg_echo('tidypics:server_info:memory_limit'); ?></td>
-		<td><?php echo tp_readable_size(ini_get('memory_limit')); ?></td>
-		<td><?php echo elgg_echo('tidypics:server_info:memory_limit_desc'); ?></td>
-	</tr>
-	<tr>
-		<td><?php echo elgg_echo('tidypics:server_info:peak_usage'); ?></td>
-		<td><?php if (function_exists('memory_get_peak_usage')) echo tp_readable_size(memory_get_peak_usage()); ?></td>
-		<td><?php echo elgg_echo('tidypics:server_info:peak_usage_desc'); ?></td>
-	</tr>
-	<tr>
-		<td><?php echo elgg_echo('tidypics:server_info:upload_max_filesize'); ?></td>
-		<td><?php echo tp_readable_size(ini_get('upload_max_filesize')); ?></td>
-		<td><?php echo elgg_echo('tidypics:server_info:upload_max_filesize_desc'); ?></td>
-	</tr>
-	<tr>
-		<td><?php echo elgg_echo('tidypics:server_info:post_max_size'); ?></td>
-		<td><?php echo tp_readable_size(ini_get('post_max_size')); ?></td>
-		<td><?php echo elgg_echo('tidypics:server_info:post_max_size_desc'); ?></td>
-	</tr>
-	<tr>
-		<td><?php echo elgg_echo('tidypics:server_info:max_input_time'); ?></td>
-		<td><?php echo ini_get('max_input_time'); ?>s</td>
-		<td><?php echo elgg_echo('tidypics:server_info:max_input_time_desc'); ?></td>
-	</tr>
-	<tr>
-		<td><?php echo elgg_echo('tidypics:server_info:max_execution_time'); ?></td>
-		<td><?php echo ini_get('max_execution_time'); ?> s</td>
-		<td><?php echo elgg_echo('tidypics:server_info:max_execution_time_desc'); ?></td>
-	</tr>
-	<tr>
-		<td>GD imagejpeg</td>
-		<td><?php echo (is_callable('imagejpeg')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
-		<td></td>
-	</tr>
-	<tr>
-		<td>GD imagepng</td>
-		<td><?php echo (is_callable('imagepng')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
-		<td></td>
-	</tr>
-	<tr>
-		<td>GD imagegif</td>
-		<td><?php echo (is_callable('imagegif')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
-		<td></td>
-	</tr>
-	<tr>
-		<td>EXIF</td>
-		<td><?php echo (is_callable('exif_read_data')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
-		<td></td>
-	</tr>
-	<tr>
-		<td><?php echo elgg_echo('tidypics:server_info:use_only_cookies'); ?></td>
-		<td><?php echo (ini_get('session.use_only_cookies')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
-		<td><?php echo elgg_echo('tidypics:server_info:use_only_cookies_desc'); ?></td>
-	</tr>
-</table>
-
-<p class="ptl">
-	<?php
-		echo elgg_view('output/url', array(
-			'href' => '/mod/tidypics/docs/configure_server.txt',
-			'text' => elgg_echo('tidypics:server_configuration_doc')
-		));
-	?>
-</p>
-<?php
-
-$content = ob_get_clean();
-
-echo elgg_view_module('inline', elgg_echo('admin:administer_utilities:tidypics_server_info'), $content);
diff --git a/views/default/admin/administer_utilities/tidypics_tools.php b/views/default/admin/administer_utilities/tidypics_tools.php
new file mode 100644
index 000000000..1df664be8
--- /dev/null
+++ b/views/default/admin/administer_utilities/tidypics_tools.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * Tidypics server analysis
+ */
+
+$title = elgg_echo('admin:administer_utilities:tidypics_tools');
+
+// server info
+function tp_readable_size($bytes) {
+	if (strpos($bytes, 'M')) {
+		return $bytes . 'B';
+	}
+
+	$size = $bytes / 1024;
+	if ($size < 1024) {
+		$size = number_format($size, 2);
+		$size .= ' KB';
+	} else {
+		$size = $size / 1024;
+		if ($size < 1024) {
+			$size = number_format($size, 2);
+			$size .= ' MB';
+		} else {
+			$size = $size / 1024;
+			$size = number_format($size, 2);
+			$size .= ' GB';
+		}
+	}
+	return $size;
+}
+
+$disablefunc = explode(',', ini_get('disable_functions'));
+$exec_avail = elgg_echo('tidypics:disabled');
+if (is_callable('exec') && !in_array('exec',$disablefunc)) {
+	$exec_avail = elgg_echo('tidypics:enabled');
+}
+
+ob_start();
+
+?>
+<table class="elgg-table-alt">
+	<tr>
+		<td><?php echo elgg_echo('tidypics:server_info:php_version'); ?></td>
+		<td><?php echo phpversion(); ?></td>
+		<td></td>
+	</tr>
+	<tr>
+		<td>GD</td>
+		<td><?php echo (extension_loaded('gd')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
+		<td><?php echo elgg_echo('tidypics:server_info:gd_desc'); ?></td>
+	</tr>
+	<tr>
+		<td>IMagick</td>
+		<td><?php echo (extension_loaded('imagick')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
+		<td></td>
+	</tr>
+	<tr>
+		<td>exec()</td>
+		<td><?php echo $exec_avail; ?></td>
+		<td><?php echo elgg_echo('tidypics:server_info:exec_desc'); ?></td>
+	</tr>
+	<tr>
+		<td><?php echo elgg_echo('tidypics:server_info:memory_limit'); ?></td>
+		<td><?php echo tp_readable_size(ini_get('memory_limit')); ?></td>
+		<td><?php echo elgg_echo('tidypics:server_info:memory_limit_desc'); ?></td>
+	</tr>
+	<tr>
+		<td><?php echo elgg_echo('tidypics:server_info:peak_usage'); ?></td>
+		<td><?php if (function_exists('memory_get_peak_usage')) echo tp_readable_size(memory_get_peak_usage()); ?></td>
+		<td><?php echo elgg_echo('tidypics:server_info:peak_usage_desc'); ?></td>
+	</tr>
+	<tr>
+		<td><?php echo elgg_echo('tidypics:server_info:upload_max_filesize'); ?></td>
+		<td><?php echo tp_readable_size(ini_get('upload_max_filesize')); ?></td>
+		<td><?php echo elgg_echo('tidypics:server_info:upload_max_filesize_desc'); ?></td>
+	</tr>
+	<tr>
+		<td><?php echo elgg_echo('tidypics:server_info:post_max_size'); ?></td>
+		<td><?php echo tp_readable_size(ini_get('post_max_size')); ?></td>
+		<td><?php echo elgg_echo('tidypics:server_info:post_max_size_desc'); ?></td>
+	</tr>
+	<tr>
+		<td><?php echo elgg_echo('tidypics:server_info:max_input_time'); ?></td>
+		<td><?php echo ini_get('max_input_time'); ?>s</td>
+		<td><?php echo elgg_echo('tidypics:server_info:max_input_time_desc'); ?></td>
+	</tr>
+	<tr>
+		<td><?php echo elgg_echo('tidypics:server_info:max_execution_time'); ?></td>
+		<td><?php echo ini_get('max_execution_time'); ?> s</td>
+		<td><?php echo elgg_echo('tidypics:server_info:max_execution_time_desc'); ?></td>
+	</tr>
+	<tr>
+		<td>GD imagejpeg</td>
+		<td><?php echo (is_callable('imagejpeg')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
+		<td></td>
+	</tr>
+	<tr>
+		<td>GD imagepng</td>
+		<td><?php echo (is_callable('imagepng')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
+		<td></td>
+	</tr>
+	<tr>
+		<td>GD imagegif</td>
+		<td><?php echo (is_callable('imagegif')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
+		<td></td>
+	</tr>
+	<tr>
+		<td>EXIF</td>
+		<td><?php echo (is_callable('exif_read_data')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
+		<td></td>
+	</tr>
+	<tr>
+		<td><?php echo elgg_echo('tidypics:server_info:use_only_cookies'); ?></td>
+		<td><?php echo (ini_get('session.use_only_cookies')) ? elgg_echo('tidypics:enabled') : elgg_echo('tidypics:disabled'); ?></td>
+		<td><?php echo elgg_echo('tidypics:server_info:use_only_cookies_desc'); ?></td>
+	</tr>
+</table>
+
+<p class="ptl">
+	<?php
+		echo elgg_view('output/url', array(
+			'href' => '/mod/tidypics/docs/configure_server.txt',
+			'text' => elgg_echo('tidypics:server_configuration_doc')
+		));
+	?>
+</p>
+<?php
+
+$content = ob_get_clean();
+
+echo elgg_view_module('inline', elgg_echo('tidypics:server_info'), $content);
+
+// image library tools
+$content = '<p>' . elgg_echo('tidypics:lib_tools:overview') . '</p>';
+$content .= '<p>' . elgg_echo('tidypics:lib_tools:testing') . '</p>';
+$content .= '<p><label>' . elgg_echo('tidypics:settings:im_path');
+$content .= elgg_view('input/text', array(
+	'name' => 'im_location'
+));
+$content .= elgg_view('input/submit', array(
+	'value' => elgg_echo('submit'),
+	'id' => 'tidypics-im-test'
+));	
+$content .= '</p>';
+$content .= '<p id="tidypics-im-results"></p>';
+
+echo elgg_view_module('inline', elgg_echo('tidypics:lib_tools'), $content);
+
+?>
+<script type="text/javascript">
+	$(function() {
+		$('#tidypics-im-test').click(function() {
+			var loc = $('input[name=im_location]').val();
+			$("#tidypics-im-results").html("");
+			$.ajax({
+				type: "GET",
+				url: elgg.normalize_url('mod/tidypics/actions/admin/imtest.php'),
+				data: {location: loc},
+				cache: false,
+				success: function(html){
+					$("#tidypics-im-results").html(html);
+				}
+			});
+		});
+	});
+</script>
diff --git a/views/default/tidypics/admin/imagelib.php b/views/default/tidypics/admin/imagelib.php
deleted file mode 100644
index 2b7a3a7b0..000000000
--- a/views/default/tidypics/admin/imagelib.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-$img_type = get_subtype_id('object', 'image');
-$query = "SELECT count(guid) as total from {$CONFIG->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');
-?>
-<br />
-<h3>Overview</h3>
-<p>
-	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 <a href="http://www.php.net/manual/en/book.image.php">GD</a>,
-	<a href="http://www.imagemagick.org/">ImageMagick</a> called via a system call, and the PHP extension
-	<a href="http://pecl.php.net/package/imagick/">imagick</a>. 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.
-</p>
-<h3>Testing ImageMagick Commandline</h3>
-<p>
-	To use the ImageMagick executables, PHP must be configured to allow calls to exec(). You can check our
-	<a href="<?php echo $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php'; ?>">server analysis page</a> 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.
-</p>
-<br />
-<p>
-	<?php echo elgg_echo('tidypics:settings:im_path'); ?><br />
-	<input name="im_location" type="text" />
-	<input type="submit" value="Submit" onclick="TestImageMagickLocation();" />
-</p>
-<div id="im_results"></div>
-
-<script type="text/javascript">
-	function TestImageMagickLocation()
-	{
-		var loc = $('input[name=im_location]').val();
-		$("#im_results").html("");
-		$.ajax({
-			type: "GET",
-			url: "<?php echo $CONFIG->wwwroot . 'mod/tidypics/actions/admin/imtest.php'; ?>",
-			data: {location: loc},
-			cache: false,
-			success: function(html){
-				$("#im_results").html(html);
-			}
-		});
-	}
-</script>
\ No newline at end of file
-- 
cgit v1.2.3