Standardized code in all of core, not including language files, tests, or core mods.

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

5 files changed, 20 insertions, 19 deletions

diff --git a/pages/friends/add.php b/pages/friends/add.php
index e4da65237..34944d624 100644
--- a/pages/friends/add.php
+++ b/pages/friends/add.php
@@ -20,4 +20,4 @@ $content .= elgg_view('friends/forms/edit', array(
 
 $body = elgg_view_layout('one_column_with_sidebar', $content);
 
-page_draw(elgg_echo('friends:collections:add'),$body);
+page_draw(elgg_echo('friends:collections:add'), $body);
diff --git a/pages/friends/edit.php b/pages/friends/edit.php
index 0d82d210d..ddc7f9650 100644
--- a/pages/friends/edit.php
+++ b/pages/friends/edit.php
@@ -22,7 +22,8 @@ $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));
+$content .= elgg_view('friends/forms/edit', array('collection' => $collection,
+	'collection_members' => $collection_members));
 
 $body = elgg_view_layout('one_column_with_sidebar', $content);
 
diff --git a/pages/friends/index.php b/pages/friends/index.php
index a44a08227..10128ffc7 100644
--- a/pages/friends/index.php
+++ b/pages/friends/index.php
@@ -17,7 +17,9 @@ $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>";
+$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);
 
diff --git a/pages/friends/of.php b/pages/friends/of.php
index 7a35e138a..b8740b88e 100644
--- a/pages/friends/of.php
+++ b/pages/friends/of.php
@@ -17,7 +17,9 @@ $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>";
+$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);
 
diff --git a/pages/friends/pickercallback.php b/pages/friends/pickercallback.php
index a5d85f1e4..c04b1d383 100644
--- a/pages/friends/pickercallback.php
+++ b/pages/friends/pickercallback.php
@@ -11,22 +11,15 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 // Get callback type (list or picker)
-$type = get_input('type','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);
+$collection = (int) get_input('collection', 0);
 $members = get_members_of_access_collection($collection, true);
 if (!$members) {
 	$members = array();
 }
 
-$friendspicker = (int) get_input('friendspicker',0);
+$friendspicker = (int) get_input('friendspicker', 0);
 
 // Get page owner (bomb out if there isn't one)
 $pageowner = page_owner_entity();
@@ -38,17 +31,20 @@ if (!$pageowner) {
 // 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));
+		$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(
+		$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))),
+			'formcontents' => elgg_view('friends/forms/collectionfields',
+				array('collection' => get_access_collection($collection))),
 			'formtarget' => $CONFIG->wwwroot . 'action/friends/editcollection',
 		));
 		break;