From 467408d9f799e88a9641c378370b53ca715c972c Mon Sep 17 00:00:00 2001 From: iglocska Date: Fri, 24 Jan 2014 10:43:07 +0100 Subject: [PATCH] Org admins should be able to delete / edit their own server links --- app/Controller/ServersController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php index be5dc6d01..2f7f17546 100755 --- a/app/Controller/ServersController.php +++ b/app/Controller/ServersController.php @@ -135,7 +135,7 @@ class ServersController extends AppController { throw new NotFoundException(__('Invalid server')); } $s = $this->Server->read(null, $id); - if (!$this->_isSiteAdmin() && !($s['Server']['org'] == $this->Auth->user('org') && $this->_isSiteAdmin())) $this->redirect(array('controller' => 'servers', 'action' => 'index')); + if (!$this->_isSiteAdmin() && !($s['Server']['org'] == $this->Auth->user('org') && $this->_isAdmin())) $this->redirect(array('controller' => 'servers', 'action' => 'index')); if ($this->Server->delete()) { $this->Session->setFlash(__('Server deleted')); $this->redirect(array('action' => 'index')); @@ -162,7 +162,7 @@ class ServersController extends AppController { throw new NotFoundException(__('Invalid server')); } $s = $this->Server->read(null, $id); - if (!$this->_isSiteAdmin() && !($s['Server']['org'] == $this->Auth->user('org') && $this->_isSiteAdmin())) $this->redirect(array('controller' => 'servers', 'action' => 'index')); + if (!$this->_isSiteAdmin() && !($s['Server']['org'] == $this->Auth->user('org') && $this->_isAdmin())) $this->redirect(array('controller' => 'servers', 'action' => 'index')); $this->Server->id = $id; if (!$this->Server->exists()) { throw new NotFoundException(__('Invalid server')); @@ -231,7 +231,7 @@ class ServersController extends AppController { throw new NotFoundException(__('Invalid server')); } $s = $this->Server->read(null, $id); - if (!$this->_isSiteAdmin() && !($s['Server']['org'] == $this->Auth->user('org') && $this->_isSiteAdmin())) $this->redirect(array('controller' => 'servers', 'action' => 'index')); + if (!$this->_isSiteAdmin() && !($s['Server']['org'] == $this->Auth->user('org') && $this->_isAdmin())) $this->redirect(array('controller' => 'servers', 'action' => 'index')); if (!Configure::read('MISP.background_jobs')) { $server = $this->Server->read(null, $id); App::uses('SyncTool', 'Tools');