From 56aa5681244a5c4577ad3a3d95d32d764309d15a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 22 Sep 2016 11:07:21 +0200 Subject: objects with id=share_container seem to be blacklisted in various security browser plugins. rename it to distr_container. also remove some superfluous js --- Zotlabs/Module/Events.php | 4 ++-- view/tpl/event_head.tpl | 16 ++-------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index d27de9989..2bff4676e 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -118,7 +118,7 @@ class Events extends \Zotlabs\Web\Controller { goaway($onerror_url); } - $share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0); + $share = ((intval($_POST['distr'])) ? intval($_POST['distr']) : 0); $channel = \App::get_channel(); @@ -469,7 +469,7 @@ class Events extends \Zotlabs\Web\Controller { '$t_orig' => $t_orig, '$sh_text' => t('Share this event'), '$sh_checked' => $sh_checked, - '$share' => array('share', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))), + '$share' => array('distr', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))), '$preview' => t('Preview'), '$perms_label' => t('Permission settings'), // populating the acl dialog was a permission description from view_stream because Cal.php, which diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 640e6024a..646c68564 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -154,9 +154,9 @@ }); // ACL - $('#id_share').change(function() { + $('#id_distr').change(function() { - if ($('#id_share').is(':checked')) { + if ($('#id_distr').is(':checked')) { $('#dbtn-acl').show(); } else { @@ -164,18 +164,6 @@ } }).trigger('change'); - $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { - var selstr; - $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { - selstr = $(this).text(); - $('#jot-public').hide(); - }); - if(selstr == null) { - $('#jot-public').show(); - } - - }).trigger('change'); - }); -- cgit v1.2.3