From da9858182b8ae223428dd802f3eeb7624dcd3645 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 30 Sep 2010 23:23:18 +0000
Subject: Closes #2344 - moves friends pages into pages directory

git-svn-id: http://code.elgg.org/elgg/trunk@6989 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/users.php                     |  8 ++---
 friends/add.php                          | 25 -------------
 friends/collections.php                  | 22 ------------
 friends/edit.php                         | 31 -----------------
 friends/index.php                        | 26 --------------
 friends/of.php                           | 26 --------------
 friends/pickercallback.php               | 60 --------------------------------
 pages/friends/add.php                    | 25 +++++++++++++
 pages/friends/collections.php            | 22 ++++++++++++
 pages/friends/edit.php                   | 31 +++++++++++++++++
 pages/friends/index.php                  | 26 ++++++++++++++
 pages/friends/of.php                     | 26 ++++++++++++++
 pages/friends/pickercallback.php         | 60 ++++++++++++++++++++++++++++++++
 views/default/friends/collection.php     |  2 +-
 views/default/friends/collectiontabs.php |  4 +--
 15 files changed, 197 insertions(+), 197 deletions(-)
 delete mode 100644 friends/add.php
 delete mode 100644 friends/collections.php
 delete mode 100644 friends/edit.php
 delete mode 100644 friends/index.php
 delete mode 100644 friends/of.php
 delete mode 100644 friends/pickercallback.php
 create mode 100644 pages/friends/add.php
 create mode 100644 pages/friends/collections.php
 create mode 100644 pages/friends/edit.php
 create mode 100644 pages/friends/index.php
 create mode 100644 pages/friends/of.php
 create mode 100644 pages/friends/pickercallback.php

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 5d16decb7..05311ab9d 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1133,7 +1133,7 @@ function friends_page_handler($page_elements) {
 	if (get_loggedin_userid() == page_owner()) {
 		// collections_submenu_items(); disabled for now as we no longer use friends collections (replaced by shared access)
 	}
-	require_once(dirname(dirname(dirname(__FILE__))) . "/friends/index.php");
+	require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/index.php");
 }
 
 /**
@@ -1147,7 +1147,7 @@ function friends_of_page_handler($page_elements) {
 	if (get_loggedin_userid() == page_owner()) {
 		// collections_submenu_items(); disabled for now as we no longer use friends collections (replaced by shared access)
 	}
-	require_once(dirname(dirname(dirname(__FILE__))) . "/friends/of.php");
+	require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/of.php");
 }
 
 /**
@@ -1159,14 +1159,14 @@ function collections_page_handler($page_elements) {
 		if ($page_elements[0] == "add") {
 			set_page_owner(get_loggedin_userid());
 			collections_submenu_items();
-			require_once(dirname(dirname(dirname(__FILE__))) . "/friends/add.php");
+			require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/add.php");
 		} else {
 			if ($user = get_user_by_username($page_elements[0])) {
 				set_page_owner($user->getGUID());
 				if (get_loggedin_userid() == page_owner()) {
 					collections_submenu_items();
 				}
-				require_once(dirname(dirname(dirname(__FILE__))) . "/friends/collections.php");
+				require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/collections.php");
 			}
 		}
 	}
diff --git a/friends/add.php b/friends/add.php
deleted file mode 100644
index 0adbd7a63..000000000
--- a/friends/add.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Elgg add a collection of friends
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-// You need to be logged in for this one
-gatekeeper();
-
-$title = elgg_echo('friends:collections:add');
-
-$content = elgg_view_title($title);
-
-$content .= elgg_view('friends/forms/edit', array(
-	'friends' => get_user_friends(get_loggedin_userid(), "", 9999)
-	)
-);
-
-$body = elgg_view_layout('one_column_with_sidebar', $content);
-
-page_draw(elgg_echo('friends:collections:add'),$body);
diff --git a/friends/collections.php b/friends/collections.php
deleted file mode 100644
index 25ab98c4c..000000000
--- a/friends/collections.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Elgg collections of friends
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-// You need to be logged in for this one
-gatekeeper();
-
-$title = elgg_echo('friends:collections');
-
-$content = elgg_view_title($title);
-
-$content .= elgg_view_access_collections(get_loggedin_userid());
-
-$body = elgg_view_layout('one_column_with_sidebar', $content);
-
-page_draw($title, $body);
diff --git a/friends/edit.php b/friends/edit.php
deleted file mode 100644
index c164a819e..000000000
--- a/friends/edit.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Elgg add a collection of friends
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-// You need to be logged in for this one
-gatekeeper();
-
-$title = elgg_echo('friends:collectionedit');
-
-$content = elgg_view_title($title);
-
-//grab the collection id passed to the edit form
-$collection_id = get_input('collection');
-
-//get the full collection
-$collection = get_access_collection($collection_id);
-
-//get all members of the collection
-$collection_members = get_members_of_access_collection($collection_id);
-
-$content .= elgg_view('friends/forms/edit', array('collection' => $collection, 'collection_members' => $collection_members));
-
-$body = elgg_view_layout('one_column_with_sidebar', $content);
-
-page_draw($title, $body);
\ No newline at end of file
diff --git a/friends/index.php b/friends/index.php
deleted file mode 100644
index b7f0a2a75..000000000
--- a/friends/index.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Elgg friends page
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-$owner = page_owner_entity();
-if (!$owner) {
-	gatekeeper();
-	set_page_owner(get_loggedin_userid());
-	$owner = page_owner_entity();
-}
-
-$title = sprintf(elgg_echo("friends:owned"), $owner->name);
-
-$content = elgg_view_title($title);
-
-$content .= "<div class='members_list'>" . list_entities_from_relationship('friend', $owner->getGUID(), FALSE, 'user', '', 0, 10, FALSE) . "</div>";
-
-$body = elgg_view_layout('one_column_with_sidebar', $content);
-
-page_draw($title, $body);
diff --git a/friends/of.php b/friends/of.php
deleted file mode 100644
index a64b9cb6e..000000000
--- a/friends/of.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Elgg friends of page
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-$owner = page_owner_entity();
-if (!$owner) {
-	gatekeeper();
-	set_page_owner(get_loggedin_userid());
-	$owner = page_owner_entity();
-}
-
-$title = sprintf(elgg_echo("friends:of:owned"), $owner->name);
-
-$content = elgg_view_title($title);
-
-$content .= "<div class='members_list'>" . list_entities_from_relationship('friend', $owner->getGUID(), TRUE, 'user', '', 0, 10, FALSE) . "</div>";
-
-$body = elgg_view_layout('one_column_with_sidebar', $content);
-
-page_draw($title, $body);
diff --git a/friends/pickercallback.php b/friends/pickercallback.php
deleted file mode 100644
index 4fe08b505..000000000
--- a/friends/pickercallback.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Elgg friends picker callback
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-// Load Elgg engine
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-global $CONFIG;
-
-// Get callback type (list or picker)
-$type = get_input('type','picker');
-
-// Get list of members if applicable
-/*$members = get_input('members','');
-if (!empty($members)) {
-	$members = explode(',',$members);
-} else {
-	$members = array();
-}*/
-$collection = (int) get_input('collection',0);
-$members = get_members_of_access_collection($collection, true);
-if (!$members) {
-	$members = array();
-}
-
-$friendspicker = (int) get_input('friendspicker',0);
-
-// Get page owner (bomb out if there isn't one)
-$pageowner = page_owner_entity();
-if (!$pageowner) {
-	forward();
-	exit;
-}
-
-// Depending on the view type, launch a different view
-switch($type) {
-	case 'list':
-		$js_segment = elgg_view('friends/tablelistcountupdate',array('friendspicker' => $friendspicker, 'count' => sizeof($members)));
-		$content = elgg_view('friends/tablelist',array('entities' => $members, 'content' => $js_segment));
-		break;
-	default:
-		$friends = $pageowner->getFriends('',9999);
-		$content = elgg_view('friends/picker',array(
-			'entities' => $friends,
-			'value' => $members,
-			'callback' => true,
-			'friendspicker' => $friendspicker,
-			'formcontents' => elgg_view('friends/forms/collectionfields',array('collection' => get_access_collection($collection))),
-			'formtarget' => $CONFIG->wwwroot . 'action/friends/editcollection',
-		));
-		break;
-}
-
-// Output the content
-echo $content;
\ No newline at end of file
diff --git a/pages/friends/add.php b/pages/friends/add.php
new file mode 100644
index 000000000..0adbd7a63
--- /dev/null
+++ b/pages/friends/add.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Elgg add a collection of friends
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+// You need to be logged in for this one
+gatekeeper();
+
+$title = elgg_echo('friends:collections:add');
+
+$content = elgg_view_title($title);
+
+$content .= elgg_view('friends/forms/edit', array(
+	'friends' => get_user_friends(get_loggedin_userid(), "", 9999)
+	)
+);
+
+$body = elgg_view_layout('one_column_with_sidebar', $content);
+
+page_draw(elgg_echo('friends:collections:add'),$body);
diff --git a/pages/friends/collections.php b/pages/friends/collections.php
new file mode 100644
index 000000000..25ab98c4c
--- /dev/null
+++ b/pages/friends/collections.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Elgg collections of friends
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+// You need to be logged in for this one
+gatekeeper();
+
+$title = elgg_echo('friends:collections');
+
+$content = elgg_view_title($title);
+
+$content .= elgg_view_access_collections(get_loggedin_userid());
+
+$body = elgg_view_layout('one_column_with_sidebar', $content);
+
+page_draw($title, $body);
diff --git a/pages/friends/edit.php b/pages/friends/edit.php
new file mode 100644
index 000000000..c164a819e
--- /dev/null
+++ b/pages/friends/edit.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Elgg add a collection of friends
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+// You need to be logged in for this one
+gatekeeper();
+
+$title = elgg_echo('friends:collectionedit');
+
+$content = elgg_view_title($title);
+
+//grab the collection id passed to the edit form
+$collection_id = get_input('collection');
+
+//get the full collection
+$collection = get_access_collection($collection_id);
+
+//get all members of the collection
+$collection_members = get_members_of_access_collection($collection_id);
+
+$content .= elgg_view('friends/forms/edit', array('collection' => $collection, 'collection_members' => $collection_members));
+
+$body = elgg_view_layout('one_column_with_sidebar', $content);
+
+page_draw($title, $body);
\ No newline at end of file
diff --git a/pages/friends/index.php b/pages/friends/index.php
new file mode 100644
index 000000000..b7f0a2a75
--- /dev/null
+++ b/pages/friends/index.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Elgg friends page
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+$owner = page_owner_entity();
+if (!$owner) {
+	gatekeeper();
+	set_page_owner(get_loggedin_userid());
+	$owner = page_owner_entity();
+}
+
+$title = sprintf(elgg_echo("friends:owned"), $owner->name);
+
+$content = elgg_view_title($title);
+
+$content .= "<div class='members_list'>" . list_entities_from_relationship('friend', $owner->getGUID(), FALSE, 'user', '', 0, 10, FALSE) . "</div>";
+
+$body = elgg_view_layout('one_column_with_sidebar', $content);
+
+page_draw($title, $body);
diff --git a/pages/friends/of.php b/pages/friends/of.php
new file mode 100644
index 000000000..a64b9cb6e
--- /dev/null
+++ b/pages/friends/of.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Elgg friends of page
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+$owner = page_owner_entity();
+if (!$owner) {
+	gatekeeper();
+	set_page_owner(get_loggedin_userid());
+	$owner = page_owner_entity();
+}
+
+$title = sprintf(elgg_echo("friends:of:owned"), $owner->name);
+
+$content = elgg_view_title($title);
+
+$content .= "<div class='members_list'>" . list_entities_from_relationship('friend', $owner->getGUID(), TRUE, 'user', '', 0, 10, FALSE) . "</div>";
+
+$body = elgg_view_layout('one_column_with_sidebar', $content);
+
+page_draw($title, $body);
diff --git a/pages/friends/pickercallback.php b/pages/friends/pickercallback.php
new file mode 100644
index 000000000..006ca20e5
--- /dev/null
+++ b/pages/friends/pickercallback.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Elgg friends picker callback
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+// Load Elgg engine
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+global $CONFIG;
+
+// Get callback type (list or picker)
+$type = get_input('type','picker');
+
+// Get list of members if applicable
+/*$members = get_input('members','');
+if (!empty($members)) {
+	$members = explode(',',$members);
+} else {
+	$members = array();
+}*/
+$collection = (int) get_input('collection',0);
+$members = get_members_of_access_collection($collection, true);
+if (!$members) {
+	$members = array();
+}
+
+$friendspicker = (int) get_input('friendspicker',0);
+
+// Get page owner (bomb out if there isn't one)
+$pageowner = page_owner_entity();
+if (!$pageowner) {
+	forward();
+	exit;
+}
+
+// Depending on the view type, launch a different view
+switch($type) {
+	case 'list':
+		$js_segment = elgg_view('friends/tablelistcountupdate',array('friendspicker' => $friendspicker, 'count' => sizeof($members)));
+		$content = elgg_view('friends/tablelist',array('entities' => $members, 'content' => $js_segment));
+		break;
+	default:
+		$friends = $pageowner->getFriends('',9999);
+		$content = elgg_view('friends/picker',array(
+			'entities' => $friends,
+			'value' => $members,
+			'callback' => true,
+			'friendspicker' => $friendspicker,
+			'formcontents' => elgg_view('friends/forms/collectionfields',array('collection' => get_access_collection($collection))),
+			'formtarget' => $CONFIG->wwwroot . 'action/friends/editcollection',
+		));
+		break;
+}
+
+// Output the content
+echo $content;
\ No newline at end of file
diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php
index ddd0a0ed0..5683d5982 100644
--- a/views/default/friends/collection.php
+++ b/views/default/friends/collection.php
@@ -45,7 +45,7 @@ if ($friends = $vars['collection']->entities) {
 	<script type="text/javascript">
 	$(document).ready(function () {
 
-			$('#friends_picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
+			$('#friends_picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
 
 	});
 	</script>
diff --git a/views/default/friends/collectiontabs.php b/views/default/friends/collectiontabs.php
index 9a6577671..43a8aef46 100644
--- a/views/default/friends/collectiontabs.php
+++ b/views/default/friends/collectiontabs.php
@@ -32,7 +32,7 @@ $(document).ready(function () {
 
 	$('a.collectionmembers<?php echo $friendspicker; ?>').click(function () {
 		// load collection members pane
-		$('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+		$('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
 
 		// remove selected state from previous tab
 		$(this).parent().parent().find("li.selected").removeClass("selected");
@@ -44,7 +44,7 @@ $(document).ready(function () {
 
 	$('a.editmembers<?php echo $friendspicker; ?>').click(function () {
 		// load friends picker pane
-		$('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+		$('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
 
 		// remove selected state from previous tab
 		$(this).parent().parent().find("li.selected").removeClass("selected");
-- 
cgit v1.2.3