diff --git a/src/mailer.js b/src/mailer.js index e2bb686c4..a923eead5 100644 --- a/src/mailer.js +++ b/src/mailer.js @@ -182,26 +182,6 @@ function render(templateFile, params) { return content; } -function mailUserEventToAdmins(user, event) { - assert.strictEqual(typeof user, 'object'); - assert.strictEqual(typeof event, 'string'); - - getMailConfig(function (error, mailConfig) { - if (error) return debug('Error getting mail details:', error); - - var adminEmails = _.difference(mailConfig.adminEmails, [ user.email ]); - - var mailOptions = { - from: mailConfig.notificationFrom, - to: adminEmails.join(', '), - subject: util.format('[%s] %s %s', mailConfig.cloudronName, user.username || user.fallbackEmail || user.email, event), - text: render('user_event.ejs', { user: user, event: event, format: 'text' }), - }; - - enqueue(mailOptions); - }); -} - function mailUserEvent(mailTo, user, event) { assert.strictEqual(typeof mailTo, 'string'); assert.strictEqual(typeof user, 'object'); diff --git a/src/notifications.js b/src/notifications.js index cb100eef3..a0acef94d 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -138,7 +138,7 @@ function userAdded(user, callback) { if (admin.email === user.email || admin.email === user.fallbackEmail) return callback(); mailer.userAdded(admin.email, user); - add(admin.id, 'User added', `User ${user.fallbackEmail} was added`, '', callback); + add(admin.id, 'User added', `User ${user.fallbackEmail} was added`, '/#/users', callback); }, callback); } @@ -153,7 +153,7 @@ function userRemoved(user, callback) { if (admin.email === user.email || admin.email === user.fallbackEmail) return callback(); mailer.userRemoved(admin.email, user); - add(admin.id, 'User removed', `User ${user.username || user.email || user.fallbackEmail} was removed`, '', callback); + add(admin.id, 'User removed', `User ${user.username || user.email || user.fallbackEmail} was removed`, '/#/users', callback); }, callback); }