diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-06 08:49:17 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-06 08:49:17 +0100 |
| commit | d1bd6cdb25108e78173f92b2e11d03b617653ac8 (patch) | |
| tree | 1caccd16860b746e97c646bb2c41d859f1b25632 /mod | |
| parent | bd1849ddae165a85cb57377e9a35ea10b48fdddc (diff) | |
| parent | 2c451d5c288d976b886338df4692249125dc8172 (diff) | |
| download | volse-hubzilla-d1bd6cdb25108e78173f92b2e11d03b617653ac8.tar.gz volse-hubzilla-d1bd6cdb25108e78173f92b2e11d03b617653ac8.tar.bz2 volse-hubzilla-d1bd6cdb25108e78173f92b2e11d03b617653ac8.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/chat.php | 11 | ||||
| -rw-r--r-- | mod/xchan.php | 4 |
2 files changed, 13 insertions, 2 deletions
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 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; |