From b06376e171d82c821106f8f86a856fb2aea41f7a Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 30 Jul 2008 17:13:13 +0000
Subject: Closes #189: ODD -> OpenDD

git-svn-id: https://code.elgg.org/elgg/trunk@1611 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/import/odd.php                         | 31 --------------------------
 actions/import/opendd.php                      | 31 ++++++++++++++++++++++++++
 engine/lib/export.php                          |  4 ++--
 services/export/handler.php                    |  2 +-
 views/odd/canvas/default.php                   | 21 -----------------
 views/odd/export/entity.php                    | 19 ----------------
 views/odd/export/metadata.php                  | 23 -------------------
 views/odd/export/relationship.php              | 22 ------------------
 views/odd/group/default.php                    | 17 --------------
 views/odd/messages/exceptions/exception.php    | 31 --------------------------
 views/odd/object/default.php                   | 17 --------------
 views/odd/pageshells/pageshell.php             | 22 ------------------
 views/odd/site/default.php                     | 17 --------------
 views/odd/user/default.php                     | 17 --------------
 views/opendd/canvas/default.php                | 21 +++++++++++++++++
 views/opendd/export/entity.php                 | 19 ++++++++++++++++
 views/opendd/export/metadata.php               | 23 +++++++++++++++++++
 views/opendd/export/relationship.php           | 22 ++++++++++++++++++
 views/opendd/group/default.php                 | 17 ++++++++++++++
 views/opendd/messages/exceptions/exception.php | 31 ++++++++++++++++++++++++++
 views/opendd/object/default.php                | 17 ++++++++++++++
 views/opendd/pageshells/pageshell.php          | 22 ++++++++++++++++++
 views/opendd/site/default.php                  | 17 ++++++++++++++
 views/opendd/user/default.php                  | 17 ++++++++++++++
 24 files changed, 240 insertions(+), 240 deletions(-)
 delete mode 100644 actions/import/odd.php
 create mode 100644 actions/import/opendd.php
 delete mode 100644 views/odd/canvas/default.php
 delete mode 100644 views/odd/export/entity.php
 delete mode 100644 views/odd/export/metadata.php
 delete mode 100644 views/odd/export/relationship.php
 delete mode 100644 views/odd/group/default.php
 delete mode 100644 views/odd/messages/exceptions/exception.php
 delete mode 100644 views/odd/object/default.php
 delete mode 100644 views/odd/pageshells/pageshell.php
 delete mode 100644 views/odd/site/default.php
 delete mode 100644 views/odd/user/default.php
 create mode 100644 views/opendd/canvas/default.php
 create mode 100644 views/opendd/export/entity.php
 create mode 100644 views/opendd/export/metadata.php
 create mode 100644 views/opendd/export/relationship.php
 create mode 100644 views/opendd/group/default.php
 create mode 100644 views/opendd/messages/exceptions/exception.php
 create mode 100644 views/opendd/object/default.php
 create mode 100644 views/opendd/pageshells/pageshell.php
 create mode 100644 views/opendd/site/default.php
 create mode 100644 views/opendd/user/default.php

