extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: send notifications/meeting requests after responding to user

Browse Source
This commit is contained in:
Ralf Becker 2020-07-26 15:04:22 +02:00
parent 7c2ff113cb
commit 92bb06f724
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -819,6 +819,22 @@ class calendar_boupdate extends calendar_bo
* @return bool true/false * @return bool true/false
*/ */
function send_update($msg_type, $to_notify, $old_event, $new_event=null, $user=0, array $alarm=null) function send_update($msg_type, $to_notify, $old_event, $new_event=null, $user=0, array $alarm=null)
{
Api\Egw::on_shutdown([$this, '_send_update'], func_get_args());
}
/**
* sends update-messages to certain participants of an event
*
* @param int $msg_type type of the notification: MSG_ADDED, MSG_MODIFIED, MSG_ACCEPTED, ...
* @param array $to_notify numerical user-ids as keys (!) (value is not used)
* @param array $old_event Event before the change
* @param array $new_event =null Event after the change
* @param int|string $user =0 User/participant who started the notify, default current user
* @param array $alarm =null values for "offset", "start", etc.
* @return bool true/false
*/
function _send_update($msg_type, $to_notify, $old_event, $new_event=null, $user=0, array $alarm=null)
{ {
//error_log(__METHOD__."($msg_type,".array2string($to_notify).",...) ".array2string($new_event)); //error_log(__METHOD__."($msg_type,".array2string($to_notify).",...) ".array2string($new_event));
if (!is_array($to_notify)) if (!is_array($to_notify))

2
json.php
View File

@ -129,7 +129,7 @@ try {
$json->parseRequest($_GET['menuaction'], $_REQUEST['json_data']); $json->parseRequest($_GET['menuaction'], $_REQUEST['json_data']);
} }
Json\Response::get(); Json\Response::get();
exit(); $GLOBALS['egw']->__destruct();
} }
// missing menuaction GET parameter or request:parameters object or unparsable JSON // missing menuaction GET parameter or request:parameters object or unparsable JSON
catch (\InvalidArgumentException $e) { catch (\InvalidArgumentException $e) {