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

micro HTML bugfixes in views

pull/61/head
Christophe Vandeplas 2012-03-25 16:25:16 +02:00
parent 04c9028008
commit 803bdbdf87
5 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/View/Events/export.ctp
View File

@ -2,7 +2,7 @@
<h2>Export</h2>
<p>To make exports available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentiation.<br/>
<strong>Make sure you keep that key secret as it gives access to the entire database !</strong></p>
<p>Your current key is: <code><?php echo $me['authkey'];?></code>.
<p>Your current key is: <code><?php echo $me['authkey'];?></code>.
You can <?php echo $this->Html->link('reset', array('controller' => 'users', 'action' => 'resetauthkey', 'me'));?> this key.
</p>
@ -13,7 +13,7 @@ You can <?php echo $this->Html->link('reset', array('controller' => 'users', 'ac
<p></p>
<h3>NIDS Export</h3>
<p>An automatic export of all network related attributes is available under the Snort rule format. Only attributes marked as <u>to IDS</u> are exported.</p>
<p>An automatic export of all network related attributes is available under the Snort rule format. Only attributes marked as <em>to IDS</em> are exported.</p>
<p>You can configure your tools to automatically download the following following file:</p>
<pre><?php echo Configure::read('CyDefSIG.baseurl');?>/events/nids/<?php echo $me['authkey']; ?></pre>
<p></p>

8
app/View/Events/index.ctp
View File

@ -12,7 +12,7 @@
<th class="actions"><?php echo __('Actions');?></th>
</tr>
<?php
foreach ($events as $event):
foreach ($events as $event):
?>
<tr>
<td class="short" onclick="document.location ='<?php echo $this->Html->url(array('action' => 'view', $event['Event']['id']), true) ;?>';">
@ -29,15 +29,15 @@
<td onclick="document.location ='<?php echo $this->Html->url(array('action' => 'view', $event['Event']['id']), true) ;?>';">
<?php echo nl2br(Sanitize::html($event['Event']['info'])); ?>&nbsp;</td>
<td class="actions">
<?php
<?php
if (0 == $event['Event']['alerted'] && ($isAdmin || $event['Event']['org'] == $me['org']))
echo $this->Form->postLink('Publish Event', array('action' => 'alert', $event['Event']['id']), null, 'Are you sure this event is complete and everyone should be alerted?');
elseif (0 == $event['Event']['alerted']) echo 'Not published';
?>
<?php
<?php
if ($isAdmin || $event['Event']['org'] == $me['org']) {
echo $this->Html->link(__('Edit', true), array('action' => 'edit', $event['Event']['id']));
echo $this->Form->postLink(__('Delete'), array('action' => 'delete', $event['Event']['id']), null, __('Are you sure you want to delete # %s?', $event['Event']['id']));
echo $this->Form->postLink(__('Delete'), array('action' => 'delete', $event['Event']['id']), null, __('Are you sure you want to delete # %s?', $event['Event']['id']));
}
?>
<?php echo $this->Html->link(__('View', true), array('action' => 'view', $event['Event']['id'])); ?>

23
app/View/Events/view.ctp
View File

@ -1,9 +1,9 @@
<div class="events view">
<div class="actions" style="float:right;">
<?php if ( 0 == $event['Event']['alerted'] && ($isAdmin || $event['Event']['org'] == $me['org'])):
// only show button if alert has not been sent // LATER show the ALERT button in red-ish
<?php if ( 0 == $event['Event']['alerted'] && ($isAdmin || $event['Event']['org'] == $me['org'])):
// only show button if alert has not been sent // LATER show the ALERT button in red-ish
?>
<ul><li><?php
<ul><li><?php
echo $this->Form->postLink('Publish Event', array('action' => 'alert', $event['Event']['id']), null, 'Are you sure this event is complete and everyone should be alerted?');
?> </li></ul>
<?php elseif (0 == $event['Event']['alerted']): ?>
@ -56,14 +56,15 @@
<h3>Related Events</h3>
<ul>
<?php foreach ($relatedEvents as $relatedEvent): ?>
<li><?php
<li><?php
$link_text = $relatedEvent['Event']['date'].' ('.$relatedEvent['Event']['id'].')';
echo $this->Html->link($link_text, array('controller' => 'events', 'action' => 'view', $relatedEvent['Event']['id']));
?></li>
<?php endforeach; ?>
</ul>
</div>
<?php endif; ?>
<div class="related">
<h3>Attributes</h3>
<?php if (!empty($event['Signature'])):?>
@ -87,10 +88,10 @@
echo $signature['category'];
} else {
echo '&nbsp;';
}
}
?></td>
<td class="short"><?php echo $signature['type'];?></td>
<td><?php
<td><?php
$sig_display = nl2br(Sanitize::html($signature['value']));
if('attachment' == $signature['type'] ||
'malware-sample' == $signature['type']) {
@ -106,7 +107,7 @@
if (null != $relatedSignatures[$signature['id']]) {
foreach ($relatedSignatures[$signature['id']] as $relatedSignature) {
echo $this->Html->link($relatedSignature['Signature']['event_id'], array('controller' => 'events', 'action' => 'view', $relatedSignature['Signature']['event_id']));
echo ' ';
echo ' ';
}
}
?>
@ -114,9 +115,9 @@
<td class="short" style="text-align: center;"><?php echo $signature['to_ids'] ? 'Yes' : 'No';?></td>
<td class="actions">
<?php
if ($isAdmin || $event['Event']['org'] == $me['org']) {
echo $this->Html->link(__('Edit', true), array('controller' => 'signatures', 'action' => 'edit', $signature['id']));
echo $this->Form->postLink(__('Delete'), array('controller' => 'signatures', 'action' => 'delete', $signature['id']), null, __('Are you sure you want to delete this attribute?'));
if ($isAdmin || $event['Event']['org'] == $me['org']) {
echo $this->Html->link(__('Edit', true), array('controller' => 'signatures', 'action' => 'edit', $signature['id']));
echo $this->Form->postLink(__('Delete'), array('controller' => 'signatures', 'action' => 'delete', $signature['id']), null, __('Are you sure you want to delete this attribute?'));
} ?>
</td>
</tr>

6
app/View/Layouts/default.ctp
View File

@ -30,7 +30,7 @@
echo $this->Html->css('cake.generic');
echo $this->Html->css(array('print'), 'stylesheet', array('media' => 'print'));
echo $this->fetch('meta');
echo $this->fetch('css');
echo $this->fetch('script');
@ -39,7 +39,7 @@
<body>
<div id="container">
<div id="header">
<h1><?php echo $this->Html->link(Configure::read('CyDefSIG.header'), array('controller' => 'events', 'action' => 'index')); ?>
<h1><?php echo $this->Html->link(Configure::read('CyDefSIG.header'), array('controller' => 'events', 'action' => 'index')); ?></h1>
<?php if($logo = Configure::read('CyDefSIG.logo')) {
echo "<img src=\"$logo\" align=\"right\" height=\"30\">";
}?>
@ -57,7 +57,7 @@
<div id="footer">
<h1 style="float:left;">Download: <?php echo $this->Html->link('PGP/GPG key', '/gpg.asc');?></h1>
<h1 style="float:right;"> <?php echo $this->Html->link(__('Log out', true), array('controller' => 'users', 'action' => 'logout'));?></h1>
<h1 style="text-align:center;"><?php echo Configure::read('CyDefSIG.footer')?></h1>
</div>
</div>

16
app/View/Users/news.ctp
View File

@ -2,10 +2,10 @@
<h2>News</h2>
<h3>March 2012</h3>
<p><b>Printing</b><br/>
A special CSS exists now to give a better layout when printing pages.
A special CSS exists now to give a better layout when printing pages.
All the pages should now look a lot better on paper.</p>
<p><b>File upload</b><br/>
Andrzej Dereszowski (NCIRC) added the file-uploading functionality.
Andrzej Dereszowski (NCIRC) added the file-uploading functionality.
</p>
<p><b>Backend rewrite + security</b><br/>
Complete rewrite of the backend code to migrate to CakePHP 2.x (from CakePHP 1.3). <br/>
@ -13,16 +13,16 @@ During this rewrite the code was cleaned up, CSRF protection should now be prese
Password strength validation and better security has been implemented.<br/>
Signatures are now known as Attributes.<br/>
Many known bugs have been fixed.<br/>
Some intermittent bugs might have slipped in during the (manual) conversion. Please contact me <a href="mailto:user1088@qet.be">user1088@qet.be</a> to report any issues.
Some intermittent bugs might have slipped in during the (manual) conversion. Please contact me <a href="mailto:user1088@qet.be">user1088@qet.be</a> to report any issues.
</p>
<h3>March 2012</h3>
<p><b>Terms and News</b><br/>
Terms and conditions have been enabled. You should only see this page once.<br/>
When new software updates of CyDefSIG are installed you will see the news page.</p>
When new software updates of CyDefSIG are installed you will see the news page.</p>
<h3>February 2012</h3>
<p><b>Automation</b><br/>
It is now possible to batch import attributes. To do this simply check the
It is now possible to batch import attributes. To do this simply check the
<em>batch import</em> box and insert one attribute per line in the value field.</p>
<p><b>Network IDS</b><br/>
You can now customize your <em>NIDS start SID</em> in your profile.<br/>
@ -51,12 +51,12 @@ Using the members list button you can see a list of the organisations and the nu
<p><b>Security Improvements</b><br/>
XSRF protection has been added on some (but not yet all) pages.<br/>
You can now reset your authentication key (key for automatic exports) if it is compromised.<br/>
The authkey generation algorithm has also been improved.</p>
You can now reset your authentication key (key for automatic exports) if it is compromised.<br/>
The authkey generation algorithm has also been improved.</p>
<p><b>Network IDS Export</b><br/>
A bug in the DNS attributes has been corrected.</p>
</p>
</div>
<div class="actions">