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

issues uncovered whilst testing the chatroom API

Browse Source
This commit is contained in:
friendica
2014-01-29 02:25:21 -08:00
parent f84ba95e87
commit 10b51a9471
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mod/ping.php
View File

@@ -44,18 +44,22 @@ function ping_init(&$a) {
}
if(get_observer_hash() && (! $result['invalid'])) {
$r = q("select cp_id from chatpresence where cp_xchan = '%s'",
dbesc(get_observer_hash())
$r = q("select cp_id from chatpresence where cp_xchan = '%s' and cp_client = '%s'",
dbesc(get_observer_hash()),
dbesc($_SERVER['REMOTE_ADDR'])
);
$basic_presence = false;
if($r) {
foreach($r as $rr) {
if($rr['cp_id'] == 0)
$basic_presence = true;
q("update chatpresence set cp_last = '%s' where cp_id = %d limit 1",
dbesc(datetime_convert()),
intval($rr['cp_id'])
);
}
}
else {
if(! $basic_presence) {
q("insert into chatpresence ( cp_xchan, cp_last, cp_status, cp_client)
values( '%s', '%s', '%s', '%s' ) ",
dbesc(get_observer_hash()),