All line endings are now Unix-style.

git-svn-id: https://code.elgg.org/elgg/trunk@3451 36083f99-b078-4883-b0ff-0f9b5a30f544

6 files changed, 190 insertions, 190 deletions

diff --git a/friends/add.php b/friends/add.php
index edca9d96e..60cbd28db 100644
--- a/friends/add.php
+++ b/friends/add.php
@@ -1,28 +1,28 @@
-<?php

-

-	/**

-	 * Elgg add a collection of friends

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg add a collection of friends
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname((__FILE__))) . "/engine/start.php");
+		
+	// You need to be logged in for this one
+		gatekeeper();
+		
+	    $area2 = elgg_view('friends/forms/edit', array('friends' => get_user_friends($_SESSION['user']->getGUID(),"",9999)));
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar','', elgg_view_title(elgg_echo('friends:collections:add')) . $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('friends:collections:add'),$body);
 
-	 * @link http://elgg.org/

-	 */

-

-	// Start engine

-		require_once(dirname(dirname((__FILE__))) . "/engine/start.php");

-		

-	// You need to be logged in for this one

-		gatekeeper();

-		

-	    $area2 = elgg_view('friends/forms/edit', array('friends' => get_user_friends($_SESSION['user']->getGUID(),"",9999)));

-		

-	// Format page

-		$body = elgg_view_layout('two_column_left_sidebar','', elgg_view_title(elgg_echo('friends:collections:add')) . $area2);

-		

-	// Draw it

-		page_draw(elgg_echo('friends:collections:add'),$body);

-

 ?>
\ No newline at end of file
diff --git a/friends/collections.php b/friends/collections.php
index f507654e4..6c023f005 100644
--- a/friends/collections.php
+++ b/friends/collections.php
@@ -1,28 +1,28 @@
-<?php

-

-	/**

-	 * Elgg collections of friends

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg collections of friends
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname((__FILE__))) . "/engine/start.php");
+		
+	// You need to be logged in for this one
+		gatekeeper();
+	    
+		$area2 = elgg_view_access_collections($_SESSION['user']->getGUID());
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar', '', elgg_view_title(elgg_echo('friends:collections')) . $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('friends:collections'),$body);
 
-	 * @link http://elgg.org/

-	 */

-

-	// Start engine

-		require_once(dirname(dirname((__FILE__))) . "/engine/start.php");

-		

-	// You need to be logged in for this one

-		gatekeeper();

-	    

-		$area2 = elgg_view_access_collections($_SESSION['user']->getGUID());

-		

-	// Format page

-		$body = elgg_view_layout('two_column_left_sidebar', '', elgg_view_title(elgg_echo('friends:collections')) . $area2);

-		

-	// Draw it

-		page_draw(elgg_echo('friends:collections'),$body);

-

 ?>
\ No newline at end of file
diff --git a/friends/edit.php b/friends/edit.php
index 5ece2596a..cd9f37b95 100644
--- a/friends/edit.php
+++ b/friends/edit.php
@@ -1,39 +1,39 @@
-<?php

-

-	/**

-	 * Elgg add a collection of friends

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg add a collection of friends
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+	// Start engine
+		require_once(dirname(dirname((__FILE__))) . "/engine/start.php");
+		
+	// You need to be logged in for this one
+		gatekeeper();
+		
+		//set the title
+		$area1 = elgg_view_title(elgg_echo('friends:collectionedit'), false);
+		
+		//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);
+		
+	    $area2 = elgg_view('friends/forms/edit', array('collection' => $collection, 'collection_members' => $collection_members));
+		
+	// Format page
+		$body = elgg_view_layout('two_column_left_sidebar',$area1. $area2);
+		
+	// Draw it
+		page_draw(elgg_echo('friends:add'),$body);
 
-	 * @link http://elgg.org/

-	 */

-

-	// Start engine

-		require_once(dirname(dirname((__FILE__))) . "/engine/start.php");

-		

-	// You need to be logged in for this one

-		gatekeeper();

-		

-		//set the title

-		$area1 = elgg_view_title(elgg_echo('friends:collectionedit'), false);

-		

-		//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);

-		

-	    $area2 = elgg_view('friends/forms/edit', array('collection' => $collection, 'collection_members' => $collection_members));

-		

-	// Format page

-		$body = elgg_view_layout('two_column_left_sidebar',$area1. $area2);

-		

-	// Draw it

-		page_draw(elgg_echo('friends:add'),$body);

-

 ?>
\ No newline at end of file
diff --git a/friends/index.php b/friends/index.php
index 1c85cdc6f..e9e4f7374 100644
--- a/friends/index.php
+++ b/friends/index.php
@@ -1,26 +1,26 @@
-<?php

-

-	/**

-	 * Elgg friends page

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg friends page
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+		if (!$owner = page_owner_entity()) {
+			gatekeeper();
+			set_page_owner($_SESSION['user']->getGUID());
+			$owner = $_SESSION['user'];
+		}
+		
+		$area1 = elgg_view_title(elgg_echo('friends'));
+		$area2 = list_entities_from_relationship('friend',$owner->getGUID(),false,'user','',0,10,false);
+		$body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2);
+		
+		page_draw(sprintf(elgg_echo("friends:owned"),$owner->name),$body);
 
-	 * @link http://elgg.org/

-	 */

-

-		if (!$owner = page_owner_entity()) {

-			gatekeeper();

-			set_page_owner($_SESSION['user']->getGUID());

-			$owner = $_SESSION['user'];

-		}

-		

-		$area1 = elgg_view_title(elgg_echo('friends'));

-		$area2 = list_entities_from_relationship('friend',$owner->getGUID(),false,'user','',0,10,false);

-		$body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2);

-		

-		page_draw(sprintf(elgg_echo("friends:owned"),$owner->name),$body);

-

 ?>
\ No newline at end of file
diff --git a/friends/of.php b/friends/of.php
index 4ae20dc7d..f1231750c 100644
--- a/friends/of.php
+++ b/friends/of.php
@@ -1,26 +1,26 @@
-<?php

-

-	/**

-	 * Elgg friends of page

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg friends of page
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+		if (!$owner = page_owner_entity()) {
+			gatekeeper();
+			set_page_owner($_SESSION['user']->getGUID());
+			$owner = $_SESSION['user'];
+		}
+		
+		$area1 = elgg_view_title(elgg_echo('friends:of'));
+		$area2 = list_entities_from_relationship('friend',$owner->getGUID(),true,'user','',0,10,false);
+		$body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2);
+		
+		page_draw(sprintf(elgg_echo("friends:of:owned"),$owner->name),$body);
 
-	 * @link http://elgg.org/

-	 */

-

-		if (!$owner = page_owner_entity()) {

-			gatekeeper();

-			set_page_owner($_SESSION['user']->getGUID());

-			$owner = $_SESSION['user'];

-		}

-		

-		$area1 = elgg_view_title(elgg_echo('friends:of'));

-		$area2 = list_entities_from_relationship('friend',$owner->getGUID(),true,'user','',0,10,false);

-		$body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2);

-		

-		page_draw(sprintf(elgg_echo("friends:of:owned"),$owner->name),$body);

-

 ?>
\ No newline at end of file
diff --git a/friends/pickercallback.php b/friends/pickercallback.php
index 2cbe82506..57406b94d 100644
--- a/friends/pickercallback.php
+++ b/friends/pickercallback.php
@@ -1,61 +1,61 @@
-<?php

-

-	/**

-	 * Elgg friends picker callback

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg friends picker callback
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @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;

-		

+	 * @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