extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 01:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Notifications: fix wrong condition leading to infinite recursion (causing timeout) and high database load

Browse Source
This commit is contained in:
ralf 2024-07-09 16:16:33 +02:00
parent 8f0cf4998f
commit 343025dece
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
notifications/inc/class.notifications_popup.inc.php
View File

@ -155,17 +155,18 @@ class notifications_popup implements notifications_iface
$db = $GLOBALS['egw']->db; $db = $GLOBALS['egw']->db;
$result = []; $result = [];
$cut_off_date = $db->quote(Api\DateTime::to(notifications_ajax::$cut_off_date, Api\DateTime::DATABASE));
if (($total = $db->select(self::_notification_table, 'COUNT(*)', [ if (($total = $db->select(self::_notification_table, 'COUNT(*)', [
'account_id' => $_account_id, 'account_id' => $_account_id,
'notify_type' => self::_type, 'notify_type' => self::_type,
'notify_created > '.($cut_off=$db->quote(Api\DateTime::to(notifications_ajax::$cut_off_date, Api\DateTime::DATABASE))), 'notify_created > '.$cut_off_date,
'notify_app_id IS NULL', 'notify_app_id IS NULL',
], __LINE__, __FILE__, false, '', self::_appname)->fetchColumn()+ ], __LINE__, __FILE__, false, '', self::_appname)->fetchColumn()+
$db->select( $db->select(
'('.$db->select(self::_notification_table, 'notify_app,notify_app_id', [ '('.$db->select(self::_notification_table, 'notify_app,notify_app_id', [
'account_id' => $_account_id, 'account_id' => $_account_id,
'notify_type' => self::_type, 'notify_type' => self::_type,
'notify_created > '.($cut_off=$db->quote(Api\DateTime::to(notifications_ajax::$cut_off_date, Api\DateTime::DATABASE))), 'notify_created > '.$cut_off_date,
'notify_app_id IS NOT NULL', 'notify_app_id IS NOT NULL',
], false, false, false, 'GROUP BY notify_app,notify_app_id', self::_appname).') AS app_ids', ], false, false, false, 'GROUP BY notify_app,notify_app_id', self::_appname).') AS app_ids',
'COUNT(*)', false, __LINE__, __FILE__, false, '', self::_appname)->fetchColumn() 'COUNT(*)', false, __LINE__, __FILE__, false, '', self::_appname)->fetchColumn()
@ -179,7 +180,7 @@ class notifications_popup implements notifications_iface
foreach ($rs=$db->select(self::_notification_table, '*', [ foreach ($rs=$db->select(self::_notification_table, '*', [
'account_id' => $_account_id, 'account_id' => $_account_id,
'notify_type' => self::_type, 'notify_type' => self::_type,
'notify_created > ' . $cut_off, 'notify_created > '.$cut_off_date,
], __LINE__, __FILE__, $n, 'ORDER BY notify_id DESC', self::_appname, $chunk_size) as $notification) ], __LINE__, __FILE__, $n, 'ORDER BY notify_id DESC', self::_appname, $chunk_size) as $notification)
{ {
$actions = null; $actions = null;
@ -219,9 +220,9 @@ class notifications_popup implements notifications_iface
} }
$n += $chunk_size; $n += $chunk_size;
} }
while(!$notification || count($result) < min($num_rows, $total)); while($notification && count($result) < min($num_rows, $total));
return ['rows' => array_values($result), 'total'=> $total]; return ['rows' => array_values($result), 'total' => $total];
} }
} }