Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 41 insertions, 0 deletions

diff --git a/mod/beechat/actions/get_statuses.php b/mod/beechat/actions/get_statuses.php
new file mode 100644
index 000000000..6f7620beb
--- /dev/null
+++ b/mod/beechat/actions/get_statuses.php
@@ -0,0 +1,41 @@
+<?php
+	/**
+	 * Beechat
+	 * 
+	 * @package beechat
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Beechannels <contact@beechannels.com>
+	 * @copyright Beechannels 2007-2010
+	 * @link http://beechannels.com/
+	 */
+
+	header('Content-type: application/json');
+	gatekeeper();
+	$usernames = get_input('beechat_roster_items_usernames');
+	if (!empty($usernames))
+	{
+		$iconSize = 'small';
+		$rosterItemsUsernames = explode(',', $usernames);
+		$userFriendsEntities = $_SESSION['user']->getFriends('', 1000000000, 0);
+		
+		$res = array();
+		foreach ($rosterItemsUsernames as $value)
+		{
+			foreach ($userFriendsEntities as $friend)
+			{
+				if (strtolower($friend->username) == strtolower($value))
+				{
+					$status = get_entities_from_metadata("state", "current", "object", "status", $friend->get('guid'));
+					$res[$value] = ($status != false) ? $status[0]->description : '';
+					break;
+				}
+			}
+		}
+		echo json_encode($res);
+	}
+	else
+		echo json_encode(null);
+
+	exit();
+
+?>