diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-07 21:35:18 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-07 21:35:18 +0100 |
| commit | 4c0f9a91b95025f08e3c4e2739cb5f4186726023 (patch) | |
| tree | 3b19b8c3aa086e4931aac9790d298b2306f71ff7 /mod | |
| parent | c26ae94592dda51a40903ea65f117fd7dd9d0ef3 (diff) | |
| parent | f62ec4132ed571288737423de386054a4cc8b0d5 (diff) | |
| download | volse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.tar.gz volse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.tar.bz2 volse-hubzilla-4c0f9a91b95025f08e3c4e2739cb5f4186726023.zip | |
Merge branch 'upstream'
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/chat.php | 5 | ||||
| -rw-r--r-- | mod/group.php | 8 | ||||
| -rw-r--r-- | mod/item.php | 2 | ||||
| -rw-r--r-- | mod/ping.php | 6 |
4 files changed, 15 insertions, 6 deletions
diff --git a/mod/chat.php b/mod/chat.php index e3725830c..872571f8c 100644 --- a/mod/chat.php +++ b/mod/chat.php @@ -79,6 +79,9 @@ function chat_post(&$a) { function chat_content(&$a) { + if(local_user()) + $channel = $a->get_channel(); + $observer = get_observer_hash(); if(! $observer) { notice( t('Permission denied.') . EOL); @@ -129,7 +132,7 @@ function chat_content(&$a) { if(local_user() && argc() > 2 && argv(2) === 'new') { - $channel = $a->get_channel(); + $channel_acl = array( 'allow_cid' => $channel['channel_allow_cid'], 'allow_gid' => $channel['channel_allow_gid'], diff --git a/mod/group.php b/mod/group.php index 66e5fbf8e..15e4ff2a3 100644 --- a/mod/group.php +++ b/mod/group.php @@ -117,10 +117,10 @@ function group_content(&$a) { check_form_security_token_ForbiddenOnErr('group_member_change', 't'); - $r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1", + $r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1", dbesc(argv(2)), intval(local_user()), - intval(ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_PENDING) ); @@ -210,10 +210,10 @@ function group_content(&$a) { group_rmv_member(local_user(),$group['name'],$member['xchan_hash']); } - $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) order by xchan_name asc", + $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d) and not (xchan_flags & %d) and not (abook_flags & %d) order by xchan_name asc", intval(local_user()), intval(ABOOK_FLAG_BLOCKED), - intval(ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_PENDING) ); diff --git a/mod/item.php b/mod/item.php index c8c0e3762..47a3f1961 100644 --- a/mod/item.php +++ b/mod/item.php @@ -425,7 +425,7 @@ function item_post(&$a) { * (already known to us) which will get a zrl, otherwise link with url */ - $body = preg_replace_callback("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body); + $body = preg_replace_callback("/([^\^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body); /** * diff --git a/mod/ping.php b/mod/ping.php index 4b07fee7a..b9d9a9c77 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -43,6 +43,12 @@ function ping_init(&$a) { unset($_SESSION['sysmsg_info']); } + if($a->install) { + echo json_encode($result); + killme(); + } + + if(get_observer_hash() && (! $result['invalid'])) { $r = q("select cp_id, cp_room from chatpresence where cp_xchan = '%s' and cp_client = '%s' and cp_room = 0 limit 1", dbesc(get_observer_hash()), |