diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-02 17:31:25 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-02 17:31:25 +0100 |
| commit | 9fcc2a18dfb042eca619d338ed6615bff3784be5 (patch) | |
| tree | d02cdea385de99975d27c43ca555e57942ba2ee5 /include/chat.php | |
| parent | b3f819d52aa2b68529dadb3b409fe3c6f8ba7c0d (diff) | |
| parent | e83419b53e27078867f8449f476d87b064b9d502 (diff) | |
| download | volse-hubzilla-9fcc2a18dfb042eca619d338ed6615bff3784be5.tar.gz volse-hubzilla-9fcc2a18dfb042eca619d338ed6615bff3784be5.tar.bz2 volse-hubzilla-9fcc2a18dfb042eca619d338ed6615bff3784be5.zip | |
Merge branch 'master' of https://github.com/friendica/red
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; } |