All line endings are now Unix-style.

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

5 files changed, 177 insertions, 177 deletions

diff --git a/actions/friends/add.php b/actions/friends/add.php
index 004b0eaad..63f1e2d94 100644
--- a/actions/friends/add.php
+++ b/actions/friends/add.php
@@ -1,40 +1,40 @@
-<?php

-

-	/**

-	 * Elgg add friend action

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg add friend action
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 */

-

-	// Ensure we are logged in

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+	// Ensure we are logged in
 		gatekeeper();
-		action_gatekeeper();

-		

-	// Get the GUID of the user to friend

-		$friend_guid = get_input('friend');

-		$friend = get_entity($friend_guid);

-

-		$errors = false;

-		

-	// Get the user

-		try {

-			if (!$_SESSION['user']->addFriend($friend_guid)) $errors = true;

-		} catch (Exception $e) {

-			register_error(sprintf(elgg_echo("friends:add:failure"),$friend->name));

-			$errors = true;

-		}

-		if (!$errors){

-			// add to river

-	        add_to_river('friends/river/create','friend',$_SESSION['user']->guid,$friend_guid);

-			system_message(sprintf(elgg_echo("friends:add:successful"),$friend->name));

-		}

-		

-	// Forward to the user friends page

-		forward("pg/friends/" . $_SESSION['user']->username . "/");

-		

+		action_gatekeeper();
+		
+	// Get the GUID of the user to friend
+		$friend_guid = get_input('friend');
+		$friend = get_entity($friend_guid);
+
+		$errors = false;
+		
+	// Get the user
+		try {
+			if (!$_SESSION['user']->addFriend($friend_guid)) $errors = true;
+		} catch (Exception $e) {
+			register_error(sprintf(elgg_echo("friends:add:failure"),$friend->name));
+			$errors = true;
+		}
+		if (!$errors){
+			// add to river
+	        add_to_river('friends/river/create','friend',$_SESSION['user']->guid,$friend_guid);
+			system_message(sprintf(elgg_echo("friends:add:successful"),$friend->name));
+		}
+		
+	// Forward to the user friends page
+		forward("pg/friends/" . $_SESSION['user']->username . "/");
+		
 ?>
\ No newline at end of file
diff --git a/actions/friends/addcollection.php b/actions/friends/addcollection.php
index bda98984b..7dfba1ee7 100644
--- a/actions/friends/addcollection.php
+++ b/actions/friends/addcollection.php
@@ -1,50 +1,50 @@
-<?php

-

-	/**

-	 * Elgg collection add page

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg collection add page
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 */

-	 

-	 //must be logged in

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+	 
+	 //must be logged in
 	 gatekeeper();
-	 action_gatekeeper();

-	 

-	 $collection_name = get_input('collection_name');

-	 $friends = get_input('friends_collection');

-	 

-    //first check to make sure that a collection name has been set and create the new colection

-    if($collection_name){

-        

-        //create the collection

-        $create_collection = create_access_collection($collection_name, $_SESSION['user']->getGUID());

-        

-        //if the collection was created and the user passed some friends from the form, add them

-        if($create_collection && (!empty($friends))){

-            

-            //add friends to the collection

-            foreach($friends as $friend){

-                add_user_to_access_collection($friend, $create_collection);

-	        }

-	        

-        }

-        

-        // Success message

-		system_message(elgg_echo("friends:collectionadded"));

-		// Forward to the collections page

-		forward("pg/collections/" . $_SESSION['user']->username);

-        

-    } else {

-        

-        register_error(elgg_echo("friends:nocollectionname"));

-        // Forward to the add collection page

-		forward("pg/collections/add");

-		

-    }

-	 

+	 action_gatekeeper();
+	 
+	 $collection_name = get_input('collection_name');
+	 $friends = get_input('friends_collection');
+	 
+    //first check to make sure that a collection name has been set and create the new colection
+    if($collection_name){
+        
+        //create the collection
+        $create_collection = create_access_collection($collection_name, $_SESSION['user']->getGUID());
+        
+        //if the collection was created and the user passed some friends from the form, add them
+        if($create_collection && (!empty($friends))){
+            
+            //add friends to the collection
+            foreach($friends as $friend){
+                add_user_to_access_collection($friend, $create_collection);
+	        }
+	        
+        }
+        
+        // Success message
+		system_message(elgg_echo("friends:collectionadded"));
+		// Forward to the collections page
+		forward("pg/collections/" . $_SESSION['user']->username);
+        
+    } else {
+        
+        register_error(elgg_echo("friends:nocollectionname"));
+        // Forward to the add collection page
+		forward("pg/collections/add");
+		
+    }
+	 
 ?>
\ No newline at end of file
diff --git a/actions/friends/deletecollection.php b/actions/friends/deletecollection.php
index 674e68751..bdfcc9b2c 100644
--- a/actions/friends/deletecollection.php
+++ b/actions/friends/deletecollection.php
@@ -1,52 +1,52 @@
-<?php

-

-	/**

-	 * Elgg friends: delete collection action

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg friends: delete collection action
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 */

