condensed most recent list pages into one instead of 3

3 files changed, 20 insertions, 81 deletions

diff --git a/pages/lists/friendmostrecent.php b/pages/lists/friendmostrecent.php
deleted file mode 100644
index 5f71d5679..000000000
--- a/pages/lists/friendmostrecent.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-	/**
-	 * List of someone else's most recent photos (we should be able to combine with yourmostrecent.php)
-	 * 
-	 */
-
-	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
-
-	if (is_null(page_owner_entity()->name) || page_owner_entity()->name == '') {
-		$friendname = get_input('username');
-	} else {
-		$friendname = page_owner_entity()->name;
-	};
-	
-	//there has to be a better way to do this
-	if(!$friendname) {
-		$page = get_input("page");
-		list($pagename, $friendname) = split("/", $page);
-	}
-	$user = get_user_by_username($friendname);
-	
-	global $CONFIG;
-	$prefix = $CONFIG->dbprefix;
-	$max = 24;
-	//grab the top views (metadata 'tp_views') for $max number of entities 
-	//ignores entity subtypes
-	
-	$sql = "SELECT ent.guid as entity_guid FROM " . $prefix . "entities ent
-			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id AND sub.subtype = 'image'
-			WHERE ent.owner_guid = " . $user->guid . "
-			ORDER BY ent.guid DESC
-			LIMIT $max";
-	$result = get_data($sql);
-	$entities = array();
-	foreach($result as $entity) {
-		$entities[] = get_entity($entity->entity_guid);
-	}
-	
-	$title = sprintf(elgg_echo("tidypics:friendmostrecent"), $friendname);
-	$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/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 5332d8e9e..32320a5d2 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -8,13 +8,31 @@
 	// Load Elgg engine
 	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
 
+	// start with assumption this is for all site photos
+	$title = elgg_echo('tidypics:mostrecent');
+	$user_id = 0;
+	
+	// is this all site or an individuals images
+	$username = get_input('username');
+	if ($username) {
+		$user = get_user_by_username($username);
+		if ($user) {
+			$user_id = $user->guid;
+			
+			if ($user_id == get_loggedin_userid())
+				$title = elgg_echo('tidypics:yourmostrecent');
+			else
+				$title = sprintf(elgg_echo("tidypics:friendmostrecent"), $user->name);
+		}
+	}
+
 	// how many do we display
 	$max = 12;
 	
 	// grab the html to display the images
-	$images = list_entities("object", "image", 0, $max, false, false, true);
+	$images = tp_list_entities("object", "image", $user_id, $max, false, false, true);
+	$images .= '<div class="clearfloat"/>'; // hack until elgg fixes problem with css/list entities html
 	
-	$title = elgg_echo('tidypics:mostrecent');
 	
 	// this view takes care of the title on the main column and the content wrapper
 	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
diff --git a/pages/lists/yourmostrecent.php b/pages/lists/yourmostrecent.php
deleted file mode 100644
index eb124c84d..000000000
--- a/pages/lists/yourmostrecent.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-	/**
-	 * List of user's most recently uploaded photos
-	 * 
-	 */
-
-	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
-
-	global $CONFIG;
-	$viewer = get_loggedin_user();
-	$prefix = $CONFIG->dbprefix;
-	$max = 24;
-	//grab the top views (metadata 'tp_views') for $max number of entities 
-	//ignores entity subtypes
-	
-	$sql = "SELECT ent.guid as entity_guid FROM " . $prefix . "entities ent
-			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id AND sub.subtype = 'image'
-			WHERE ent.owner_guid = " . $viewer->guid . "
-			ORDER BY ent.guid DESC
-			LIMIT $max";
-	
-	$result = get_data($sql);
-	$entities = array();
-	foreach($result as $entity) {
-		$entities[] = get_entity($entity->entity_guid);
-	}
-	
-	$title = elgg_echo("tidypics:yourmostrecent");
-	$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