mirror of https://github.com/MISP/MISP
fix: removing some unused code.
parent
0941d709e0
commit
4f288bd23f
|
@ -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));
|
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());
|
$responsibleAdmin = $this->User->findAdminsResponsibleForUser($this->Auth->user());
|
||||||
$message = "Something went wrong, please try again later.";
|
|
||||||
if (isset($responsibleAdmin['email']) && !empty($responsibleAdmin['email'])) {
|
if (isset($responsibleAdmin['email']) && !empty($responsibleAdmin['email'])) {
|
||||||
$subject = "[MISP ".Configure::read('MISP.org')."] User requesting API access";
|
$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/>";
|
$body = "A user (".$this->Auth->user('email').") has sent you a request to enable his/her API key access.<br/>";
|
||||||
|
|
|
@ -908,7 +908,7 @@ class User extends AppModel {
|
||||||
'User.org_id' => $user['org_id']
|
'User.org_id' => $user['org_id']
|
||||||
),
|
),
|
||||||
'contain' => array(
|
'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')
|
'fields' => array('User.id', 'User.email', 'User.org_id')
|
||||||
));
|
));
|
||||||
|
|
Loading…
Reference in New Issue