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

- Send push messages for account delete

Browse Source 
- Send actual push type for contact changes
- Handle push deletes for admin
This commit is contained in:
nathangray 2020-09-22 13:53:08 -06:00
parent c883d3ece7
commit b5ef5126c6
4 changed files with 78 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
admin/js/app.js
View File

@ -296,6 +296,35 @@ var AdminApp = /** @class */ (function (_super) {
}
}
};
/**
* Handle a push notification about entry changes from the websocket
*
* Get's called for data of all apps, but should only handle data of apps it displays,
* which is by default only it's own, but can be for multiple apps eg. for calendar.
*
* @param pushData
* @param {string} pushData.app application name
* @param {(string|number)} pushData.id id of entry to refresh or null
* @param {string} pushData.type either 'update', 'edit', 'delete', 'add' or null
* - update: request just modified data from given rows. Sorting is not considered,
* so if the sort field is changed, the row will not be moved.
* - edit: rows changed, but sorting may be affected. Requires full reload.
* - delete: just delete the given rows clientside (no server interaction neccessary)
* - add: requires full reload for proper sorting
* @param {object|null} pushData.acl Extra data for determining relevance. eg: owner or responsible to decide if update is necessary
* @param {number} pushData.account_id User that caused the notification
*/
AdminApp.prototype.push = function (pushData) {
// We'll listen to addressbook, but only if it has an account ID
if (pushData.app != this.appname)
return;
if (pushData.id > 0) {
this.nm.refresh(pushData.id, pushData.type);
}
else if (pushData.id < 0) {
this.groups.refresh(pushData.id, pushData.type);
}
};
/**
* Hide navbar for idots template
*

35
admin/js/app.ts
View File

@ -17,7 +17,7 @@ import 'jqueryui';
import '../jsapi/egw_global';
import '../etemplate/et2_types';
import {EgwApp} from '../../api/js/jsapi/egw_app';
import {EgwApp, PushData} from '../../api/js/jsapi/egw_app';
/**
* UI for Admin
@ -315,6 +315,39 @@ class AdminApp extends EgwApp
}
}
/**
* Handle a push notification about entry changes from the websocket
*
* Get's called for data of all apps, but should only handle data of apps it displays,
* which is by default only it's own, but can be for multiple apps eg. for calendar.
*
* @param pushData
* @param {string} pushData.app application name
* @param {(string|number)} pushData.id id of entry to refresh or null
* @param {string} pushData.type either 'update', 'edit', 'delete', 'add' or null
* - update: request just modified data from given rows. Sorting is not considered,
* so if the sort field is changed, the row will not be moved.
* - edit: rows changed, but sorting may be affected. Requires full reload.
* - delete: just delete the given rows clientside (no server interaction neccessary)
* - add: requires full reload for proper sorting
* @param {object|null} pushData.acl Extra data for determining relevance. eg: owner or responsible to decide if update is necessary
* @param {number} pushData.account_id User that caused the notification
*/
push(pushData : PushData)
{
// We'll listen to addressbook, but only if it has an account ID
if (pushData.app != this.appname) return;
if(pushData.id > 0)
{
this.nm.refresh(pushData.id, pushData.type);
}
else if (pushData.id < 0)
{
this.groups.refresh(pushData.id, pushData.type);
}
}
/**
* Hide navbar for idots template
*

7
api/src/Accounts.php
View File

@ -653,6 +653,7 @@ class Accounts
}
}
}
$update_type = "update";
// add default description for Admins and Default group
if ($data['account_type'] === 'g' && empty($data['account_description']))
{
@ -696,6 +697,9 @@ class Accounts
$invalidate[] = $data['account_id'];
self::cache_invalidate($invalidate);
// Notify linked apps about changes in the account data
Link::notify_update('admin', $id, $data, $update_type);
return $id;
}
@ -733,6 +737,9 @@ class Accounts
// delete all categories belonging to that user or group
Categories::delete_account($id);
// Notify linked apps about changes in the account data
Link::notify_update('admin', $id, null, 'delete');
return true;
}

11
api/src/Contacts.php
View File

@ -864,6 +864,8 @@ class Contacts extends Contacts\Storage
*/
function save(&$contact, $ignore_acl=false, $touch_modified=true)
{
$update_type = "update";
// Make sure photo remains unchanged unless its purposely set to be false
// which means photo has changed.
if (!array_key_exists('photo_unchanged',$contact)) $contact['photo_unchanged'] = true;
@ -887,6 +889,7 @@ class Contacts extends Contacts\Storage
else // entry not found --> create a new one
{
$isUpdate = $contact['id'] = null;
$update_type = "add";
}
}
}
@ -905,6 +908,7 @@ class Contacts extends Contacts\Storage
if (!$contact['created'] || !$ignore_acl && !$this->is_admin($contact)) $contact['created'] = $this->now_su;
if (!$contact['tid']) $contact['tid'] = 'n';
$update_type = "add";
}
// ensure accounts and group addressbooks are never private!
if ($contact['owner'] <= 0)
@ -1032,8 +1036,6 @@ class Contacts extends Contacts\Storage
$to_write['location'] = 'editaccountcontact';
Hooks::process($to_write,False,True); // called for every app now, not only enabled ones));
}
// Notify linked apps about changes in the contact data
Link::notify_update('addressbook', $contact['id'], $contact);
// Check for restore of deleted contact, restore held links
if($old && $old['tid'] == self::DELETED_TYPE && $contact['tid'] != self::DELETED_TYPE)
@ -1042,13 +1044,16 @@ class Contacts extends Contacts\Storage
}
// Record change history for sql - doesn't work for LDAP accounts
$deleted = ($old['tid'] == self::DELETED_TYPE || $contact['tid'] == self::DELETED_TYPE);
if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
{
$deleted = ($old['tid'] == self::DELETED_TYPE || $contact['tid'] == self::DELETED_TYPE);
if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
$this->tracking->track($to_write, $old ? $old : null, null, $deleted);
}
// Notify linked apps about changes in the contact data
Link::notify_update('addressbook', $contact['id'], $contact, $deleted ? 'delete' : $update_type);
// Expire birthday cache for this year and next if birthday changed
if($isUpdate && $old['bday'] !== $to_write['bday'] || !$isUpdate && $to_write['bday'])
{