Small fixes

- filename fix
- per event download fixed
pull/567/head
iglocska 2015-05-20 16:28:59 +02:00
parent 2afea61ea0
commit 9db3a36103
2 changed files with 3 additions and 3 deletions

View File

@ -1854,8 +1854,8 @@ class AttributesController extends AppController {
if ($eventId) $file .= 'event-' . $eventId . '.';
if ($from) $file .= 'from-' . $from . '.';
if ($to) $file .= 'to-' . $to . '.';
if ($file == '') $file = 'all';
$this->header('Content-Disposition: download; filename="misp.rpz.' . $file . '.txt"');
if ($file == '') $file = 'all.';
$this->header('Content-Disposition: download; filename="misp.rpz.' . $file . 'txt"');
$this->layout = 'text/default';
$this->loadModel('Whitelist');
$values = $this->Whitelist->removeWhitelistedValuesFromArray($values);

View File

@ -3167,7 +3167,7 @@ class EventsController extends AppController {
'checkbox_set' => '/true'
),
'rpz' => array(
'url' => '/attributes/rpz/download',
'url' => '/attributes/rpz/download/false/' . $id,
'text' => 'RPZ Zone file',
'requiresPublished' => true,
'checkbox' => false,