holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar/Notifications: show notification errors, eg. mail could not be sent

Browse Source
This commit is contained in:
Ralf Becker 2014-06-05 11:03:12 +00:00
parent 6efc08cc0a
commit d3fed2c9b7
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -175,6 +175,8 @@ class calendar_uiforms extends calendar_ui
{
return $this->edit(null,null,strip_tags($_GET['msg']));
}
// clear notification errors
notifications::errors(true);
$messages = null;
$msg_permission_denied_added = false;
list($button) = @each($content['button']);
@ -937,6 +939,11 @@ class calendar_uiforms extends calendar_ui
}
break;
}
// add notification-errors, if we have some
if (($notification_errors = notifications::errors(true)))
{
$msg .= ($msg ? "\n" : '').implode("\n", $notification_errors);
}
if (in_array($button,array('cancel','save','delete','delete_exceptions','delete_keep_exceptions')) && $noerror)
{
if ($content['lock_token']) // remove an existing lock
@ -1288,7 +1295,7 @@ class calendar_uiforms extends calendar_ui
);
// set default preference value. If there's no preference chooses 10 min
$event['new_alarm']['options'] = $default_alarm ? $default_alarm: 600;
$etpl = new etemplate_new();
if (!$etpl->read($preserv['template']))
{
@ -1627,9 +1634,9 @@ class calendar_uiforms extends calendar_ui
* @todo Handle situation when user is NOT invited, but eg. can view that mail ...
* @param array $event=null; special usage if $event is array('event'=>null,'msg'=>'','useSession'=>true) we
* are called by new mail-app; and we intend to use the stuff passed on by session
* @param string $msg=''
* @param string $msg=null
*/
function meeting(array $event=null, $msg='')
function meeting(array $event=null, $msg=null)
{
$user = $GLOBALS['egw_info']['user']['account_id'];
$readonlys['button[apply]'] = true;
@ -1742,6 +1749,9 @@ class calendar_uiforms extends calendar_ui
list($button) = each($event['button']);
unset($event['button']);
// clear notification errors
notifications::errors(true);
switch($button)
{
case 'reject':
@ -1792,6 +1802,8 @@ class calendar_uiforms extends calendar_ui
break;
}
// add notification-errors, if we have some
$msg = array_merge((array)$msg, notifications::errors(true));
}
$event['msg'] = implode("\n",(array)$msg);
$readonlys['button[edit]'] = !$event['id'];

32
notifications/inc/class.notifications.inc.php
View File

@ -167,6 +167,13 @@ final class notifications {
*/
private $config;
/**
* Error-message cat be read and reset via notifications::errors($reset=false)
*
* @var array
*/
private static $errors = array();
/**
* constructor of notifications
*
@ -175,6 +182,19 @@ final class notifications {
$this->config = (object) config::read(self::_appname);
}
/**
* Return notification errors
*
* @param boolean $reset=false true: reset all errors
* @return array
*/
public static function errors($reset=false)
{
$ret = self::$errors;
if ($reset) self::$errors = array();
return $ret;
}
/**
* Set sender for the current notification
*
@ -522,15 +542,19 @@ final class notifications {
if($action == 'stop' || $action == 'fail') { break; } // stop running through chain
}
// check if the user has been notified at all
/*if(!$user_notified) {
error_log('Error: notification of receiver '.$receiver->handle.' failed for the following reasons:');
if(!$user_notified) {
/*error_log('Error: notification of receiver '.$receiver->handle.' failed for the following reasons:');
foreach($backend_errors as $id=>$backend_error) {
error_log($backend_error);
}
}*/
}*/
$error = implode(', ', $backend_errors);
if (stripos($error, (string)$receiver->handle) !== false) $error = $receiver->handle.': '.$error;
self::$errors[] = $error;
}
}
catch (Exception $exception_user) {
error_log('Error: notification of receiver '.$receiver->handle.' failed: '.$exception_user->getMessage());
self::$errors[] = $receiver->handle.': '.$exception_user->getMessage();
}
}
return true;