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

Merge branch 'develop' of ssh://misp.ncirc.nato.int/home/git/cydefsig into develop

pull/63/head
Noud de Brouwer 2012-12-17 17:35:01 +00:00
parent 8c7f8921a7 38506ecaf8
commit d5bcee63af
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Model/Event.php
View File

@ -46,7 +46,7 @@ class Event extends AppModel {
'Medium' => array('desc' => '*medium* means APT malware', 'formdesc' => 'APT malware'),
'High' => array('desc' => '*high* means sophisticated APT malware or 0-day attack', 'formdesc' => 'Sophisticated APT malware or 0-day attack')
);
public $analysisDescriptions = array(
0 => array('desc' => '*Initial* means the event has just been created', 'formdesc' => 'Creation started'),
1 => array('desc' => '*Sandbox* means that the event was created using a sandbox', 'formdesc' => 'Creation ongoing'),
@ -61,7 +61,7 @@ class Event extends AppModel {
'Connected communities' => array('desc' => 'This field determines the current distribution of the even', 'formdesc' => "Event visible to CyDefSIG instances with more then two servers but will not be shared past it"),
'All communities' => array('desc' => 'This field determines the current distribution of the even', 'formdesc' => "To be distributed to every connected CyDefSIG server"),
);
public $analysisLevels = array(
0 => 'Initial', 1 => 'Sandbox', 2 => 'Ongoing', 3 => 'Completed'
);
@ -100,8 +100,8 @@ class Event extends AppModel {
//'on' => 'create', // Limit validation to 'create' or 'update' operations
),
'analysis' => array(
'rule' => array('inList', array('0', '1', '2')),
'message' => 'Options : 0, 1, 2',
'rule' => array('inList', array('0', '1', '2', '3')),
'message' => 'Options : 0, 1, 2, 3',
//'allowEmpty' => false,
'required' => true,
//'last' => false, // Stop validation after this rule
@ -343,7 +343,7 @@ class Event extends AppModel {
break;
case 'Completed':
$data['Event']['analysis'] = 3;
break;
break;
}
return $data;
}

17
app/View/Users/change_pw.ctp Normal file
View File

@ -0,0 +1,17 @@
<div class="users form">
<?php echo $this->Form->create('User');?>
<fieldset>
<legend><?php echo __('Change Password'); ?></legend>
<?php
echo $this->Form->input('password');
echo $this->Form->input('confirm_password', array('type' => 'password', 'div' => array('class' => 'input password required')));
?>
</fieldset>
<?php echo $this->Form->end(__('Submit', true));?>
</div>
<div class="actions">
<ul>
<?php echo $this->element('actions_menu'); ?>
</ul>
</div>