clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8106 from MrPetovan/bug/8097-event-share-default 

Initial event share status doesn't depend on the user's default permissions anymore
This commit is contained in:
Tobias Diekershoff 2020-01-12 19:06:11 +01:00 committed by GitHub
parent d45575e0fa b12c646503
commit 5fe95d7539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mod/events.php
View File

@ -427,8 +427,16 @@ function events_content(App $a)
// Passed parameters overrides anything found in the DB // Passed parameters overrides anything found in the DB
if (in_array($mode, ['edit', 'new', 'copy'])) { if (in_array($mode, ['edit', 'new', 'copy'])) {
$share_checked = '';
$share_disabled = '';
if (empty($orig_event)) { if (empty($orig_event)) {
$orig_event = User::getById(local_user(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);; $orig_event = User::getById(local_user(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);;
} elseif ($orig_event['allow_cid'] !== '<' . local_user() . '>'
|| $orig_event['allow_gid']
|| $orig_event['deny_cid']
|| $orig_event['deny_gid']) {
$share_checked = ' checked="checked" ';
} }
// In case of an error the browser is redirected back here, with these parameters filled in with the previous values // In case of an error the browser is redirected back here, with these parameters filled in with the previous values
@ -450,20 +458,8 @@ function events_content(App $a)
$cid = !empty($orig_event) ? $orig_event['cid'] : 0; $cid = !empty($orig_event) ? $orig_event['cid'] : 0;
$uri = !empty($orig_event) ? $orig_event['uri'] : ''; $uri = !empty($orig_event) ? $orig_event['uri'] : '';
$sh_disabled = '';
$sh_checked = '';
if (!empty($orig_event)
&& ($orig_event['allow_cid'] !== '<' . local_user() . '>'
|| $orig_event['allow_gid']
|| $orig_event['deny_cid']
|| $orig_event['deny_gid']))
{
$sh_checked = ' checked="checked" ';
}
if ($cid || $mode === 'edit') { if ($cid || $mode === 'edit') {
$sh_disabled = 'disabled="disabled"'; $share_disabled = 'disabled="disabled"';
} }
$sdt = !empty($orig_event) ? $orig_event['start'] : 'now'; $sdt = !empty($orig_event) ? $orig_event['start'] : 'now';
@ -547,8 +543,8 @@ function events_content(App $a)
'$t_orig' => $t_orig, '$t_orig' => $t_orig,
'$summary' => ['summary', L10n::t('Title:'), $t_orig, '', '*'], '$summary' => ['summary', L10n::t('Title:'), $t_orig, '', '*'],
'$sh_text' => L10n::t('Share this event'), '$sh_text' => L10n::t('Share this event'),
'$share' => ['share', L10n::t('Share this event'), $sh_checked, '', $sh_disabled], '$share' => ['share', L10n::t('Share this event'), $share_checked, '', $share_disabled],
'$sh_checked' => $sh_checked, '$sh_checked' => $share_checked,
'$nofinish' => ['nofinish', L10n::t('Finish date/time is not known or not relevant'), $n_checked], '$nofinish' => ['nofinish', L10n::t('Finish date/time is not known or not relevant'), $n_checked],
'$adjust' => ['adjust', L10n::t('Adjust for viewer timezone'), $a_checked], '$adjust' => ['adjust', L10n::t('Adjust for viewer timezone'), $a_checked],
'$preview' => L10n::t('Preview'), '$preview' => L10n::t('Preview'),