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

W.I.P restructuring of Notifications actions:

Browse Source 
- Fix actions of calendar show up for other notifications too
This commit is contained in:
Hadi Nategh 2018-01-25 11:07:51 +01:00
parent c2a3c19124
commit 65a811a940
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,6 @@ class notifications_ajax {
* @return boolean true or false * @return boolean true or false
*/ */
private function get_egwpopup($browserNotify = false) { private function get_egwpopup($browserNotify = false) {
$message = '';
$rs = $this->db->select(self::_notification_table, '*', array( $rs = $this->db->select(self::_notification_table, '*', array(
'account_id' => $this->recipient->account_id, 'account_id' => $this->recipient->account_id,
'notify_type' => self::_type 'notify_type' => self::_type
@ -184,7 +183,7 @@ class notifications_ajax {
__LINE__,__FILE__,false,'',self::_appname); __LINE__,__FILE__,false,'',self::_appname);
if ($rs->NumRows() > 0) { if ($rs->NumRows() > 0) {
foreach ($rs as $notification) { foreach ($rs as $notification) {
$message = null; $actions = null;
$data = json_decode($notification['notify_data'], true); $data = json_decode($notification['notify_data'], true);
if ($data['appname']) if ($data['appname'])
{ {
@ -194,23 +193,10 @@ class notifications_ajax {
), $data['appname'], true); ), $data['appname'], true);
$actions = $_actions[$data['appname']]; $actions = $_actions[$data['appname']];
} }
if($browserNotify)
{
$message = $notification['notify_message'];
// Check for a link - doesn't work in notification
if(strpos($message, lang('Linked entries:')))
{
$message = substr_replace($message, '', strpos($message, lang('Linked entries:')));
}
$message2 = preg_replace('#</?a[^>]*>#is','',$message);
$message3 = 'data:text/html;charset=' . Api\Translation::charset() .';base64,'.base64_encode($message2);
}
$this->response->apply('app.notifications.append',array( $this->response->apply('app.notifications.append',array(
$notification['notify_id'], $notification['notify_id'],
$notification['notify_message'], $notification['notify_message'],
$message3, $browserNotify,
$notification['notify_status'], $notification['notify_status'],
$notification['notify_created'], $notification['notify_created'],
new DateTime(), new DateTime(),