From 694781d190fba09437a37983f077d0381a56050b Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 16 Oct 2009 21:25:25 +0000 Subject: Finished standardizing seconday views. git-svn-id: http://code.elgg.org/elgg/trunk@3559 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/php/api/output.php | 29 +++++++++++----------- views/php/canvas/default.php | 28 +++++++++------------ views/php/export/entity.php | 38 ++++++++++++++--------------- views/php/export/metadata.php | 38 ++++++++++++++--------------- views/php/export/relationship.php | 38 ++++++++++++++--------------- views/php/group/default.php | 21 +++++++--------- views/php/messages/exceptions/exception.php | 25 +++++++++---------- views/php/object/default.php | 21 +++++++--------- views/php/pageshells/pageshell.php | 21 ++++++++-------- views/php/search/entity_list.php | 28 ++++++++++----------- views/php/site/default.php | 28 +++++++++------------ views/php/user/default.php | 21 +++++++--------- 12 files changed, 157 insertions(+), 179 deletions(-) (limited to 'views/php') diff --git a/views/php/api/output.php b/views/php/api/output.php index 1e4133772..2b0b2b754 100644 --- a/views/php/api/output.php +++ b/views/php/api/output.php @@ -1,17 +1,16 @@ export(); - - echo serialize($export); -?> \ No newline at end of file +$result = $vars['result']; +$export = $result->export(); + +echo serialize($export); \ No newline at end of file diff --git a/views/php/canvas/default.php b/views/php/canvas/default.php index a5cc56917..0cfa8b49a 100644 --- a/views/php/canvas/default.php +++ b/views/php/canvas/default.php @@ -1,19 +1,15 @@ \ No newline at end of file +} \ No newline at end of file diff --git a/views/php/export/entity.php b/views/php/export/entity.php index a23f2c1d8..ecceb5fd3 100644 --- a/views/php/export/entity.php +++ b/views/php/export/entity.php @@ -1,21 +1,21 @@ getExportableValues(); - - foreach ($exportable_values as $v) - $export->$v = $entity->$v; - - echo serialize($export); -?> \ No newline at end of file +$entity = $vars['entity']; + +$export = new stdClass; +$exportable_values = $entity->getExportableValues(); + +foreach ($exportable_values as $v) { + $export->$v = $entity->$v; +} + +echo serialize($export); diff --git a/views/php/export/metadata.php b/views/php/export/metadata.php index e0d5cc4a7..d454aec7f 100644 --- a/views/php/export/metadata.php +++ b/views/php/export/metadata.php @@ -1,21 +1,21 @@ getExportableValues(); - - foreach ($exportable_values as $v) - $export->$v = $m->$v; - - echo serialize($export); -?> \ No newline at end of file +$m = $vars['metadata']; + +$export = new stdClass; +$exportable_values = $m->getExportableValues(); + +foreach ($exportable_values as $v) { + $export->$v = $m->$v; +} + +echo serialize($export); \ No newline at end of file diff --git a/views/php/export/relationship.php b/views/php/export/relationship.php index ef6482a64..8cb3c9d73 100644 --- a/views/php/export/relationship.php +++ b/views/php/export/relationship.php @@ -1,21 +1,21 @@ getExportableValues(); - - foreach ($exportable_values as $v) - $export->$v = $r->$v; - - echo serialize($export); -?> \ No newline at end of file +$r = $vars['relationship']; + +$export = new stdClass; +$exportable_values = $r->getExportableValues(); + +foreach ($exportable_values as $v) { + $export->$v = $r->$v; +} + +echo serialize($export); \ No newline at end of file diff --git a/views/php/group/default.php b/views/php/group/default.php index d976764d9..1c8440d4a 100644 --- a/views/php/group/default.php +++ b/views/php/group/default.php @@ -1,14 +1,11 @@ \ No newline at end of file +echo elgg_view('export/entity', $vars); \ No newline at end of file diff --git a/views/php/messages/exceptions/exception.php b/views/php/messages/exceptions/exception.php index 4e66eb016..c8f549734 100644 --- a/views/php/messages/exceptions/exception.php +++ b/views/php/messages/exceptions/exception.php @@ -1,15 +1,14 @@ \ No newline at end of file +echo serialize($vars['object']); \ No newline at end of file diff --git a/views/php/object/default.php b/views/php/object/default.php index d976764d9..1c8440d4a 100644 --- a/views/php/object/default.php +++ b/views/php/object/default.php @@ -1,14 +1,11 @@ \ No newline at end of file +echo elgg_view('export/entity', $vars); \ No newline at end of file diff --git a/views/php/pageshells/pageshell.php b/views/php/pageshells/pageshell.php index a956a4432..d6a924c2f 100644 --- a/views/php/pageshells/pageshell.php +++ b/views/php/pageshells/pageshell.php @@ -1,13 +1,12 @@ \ No newline at end of file +echo $vars['body']; \ No newline at end of file diff --git a/views/php/search/entity_list.php b/views/php/search/entity_list.php index 9e5737bbe..35f4341f8 100644 --- a/views/php/search/entity_list.php +++ b/views/php/search/entity_list.php @@ -1,18 +1,16 @@ 0) { - foreach($entities as $entity) - echo elgg_view_entity($entity); +$entities = $vars['entities']; +if (is_array($entities) && sizeof($entities) > 0) { + foreach($entities as $entity) { + echo elgg_view_entity($entity); } - -?> \ No newline at end of file +} \ No newline at end of file diff --git a/views/php/site/default.php b/views/php/site/default.php index a5cc56917..0cfa8b49a 100644 --- a/views/php/site/default.php +++ b/views/php/site/default.php @@ -1,19 +1,15 @@ \ No newline at end of file +} \ No newline at end of file diff --git a/views/php/user/default.php b/views/php/user/default.php index d976764d9..1c8440d4a 100644 --- a/views/php/user/default.php +++ b/views/php/user/default.php @@ -1,14 +1,11 @@ \ No newline at end of file +echo elgg_view('export/entity', $vars); \ No newline at end of file -- cgit v1.2.3