From c1411ffc81908882edaace315c46e500419d2aba Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 26 Feb 2011 14:23:32 +0000
Subject: Refs #2982 adding and deleting friend collections works - editing
 does not

git-svn-id: http://code.elgg.org/elgg/trunk@8490 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 pages/friends/add.php                        | 23 ---------
 pages/friends/collections.php                | 23 ---------
 pages/friends/collections/add.php            | 26 ++++++++++
 pages/friends/collections/pickercallback.php | 71 ++++++++++++++++++++++++++++
 pages/friends/collections/view.php           | 23 +++++++++
 pages/friends/edit.php                       | 30 ------------
 pages/friends/pickercallback.php             | 55 ---------------------
 7 files changed, 120 insertions(+), 131 deletions(-)
 delete mode 100644 pages/friends/add.php
 delete mode 100644 pages/friends/collections.php
 create mode 100644 pages/friends/collections/add.php
 create mode 100644 pages/friends/collections/pickercallback.php
 create mode 100644 pages/friends/collections/view.php
 delete mode 100644 pages/friends/edit.php
 delete mode 100644 pages/friends/pickercallback.php

(limited to 'pages/friends')

diff --git a/pages/friends/add.php b/pages/friends/add.php
deleted file mode 100644
index 96da26ae1..000000000
--- a/pages/friends/add.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Elgg add a collection of friends
- *
- * @package Elgg
- * @subpackage Core
- */
-
-// You need to be logged in for this one
-gatekeeper();
-
-$title = elgg_echo('friends:collections:add');
-
-$content = elgg_view_title($title);
-
-$content .= elgg_view_form('friends/edit', array(), array(
-	'friends' => get_user_friends(elgg_get_logged_in_user_guid(), "", 9999)
-	)
-);
-
-$body = elgg_view_layout('one_sidebar', array('content' => $content));
-
-echo elgg_view_page(elgg_echo('friends:collections:add'), $body);
diff --git a/pages/friends/collections.php b/pages/friends/collections.php
deleted file mode 100644
index fa7527f4d..000000000
--- a/pages/friends/collections.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Elgg collections of friends
- *
- * @package Elgg
- * @subpackage Core
- */
-
-// You need to be logged in for this one
-gatekeeper();
-
-$title = elgg_echo('friends:collections');
-
-$content = elgg_view_access_collections(elgg_get_logged_in_user_guid());
-
-$body = elgg_view_layout('content', array(
-	'filter' => false,
-	'content' => $content,
-	'title' => $title,
-	'context' => 'collections',
-));
-
-echo elgg_view_page($title, $body);
diff --git a/pages/friends/collections/add.php b/pages/friends/collections/add.php
new file mode 100644
index 000000000..51425db37
--- /dev/null
+++ b/pages/friends/collections/add.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Elgg add a collection of friends
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+// You need to be logged in for this one
+gatekeeper();
+
+$title = elgg_echo('friends:collections:add');
+
+$content = elgg_view_title($title);
+
+$form_body = elgg_view('forms/friends/collections/edit', array(
+	'friends' => get_user_friends(elgg_get_logged_in_user_guid(), "", 9999)
+));
+$content .= elgg_view('input/form', array(
+	'action' => 'action/friends/collections/add',
+	'body' => $form_body,
+));
+
+$body = elgg_view_layout('one_sidebar', array('content' => $content));
+
+echo elgg_view_page(elgg_echo('friends:collections:add'), $body);
diff --git a/pages/friends/collections/pickercallback.php b/pages/friends/collections/pickercallback.php
new file mode 100644
index 000000000..8da44d8c0
--- /dev/null
+++ b/pages/friends/collections/pickercallback.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Elgg friends picker callback
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+// Load Elgg engine
+require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+
+$site_url = elgg_get_site_url();
+
+// Get callback type (list or picker)
+$type = get_input('type', 'picker');
+
+$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 = elgg_get_page_owner_entity();
+if (!$pageowner) {
+	forward();
+	exit;
+}
+
+// Depending on the view type, launch a different view
+switch($type) {
+	case 'list':
+		$js_segment = elgg_view('core/friends/tablelistcountupdate', array(
+			'friendspicker' => $friendspicker,
+			'count' => sizeof($members),
+		));
+		$content = elgg_view('core/friends/tablelist', array(
+			'entities' => $members,
+			'content' => $js_segment,
+		));
+		break;
+	default:
+		$friends = $pageowner->getFriends('', 9999);
+		$params = array(
+			'collection' => get_access_collection($collection),
+			'friends' => $friends,
+			'friendspicker' => $friendspicker,
+		);
+		$content = elgg_view_form('friends/collections/edit', array(), $params);
+		/*
+		$form_body = elgg_view('input/hidden', array(
+			'name' => 'collection_id',
+			'value' => get_access_collection($collection)->id,
+		));
+		$content = elgg_view('input/friendspicker', array(
+			'entities' => $friends,
+			'value' => $members,
+			'callback' => true,
+			'friendspicker' => $friendspicker,
+			'formcontents' => $form_body,
+			'formtarget' => $site_url . 'action/friends/collections/edit',
+		));
+		 * 
+		 */
+		break;
+}
+
+// Output the content
+echo $content;
\ No newline at end of file
diff --git a/pages/friends/collections/view.php b/pages/friends/collections/view.php
new file mode 100644
index 000000000..fa7527f4d
--- /dev/null
+++ b/pages/friends/collections/view.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Elgg collections of friends
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+// You need to be logged in for this one
+gatekeeper();
+
+$title = elgg_echo('friends:collections');
+
+$content = elgg_view_access_collections(elgg_get_logged_in_user_guid());
+
+$body = elgg_view_layout('content', array(
+	'filter' => false,
+	'content' => $content,
+	'title' => $title,
+	'context' => 'collections',
+));
+
+echo elgg_view_page($title, $body);
diff --git a/pages/friends/edit.php b/pages/friends/edit.php
deleted file mode 100644
index 665929319..000000000
--- a/pages/friends/edit.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Elgg add a collection of friends
- *
- * @package Elgg
- * @subpackage Core
- */
-
-// 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_form('friends/edit', array(), array('collection' => $collection,
-	'collection_members' => $collection_members));
-
-$body = elgg_view_layout('one_sidebar', array('content' => $content));
-
-echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/pages/friends/pickercallback.php b/pages/friends/pickercallback.php
deleted file mode 100644
index f613f1ae1..000000000
--- a/pages/friends/pickercallback.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Elgg friends picker callback
- *
- * @package Elgg
- * @subpackage Core
- */
-
-// Load Elgg engine
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-$site_url = elgg_get_site_url();
-
-// Get callback type (list or picker)
-$type = get_input('type', 'picker');
-
-$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 = elgg_get_page_owner_entity();
-if (!$pageowner) {
-	forward();
-	exit;
-}
-
-// Depending on the view type, launch a different view
-switch($type) {
-	case 'list':
-		$js_segment = elgg_view('core/friends/tablelistcountupdate',
-			array('friendspicker' => $friendspicker, 'count' => sizeof($members)));
-		$content = elgg_view('core/friends/tablelist',
-			array('entities' => $members, 'content' => $js_segment));
-		break;
-	default:
-		$friends = $pageowner->getFriends('', 9999);
-		$content = elgg_view('input/friendspicker', array(
-			'entities' => $friends,
-			'value' => $members,
-			'callback' => true,
-			'friendspicker' => $friendspicker,
-			'formcontents' => elgg_view('forms/friends/collectionfields',
-				array('collection' => get_access_collection($collection))),
-			'formtarget' => $site_url . 'action/friends/editcollection',
-		));
-		break;
-}
-
-// Output the content
-echo $content;
\ No newline at end of file
-- 
cgit v1.2.3