extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Notifications: fix dont try to notify when none is set/forced for folders to check for new mails; dont try to notify when email as module is not enabled for the particular user

Browse Source
This commit is contained in:
Klaus Leithoff 2010-12-03 10:44:47 +00:00
parent 9981730b29
commit d08086c8b2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
notifications/inc/class.notifications_ajax.inc.php
View File

@ -112,7 +112,7 @@ class notifications_ajax {
* @return xajax response * @return xajax response
*/ */
public function get_notifications() { public function get_notifications() {
$this->check_mailbox(); if ($GLOBALS['egw_info']['user']['apps']['felamimail']) $this->check_mailbox();
$this->get_egwpopup(); $this->get_egwpopup();
return $this->response->getXML(); return $this->response->getXML();
@ -124,7 +124,8 @@ class notifications_ajax {
* @return boolean true or false * @return boolean true or false
*/ */
private function check_mailbox() { private function check_mailbox() {
if(!isset($this->preferences[self::_mailappname]['notify_folders'])) { //error_log(__METHOD__.__LINE__.array2string($this->preferences[self::_mailappname]['notify_folders']));
if(!isset($this->preferences[self::_mailappname]['notify_folders'])||$this->preferences[self::_mailappname]['notify_folders']=='none') {
return true; //no pref set for notifying - exit return true; //no pref set for notifying - exit
} }
$notify_folders = explode(',', $this->preferences[self::_mailappname]['notify_folders']); $notify_folders = explode(',', $this->preferences[self::_mailappname]['notify_folders']);