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

fix: removing some unused code.

pull/1541/head
Cristian Bell 2016-09-16 16:15:26 +02:00
parent 0941d709e0
commit 4f288bd23f
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/UsersController.php
View File

@ -48,7 +48,6 @@ class UsersController extends AppController {
return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'API access request failed. E-mailing is currently disabled on this instance.')),'status'=>200));
}
$responsibleAdmin = $this->User->findAdminsResponsibleForUser($this->Auth->user());
$message = "Something went wrong, please try again later.";
if (isset($responsibleAdmin['email']) && !empty($responsibleAdmin['email'])) {
$subject = "[MISP ".Configure::read('MISP.org')."] User requesting API access";
$body = "A user (".$this->Auth->user('email').") has sent you a request to enable his/her API key access.<br/>";

2
app/Model/User.php
View File

@ -908,7 +908,7 @@ class User extends AppModel {
'User.org_id' => $user['org_id']
),
'contain' => array(
'Role' => array('fields' => array('perm_admin', 'perm_site_admin'))
'Role' => array('fields' => array('perm_admin'))
),
'fields' => array('User.id', 'User.email', 'User.org_id')
));