diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-05 14:48:42 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-05 14:48:42 +0100 |
| commit | 419e3b5024efec40c98e48c3bf213c4e60d39fae (patch) | |
| tree | d3754aa1d251308eb6178fe4ab138463ceaaf135 /include/chat.php | |
| parent | d7d2fff24b05bcb3ff3acc215e99f8f7d33d058d (diff) | |
| parent | 0844110f7b154a0fb5102362fe732c2b091222d7 (diff) | |
| download | volse-hubzilla-419e3b5024efec40c98e48c3bf213c4e60d39fae.tar.gz volse-hubzilla-419e3b5024efec40c98e48c3bf213c4e60d39fae.tar.bz2 volse-hubzilla-419e3b5024efec40c98e48c3bf213c4e60d39fae.zip | |
Merge branch 'master' of https://github.com/friendica/red into upstream
Diffstat (limited to 'include/chat.php')
| -rw-r--r-- | include/chat.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/chat.php b/include/chat.php index 08fd154b5..5af3a3a9a 100644 --- a/include/chat.php +++ b/include/chat.php @@ -122,10 +122,10 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) { intval($room_id) ); if($r) { - q("update chatpresence set cp_status = %d and cp_last = '%s' where cp_id = %d limit 1", - dbesc($status), + q("update chatpresence set cp_last = '%s' where cp_id = %d and cp_client = '%s' limit 1", dbesc(datetime_convert()), - intval($r[0]['cp_id']) + intval($r[0]['cp_id']), + dbesc($client) ); return true; } @@ -145,6 +145,7 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) { function chatroom_leave($observer_xchan,$room_id,$client) { if(! $room_id || ! $observer_xchan) return; + $r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d and cp_client = '%s' limit 1", dbesc($observer_xchan), intval($room_id), @@ -155,6 +156,7 @@ function chatroom_leave($observer_xchan,$room_id,$client) { intval($r[0]['cp_id']) ); } + return true; } |