diff --git a/app/View/Attributes/add.ctp b/app/View/Attributes/add.ctp
index a7c28f5c3..ff10e3f44 100755
--- a/app/View/Attributes/add.ctp
+++ b/app/View/Attributes/add.ctp
@@ -1,124 +1,124 @@
-
-<div class="attributes form">
-<?php echo $this->Form->create('Attribute');?>
-	<fieldset>
-		<legend><?php echo __('Add Attribute'); ?></legend>
-<?php
-echo $this->Form->hidden('event_id');
-echo $this->Form->input('category', array(
-		'between' => $this->Html->div('forminfo', '', array('id' => 'AttributeCategoryDiv')),
-		'empty' => '(choose one)'
-		));
-echo $this->Form->input('type', array(
-		'between' => $this->Html->div('forminfo', '', array('id' => 'AttributeTypeDiv')),
-		'empty' => '(first choose category)'
-		));
-if ('true' == Configure::read('CyDefSIG.sync')) {
-	if ('true' == Configure::read('CyDefSIG.private')) {
-		echo $this->Form->input('distribution', array('label' => 'Distribution', 'selected' => $maxDist,
-			'between' => $this->Html->div('forminfo', '', array('id' => 'AttributeDistributionDiv'))
-		));
-	} else {
-		echo $this->Form->input('private', array(
-			'before' => $this->Html->div('forminfo', isset($attrDescriptions['private']['formdesc']) ? $attrDescriptions['private']['formdesc'] : $attrDescriptions['private']['desc']),
-		));
-	}
-}
-echo $this->Form->input('to_ids', array(
-			'checked' => true,
-			'before' => $this->Html->div('forminfo', isset($attrDescriptions['signature']['formdesc']) ? $attrDescriptions['signature']['formdesc'] : $attrDescriptions['signature']['desc']),
-			'label' => 'IDS Signature?'
-));
-echo $this->Form->input('value', array(
-			'type' => 'textarea',
-			'error' => array('escape' => false),
-));
-echo $this->Form->input('batch_import', array(
-			'type' => 'checkbox',
-			'after' => $this->Html->div('forminfo', 'Create multiple attributes one per line'),
-));
-
-// link an onchange event to the form elements
-$this->Js->get('#AttributeCategory')->event('change', 'formCategoryChanged("#AttributeCategory")');
-$this->Js->get('#AttributeType')->event('change', 'showFormInfo("#AttributeType")');
-$this->Js->get('#AttributeDistribution')->event('change', 'showFormInfo("#AttributeDistribution")');
-?>
-	</fieldset>
-<?php echo $this->Form->end(__('Submit'));?>
-</div>
-<div class="actions">
-	<ul>
-		<?php echo $this->element('actions_menu'); ?>
-	</ul>
-</div>
-<script type="text/javascript">
-//
-//Generate Category / Type filtering array
-//
-var category_type_mapping = new Array();
-<?php
-foreach ($categoryDefinitions as $category => $def) {
-	echo "category_type_mapping['" . addslashes($category) . "'] = {";
-	$first = true;
-	foreach ($def['types'] as $type) {
-		if ($first) $first = false;
-		else echo ', ';
-		echo "'" . addslashes($type) . "' : '" . addslashes($type) . "'";
-	}
-	echo "}; \n";
-}
-?>
-
-function formCategoryChanged(id) {
-	showFormInfo(id); // display the tooltip
-	// fill in the types
-	var options = $('#AttributeType').prop('options');
-	$('option', $('#AttributeType')).remove();
-	$.each(category_type_mapping[$('#AttributeCategory').val()], function(val, text) {
-		options[options.length] = new Option(text, val);
-	});
-	// enable the form element
-	$('#AttributeType').prop('disabled', false);
-}
-
-
-//
-// Generate tooltip information
-//
-var formInfoValues = new Array();
-<?php
-foreach ($typeDefinitions as $type => $def) {
-	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
-	echo "formInfoValues['" . addslashes($type) . "'] = \"" . addslashes($info) . "\";\n";  // as we output JS code we need to add slashes
-}
-foreach ($categoryDefinitions as $category => $def) {
-	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
-	echo "formInfoValues['" . addslashes($category) . "'] = \"" . addslashes($info) . "\";\n"; // as we output JS code we need to add slashes
-}
-foreach ($distributionDescriptions as $type => $def) {
-	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
-	echo "formInfoValues['" . addslashes($type) . "'] = \"" . addslashes($info) . "\";\n";  // as we output JS code we need to add slashes
-}
-?>
-
-function showFormInfo(id) {
-	idDiv = id+'Div';
-	// LATER use nice animations
-	//$(idDiv).hide('fast');
-	// change the content
-	var value = $(id).val();    // get the selected value
-	$(idDiv).html(formInfoValues[value]);    // search in a lookup table
-
-	// show it again
-	$(idDiv).fadeIn('slow');
-}
-
-// hide the formInfo things
-$('#AttributeTypeDiv').hide();
-$('#AttributeCategoryDiv').hide();
-$('#AttributeType').prop('disabled', true);
-$('#AttributeDistributionDiv').hide();
-
-
-</script>
+
+<div class="attributes form">
+<?php echo $this->Form->create('Attribute');?>
+	<fieldset>
+		<legend><?php echo __('Add Attribute'); ?></legend>
+<?php
+echo $this->Form->hidden('event_id');
+echo $this->Form->input('category', array(
+		'between' => $this->Html->div('forminfo', '', array('id' => 'AttributeCategoryDiv')),
+		'empty' => '(choose one)'
+		));
+echo $this->Form->input('type', array(
+		'between' => $this->Html->div('forminfo', '', array('id' => 'AttributeTypeDiv')),
+		'empty' => '(first choose category)'
+		));
+if ('true' == Configure::read('CyDefSIG.sync')) {
+	if ('true' == Configure::read('CyDefSIG.private')) {
+		echo $this->Form->input('distribution', array('label' => 'Distribution', 'selected' => $maxDist,
+			'between' => $this->Html->div('forminfo', '', array('id' => 'AttributeDistributionDiv'))
+		));
+	} else {
+		echo $this->Form->input('private', array(
+			'before' => $this->Html->div('forminfo', isset($attrDescriptions['private']['formdesc']) ? $attrDescriptions['private']['formdesc'] : $attrDescriptions['private']['desc']),
+		));
+	}
+}
+echo $this->Form->input('to_ids', array(
+			'checked' => true,
+			'before' => $this->Html->div('forminfo', isset($attrDescriptions['signature']['formdesc']) ? $attrDescriptions['signature']['formdesc'] : $attrDescriptions['signature']['desc']),
+			'label' => 'IDS Signature?'
+));
+echo $this->Form->input('value', array(
+			'type' => 'textarea',
+			'error' => array('escape' => false),
+));
+echo $this->Form->input('batch_import', array(
+			'type' => 'checkbox',
+			'after' => $this->Html->div('forminfo', 'Create multiple attributes one per line'),
+));
+
+// link an onchange event to the form elements
+$this->Js->get('#AttributeCategory')->event('change', 'formCategoryChanged("#AttributeCategory")');
+$this->Js->get('#AttributeType')->event('change', 'showFormInfo("#AttributeType")');
+$this->Js->get('#AttributeDistribution')->event('change', 'showFormInfo("#AttributeDistribution")');
+?>
+	</fieldset>
+<?php echo $this->Form->end(__('Submit'));?>
+</div>
+<div class="actions">
+	<ul>
+		<?php echo $this->element('actions_menu'); ?>
+	</ul>
+</div>
+<script type="text/javascript">
+//
+//Generate Category / Type filtering array
+//
+var category_type_mapping = new Array();
+<?php
+foreach ($categoryDefinitions as $category => $def) {
+	echo "category_type_mapping['" . addslashes($category) . "'] = {";
+	$first = true;
+	foreach ($def['types'] as $type) {
+		if ($first) $first = false;
+		else echo ', ';
+		echo "'" . addslashes($type) . "' : '" . addslashes($type) . "'";
+	}
+	echo "}; \n";
+}
+?>
+
+function formCategoryChanged(id) {
+	showFormInfo(id); // display the tooltip
+	// fill in the types
+	var options = $('#AttributeType').prop('options');
+	$('option', $('#AttributeType')).remove();
+	$.each(category_type_mapping[$('#AttributeCategory').val()], function(val, text) {
+		options[options.length] = new Option(text, val);
+	});
+	// enable the form element
+	$('#AttributeType').prop('disabled', false);
+}
+
+
+//
+// Generate tooltip information
+//
+var formInfoValues = new Array();
+<?php
+foreach ($typeDefinitions as $type => $def) {
+	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
+	echo "formInfoValues['" . addslashes($type) . "'] = \"" . addslashes($info) . "\";\n";  // as we output JS code we need to add slashes
+}
+foreach ($categoryDefinitions as $category => $def) {
+	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
+	echo "formInfoValues['" . addslashes($category) . "'] = \"" . addslashes($info) . "\";\n"; // as we output JS code we need to add slashes
+}
+foreach ($distributionDescriptions as $type => $def) {
+	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
+	echo "formInfoValues['" . addslashes($type) . "'] = \"" . addslashes($info) . "\";\n";  // as we output JS code we need to add slashes
+}
+?>
+
+function showFormInfo(id) {
+	idDiv = id+'Div';
+	// LATER use nice animations
+	//$(idDiv).hide('fast');
+	// change the content
+	var value = $(id).val();    // get the selected value
+	$(idDiv).html(formInfoValues[value]);    // search in a lookup table
+
+	// show it again
+	$(idDiv).fadeIn('slow');
+}
+
+// hide the formInfo things
+$('#AttributeTypeDiv').hide();
+$('#AttributeCategoryDiv').hide();
+$('#AttributeType').prop('disabled', true);
+$('#AttributeDistributionDiv').hide();
+
+
+</script>
 <?php echo $this->Js->writeBuffer(); // Write cached scripts
