From 6c7da13cd392e6c06ce7970bfbe4ddbb9854737a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 30 Dec 2016 20:50:12 +0100 Subject: prevent eventual double scrollbar --- view/js/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index 5f961f6e9..c67f1c167 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -434,12 +434,12 @@ function contextualHelp() { if(container.hasClass('contextual-help-content-open')) { container.removeClass('contextual-help-content-open'); - $('main').css('top', '') + $('main').css('margin-top', '') } else { container.addClass('contextual-help-content-open'); var mainTop = container.outerHeight(true); - $('main').css('top', mainTop + 'px'); + $('main').css('margin-top', mainTop + 'px'); } } -- cgit v1.2.3 From a9c8d4a2162d096b8e09daae1e2c1af6c99d76fb Mon Sep 17 00:00:00 2001 From: zotlabs Date: Fri, 30 Dec 2016 13:09:35 -0800 Subject: peoplefind widget should honour directory option settings (such as this site only). --- Zotlabs/Module/Directory.php | 1 + view/tpl/peoplefind.tpl | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php index 76f1937a2..59ae88857 100644 --- a/Zotlabs/Module/Directory.php +++ b/Zotlabs/Module/Directory.php @@ -68,6 +68,7 @@ class Directory extends \Zotlabs\Web\Controller { $observer = get_observer_hash(); $globaldir = get_directory_setting($observer, 'globaldir'); + // override your personal global search pref if we're doing a navbar search of the directory if(intval($_REQUEST['navsearch'])) $globaldir = 1; diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 0b7f792a6..ae0b7f1ea 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,7 +1,6 @@

{{$findpeople}}

-
-- cgit v1.2.3 From 9820baf82eb61346bc3b7695889d9d242f30487d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 31 Dec 2016 12:55:10 +0100 Subject: fix expand-aside button hiding if aside is empty --- view/theme/redbasic/js/redbasic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index b7993ce90..395385411 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -30,7 +30,7 @@ $(document).ready(function() { } }); - if($('aside').length && $('aside').html().length === 0) { + if($('#left_aside_wrapper').length && $('#left_aside_wrapper').html().length === 0) { $('#expand-aside').hide(); } -- cgit v1.2.3 From 444e938e2d34044f1aa7d04110e0e391caafeea3 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 31 Dec 2016 13:38:19 -0800 Subject: issues #629, #635 - edited post arriving from downstream source was not being rejected --- include/zot.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/zot.php b/include/zot.php index 853c8eb9e..43749840a 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1943,6 +1943,20 @@ function update_imported_item($sender, $item, $orig, $uid) { unset($item['item_private']); } + // Subtle issue where we might receive an edit item update from a downstream source. + // Ignore unless it comes from upstream. + + $x = q("select item_wall from item where mid = '%s' and uid = %d limit 1", + dbesc($item['mid']), + intval($uid) + ); + + if($x && $x[0]['item_wall'] == 1 && $item['item_wall'] == 0) { + notice('remote wall update ignored'); + return; + } + + $x = item_store_update($item); // If we're updating an event that we've saved locally, we store the item info first -- cgit v1.2.3 From e2eb0b2eac6f32a0e4781eabbb147f0bee0736fb Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 31 Dec 2016 15:56:45 -0800 Subject: better fix for #629 #635 based on ownership/authorship rather than message flags which could be forged --- include/zot.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/include/zot.php b/include/zot.php index 43749840a..96ec71112 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1782,7 +1782,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ $result[] = $DR->get(); } else { - update_imported_item($sender,$arr,$r[0],$channel['channel_id']); + update_imported_item($sender,$arr,$r[0],$channel['channel_id'],$tag_delivery); $DR->update('updated'); $result[] = $DR->get(); if(! $relay) @@ -1930,7 +1930,7 @@ function remove_community_tag($sender, $arr, $uid) { * @param int $uid */ -function update_imported_item($sender, $item, $orig, $uid) { +function update_imported_item($sender, $item, $orig, $uid, $tag_delivery) { // If this is a comment being updated, remove any privacy information // so that item_store_update will set it from the original. @@ -1943,16 +1943,11 @@ function update_imported_item($sender, $item, $orig, $uid) { unset($item['item_private']); } - // Subtle issue where we might receive an edit item update from a downstream source. - // Ignore unless it comes from upstream. + // we need the tag_delivery check for downstream flowing posts as the stored post + // may have a different owner than the one being transmitted. - $x = q("select item_wall from item where mid = '%s' and uid = %d limit 1", - dbesc($item['mid']), - intval($uid) - ); - - if($x && $x[0]['item_wall'] == 1 && $item['item_wall'] == 0) { - notice('remote wall update ignored'); + if(($sender['hash'] != $orig['owner_xchan'] && $sender['hash'] != $orig['author_xchan']) && (! $tag_delivery)) { + notice('sender is not owner or author'); return; } -- cgit v1.2.3