2 files changed, 57 insertions, 36 deletions
diff --git a/views/default/admin/statistics/tidypics.php b/views/default/admin/statistics/tidypics.php
new file mode 100644
index 000000000..3e4af782a
--- /dev/null
+++ b/views/default/admin/statistics/tidypics.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Tidypics admin stats page.
+ */
+
+$stats = array();
+
+$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;
+$stats['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;
+$stats['albums'] = $total->total;
+
+$options = array(
+	'count' => true,
+	'type' => 'object',
+	'subtype' => 'image',
+	'annotation_name' => 'generic_comment'
+);
+
+$stats['photo_comments'] = elgg_get_annotations($options);
+
+$options['subtype'] = 'album';
+$stats['album_comments'] = elgg_get_annotations($options);
+
+$options['subtype'] = 'image';
+$options['annotation_name'] = 'tp_view';
+$stats['views'] = elgg_get_annotations($options);
+
+if (elgg_get_plugin_setting('tagging', 'tidypics') != 'disabled') {
+	$options['annotation_name'] = 'phototag';
+	$stats['tags'] = elgg_get_annotations($options);
+}
+
+$content = '<table class="elgg-table-alt">';
+
+foreach ($stats as $str => $value) {
+	$str = elgg_echo("tidypics:stats:$str");
+	$value = (int)$value;
+	
+	$content .= <<<HTML
+	<tr>
+		<td>$str:</td>
+		<td>$value</td>
+	</tr>
+HTML;
+}
+
+$content .= '</table>';
+
+echo elgg_view_module('inline', elgg_echo('tidypics:stats'), $content);
+\ No newline at end of file
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