From 5ce50d0a2e15ae66765a68ba2785a87ecda57f6a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 18 Jul 2018 17:05:38 -0700 Subject: mangled urls on redirects --- include/connections.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/connections.php') diff --git a/include/connections.php b/include/connections.php index 20f7c24ff..807d07220 100644 --- a/include/connections.php +++ b/include/connections.php @@ -120,7 +120,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { App::$profile_uid = $xchan['channel_id']; $url = (($observer) - ? z_root() . '/magic?f=&owa=1&dest=' . $xchan['xchan_url'] . '&addr=' . $xchan['xchan_addr'] + ? z_root() . '/magic?f=&owa=1&bdest=' . bin2hex($xchan['xchan_url']) . '&addr=' . $xchan['xchan_addr'] : $xchan['xchan_url'] ); -- cgit v1.2.3 From ec3a066e4e94ad7c72d1d07371081318a4d5e9ab Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Jul 2018 09:32:52 +0200 Subject: fix sql error --- include/connections.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/connections.php') diff --git a/include/connections.php b/include/connections.php index 807d07220..129bcdc8d 100644 --- a/include/connections.php +++ b/include/connections.php @@ -380,7 +380,7 @@ function contact_remove($channel_id, $abook_id) { ); if($r) { foreach($r as $rr) { - $x = q("select uid from term where otype = %d and oid = %d ttype = %d limit 1", + $x = q("select uid from term where otype = %d and oid = %d and ttype = %d limit 1", intval(TERM_OBJ_POST), intval($rr['id']), intval(TERM_FILE) -- cgit v1.2.3 From 9f89f3190a49e454bc8ea9f1e24db03374edb491 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Thu, 27 Sep 2018 23:55:20 +0200 Subject: Update connections.php --- include/connections.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/connections.php') diff --git a/include/connections.php b/include/connections.php index 129bcdc8d..d97ea3887 100644 --- a/include/connections.php +++ b/include/connections.php @@ -296,7 +296,7 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) { $r = q("delete from event where event_xchan = '%s'", dbesc($xchan) ); - $r = q("delete from group_member where xchan = '%s'", + $r = q("delete from pgrp_member where xchan = '%s'", dbesc($xchan) ); $r = q("delete from mail where ( from_xchan = '%s' or to_xchan = '%s' )", @@ -402,7 +402,7 @@ function contact_remove($channel_id, $abook_id) { intval($channel_id) ); - $r = q("delete from group_member where xchan = '%s' and uid = %d", + $r = q("delete from pgrp_member where xchan = '%s' and uid = %d", dbesc($abook['abook_xchan']), intval($channel_id) ); -- cgit v1.2.3