Merging admin changes from Brett's repo

7 files changed, 0 insertions, 281 deletions

diff --git a/views/default/tidypics/admin/help.php b/views/default/tidypics/admin/help.php
deleted file mode 100644
index b939a74a8..000000000
--- a/views/default/tidypics/admin/help.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<br />
-<h3>White screen when uploading images</h3>
-<p>
-Tidypics tries to calculate the maximum size of an image that your server will support. If it
-guesses incorrectly and someone uploads a photo that is too large, the script may crash when
-resizing the image if you are using GD. The easiest way to test this is to set display_errors
-to 1 in your .htaccess file and upload large images. If this causes a problem, a php memory error
-should display on the screen. You can increased your php memory limit (see the docs directory).
-A better option is to use ImageMagick if your server supports it (again see the docs directory).
-</p><p>
-If it is not a memory issue, you should see some other error appear. Once you have fixed the error,
-change display_error back to 0.  
-</p>
-<h3>Question mark images appear</h3>
-<p>
-If you see question mark images when you look at your albums, this means the resizing of the images
-failed. This could be due to the memory limits as described above. There are other causes. Tidypics
-tries to detect these problems and write the cause to the error log. You should check your server
-error log right after an upload that results in a question mark for these error messages. The messages
-will begin with "Tidypics warning:". It is possible if you have turned off php warnings that you will 
-not see these warnings.
-</p><p>
-Another possible cause is using ImageMagick when your server does not support it or specifying
-the wrong path to the ImageMagick executables.
-</p>
-<h3>Unable to save settings</h3>
-<p>If you are unable to settings, there are two possible causes. First,
-Apache can be configured to block pages that use file paths as Tidypics
-does when setting the location of the ImageMagick executable. In this case,
-leave that field blank. Second, there is some bad code in the Izaps video
-plugin that can prevent the settings from being saved. Try disabling that plugin.
-</p>
\ No newline at end of file
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
diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php
deleted file mode 100644
index e1d20f953..000000000
--- a/views/default/tidypics/admin/settings.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Tidypics admin settings tab
- */
-
-$form_body = elgg_view('forms/tidypics/admin/settings', $vars);
-
-$server_analysis_link = elgg_view('output/url', array(
-	'href' => "{$vars['url']}mod/tidypics/pages/server_analysis.php",
-	'text' => elgg_echo('tidypics:settings:server:analysis'),
-));
-
-echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions')));
-
-echo '<p>';
-echo elgg_view('tidypics/admin/upgrade');
-echo $server_analysis_link;
-echo '</p>';
-
-echo elgg_view('input/form', array(
-	'body' => $form_body,
-	'action' => $vars['url'] . 'action/tidypics/admin/settings',
-));
diff --git a/views/default/tidypics/admin/stats.php b/views/default/tidypics/admin/stats.php
deleted file mode 100644
index 0b088dc2e..000000000
--- a/views/default/tidypics/admin/stats.php
+++ /dev/null
@@ -1,36 +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');
-}
-?>
-<p>
-	<br />
-	Photos: <?php echo $num_images; ?><br />
-	Albums: <?php echo $num_albums; ?><br />
-	Comments on photos: <?php echo $num_comments_photos; ?><br />
-	Comments on albums: <?php echo $num_comments_albums; ?><br />
-	Total views: <?php echo $num_views; ?><br />
-<?php 
-if ($num_tags) {
-?>
-	Photo tags: <?php echo $num_tags; ?><br />
-<?php
-}
-?>
-</p>
\ No newline at end of file
diff --git a/views/default/tidypics/admin/thumbnails.php b/views/default/tidypics/admin/thumbnails.php
deleted file mode 100644
index 5884b9dc3..000000000
--- a/views/default/tidypics/admin/thumbnails.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<br />
-<h3>Overview</h3>
-<p>
-This page allows you to create thumbnails for images when the thumbnail creation failed during upload. 
-You may experience problems with thumbnail creation if your image library is not configured properly or
-if there is not enough memory for the GD library to load and resize an image. If your users have 
-experienced problems with thumbnail creation and you have corrected your configuration, you can try to redo the
-thumbnails. Find the unique identifier of the photo (it is the number near the end of the url when viewing
-a photo) and enter it below. 
-</p>
-<h3>Thumbnail Creation</h3>
-<p>
-<b><?php echo elgg_echo('tidypics:settings:im_id'); ?></b>:
-<input name="image_id" type="text" />
-<input type="submit" value="Submit" onclick="TestThumbnailCreation();" />
-</p>
-<div id="im_results"></div>
-<script type="text/javascript">
-function TestThumbnailCreation()
-{
-	var image_id = $('input[name=image_id]').val();
-	$("#im_results").html("");
-	$.ajax({
-		type: "GET",
-		url: "<?php echo $CONFIG->wwwroot . 'mod/tidypics/actions/admin/create_thumbnails.php'; ?>",
-		data: {guid: image_id},
-		cache: false,
-		success: function(html){
-			$("#im_results").html(html);
-		}
-	});
-}
-</script>
\ No newline at end of file
diff --git a/views/default/tidypics/admin/tidypics.php b/views/default/tidypics/admin/tidypics.php
deleted file mode 100644
index d3f188741..000000000
--- a/views/default/tidypics/admin/tidypics.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-global $CONFIG;
-
-$tab = $vars['tab'];
-
-$settingsselect = ''; 
-$statsselect = '';
-$imagelibselect = '';
-$thumbnailselect = '';
-$helpselect = '';
-switch($tab) {
-	case 'settings':
-		$settingsselect = 'class="selected"';
-		break;
-	case 'stats':
-		$statsselect = 'class="selected"';
-		break;
-	case 'imagelib':
-		$imagelibselect = 'class="selected"';
-		break;
-	case 'thumbnail':
-		$thumbnailselect = 'class="selected"';
-		break;
-	case 'help':
-		$helpselect = 'class="selected"';
-		break;
-}
-
-?>
-<div class="contentWrapper">
-	<div id="elgg_horizontal_tabbed_nav">
-		<ul>
-			<li <?php echo $settingsselect; ?>><a href="<?php echo $CONFIG->wwwroot . 'pg/photos/admin/?tab=settings'; ?>"><?php echo elgg_echo('tidypics:settings'); ?></a></li>
-			<li <?php echo $statsselect; ?>><a href="<?php echo $CONFIG->wwwroot . 'pg/photos/admin/?tab=stats'; ?>"><?php echo elgg_echo('tidypics:stats'); ?></a></li>
-			<li <?php echo $imagelibselect; ?>><a href="<?php echo $CONFIG->wwwroot . 'pg/photos/admin/?tab=imagelib'; ?>"><?php echo elgg_echo('tidypics:settings:image_lib'); ?></a></li>
-			<li <?php echo $thumbnailselect; ?>><a href="<?php echo $CONFIG->wwwroot . 'pg/photos/admin/?tab=thumbnail'; ?>"><?php echo elgg_echo('tidypics:settings:thumbnail'); ?></a></li>
-			<li <?php echo $helpselect; ?>><a href="<?php echo $CONFIG->wwwroot . 'pg/photos/admin/?tab=help'; ?>"><?php echo elgg_echo('tidypics:settings:help'); ?></a></li>
-		</ul>
-	</div>
-	<?php
-	switch($tab) {
-		case 'settings':
-			echo elgg_view("tidypics/admin/settings");
-			break;
-		case 'stats':
-			echo elgg_view("tidypics/admin/stats");
-			break;
-		case 'imagelib':
-			echo elgg_view("tidypics/admin/imagelib");
-			break;
-		case 'thumbnail':
-			echo elgg_view("tidypics/admin/thumbnails");
-			break;
-		case 'help':
-			echo elgg_view("tidypics/admin/help");
-			break;
-	}
-	?>
-</div>
diff --git a/views/default/tidypics/admin/upgrade.php b/views/default/tidypics/admin/upgrade.php
deleted file mode 100644
index bb0a12467..000000000
--- a/views/default/tidypics/admin/upgrade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-// sets $version based on code
-require_once "{$CONFIG->pluginspath}tidypics/version.php";
-
-$upgrade_url = "{$vars['url']}action/tidypics/admin/upgrade";
-
-// determine whether an upgrade is required
-$local_version = get_plugin_setting('version', 'tidypics');
-if ($local_version === FALSE) {
-	// no version set so either new install or really old one
-	if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album')) {
-		$local_version = 0;
-	} else {
-		// set initial version for new install
-		set_plugin_setting('version', $version, 'tidypics');
-		$local_version = $version;
-	}
-} elseif ($local_version == '1.62') {
-	// special work around to handle old upgrade system
-	$local_version = 2010010101;
-	set_plugin_setting('version', $local_version, 'tidypics');
-}
-if ($local_version == $version) {
-	// no upgrade required
-	return TRUE;
-}
-
-echo elgg_view('output/url', array(
-    'text' => elgg_echo('tidypics:upgrade'),
-    'href' => $upgrade_url,
-    'is_action' => TRUE)
-);
-
-echo '<br />';