extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-15 09:49:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Rework some phrasing in the preference, make sure it only applies to "responses", not other changes

Browse Source
This commit is contained in:
nathangray 2019-11-04 10:51:39 -07:00
parent 9939cc4246
commit 559a86ac0c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -605,6 +605,12 @@ class calendar_boupdate extends calendar_bo
// //
$msg_is_response = $msg_type == MSG_REJECTED || $msg_type == MSG_ACCEPTED || $msg_type == MSG_TENTATIVE || $msg_type == MSG_DELEGATED; $msg_is_response = $msg_type == MSG_REJECTED || $msg_type == MSG_ACCEPTED || $msg_type == MSG_TENTATIVE || $msg_type == MSG_DELEGATED;
// Check if user is not participating, and does not want notifications
if($msg_is_response && !$part_prefs['calendar']['receive_not_participating'] && !array_key_exists($userid, $old_event['participants']))
{
return false;
}
// always notify externals chairs // always notify externals chairs
// EGroupware owner only get notified about responses, if pref is NOT "no" // EGroupware owner only get notified about responses, if pref is NOT "no"
if (!is_numeric($userid) && $role == 'CHAIR' && if (!is_numeric($userid) && $role == 'CHAIR' &&
@ -629,11 +635,6 @@ class calendar_boupdate extends calendar_bo
} }
else else
{ {
// Check if user is not participating, and does not want notifications
if(!$part_prefs['calendar']['receive_not_participating'] && !array_key_exists($userid, $old_event['participants']))
{
return false;
}
switch($ru = $part_prefs['calendar']['receive_updates']) switch($ru = $part_prefs['calendar']['receive_updates'])
{ {
case 'responses': case 'responses':

4
calendar/inc/class.calendar_hooks.inc.php
View File

@ -528,10 +528,10 @@ class calendar_hooks
), ),
'receive_not_participating' => array( 'receive_not_participating' => array(
'type' => 'select', 'type' => 'select',
'label' => 'Receive notifications about events you are not a participant in', 'label' => 'Do you want responses from events you are not participating in?',
'name' => 'receive_not_participating', 'name' => 'receive_not_participating',
'values' => $yesno, 'values' => $yesno,
'help' => 'Do you want to be notified about events you created, but are not participating in?', 'help' => 'Do you want to be notified about participant responses from events you created, but are not participating in?',
'default'=> '1' 'default'=> '1'
), ),
'notify_externals' => array( 'notify_externals' => array(