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

flag incorrectly set for event edit's publishing right check

pull/762/head
Iglocska 2015-08-31 04:21:46 +02:00
parent e11ddb9679
commit 5f8f22e272
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/ServersController.php
View File

@ -854,7 +854,7 @@ class ServersController extends AppController {
else return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Could not kill the previous instance of the ZeroMQ script.')),'status'=>200));
}
private function statusZeroMQServer() {
public function statusZeroMQServer() {
if (!$this->_isSiteAdmin()) throw new MethodNotAllowedException();
App::uses('PubSubTool', 'Tools');
$pubSubTool = new PubSubTool();

2
app/View/Events/edit.ctp
View File

@ -1,6 +1,6 @@
<?php
$mayModify = (($isAclModify && $event['Event']['user_id'] == $me['id'] && $event['Event']['orgc_id'] == $me['org_id']) || ($isAclModifyOrg && $event['Event']['orgc_id'] == $me['org_id']));
$mayPublish = ($isAclPublish && $event['Event']['orgc'] == $me['Organisation']['name']);
$mayPublish = ($isAclPublish && $event['Event']['orgc_id'] == $me['orgc_id']);
?>
<div class="events form">
<?php echo $this->Form->create('Event');?>