aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--entities/index.php112
-rw-r--r--entities/list.php33
2 files changed, 66 insertions, 79 deletions
diff --git a/entities/index.php b/entities/index.php
index 85395b78d..fd7f1eb4f 100644
--- a/entities/index.php
+++ b/entities/index.php
@@ -1,68 +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/
+ */
- /**
- * Generic entity viewer
- * Given a GUID, this page will try and display any entity
- *
- * @package Elgg
- * @subpackage Core
+// Load Elgg engine
+require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
- * @author Curverider Ltd
+// 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;
+}
- * @link http://elgg.org/
- */
+$context = get_input('context');
+if ($context) {
+ set_context($context);
+}
- // Load Elgg engine
- require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
+// 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);
+ }
- // 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;
- }
- $area2 = elgg_view_entity($entity,true);
- if ($shell) {
- $body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2);
- } else {
- $body = $area2;
- }
-
- // Otherwise?
- } 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;
- }
+ if ($entity instanceof ElggObject) {
+ $title = $entity->title;
+ } else if ($entity instanceof ElggEntity) {
+ $title = $entity->name;
+ }
+ $area2 = elgg_view_entity($entity,true);
+ if ($shell) {
+ $body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2);
+ } else {
+ $body = $area2;
+ }
+} else {
+ $body = elgg_echo('notfound');
+}
-?> \ No newline at end of file
+// 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
index 3b02efc15..3d6089315 100644
--- a/entities/list.php
+++ b/entities/list.php
@@ -1,21 +1,16 @@
<?php
+/**
+ * Activity viewer
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
- /**
- * Activity viewer
- *
- * @package Elgg
- * @subpackage Core
-
- * @author Curverider Ltd
-
- * @link http://elgg.org/
- */
-
- require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
- set_context('search');
- $area2 = list_entities("","",0,10,false);
- set_context('entities');
- $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
- page_draw("",$body);
-
-?> \ No newline at end of file
+require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
+set_context('search');
+$area2 = list_entities("","",0,10,false);
+set_context('entities');
+$body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+page_draw("",$body); \ No newline at end of file