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

fix: Contact Users Form Email Issue fixed, fixes #1130

pull/1136/head
Iglocska 2016-05-18 11:15:11 +02:00
parent 56eaf0276a
commit 4e94913504
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/UsersController.php
View File

@ -942,7 +942,7 @@ class UsersController extends AppController {
$conditions = array();
if (!$this->_isSiteAdmin()) $conditions = array('org_id' => $this->Auth->user('org_id'));
if ($this->request->data['User']['recipient'] != 1) $conditions['id'] = $this->request->data['User']['recipientEmailList'];
else $conditions['AND'][] = array('User.disabled' => 0);
$conditions['AND'][] = array('User.disabled' => false);
$users = $this->User->find('all', array('recursive' => -1, 'order' => array('email ASC'), 'conditions' => $conditions));
$this->request->data['User']['message'] = $this->User->adminMessageResolve($this->request->data['User']['message']);
$failures = '';
@ -967,6 +967,7 @@ class UsersController extends AppController {
}
$conditions = array();
if (!$this->_isSiteAdmin()) $conditions = array('org_id' => $this->Auth->user('org_id'));
$conditions['User.disabled'] = false;
$temp = $this->User->find('all', array('recursive' => -1, 'fields' => array('id', 'email'), 'order' => array('email ASC'), 'conditions' => $conditions));
$emails = array();
$gpgKeys = array();

1
app/Model/User.php
View File

@ -702,6 +702,7 @@ class User extends AppModel {
));
return true;
}
if (isset($user['User']['disabled']) && $user['User']['disabled']) return true;
$failed = false;
$failureReason = "";
// check if the e-mail can be encrypted