From bab90941c9faea31651bb8b562ddec6b5a82292c Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 19 Nov 2008 21:16:49 +0000 Subject: Fixes #568: Exportable code now inclusive not exclusive. * Added extra function Exportable interface * OpenDD export modified * PHP & JSON export views modified * Default export view will still show all data if you are logged in as admin (since this view is used by the guidtool) git-svn-id: https://code.elgg.org/elgg/trunk@2467 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/json/export/entity.php | 5 +++-- views/json/export/metadata.php | 5 +++-- views/json/export/relationship.php | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'views/json/export') diff --git a/views/json/export/entity.php b/views/json/export/entity.php index 83524cbd8..700784ca3 100644 --- a/views/json/export/entity.php +++ b/views/json/export/entity.php @@ -14,9 +14,10 @@ $entity = $vars['entity']; $export = new stdClass; + $exportable_values = $entity->getExportableValues(); - foreach ($entity as $k => $v) - $export->$k = $v; + foreach ($exportable_values as $v) + $export->$v = $entity->$v; echo json_encode($export); ?> \ No newline at end of file diff --git a/views/json/export/metadata.php b/views/json/export/metadata.php index 0495e37b2..e56a0a7a1 100644 --- a/views/json/export/metadata.php +++ b/views/json/export/metadata.php @@ -14,9 +14,10 @@ $m = $vars['metadata']; $export = new stdClass; + $exportable_values = $entity->getExportableValues(); - foreach ($m as $k => $v) - $export->$k = $v; + foreach ($exportable_values as $v) + $export->$v = $m->$v; echo json_encode($export); ?> \ No newline at end of file diff --git a/views/json/export/relationship.php b/views/json/export/relationship.php index 22acbba92..004ce9864 100644 --- a/views/json/export/relationship.php +++ b/views/json/export/relationship.php @@ -14,9 +14,11 @@ $r = $vars['relationship']; $export = new stdClass; + + $exportable_values = $entity->getExportableValues(); - foreach ($r as $k => $v) - $export->$k = $v; + foreach ($exportable_values as $v) + $export->$v = $r->$v; echo json_encode($export); ?> \ No newline at end of file -- cgit v1.2.3