MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [registration] log entry action shortened to not cause issues

pull/5256/head
iglocska 2020-05-07 15:56:08 +02:00
parent a8cabe0d1e
commit 3740e38907
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/Log.php
View File

@ -37,7 +37,6 @@ class Log extends AppModel
'enable',
'error',
'export',
'failed_registration',
'file_upload',
'galaxy',
'include_formula',
@ -52,13 +51,14 @@ class Log extends AppModel
'pull',
'purge_events',
'push',
'registration',
'registration_error',
'remove_dead_workers',
'request',
'request_delegation',
'reset_auth_key',
'security',
'serverSettingsEdit',
'succeeded_registration',
'tag',
'undelete',
'update',

4
app/Model/User.php
View File

@ -1540,7 +1540,7 @@ class User extends AppModel
'model' => 'User',
'model_id' => $added_by['id'],
'email' => $added_by['email'],
'action' => 'failed_registration',
'action' => 'registration_error',
'title' => 'User registration failed for ' . $user['email'] . '. Reason(s): ' . $error,
'change' => null,
));
@ -1555,7 +1555,7 @@ class User extends AppModel
'model' => 'User',
'model_id' => $added_by['id'],
'email' => $added_by['email'],
'action' => 'succeeded_registration',
'action' => 'registration',
'title' => sprintf('User registration success for %s (id=%s)', $user['User']['email'], $user['User']['id']),
'change' => null,
));