3 files changed, 65 insertions, 64 deletions
diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php
new file mode 100644
index 000000000..d9231eb08
--- /dev/null
+++ b/pages/photos/image/view.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * View an image
+ *
+ * @author Cash Costello
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
+ */
+
+group_gatekeeper();
+
+// get the photo entity
+$photo_guid = (int) get_input('guid');
+$photo = get_entity($photo_guid);
+
+// set page owner based on owner of photo album
+$album = $photo->getContainerEntity();
+if ($album) {
+	elgg_set_page_owner_guid($album->getContainerGUID());
+}
+$owner = elgg_get_page_owner_entity();
+
+// set up breadcrumbs
+elgg_push_breadcrumb(elgg_echo('photos'), 'photos/all');
+if (elgg_instanceof($page_owner, 'group')) {
+	elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all");
+} else {
+	elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
+}
+elgg_push_breadcrumb($album->title, $album->getURL());
+elgg_push_breadcrumb($photo->title);
+
+// add download button to title menu
+elgg_register_menu_item('title', array(
+	'name' => 'download',
+	'href' => 'photos/download',
+	'text' => elgg_echo('image:download'),
+	'link_class' => 'elgg-button elgg-button-action',
+));
+
+$content = elgg_view_entity($photo, array('full_view' => true));
+
+$body = elgg_view_layout('content', array(
+	'filter' => false,
+	'content' => $content,
+	'title' => $photo->title,
+	'sidebar' => elgg_view('tidypics/sidebar', array(
+		'page' => 'view',
+		'image' => $photo,
+	)),
+));
+
+echo elgg_view_page($photo->title, $body);
diff --git a/pages/photos/owner.php b/pages/photos/owner.php
index f6582e326..214cd2e37 100644
--- a/pages/photos/owner.php
+++ b/pages/photos/owner.php
@@ -35,11 +35,22 @@ elgg_pop_context();
 
 elgg_register_title_button();
 
-$body = elgg_view_layout('content', array(
+$params = array(
 	'filter_context' => 'mine',
 	'content' => $content,
 	'title' => $title,
 	'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'owner')),
-));
+);
+
+// don't show filter if out of filter context
+if ($owner instanceof ElggGroup) {
+	$params['filter'] = false;
+}
+
+if ($owner->getGUID() != elgg_get_logged_in_user_guid()) {
+	$params['filter_context'] = '';
+}
+
+$body = elgg_view_layout('content', $params);
 
 echo elgg_view_page($title, $body);
diff --git a/pages/viewimage.php b/pages/viewimage.php
deleted file mode 100644
index 890f7e8c4..000000000
--- a/pages/viewimage.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Tidypics image view
- *
- * Display a view of a single image
- */
-
-// Load Elgg engine
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
-
-// if this page belongs to a closed group, prevent anyone outside group from seeing
-if (is_callable('group_gatekeeper')) {
-	group_gatekeeper();
-}
-
-// get the album entity
-$photo_guid = (int) get_input('guid');
-$photo = get_entity($photo_guid);
-
-// panic if we can't get it
-if (!$photo) {
-	forward();
-}
-
-// set page owner based on owner of photo album
-set_page_owner($photo->owner_guid);
-$album = get_entity($photo->container_guid);
-if ($album) {
-	$owner_guid = $album->container_guid;
-	if ($owner_guid) {
-		set_page_owner($owner_guid);
-	}
-}
-
-
-$page_owner = page_owner_entity();
-if ($page_owner instanceof ElggGroup) {
-	add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name),
-			$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-}
-
-if (can_write_to_container(0, $album->container_guid)) {
-	add_submenu_item(	elgg_echo('image:edit'),
-			$CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid,
-			'photos');
-	$ts = time();
-	$token = generate_action_token($ts);
-	add_submenu_item(	elgg_echo('image:delete'),
-			$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $photo_guid . '&amp;__elgg_token=' . $token . '&amp;__elgg_ts=' . $ts,
-			'photos',
-			true);
-}
-
-
-$title = $photo->title;
-$area2 = elgg_view_title($title);
-$area2 .= elgg_view_entity($photo, true);
-
-$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-
-page_draw($title, $body);