first go at brining tidypics up to code standards

4 files changed, 117 insertions, 116 deletions

diff --git a/views/default/tidypics/admin/imagelib.php b/views/default/tidypics/admin/imagelib.php
index b4656afe1..a0d0c19e7 100644
--- a/views/default/tidypics/admin/imagelib.php
+++ b/views/default/tidypics/admin/imagelib.php
@@ -1,62 +1,62 @@
 <?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;
+$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;
 
-	$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');
+$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.
+	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.  
+	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();" />
+	<?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/imtest.php'; ?>",
-		data: {location: loc},
-		cache: false,
-		success: function(html){
-			$("#im_results").html(html);
-		}
-	});
-}
+	function TestImageMagickLocation()
+	{
+		var loc = $('input[name=im_location]').val();
+		$("#im_results").html("");
+		$.ajax({
+			type: "GET",
+			url: "<?php echo $CONFIG->wwwroot . 'mod/tidypics/actions/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
index ce5652c16..bc0befa16 100644
--- a/views/default/tidypics/admin/settings.php
+++ b/views/default/tidypics/admin/settings.php
@@ -1,26 +1,26 @@
 <?php
 
-	echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:instructions")));
-	
-	global $CONFIG;  
-	$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
-	$upgrade_url = $CONFIG->wwwroot . 'mod/tidypics/actions/upgrade.php';
-	$upgrade_url = elgg_add_action_tokens_to_url($upgrade_url);
-	
-	$upgrade = false;
-	if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album'))
-		$upgrade = true;
+echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:instructions")));
+
+global $CONFIG;  
+$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
+$upgrade_url = $CONFIG->wwwroot . 'mod/tidypics/actions/upgrade.php';
+$upgrade_url = elgg_add_action_tokens_to_url($upgrade_url);
+
+$upgrade = false;
+if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album')) {
+	$upgrade = true;
+}
 ?>
 <p>
-<?php
+	<?php
 	if ($upgrade) {
-?>
-<a href="<?php echo $upgrade_url; ?>">Upgrade</a><br />
-<?php
+		?>
+	<a href="<?php echo $upgrade_url; ?>">Upgrade</a><br />
+		<?php
 	}
-?>
-<a href="<?php echo $system_url; ?>">Run Server Analysis</a>
+	?>
+	<a href="<?php echo $system_url; ?>">Run Server Analysis</a>
 </p>
 <?php
-	echo elgg_view("tidypics/forms/settings");
-?>
\ No newline at end of file
+echo elgg_view("tidypics/forms/settings");
diff --git a/views/default/tidypics/admin/stats.php b/views/default/tidypics/admin/stats.php
index aea5e75ba..0b088dc2e 100644
--- a/views/default/tidypics/admin/stats.php
+++ b/views/default/tidypics/admin/stats.php
@@ -1,35 +1,36 @@
 <?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;
+$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;
 
-	$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');
+$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 />
+	<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) {
+if ($num_tags) {
 ?>
-Photo tags: <?php echo $num_tags; ?><br />
+	Photo tags: <?php echo $num_tags; ?><br />
 <?php
-	}
+}
 ?>
 </p>
\ No newline at end of file
diff --git a/views/default/tidypics/admin/tidypics.php b/views/default/tidypics/admin/tidypics.php
index fa518156c..a46781c2a 100644
--- a/views/default/tidypics/admin/tidypics.php
+++ b/views/default/tidypics/admin/tidypics.php
@@ -1,32 +1,32 @@
 <?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;
-	}
-	
+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">
@@ -38,7 +38,7 @@
 			<li <?php echo $helpselect; ?>><a href="<?php echo $CONFIG->wwwroot . 'mod/tidypics/pages/admin.php?tab=help'; ?>"><?php echo elgg_echo('tidypics:settings:help'); ?></a></li>
 		</ul>
 	</div>
-<?php
+	<?php
 	switch($tab) {
 		case 'settings':
 			echo elgg_view("tidypics/admin/settings");
@@ -56,5 +56,5 @@
 			echo elgg_view("tidypics/admin/help");
 			break;
 	}
-?>
+	?>
 </div>