harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provide the room name for the room you're in.

Browse Source
This commit is contained in:
friendica 2014-02-01 00:54:20 -08:00
parent 33f3cd3d4a
commit d14afc0ee4
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mod/chat.php
View File

@ -101,8 +101,15 @@ function chat_content(&$a) {
$x = chatroom_enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']); $x = chatroom_enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']);
if(! $x) if(! $x)
return; return;
$x = q("select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
intval($room_id),
intval($a->profile['profile_uid'])
);
if($x) {
$room_name = $x[0]['cr_name'];
}
$o = replace_macros(get_markup_template('chat.tpl'),array( $o = replace_macros(get_markup_template('chat.tpl'),array(
'$room_name' => '', // should we get this from the API? '$room_name' => $room_name,
'$room_id' => $room_id, '$room_id' => $room_id,
'$submit' => t('Submit') '$submit' => t('Submit')
)); ));

2
version.inc
View File

@ -1 +1 @@
2014-01-31.574 2014-02-01.575

1
view/tpl/chat.tpl
View File

@ -1,3 +1,4 @@
<h1>{{$room_name}}</h1>
<div id="chatContainer" style="height: 100%; width: 100%;"> <div id="chatContainer" style="height: 100%; width: 100%;">
<div id="chatTopBar" style="float: left; height: 400px; width: 650px; overflow-y: auto;"> <div id="chatTopBar" style="float: left; height: 400px; width: 650px; overflow-y: auto;">