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

* Notifications: configurable number of days (default 30), after which older notifications get automatic deleted

Browse Source
This commit is contained in:
ralf 2024-04-17 15:00:14 +02:00
parent 92041df5bd
commit 9d45da268e
5 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,11 +22,6 @@ class notifications_ajax
*/
const _appname = 'notifications';
/**
* Mailappname
*/
const _mailappname = 'mail';
/**
* Notification table in SQL database
*/
@ -40,7 +35,7 @@ class notifications_ajax
/**
* Do NOT consider notifications older than this
*/
const CUT_OFF_DATE = '-30days';
static public $cut_off_date = '-30days';
/**
* holds account object for user to notify
@ -49,13 +44,6 @@ class notifications_ajax
*/
private $recipient;
/**
* holds config object (sitewide application config)
*
* @var object
*/
private $config;
/**
* holds preferences array of user to notify
*
@ -91,7 +79,7 @@ class notifications_ajax
public function __construct()
{
$this->response = Api\Json\Response::get();
$this->recipient = (object)$GLOBALS['egw']->accounts->read($GLOBALS['egw_info']['user']['account_id']);
$this->recipient = (object)$GLOBALS['egw_info']['user'];
$this->db = $GLOBALS['egw']->db;
@ -187,7 +175,7 @@ class notifications_ajax
$notify_ids[] = $data;
}
}
$cut_off = $this->db->quote(Api\DateTime::to(self::CUT_OFF_DATE, Api\DateTime::DATABASE));
$cut_off = $this->db->quote(Api\DateTime::to(self::$cut_off_date, Api\DateTime::DATABASE));
try {
foreach($app_ids as $app => $ids)
{
@ -243,4 +231,14 @@ class notifications_ajax
$this->response->apply('app.notifications.append', array($entries['rows']??[], $browserNotify, $entries['total']??0));
return true;
}
public function initStatic()
{
$config = Api\Config::read(self::_appname);
if (!empty($config['popup_cut_off_days']) && $config['popup_cut_off_days'] > 0)
{
self::$cut_off_date = "-$config[popup_cut_off_days]days";
}
}
}

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

@ -158,14 +158,14 @@ class notifications_popup implements notifications_iface
if (($total = $db->select(self::_notification_table, 'COUNT(*)', [
'account_id' => $_account_id,
'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=$db->quote(Api\DateTime::to(notifications_ajax::$cut_off_date, Api\DateTime::DATABASE))),
'notify_app_id IS NULL',
], __LINE__, __FILE__, false, '', self::_appname)->fetchColumn()+
$db->select(
'('.$db->select(self::_notification_table, 'notify_app,notify_app_id', [
'account_id' => $_account_id,
'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=$db->quote(Api\DateTime::to(notifications_ajax::$cut_off_date, Api\DateTime::DATABASE))),
'notify_app_id IS NOT NULL',
], false, false, false, 'GROUP BY notify_app,notify_app_id', self::_appname).') AS app_ids',
'COUNT(*)', false, __LINE__, __FILE__, false, '', self::_appname)->fetchColumn()

2
notifications/lang/egw_de.lang
View File

@ -2,6 +2,7 @@
account: notifications de Benutzername:
all possible notification backends notifications de Alle verfügbaren Benachrichtigungs-Schnittstellen
are you sure you want to delete all notifications? notifications de Sind Sie sicher, dass Sie alle Benachrichtigungen löschen möchten?
automatic deleted notifications older than admin de Benachrichtigungen automatisch löschen, wenn älter als
browser notifications de Browser
browser is starting. notifications de Browser ist am starten.
cancal settings? notifications de Einstellungen abbrechen?
@ -65,6 +66,7 @@ more info notifications de Mehr
notification common de Benachrichtigung
notifier notifications de Benachrichtiger
notify me by notifications de Benachrichtige mich per
only used if no push server available! admin de Wird nur benutzt wenn kein Push Server verfügbar!
open notified entry notifications de Eintrag öffnen
optimize e-mails for external mail client notifications de Optimiere E-Mails für externe E-Mail-Programme
page not found, please check serveraddress. notifications de Seite nicht gefunden, bitte überprüfen Sie die Server-Adresse

2
notifications/lang/egw_en.lang
View File

@ -2,6 +2,7 @@
account: notifications en Account:
all possible notification backends notifications en All possible notification backends
are you sure you want to delete all notifications? notifications en Are you sure you want to delete all notifications?
automatic deleted notifications older than admin en Automatic deleted notifications older than
browser notifications en Browser
browser is starting. notifications en Browser is starting.
cancal settings? notifications en Cancel settings?
@ -65,6 +66,7 @@ more info notifications en More info
notification common en Notification
notifier notifications en Notifier
notify me by notifications en Notify me by
only used if no push server available! admin en Only used if no push server available!
open notified entry notifications en Open notified entry
optimize e-mails for external mail client notifications en Optimize emails for external email client
page not found, please check serveraddress. notifications en Page not found, please check server address.

14
notifications/templates/default/config.xet
View File

@ -12,7 +12,17 @@
<et2-description value="EGroupware-Popup backend" span="all" class="subHeader"></et2-description>
</row>
<row>
<et2-description value="Poll interval"></et2-description>
<et2-description value="Automatic deleted notifications older than"></et2-description>
<et2-hbox>
<et2-number id="newsettings[popup_cut_off_days]" placeholder="30"></et2-number>
<et2-description value="days" width="4em"></et2-description>
</et2-hbox>
</row>
<row>
<et2-vbox>
<et2-description value="Poll interval"></et2-description>
<et2-description value="Only used if no push server available!"></et2-description>
</et2-vbox>
<et2-select id="newsettings[popup_poll_interval]">
<option value="5">5 seconds</option>
<option value="60">1 {minute}</option>
@ -35,7 +45,7 @@
</row>
<row>
<et2-description value="Mail account to use for notifications"></et2-description>
<et2-select id="newsettings[async_identity]" emptyLable="automatic"></et2-select>
<et2-select id="newsettings[async_identity]" emptyLabel="automatic"></et2-select>
</row>
</rows>
</grid>