\ No newline at end of file
diff --git a/app/View/Attributes/add_attachment.ctp b/app/View/Attributes/add_attachment.ctp
index 35f918132..d0c99049e 100755
--- a/app/View/Attributes/add_attachment.ctp
+++ b/app/View/Attributes/add_attachment.ctp
@@ -1,143 +1,143 @@
-<div class="attributes form">
-<?php echo $this->Form->create('Attribute', array('enctype' => 'multipart/form-data','onSubmit' => 'document.getElementById("AttributeMalware").removeAttribute("disabled");'));?>
-	<fieldset>
-			<legend><?php echo __('Add Attachment'); ?></legend>
-<?php
-echo $this->Form->hidden('event_id');
-echo $this->Form->input('category', array('between' => $this->Html->div('forminfo', '', array('id' => 'AttributeCategoryDiv'))));
-echo $this->Form->file('value', array(
-	'error' => array('escape' => false),
-));
-echo $this->Form->input('malware', array(
-		'type' => 'checkbox',
-		'checked' => false,
-		'after' => '<br>Tick this box to neutralize the sample. Every malware sample will be zipped with the password "infected"',
-));
-if ('true' == Configure::read('CyDefSIG.sync')) {
-	if ('true' == Configure::read('CyDefSIG.private')) {
-		echo $this->Form->input('distribution', array('label' => 'Distribution', 'selected' => $maxDist,
-			'between' => $this->Html->div('forminfo', '', array('id' => 'AttributeDistributionDiv'))
-		));
-		//'before' => $this->Html->div('forminfo', isset($attrDescriptions['distribution']['formdesc']) ? $attrDescriptions['distribution']['formdesc'] : $attrDescriptions['distribution']['desc']),));
-	} else {
-		echo $this->Form->input('private', array(
-			'before' => $this->Html->div('forminfo', isset($attrDescriptions['private']['formdesc']) ? $attrDescriptions['private']['formdesc'] : $attrDescriptions['private']['desc']),));
-	}
-}
-// link an onchange event to the form elements
-$this->Js->get('#AttributeType')->event('change', 'showFormInfo("#AttributeType")');
-$this->Js->get('#AttributeCategory')->event('change', 'showFormInfo("#AttributeCategory")');
-$this->Js->get('#AttributeDistribution')->event('change', 'showFormInfo("#AttributeDistribution")');
-?>
-	</fieldset>
-<?php echo $this->Form->end(__('Upload'));?>
-</div>
-<div class="actions">
-	<ul>
-		<?php echo $this->element('actions_menu'); ?>
-	</ul>
-</div>
-
-<script type="text/javascript">
-var formInfoValues = new Array();
-<?php
-foreach ($categoryDefinitions as $category => $def) {
-	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
-	echo "formInfoValues['$category'] = \"$info\";\n";
-}
-foreach ($distributionDescriptions as $type => $def) {
-	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
-	echo "formInfoValues['" . addslashes($type) . "'] = \"" . addslashes($info) . "\";\n";  // as we output JS code we need to add slashes
-}
-?>
-
-var formZipTypeValues = new Array();
-<?php
-foreach ($categoryDefinitions as $category => $def) {
-	$types = $def['types'];
-	$alreadySet = false;
-	foreach ($types as $type) {
-		if (in_array($type, $zippedDefinitions) && !$alreadySet) {
-			$alreadySet = true;
-			echo "formZipTypeValues['$category'] = \"true\";\n";
-		}
-	}
-	if (!$alreadySet) {
-		echo "formZipTypeValues['$category'] = \"false\";\n";
-	}
-}
-?>
-
-var formAttTypeValues = new Array();
-<?php
-foreach ($categoryDefinitions as $category => $def) {
-	$types = $def['types'];
-	$alreadySet = false;
-	foreach ($types as $type) {
-		if (in_array($type, $uploadDefinitions) && !$alreadySet) {
-			$alreadySet = true;
-			echo "formAttTypeValues['$category'] = \"true\";\n";
-		}
-	}
-	if (!$alreadySet) {
-		echo "formAttTypeValues['$category'] = \"false\";\n";
-	}
-}
-?>
-
-function showFormType(id) {
-	idDiv = id+'Div';
-	// LATER use nice animations
-	//$(idDiv).hide('fast');
-	// change the content
-	var value = $(id).val();	// get the selected value
-	//$(idDiv).html(formInfoValues[value]);	// search in a lookup table
-
-	// do checkbox un/ticked when the document is changed
-	if (formZipTypeValues[value] == "true") {
-		document.getElementById("AttributeMalware").setAttribute("checked", "checked");
-		if (formAttTypeValues[value] == "false") document.getElementById("AttributeMalware").setAttribute("disabled", "disabled");
-		else document.getElementById("AttributeMalware").removeAttribute("disabled");
-	} else {
-		document.getElementById("AttributeMalware").removeAttribute("checked");
-		if (formAttTypeValues[value] == "true") document.getElementById("AttributeMalware").setAttribute("disabled", "disabled");
-		else document.getElementById("AttributeMalware").removeAttribute("disabled");
-	}
-}
-
-function showFormInfo(id) {
-	idDiv = id+'Div';
-	// LATER use nice animations
-	//$(idDiv).hide('fast');
-	// change the content
-	var value = $(id).val();	// get the selected value
-	$(idDiv).html(formInfoValues[value]);	// search in a lookup table
-
-	// show it again
-	$(idDiv).fadeIn('slow');
-
-	// do checkbox un/ticked when the document is changed
-	if (formZipTypeValues[value] == "true") {
-		document.getElementById("AttributeMalware").setAttribute("checked", "checked");
-		if (formAttTypeValues[value] == "false") document.getElementById("AttributeMalware").setAttribute("disabled", "disabled");
-		else document.getElementById("AttributeMalware").removeAttribute("disabled");
-	} else {
-		document.getElementById("AttributeMalware").removeAttribute("checked");
-		if (formAttTypeValues[value] == "true") document.getElementById("AttributeMalware").setAttribute("disabled", "disabled");
-		else document.getElementById("AttributeMalware").removeAttribute("disabled");
-	}
-}
-
-// hide the formInfo things
-$('#AttributeTypeDiv').hide();
-$('#AttributeCategoryDiv').hide();
-$(function(){
-	// do checkbox un/ticked when the document is ready
-	showFormType("#AttributeCategory");
-	}
-);
-
-//hide the formInfo things
-$('#AttributeDistributionDiv').hide();
-</script>
+<div class="attributes form">
+<?php echo $this->Form->create('Attribute', array('enctype' => 'multipart/form-data','onSubmit' => 'document.getElementById("AttributeMalware").removeAttribute("disabled");'));?>
+	<fieldset>
+			<legend><?php echo __('Add Attachment'); ?></legend>
+<?php
+echo $this->Form->hidden('event_id');
+echo $this->Form->input('category', array('between' => $this->Html->div('forminfo', '', array('id' => 'AttributeCategoryDiv'))));
+echo $this->Form->file('value', array(
+	'error' => array('escape' => false),
+));
+echo $this->Form->input('malware', array(
+		'type' => 'checkbox',
+		'checked' => false,
+		'after' => '<br>Tick this box to neutralize the sample. Every malware sample will be zipped with the password "infected"',
+));
+if ('true' == Configure::read('CyDefSIG.sync')) {
+	if ('true' == Configure::read('CyDefSIG.private')) {
+		echo $this->Form->input('distribution', array('label' => 'Distribution', 'selected' => $maxDist,
+			'between' => $this->Html->div('forminfo', '', array('id' => 'AttributeDistributionDiv'))
+		));
+		//'before' => $this->Html->div('forminfo', isset($attrDescriptions['distribution']['formdesc']) ? $attrDescriptions['distribution']['formdesc'] : $attrDescriptions['distribution']['desc']),));
+	} else {
+		echo $this->Form->input('private', array(
+			'before' => $this->Html->div('forminfo', isset($attrDescriptions['private']['formdesc']) ? $attrDescriptions['private']['formdesc'] : $attrDescriptions['private']['desc']),));
+	}
+}
+// link an onchange event to the form elements
+$this->Js->get('#AttributeType')->event('change', 'showFormInfo("#AttributeType")');
+$this->Js->get('#AttributeCategory')->event('change', 'showFormInfo("#AttributeCategory")');
+$this->Js->get('#AttributeDistribution')->event('change', 'showFormInfo("#AttributeDistribution")');
+?>
+	</fieldset>
+<?php echo $this->Form->end(__('Upload'));?>
+</div>
+<div class="actions">
+	<ul>
+		<?php echo $this->element('actions_menu'); ?>
+	</ul>
+</div>
+
+<script type="text/javascript">
+var formInfoValues = new Array();
+<?php
+foreach ($categoryDefinitions as $category => $def) {
+	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
+	echo "formInfoValues['$category'] = \"$info\";\n";
+}
+foreach ($distributionDescriptions as $type => $def) {
+	$info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc'];
+	echo "formInfoValues['" . addslashes($type) . "'] = \"" . addslashes($info) . "\";\n";  // as we output JS code we need to add slashes
+}
+?>
+
+var formZipTypeValues = new Array();
+<?php
+foreach ($categoryDefinitions as $category => $def) {
+	$types = $def['types'];
+	$alreadySet = false;
+	foreach ($types as $type) {
+		if (in_array($type, $zippedDefinitions) && !$alreadySet) {
+			$alreadySet = true;
+			echo "formZipTypeValues['$category'] = \"true\";\n";
+		}
+	}
+	if (!$alreadySet) {
+		echo "formZipTypeValues['$category'] = \"false\";\n";
+	}
+}
+?>
+
+var formAttTypeValues = new Array();
+<?php
+foreach ($categoryDefinitions as $category => $def) {
+	$types = $def['types'];
+	$alreadySet = false;
+	foreach ($types as $type) {
+		if (in_array($type, $uploadDefinitions) && !$alreadySet) {
+			$alreadySet = true;
+			echo "formAttTypeValues['$category'] = \"true\";\n";
+		}
+	}
+	if (!$alreadySet) {
+		echo "formAttTypeValues['$category'] = \"false\";\n";
+	}
+}
+?>
+
+function showFormType(id) {
+	idDiv = id+'Div';
+	// LATER use nice animations
+	//$(idDiv).hide('fast');
+	// change the content
+	var value = $(id).val();	// get the selected value
+	//$(idDiv).html(formInfoValues[value]);	// search in a lookup table
+
+	// do checkbox un/ticked when the document is changed
+	if (formZipTypeValues[value] == "true") {
+		document.getElementById("AttributeMalware").setAttribute("checked", "checked");
+		if (formAttTypeValues[value] == "false") document.getElementById("AttributeMalware").setAttribute("disabled", "disabled");
+		else document.getElementById("AttributeMalware").removeAttribute("disabled");
+	} else {
+		document.getElementById("AttributeMalware").removeAttribute("checked");
+		if (formAttTypeValues[value] == "true") document.getElementById("AttributeMalware").setAttribute("disabled", "disabled");
+		else document.getElementById("AttributeMalware").removeAttribute("disabled");
+	}
+}
+
+function showFormInfo(id) {
+	idDiv = id+'Div';
+	// LATER use nice animations
+	//$(idDiv).hide('fast');
+	// change the content
+	var value = $(id).val();	// get the selected value
+	$(idDiv).html(formInfoValues[value]);	// search in a lookup table
+
+	// show it again
+	$(idDiv).fadeIn('slow');
+
+	// do checkbox un/ticked when the document is changed
+	if (formZipTypeValues[value] == "true") {
+		document.getElementById("AttributeMalware").setAttribute("checked", "checked");
+		if (formAttTypeValues[value] == "false") document.getElementById("AttributeMalware").setAttribute("disabled", "disabled");
+		else document.getElementById("AttributeMalware").removeAttribute("disabled");
+	} else {
+		document.getElementById("AttributeMalware").removeAttribute("checked");
+		if (formAttTypeValues[value] == "true") document.getElementById("AttributeMalware").setAttribute("disabled", "disabled");
+		else document.getElementById("AttributeMalware").removeAttribute("disabled");
+	}
+}
+
+// hide the formInfo things
+$('#AttributeTypeDiv').hide();
+$('#AttributeCategoryDiv').hide();
+$(function(){
+	// do checkbox un/ticked when the document is ready
+	showFormType("#AttributeCategory");
+	}
+);
+
+//hide the formInfo things
+$('#AttributeDistributionDiv').hide();
+</script>
 <?php echo $this->Js->writeBuffer(); // Write cached scripts
\ No newline at end of file