-

-	// Make sure we're logged in (send us to the front page if not)

-		gatekeeper();

-		

-		// Get input data

-		$collection_id = (int) get_input('collection');

-		

-		// Check to see that the access collection exist and grab its owner

-		$get_collection = get_access_collection($collection_id);

-		

-		if($get_collection){

-    		

-    		if($get_collection->owner_guid == $_SESSION['user']->getGUID()){

-		    

-	            $delete_collection = delete_access_collection($collection_id);

-	        

-	            // Success message

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in (send us to the front page if not)
+		gatekeeper();
+		
+		// Get input data
+		$collection_id = (int) get_input('collection');
+		
+		// Check to see that the access collection exist and grab its owner
+		$get_collection = get_access_collection($collection_id);
+		
+		if($get_collection){
+    		
+    		if($get_collection->owner_guid == $_SESSION['user']->getGUID()){
+		    
+	            $delete_collection = delete_access_collection($collection_id);
+	        
+	            // Success message
 		        if ($delete_collection) 
 		        	system_message(elgg_echo("friends:collectiondeleted"));
 		        else
-		        	register_error(elgg_echo("friends:collectiondeletefailed"));

-		        

-	        } else {

-    	        

-    	        // Failure message

-		        register_error(elgg_echo("friends:collectiondeletefailed"));

-		        

-	        }

-		

-		} else {

-    		

-    		// Failure message

-		    register_error(elgg_echo("friends:collectiondeletefailed"));

-		    

-	    }

-	    

-	     // Forward to the collections page

-		 forward("pg/collections/" . $_SESSION['user']->username);

-		

+		        	register_error(elgg_echo("friends:collectiondeletefailed"));
+		        
+	        } else {
+    	        
+    	        // Failure message
+		        register_error(elgg_echo("friends:collectiondeletefailed"));
+		        
+	        }
+		
+		} else {
+    		
+    		// Failure message
+		    register_error(elgg_echo("friends:collectiondeletefailed"));
+		    
+	    }
+	    
+	     // Forward to the collections page
+		 forward("pg/collections/" . $_SESSION['user']->username);
+		
 ?>
\ No newline at end of file
diff --git a/actions/friends/editcollection.php b/actions/friends/editcollection.php
index a1a38845f..ede61b4b0 100644
--- a/actions/friends/editcollection.php
+++ b/actions/friends/editcollection.php
@@ -1,20 +1,20 @@
-<?php

-

-	/**

-	 * Elgg collection add page

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg collection add page
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 */

-	 

-	 $collection_id = get_input('collection_id');

-	 $friends = get_input('friend');

-	 

-	 //chech the collection exists and the current user owners it

-	 update_access_collection($collection_id, $friends);

-	 

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+	 
+	 $collection_id = get_input('collection_id');
+	 $friends = get_input('friend');
+	 
+	 //chech the collection exists and the current user owners it
+	 update_access_collection($collection_id, $friends);
+	 
 ?>
\ No newline at end of file
diff --git a/actions/friends/remove.php b/actions/friends/remove.php
index d1911bb90..20181bc84 100644
--- a/actions/friends/remove.php
+++ b/actions/friends/remove.php
@@ -1,42 +1,42 @@
-<?php

-

-	/**

-	 * Elgg remove friend action

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

+<?php
 
-	 * @author Curverider Ltd

+	/**
+	 * Elgg remove friend action
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/

-	 */

-

-	// Ensure we are logged in

+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
+
+	// Ensure we are logged in
 		gatekeeper();
-		action_gatekeeper();

-		

-	// Get the GUID of the user to friend

-		$friend_guid = get_input('friend');

-		$friend = get_entity($friend_guid);

-		$errors = false;

-

-	// Get the user

+		action_gatekeeper();
+		
+	// Get the GUID of the user to friend
+		$friend_guid = get_input('friend');
+		$friend = get_entity($friend_guid);
+		$errors = false;
+
+	// Get the user
 		try{
-			if ($friend instanceof ElggUser)

+			if ($friend instanceof ElggUser)
 				$_SESSION['user']->removeFriend($friend_guid);
 			else
 			{
 				register_error(sprintf(elgg_echo("friends:remove:failure"),$friend->name));
 				$errors = true;
-			}

-		} catch (Exception $e) {

-			register_error(sprintf(elgg_echo("friends:remove:failure"),$friend->name));

-			$errors = true;

-		}

-		if (!$errors)

-			system_message(sprintf(elgg_echo("friends:remove:successful"),$friend->name));			

-		

-	// Forward to the user friends page

-		forward("pg/friends/" . $_SESSION['user']->username . "/");

-		

+			}
+		} catch (Exception $e) {
+			register_error(sprintf(elgg_echo("friends:remove:failure"),$friend->name));
+			$errors = true;
+		}
+		if (!$errors)
+			system_message(sprintf(elgg_echo("friends:remove:successful"),$friend->name));			
+		
+	// Forward to the user friends page
+		forward("pg/friends/" . $_SESSION['user']->username . "/");
+		
 ?>
\ No newline at end of file