diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-10-05 11:25:39 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-10-05 11:25:39 +0200 |
| commit | 5be9477f21626469dedcff4f96243be2bfafdb71 (patch) | |
| tree | fcf56e3e85e6d28d8901ef3a0a638bfb40212b51 /Zotlabs/Module | |
| parent | 6f88d5e92be06ad8fa61f900e8a4fb41ba54135e (diff) | |
| parent | 15b9a67c01964b83ac724945fe416dd35f66e914 (diff) | |
| download | volse-hubzilla-5be9477f21626469dedcff4f96243be2bfafdb71.tar.gz volse-hubzilla-5be9477f21626469dedcff4f96243be2bfafdb71.tar.bz2 volse-hubzilla-5be9477f21626469dedcff4f96243be2bfafdb71.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Acl.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Magic.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Rmagic.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Thing.php | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 9c5f6653b..e164875e8 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -342,7 +342,7 @@ class Acl extends \Zotlabs\Web\Controller { "type" => "c", "photo" => "images/twopeople.png", "name" => $g['name'] . (($type === 'f') ? '' : '+'), - "id" => $g['id'] . (($type === 'f') ? '' : '+'), + "id" => urlencode($g['id']) . (($type === 'f') ? '' : '+'), "xid" => $g['hash'], "link" => $g['nick'], "nick" => substr($g['nick'],0,strpos($g['nick'],'@')), @@ -356,7 +356,7 @@ class Acl extends \Zotlabs\Web\Controller { "type" => "c", "photo" => $g['micro'], "name" => $g['name'], - "id" => $g['id'], + "id" => urlencode($g['id']), "xid" => $g['hash'], "link" => $g['nick'], "nick" => (($g['nick']) ? substr($g['nick'],0,strpos($g['nick'],'@')) : $g['nick']), diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index d1550ec89..879085f96 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -149,6 +149,7 @@ class Magic extends \Zotlabs\Web\Controller { if($j['success'] && $j['token']) { $x = strpbrk($dest,'?&'); $args = (($x) ? '&owt=' . $j['token'] : '?f=&owt=' . $j['token']) . (($delegate) ? '&delegate=1' : ''); + goaway($dest . $args); } } diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php index 0c4eb9ae4..bfc03f6ec 100644 --- a/Zotlabs/Module/Rmagic.php +++ b/Zotlabs/Module/Rmagic.php @@ -17,7 +17,7 @@ class Rmagic extends \Zotlabs\Web\Controller { if($r) { if($r[0]['hubloc_url'] === z_root()) goaway(z_root() . '/login'); - $dest = z_root() . '/' . str_replace('zid=','zid_=',\App::$query_string); + $dest = z_root() . '/' . str_replace(['rmagic','zid='],['','zid_='],\App::$query_string); goaway($r[0]['hubloc_url'] . '/magic' . '?f=&owa=1&dest=' . $dest); } } @@ -61,7 +61,7 @@ class Rmagic extends \Zotlabs\Web\Controller { if($_SESSION['return_url']) $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url'])); else - $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',\App::$query_string)); + $dest = urlencode(z_root() . '/' . str_replace([ 'rmagic', 'zid=' ] ,[ '', 'zid_='],\App::$query_string)); goaway($url . '/magic' . '?f=&owa=1&dest=' . $dest); } diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php index 95c6c5636..f816632ab 100644 --- a/Zotlabs/Module/Thing.php +++ b/Zotlabs/Module/Thing.php @@ -91,6 +91,7 @@ class Thing extends \Zotlabs\Web\Controller { } $orig_record = $t[0]; if($photo != $orig_record['obj_imgurl']) { + delete_thing_photo($orig_record['obj_imgurl'],get_observer_hash()); $arr = import_xchan_photo($photo,get_observer_hash(),true); $local_photo = $arr[0]; $local_photo_type = $arr[3]; @@ -336,6 +337,9 @@ class Thing extends \Zotlabs\Web\Controller { return ''; } + + delete_thing_photo($r[0]['obj_imgurl'],get_observer_hash()); + $x = q("delete from obj where obj_obj = '%s' and obj_type = %d and obj_channel = %d", dbesc($thing_hash), intval(TERM_OBJ_THING), |