diff --git a/actions/import/odd.php b/actions/import/odd.php
deleted file mode 100644
index 6802fc5a2..000000000
--- a/actions/import/odd.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-	/**
-	 * Elgg OpenDD import action.
-	 * 
-	 * This action accepts data to import (in OpenDD format) and performs and import. It accepts 
-	 * data as $data.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	// Safety
-	admin_gatekeeper();
-	
-	// Get input
-	$data = get_input($data);
-	
-	// Import 
-	$return = import($data);
-	
-	if ($return)
-		system_message(elgg_echo('importsuccess'));
-	else
-		register_error(elgg_echo('importfail'));
-		
-	forward($_SERVER['HTTP_REFERER']);
-?>
\ No newline at end of file
diff --git a/actions/import/opendd.php b/actions/import/opendd.php
new file mode 100644
index 000000000..6802fc5a2
--- /dev/null
+++ b/actions/import/opendd.php
@@ -0,0 +1,31 @@
+<?php
+	/**
+	 * Elgg OpenDD import action.
+	 * 
+	 * This action accepts data to import (in OpenDD format) and performs and import. It accepts 
+	 * data as $data.
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	// Safety
+	admin_gatekeeper();
+	
+	// Get input
+	$data = get_input($data);
+	
+	// Import 
+	$return = import($data);
+	
+	if ($return)
+		system_message(elgg_echo('importsuccess'));
+	else
+		register_error(elgg_echo('importfail'));
+		
+	forward($_SERVER['HTTP_REFERER']);
+?>
\ No newline at end of file
diff --git a/engine/lib/export.php b/engine/lib/export.php
index 6c9962aa2..5560a9f71 100644
--- a/engine/lib/export.php
+++ b/engine/lib/export.php
@@ -70,7 +70,7 @@
 	{
 		global $CONFIG;
 		
-		return $CONFIG->wwwroot  . "export/odd/$guid/";
+		return $CONFIG->wwwroot  . "export/opendd/$guid/";
 	}
 	
 	/**
@@ -224,7 +224,7 @@
 	{
 		global $CONFIG;
 		
-		register_action("import/odd", false);
+		register_action("import/opendd", false);
 	}
 	
 	// Register a startup event
diff --git a/services/export/handler.php b/services/export/handler.php
index 2662ad4be..667d2410d 100644
--- a/services/export/handler.php
+++ b/services/export/handler.php
@@ -2,7 +2,7 @@
 	/**
 	 * Open Document Definition Handler.
 	 * This file acts as the endpoint for ODD UUID url requests, exporting the requested data as an
-	 * ODD XML file. 
+	 * OpenDD XML file. 
 	 * 
 	 * @package Elgg
 	 * @subpackage Core
diff --git a/views/odd/canvas/default.php b/views/odd/canvas/default.php
deleted file mode 100644
index f1fbe6c96..000000000
--- a/views/odd/canvas/default.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-	/**
-	 * Elgg default layout
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	for ($i = 1; $i < 8; $i++) {
-		
-		if (isset($vars["area{$i}"]))
-			echo $vars["area{$i}"];
-		
-	}
-
-?>
\ No newline at end of file
diff --git a/views/odd/export/entity.php b/views/odd/export/entity.php
deleted file mode 100644
index a147a707a..000000000
--- a/views/odd/export/entity.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-	/**
-	 * Elgg Entity export.
-	 * Displays an entity as ODD
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	$entity = $vars['entity'];
-	$serialised = exportAsArray($vars['entity']->guid);
-	foreach ($serialised as $s)
-		echo $s;
-		
-?>
\ No newline at end of file
diff --git a/views/odd/export/metadata.php b/views/odd/export/metadata.php
deleted file mode 100644
index e6f74e2d2..000000000
--- a/views/odd/export/metadata.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-	/**
-	 * Elgg metadata export.
-	 * Displays a metadata item using the current view.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	$m = $vars['metadata'];
-	$uuid = $vars['uuid'];
-	
-	//$odd = new ODDDocument();
-	//$odd->addElement($m->export());
-	
-	//echo $odd;
-	
-	echo $m->export();
-?>
\ No newline at end of file
diff --git a/views/odd/export/relationship.php b/views/odd/export/relationship.php
deleted file mode 100644
index 28b3026d5..000000000
--- a/views/odd/export/relationship.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-	/**
-	 * Elgg relationship export.
-	 * Displays a relationship using ODD.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	$r = $vars['relationship'];
-	
-	//$odd = new ODDDocument();
-	//$odd->addElement($r->export());
-	
-	//echo $odd;
-	
-	echo $r->export();
-?>
\ No newline at end of file
diff --git a/views/odd/group/default.php b/views/odd/group/default.php
deleted file mode 100644
index 8cf04ef16..000000000
--- a/views/odd/group/default.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-	/**
-	 * Elgg default object view
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	$serialised = exportAsArray($vars['entity']->guid);
-	foreach ($serialised as $s)
-		echo $s;
-?>
\ No newline at end of file
diff --git a/views/odd/messages/exceptions/exception.php b/views/odd/messages/exceptions/exception.php
deleted file mode 100644
index 38afbee58..000000000
--- a/views/odd/messages/exceptions/exception.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-	/**
-	 * Elgg exception
-	 * Displays a single exception
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 * 
-	 * @uses $vars['object'] An exception
-	 */
-
-	global $CONFIG;
-?>
-<!-- 
-<?php echo get_class($vars['object']); ?>: <?php echo autop($vars['object']->getMessage()); ?>
-
-
-<?php if ($CONFIG->debug) { ?>
-<?php
-
-			echo print_r($vars['object'], true);
-		
-		?>
-<?php } ?>
-	
--->
\ No newline at end of file
diff --git a/views/odd/object/default.php b/views/odd/object/default.php
deleted file mode 100644
index 8cf04ef16..000000000
--- a/views/odd/object/default.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-	/**
-	 * Elgg default object view
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	$serialised = exportAsArray($vars['entity']->guid);
-	foreach ($serialised as $s)
-		echo $s;
-?>
\ No newline at end of file
diff --git a/views/odd/pageshells/pageshell.php b/views/odd/pageshells/pageshell.php
deleted file mode 100644
index 92c11eadc..000000000
--- a/views/odd/pageshells/pageshell.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-	/**
-	 * Elgg XML output pageshell for ODD
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 * 
-	 */
-
-	header("Content-Type: text/xml");
-
-	
-?>
-<odd>
-<?php 
-echo $vars['body'];
-?>
-</odd>
\ No newline at end of file
diff --git a/views/odd/site/default.php b/views/odd/site/default.php
deleted file mode 100644
index 8cf04ef16..000000000
--- a/views/odd/site/default.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-	/**
-	 * Elgg default object view
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	$serialised = exportAsArray($vars['entity']->guid);
-	foreach ($serialised as $s)
-		echo $s;
-?>
\ No newline at end of file
diff --git a/views/odd/user/default.php b/views/odd/user/default.php
deleted file mode 100644
index 8cf04ef16..000000000
--- a/views/odd/user/default.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-	/**
-	 * Elgg default object view
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	$serialised = exportAsArray($vars['entity']->guid);
-	foreach ($serialised as $s)
-		echo $s;
-?>
\ No newline at end of file
diff --git a/views/opendd/canvas/default.php b/views/opendd/canvas/default.php
new file mode 100644
index 000000000..f1fbe6c96
--- /dev/null
+++ b/views/opendd/canvas/default.php
@@ -0,0 +1,21 @@
+<?php
+
+	/**
+	 * Elgg default layout
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	for ($i = 1; $i < 8; $i++) {
+		
+		if (isset($vars["area{$i}"]))
+			echo $vars["area{$i}"];
+		
+	}
+
+?>
\ No newline at end of file
diff --git a/views/opendd/export/entity.php b/views/opendd/export/entity.php
new file mode 100644
index 000000000..a147a707a
--- /dev/null
+++ b/views/opendd/export/entity.php
@@ -0,0 +1,19 @@
+<?php
+	/**
+	 * Elgg Entity export.
+	 * Displays an entity as ODD
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	$entity = $vars['entity'];
+	$serialised = exportAsArray($vars['entity']->guid);
+	foreach ($serialised as $s)
+		echo $s;
+		
+?>
\ No newline at end of file
diff --git a/views/opendd/export/metadata.php b/views/opendd/export/metadata.php
new file mode 100644
index 000000000..e6f74e2d2
--- /dev/null
+++ b/views/opendd/export/metadata.php
@@ -0,0 +1,23 @@
+<?php
+	/**
+	 * Elgg metadata export.
+	 * Displays a metadata item using the current view.
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	$m = $vars['metadata'];
+	$uuid = $vars['uuid'];
+	
+	//$odd = new ODDDocument();
+	//$odd->addElement($m->export());
+	
+	//echo $odd;
+	
+	echo $m->export();
+?>
\ No newline at end of file
diff --git a/views/opendd/export/relationship.php b/views/opendd/export/relationship.php
new file mode 100644
index 000000000..28b3026d5
--- /dev/null
+++ b/views/opendd/export/relationship.php
@@ -0,0 +1,22 @@
+<?php
+	/**
+	 * Elgg relationship export.
+	 * Displays a relationship using ODD.
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	$r = $vars['relationship'];
+	
+	//$odd = new ODDDocument();
+	//$odd->addElement($r->export());
+	
+	//echo $odd;
+	
+	echo $r->export();
+?>
\ No newline at end of file
diff --git a/views/opendd/group/default.php b/views/opendd/group/default.php
new file mode 100644
index 000000000..8cf04ef16
--- /dev/null
+++ b/views/opendd/group/default.php
@@ -0,0 +1,17 @@
+<?php
+
+	/**
+	 * Elgg default object view
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	$serialised = exportAsArray($vars['entity']->guid);
+	foreach ($serialised as $s)
+		echo $s;
+?>
\ No newline at end of file
diff --git a/views/opendd/messages/exceptions/exception.php b/views/opendd/messages/exceptions/exception.php
new file mode 100644
index 000000000..38afbee58
--- /dev/null
+++ b/views/opendd/messages/exceptions/exception.php
@@ -0,0 +1,31 @@
+<?php
+
+	/**
+	 * Elgg exception
+	 * Displays a single exception
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['object'] An exception
+	 */
+
+	global $CONFIG;
+?>
+<!-- 
+<?php echo get_class($vars['object']); ?>: <?php echo autop($vars['object']->getMessage()); ?>
+
+
+<?php if ($CONFIG->debug) { ?>
+<?php
+
+			echo print_r($vars['object'], true);
+		
+		?>
+<?php } ?>
+	
+-->
\ No newline at end of file
diff --git a/views/opendd/object/default.php b/views/opendd/object/default.php
new file mode 100644
index 000000000..8cf04ef16
--- /dev/null
+++ b/views/opendd/object/default.php
@@ -0,0 +1,17 @@
+<?php
+
+	/**
+	 * Elgg default object view
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	$serialised = exportAsArray($vars['entity']->guid);
+	foreach ($serialised as $s)
+		echo $s;
+?>
\ No newline at end of file
diff --git a/views/opendd/pageshells/pageshell.php b/views/opendd/pageshells/pageshell.php
new file mode 100644
index 000000000..92c11eadc
--- /dev/null
+++ b/views/opendd/pageshells/pageshell.php
@@ -0,0 +1,22 @@
+<?php
+	/**
+	 * Elgg XML output pageshell for ODD
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 * 
+	 */
+
+	header("Content-Type: text/xml");
+
+	
+?>
+<odd>
+<?php 
+echo $vars['body'];
+?>
+</odd>
\ No newline at end of file
diff --git a/views/opendd/site/default.php b/views/opendd/site/default.php
new file mode 100644
index 000000000..8cf04ef16
--- /dev/null
+++ b/views/opendd/site/default.php
@@ -0,0 +1,17 @@
+<?php
+
+	/**
+	 * Elgg default object view
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	$serialised = exportAsArray($vars['entity']->guid);
+	foreach ($serialised as $s)
+		echo $s;
+?>
\ No newline at end of file
diff --git a/views/opendd/user/default.php b/views/opendd/user/default.php
new file mode 100644
index 000000000..8cf04ef16
--- /dev/null
+++ b/views/opendd/user/default.php
@@ -0,0 +1,17 @@
+<?php
+
+	/**
+	 * Elgg default object view
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	$serialised = exportAsArray($vars['entity']->guid);
+	foreach ($serialised as $s)
+		echo $s;
+?>
\ No newline at end of file
-- 
cgit v1.2.3