From 677f5f641e6c37244ee67459b6fa2c7e5aea119b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 29 Jan 2014 16:02:02 -0800
Subject: more testing of chatroom interfaces, also corrected a function call
 that should have been a class instantiation in reddav

---
 include/chat.php    | 4 ++--
 include/reddav.php  | 2 +-
 include/widgets.php | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/chat.php b/include/chat.php
index 6bcb003ff..f682fe6fe 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -88,8 +88,8 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) {
 	require_once('include/security.php');
 	$sql_extra = permissions_sql($r[0]['cr_uid']);
 
-	$x = q("select * from chatroom where cr_id = %d and uid = %d $sql_extra limit 1",
-			intval($room_id)
+	$x = q("select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
+			intval($room_id),
 			intval($r[0]['cr_uid'])
 	);
 	if(! $x) {
diff --git a/include/reddav.php b/include/reddav.php
index c5ef39097..e6e066770 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -628,7 +628,7 @@ function RedFileData($file, &$auth,$test = false) {
 	}
 
 	if((! $file) || ($file === '/')) {
-		return RedDirectory('/',$auth);
+		return new RedDirectory('/',$auth);
 
 	}
 
diff --git a/include/widgets.php b/include/widgets.php
index 8b22515b1..400660d11 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -580,8 +580,11 @@ function widget_menu_preview($arr) {
 function widget_chatroom_list($arr) {
 	require_once("include/chat.php");
 	$r = chatroom_list(local_user());
+	$channel = get_app()->get_channel();
 	return replace_macros(get_markup_template('chatroomlist.tpl'),array(
 		'$header' => t('Chat Rooms'),
+		'$baseurl' => z_root(),
+		'$nickname' => $channel['channel_address'],
 		'$items' => $r,
 	));
 }
\ No newline at end of file
-- 
cgit v1.2.3