From 92e0c502f76f5a3acc0498f45a0fe836973c554c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 7 Nov 2017 19:34:00 -0800 Subject: make most recent cloud_tiles setting for local channels persistent across logins --- Zotlabs/Module/Cloud_tiles.php | 4 ++++ include/security.php | 1 + 2 files changed, 5 insertions(+) diff --git a/Zotlabs/Module/Cloud_tiles.php b/Zotlabs/Module/Cloud_tiles.php index 45124cdfa..da551904f 100644 --- a/Zotlabs/Module/Cloud_tiles.php +++ b/Zotlabs/Module/Cloud_tiles.php @@ -11,6 +11,10 @@ class Cloud_tiles extends \Zotlabs\Web\Controller { else $_SESSION['cloud_tiles'] = 1; + if(local_channel()) { + set_pconfig(local_channel(),'system','cloud_tiles',$_SESSION['cloud_tiles']); + } + goaway(z_root() . '/' . hex2bin(argv(1))); } diff --git a/include/security.php b/include/security.php index 450cc4f69..8b7e7d076 100644 --- a/include/security.php +++ b/include/security.php @@ -264,6 +264,7 @@ function change_channel($change_channel) { App::set_channel($r[0]); $_SESSION['theme'] = $r[0]['channel_theme']; $_SESSION['mobile_theme'] = get_pconfig(local_channel(),'system', 'mobile_theme'); + $_SESSION['cloud_tiles'] = get_pconfig(local_channel(),'system', 'cloud_tiles'); date_default_timezone_set($r[0]['channel_timezone']); $ret = $r[0]; } -- cgit v1.2.3 From 7dad842f35184b3865714bf209c79ad1ef995733 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 8 Nov 2017 19:21:36 -0800 Subject: use logger --- include/zot.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/zot.php b/include/zot.php index 0aa50ab92..40e303bf1 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2010,8 +2010,7 @@ function update_imported_item($sender, $item, $orig, $uid, $tag_delivery) { // may have a different owner than the one being transmitted. if(($sender['hash'] != $orig['owner_xchan'] && $sender['hash'] != $orig['author_xchan']) && (! $tag_delivery)) { - /// @fixme shouldn't this be logger? - notice('sender is not owner or author'); + logger('sender is not owner or author'); return; } -- cgit v1.2.3 From 40c625158f879c51bac8c1e2271eb0505dff991d Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 8 Nov 2017 21:19:03 -0800 Subject: unable to change permissions on wiki with space in name --- Zotlabs/Module/Wiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index d6a01af11..2d2d8e2b7 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -494,7 +494,7 @@ class Wiki extends \Zotlabs\Web\Controller { return; //not reached } - $wiki = Zlib\NativeWiki::exists_by_name($owner['channel_id'], $arr['urlName']); + $wiki = Zlib\NativeWiki::exists_by_name($owner['channel_id'], urldecode($arr['urlName'])); if($wiki['resource_id']) { -- cgit v1.2.3