From cb6716a644dad4c7c196330cf945de36a000e5a3 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 5 Feb 2014 18:51:50 -0800
Subject: fix the xchan lookup tool

---
 mod/xchan.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'mod')

diff --git a/mod/xchan.php b/mod/xchan.php
index 984a62f95..9d4cdcc22 100644
--- a/mod/xchan.php
+++ b/mod/xchan.php
@@ -14,9 +14,11 @@ function xchan_content(&$a) {
 
 	if(x($_GET,'addr')) {
 		$addr = trim($_GET['addr']);
+
 		$r = q("select xchan_name from xchan where xchan_hash like '%s%%'",
-			dbesc(addr)
+			dbesc($addr)
 		);
+
 		if($r) {
 			foreach($r as $rr)
 				$o .= $rr['xchan_name'] . EOL;
-- 
cgit v1.2.3


From 05a70a8760d705e80c548d96a9d083ab032dbd8b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 5 Feb 2014 19:16:12 -0800
Subject: add chatroom links

---
 mod/chat.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'mod')

diff --git a/mod/chat.php b/mod/chat.php
index e79973aef..e3725830c 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -155,6 +155,15 @@ function chat_content(&$a) {
 
 	require_once('include/widgets.php');
 
-	return widget_chatroom_list(array());
+	$o = replace_macros(get_markup_template('chatrooms.tpl'), array(
+		'$header' => sprintf( t('%1$s\'s Chatrooms'), $a->profile['name']),
+		'$baseurl' => z_root(),
+		'$nickname' => $channel['channel_address'],
+		'$rooms' => widget_chatroom_list(array()),
+		'$newroom' => t('New Chatroom'),
+		'$is_owner' => ((local_user() && local_user() == $a->profile['profile_uid']) ? 1 : 0)
+	));
+ 
+	return $o;
 
 }
\ No newline at end of file
-- 
cgit v1.2.3