From 11792cc0394ae34aa8404a2c4335b64fea41a315 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 22 Aug 2009 19:39:39 +0000
Subject: moved the voting lists to pages/lists/

---
 highestrated.php                 | 65 ----------------------------------------
 highestvotecount.php             | 50 -------------------------------
 pages/lists/highestrated.php     | 65 ++++++++++++++++++++++++++++++++++++++++
 pages/lists/highestvotecount.php | 50 +++++++++++++++++++++++++++++++
 pages/lists/recentvotes.php      | 52 ++++++++++++++++++++++++++++++++
 recentvotes.php                  | 52 --------------------------------
 start.php                        |  2 +-
 7 files changed, 168 insertions(+), 168 deletions(-)
 delete mode 100644 highestrated.php
 delete mode 100644 highestvotecount.php
 create mode 100644 pages/lists/highestrated.php
 create mode 100644 pages/lists/highestvotecount.php
 create mode 100644 pages/lists/recentvotes.php
 delete mode 100644 recentvotes.php

diff --git a/highestrated.php b/highestrated.php
deleted file mode 100644
index e9f0296e2..000000000
--- a/highestrated.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-	/**
-	 * Tidypics Friends Albums Listing
-	 * 
-	 */
-
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-	//if no friends were requested, see world pictures instead, or redirect to user's friends
-/*	if (is_null(get_input('username')) || get_input('username')=='') {
-		if (!isloggedin()) {
-			forward('pg/photos/world');
-		} else {
-			forward('pg/photos/friends/' . $_SESSION['user']->username);
-		}
-	}*/
-
-//	if (is_null(page_owner_entity()->name) || page_owner_entity()->name == '') {
-//		$groupname = get_input('username');
-//	} else {
-//		$groupname = page_owner_entity()->name;
-//	};
-//	
-	//there has to be a better way to do this
-	if(!$groupname) {
-		$page = get_input("page");
-		list($pagename, $groupname) = split("/", $page);
-	}
-
-	list($group_holder, $album_id) = split(":", $groupname);
-//		echo "<pre>page: $page\ngroup: $groupname\nalbum: $album_id"; die;
-	
-	$user = get_user_by_username($friendname);
-	global $CONFIG;
-	$prefix = $CONFIG->dbprefix;
-	$max = 24;
-
-	$sql = "SELECT ent.guid, count(1) as mycount, avg(ms2.string) as average
-			FROM " . $prefix . "entities ent
-			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
-			AND sub.subtype = 'image' AND  ent.container_guid = $album_id
-			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
-			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
-			AND ms.string = 'generic_rate'
-			INNER JOIN " . $prefix . "metastrings ms2 ON ms2.id = ann1.value_id
-			INNER JOIN " . $prefix . "users_entity u ON ann1.owner_guid = u.guid			
-			GROUP BY ent.guid HAVING mycount > 1
-			ORDER BY average DESC
-			LIMIT $max";
-	
-	$result = get_data($sql);
-
-	$entities = array();
-	foreach($result as $entity) {
-		$entities[] = get_entity($entity->guid);
-	}
-	
-	$album = get_entity($album_id);
-	$title = $album["title"] . ": " . elgg_echo("tidypics:highestrated");
-	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	page_draw($title, $body);
-
-?>
\ No newline at end of file
diff --git a/highestvotecount.php b/highestvotecount.php
deleted file mode 100644
index 694afb32d..000000000
--- a/highestvotecount.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-	/**
-	 * Tidypics full view of an image
-	 * Given a GUID, this page will try and display any entity
-	 * 
-	 */
-
-	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-	global $CONFIG;
-	$prefix = $CONFIG->dbprefix;
-	$max = 24;
-	
-	$sql = "SELECT ent.guid, u.name as owner, count( 1 ) AS mycount, avg( ms2.string ) AS average
-			FROM " . $prefix . "entities ent
-			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
-			AND sub.subtype = 'image'
-			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
-			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
-			AND ms.string = 'generic_rate'
-			INNER JOIN " . $prefix . "metastrings ms2 ON ms2.id = ann1.value_id
-			INNER JOIN " . $prefix . "users_entity u ON ent.owner_guid = u.guid
-			GROUP BY ent.guid
-			ORDER BY mycount DESC
-			LIMIT $max";
-	
-	$result = get_data($sql);
-	
-	$title = "Most voted images";
-	$area2 = elgg_view_title($title);
-	
-	$entities = array();
-	foreach($result as $entity) {
-		$entities[] = get_entity($entity->guid);
-		$full_entity = get_entity($entity->guid);
-		$area2 .= "	<div class='tidypics_album_images'>
-						Owner: $entity->owner<br />
-						Votes: $entity->mycount<br />
-						Average: $entity->average
-					</div>		
-					";
-		$area2 .= elgg_view_entity($full_entity);
-
-	}
-
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	page_draw($title, $body);
-?>
\ No newline at end of file
diff --git a/pages/lists/highestrated.php b/pages/lists/highestrated.php
new file mode 100644
index 000000000..e9f0296e2
--- /dev/null
+++ b/pages/lists/highestrated.php
@@ -0,0 +1,65 @@
+<?php
+	/**
+	 * Tidypics Friends Albums Listing
+	 * 
+	 */
+
+	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	//if no friends were requested, see world pictures instead, or redirect to user's friends
+/*	if (is_null(get_input('username')) || get_input('username')=='') {
+		if (!isloggedin()) {
+			forward('pg/photos/world');
+		} else {
+			forward('pg/photos/friends/' . $_SESSION['user']->username);
+		}
+	}*/
+
+//	if (is_null(page_owner_entity()->name) || page_owner_entity()->name == '') {
+//		$groupname = get_input('username');
+//	} else {
+//		$groupname = page_owner_entity()->name;
+//	};
+//	
+	//there has to be a better way to do this
+	if(!$groupname) {
+		$page = get_input("page");
+		list($pagename, $groupname) = split("/", $page);
+	}
+
+	list($group_holder, $album_id) = split(":", $groupname);
+//		echo "<pre>page: $page\ngroup: $groupname\nalbum: $album_id"; die;
+	
+	$user = get_user_by_username($friendname);
+	global $CONFIG;
+	$prefix = $CONFIG->dbprefix;
+	$max = 24;
+
+	$sql = "SELECT ent.guid, count(1) as mycount, avg(ms2.string) as average
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image' AND  ent.container_guid = $album_id
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'generic_rate'
+			INNER JOIN " . $prefix . "metastrings ms2 ON ms2.id = ann1.value_id
+			INNER JOIN " . $prefix . "users_entity u ON ann1.owner_guid = u.guid			
+			GROUP BY ent.guid HAVING mycount > 1
+			ORDER BY average DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+	}
+	
+	$album = get_entity($album_id);
+	$title = $album["title"] . ": " . elgg_echo("tidypics:highestrated");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+
+?>
\ No newline at end of file
diff --git a/pages/lists/highestvotecount.php b/pages/lists/highestvotecount.php
new file mode 100644
index 000000000..694afb32d
--- /dev/null
+++ b/pages/lists/highestvotecount.php
@@ -0,0 +1,50 @@
+<?php
+
+	/**
+	 * Tidypics full view of an image
+	 * Given a GUID, this page will try and display any entity
+	 * 
+	 */
+
+	// Load Elgg engine
+	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	global $CONFIG;
+	$prefix = $CONFIG->dbprefix;
+	$max = 24;
+	
+	$sql = "SELECT ent.guid, u.name as owner, count( 1 ) AS mycount, avg( ms2.string ) AS average
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image'
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'generic_rate'
+			INNER JOIN " . $prefix . "metastrings ms2 ON ms2.id = ann1.value_id
+			INNER JOIN " . $prefix . "users_entity u ON ent.owner_guid = u.guid
+			GROUP BY ent.guid
+			ORDER BY mycount DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+	
+	$title = "Most voted images";
+	$area2 = elgg_view_title($title);
+	
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+		$full_entity = get_entity($entity->guid);
+		$area2 .= "	<div class='tidypics_album_images'>
+						Owner: $entity->owner<br />
+						Votes: $entity->mycount<br />
+						Average: $entity->average
+					</div>		
+					";
+		$area2 .= elgg_view_entity($full_entity);
+
+	}
+
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/pages/lists/recentvotes.php b/pages/lists/recentvotes.php
new file mode 100644
index 000000000..f9ddbdc38
--- /dev/null
+++ b/pages/lists/recentvotes.php
@@ -0,0 +1,52 @@
+<?php
+
+	/**
+	 * Tidypics full view of an image
+	 * Given a GUID, this page will try and display any entity
+	 * 
+	 */
+
+	// Load Elgg engine
+	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	global $CONFIG;
+	$prefix = $CONFIG->dbprefix;
+	$max = 24;
+	
+	$sql = "SELECT ent.guid, u2.name AS owner, u.name AS voter, ms2.string as vote
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image'
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'generic_rate'
+			INNER JOIN " . $prefix . "metastrings ms2 ON ms2.id = ann1.value_id
+			INNER JOIN " . $prefix . "users_entity u ON ann1.owner_guid = u.guid
+			INNER JOIN " . $prefix . "users_entity u2 ON ent.owner_guid = u2.guid
+			ORDER BY ann1.time_created DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+	
+	$title = "Recently rated images";
+	$area2 = elgg_view_title($title);
+	
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+		$full_entity = get_entity($entity->guid);
+		$area2 .= "	<div class='tidypics_album_images'>
+						Owner: $entity->owner<br />
+						Voter: $entity->voter<br />
+						Rating: $entity->vote
+					</div>		
+					";
+		$area2 .= elgg_view_entity($full_entity);
+
+	}
+	
+
+//	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/recentvotes.php b/recentvotes.php
deleted file mode 100644
index f9ddbdc38..000000000
--- a/recentvotes.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-	/**
-	 * Tidypics full view of an image
-	 * Given a GUID, this page will try and display any entity
-	 * 
-	 */
-
-	// Load Elgg engine
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-	global $CONFIG;
-	$prefix = $CONFIG->dbprefix;
-	$max = 24;
-	
-	$sql = "SELECT ent.guid, u2.name AS owner, u.name AS voter, ms2.string as vote
-			FROM " . $prefix . "entities ent
-			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
-			AND sub.subtype = 'image'
-			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
-			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
-			AND ms.string = 'generic_rate'
-			INNER JOIN " . $prefix . "metastrings ms2 ON ms2.id = ann1.value_id
-			INNER JOIN " . $prefix . "users_entity u ON ann1.owner_guid = u.guid
-			INNER JOIN " . $prefix . "users_entity u2 ON ent.owner_guid = u2.guid
-			ORDER BY ann1.time_created DESC
-			LIMIT $max";
-	
-	$result = get_data($sql);
-	
-	$title = "Recently rated images";
-	$area2 = elgg_view_title($title);
-	
-	$entities = array();
-	foreach($result as $entity) {
-		$entities[] = get_entity($entity->guid);
-		$full_entity = get_entity($entity->guid);
-		$area2 .= "	<div class='tidypics_album_images'>
-						Owner: $entity->owner<br />
-						Voter: $entity->voter<br />
-						Rating: $entity->vote
-					</div>		
-					";
-		$area2 .= elgg_view_entity($full_entity);
-
-	}
-	
-
-//	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	page_draw($title, $body);
-?>
\ No newline at end of file
diff --git a/start.php b/start.php
index 7592f00b3..b0c3a9d66 100644
--- a/start.php
+++ b/start.php
@@ -322,7 +322,7 @@
 				
 				case "highestrated":
 					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/highestrated.php");
+					include($CONFIG->pluginspath . "tidypics/pages/lists/highestrated.php");
 				break;
 			}
 		}
-- 
cgit v1.2.3