From 839dcba98a17b6d8b3fb63aec7744eda373ec5ff Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 30 Sep 2010 23:13:21 +0000
Subject: Refs #2344 - moves entities directory to pages directory

git-svn-id: http://code.elgg.org/elgg/trunk@6988 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/entities.php  |  2 +-
 entities/index.php       | 60 ------------------------------------------------
 entities/list.php        | 19 ---------------
 mod/file/start.php       |  2 +-
 pages/entities/index.php | 60 ++++++++++++++++++++++++++++++++++++++++++++++++
 pages/entities/list.php  | 19 +++++++++++++++
 6 files changed, 81 insertions(+), 81 deletions(-)
 delete mode 100644 entities/index.php
 delete mode 100644 entities/list.php
 create mode 100644 pages/entities/index.php
 create mode 100644 pages/entities/list.php

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index ccd54a312..e35252619 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -2192,7 +2192,7 @@ function entities_page_handler($page) {
 	if (isset($page[0])) {
 		global $CONFIG;
 		set_input('guid',$page[0]);
-		include($CONFIG->path . "entities/index.php");
+		include($CONFIG->path . "pages/entities/index.php");
 	}
 }
 
diff --git a/entities/index.php b/entities/index.php
deleted file mode 100644
index 68018bfff..000000000
--- a/entities/index.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Generic entity viewer
- * Given a GUID, this page will try and display any entity
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-// Load Elgg engine
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-// Get the GUID of the entity we want to view
-$guid = (int) get_input('guid');
-$shell = get_input('shell');
-if ($shell == "no") {
-	$shell = false;
-} else {
-	$shell = true;
-}
-
-$context = get_input('context');
-if ($context) {
-	set_context($context);
-}
-
-// Get the entity, if possible
-if ($entity = get_entity($guid)) {
-	if ($entity->container_guid) {
-		set_page_owner($entity->container_guid);
-	} else {
-		set_page_owner($entity->owner_guid);
-	}
-
-	// Set the body to be the full view of the entity, and the title to be its title
-	if ($entity instanceof ElggObject) {
-		$title = $entity->title;
-	} else if ($entity instanceof ElggEntity) {
-		$title = $entity->name;
-	}
-	$area1 = elgg_view_entity($entity,true);
-	if ($shell) {
-		$body = elgg_view_layout('one_column_with_sidebar', $area1);
-	} else {
-		$body = $area1;
-	}
-} else {
-	$body = elgg_echo('notfound');
-}
-
-// Display the page
-if ($shell) {
-	page_draw($title, $body);
-} else {
-	header("Content-type: text/html; charset=UTF-8");
-	echo $title;
-	echo $body;
-}
\ No newline at end of file
diff --git a/entities/list.php b/entities/list.php
deleted file mode 100644
index 280336cef..000000000
--- a/entities/list.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Entity viewer
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-set_context('search');
-$area2 = elgg_list_entities();
-set_context('entities');
-
-$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
-
-page_draw("", $body);
\ No newline at end of file
diff --git a/mod/file/start.php b/mod/file/start.php
index e8e70e6cd..ede4c4def 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -105,7 +105,7 @@
     		switch($page[1]) {
     			case "read":
     				set_input('guid',$page[2]);
-					include(dirname(dirname(dirname(__FILE__))) . "/entities/index.php");
+					include(dirname(dirname(dirname(__FILE__))) . "/pages/entities/index.php");
 				break;
     			case "friends":  
     				include($CONFIG->pluginspath . "file/friends.php");
diff --git a/pages/entities/index.php b/pages/entities/index.php
new file mode 100644
index 000000000..68018bfff
--- /dev/null
+++ b/pages/entities/index.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Generic entity viewer
+ * Given a GUID, this page will try and display any entity
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+// Load Elgg engine
+require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
+
+// Get the GUID of the entity we want to view
+$guid = (int) get_input('guid');
+$shell = get_input('shell');
+if ($shell == "no") {
+	$shell = false;
+} else {
+	$shell = true;
+}
+
+$context = get_input('context');
+if ($context) {
+	set_context($context);
+}
+
+// Get the entity, if possible
+if ($entity = get_entity($guid)) {
+	if ($entity->container_guid) {
+		set_page_owner($entity->container_guid);
+	} else {
+		set_page_owner($entity->owner_guid);
+	}
+
+	// Set the body to be the full view of the entity, and the title to be its title
+	if ($entity instanceof ElggObject) {
+		$title = $entity->title;
+	} else if ($entity instanceof ElggEntity) {
+		$title = $entity->name;
+	}
+	$area1 = elgg_view_entity($entity,true);
+	if ($shell) {
+		$body = elgg_view_layout('one_column_with_sidebar', $area1);
+	} else {
+		$body = $area1;
+	}
+} else {
+	$body = elgg_echo('notfound');
+}
+
+// Display the page
+if ($shell) {
+	page_draw($title, $body);
+} else {
+	header("Content-type: text/html; charset=UTF-8");
+	echo $title;
+	echo $body;
+}
\ No newline at end of file
diff --git a/pages/entities/list.php b/pages/entities/list.php
new file mode 100644
index 000000000..280336cef
--- /dev/null
+++ b/pages/entities/list.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Entity viewer
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
+
+set_context('search');
+$area2 = elgg_list_entities();
+set_context('entities');
+
+$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+
+page_draw("", $body);
\ No newline at end of file
-- 
cgit v1.2.3