Removed the js title bubble for related events

- Removed javascripts based title bubble showing the event info in related
  events / attributes and in the search attribute view.

- Replaced it with values provided by extra cake queries as the delay for
  fetching the info field through a js rest request was annoyingly slow

- some coding standards

app/Controller/AttributesController.php

@@ -53,7 +53,10 @@ class AttributesController extends AppController {
 								array(
 									'Event.org =' => $this->Auth->user('org'),
 									'AND' => array(
-										array('Attribute.distribution !=' => 'Your organization only'),
+										array('OR' => array(
+												array('Attribute.private !=' => 1),
+												array('Attribute.cluster =' => 1),
+											)),
 										array('OR' => array(
 												array('Event.private !=' => 1),
 												array('Event.cluster =' => 1),
@@ -568,7 +571,7 @@ class AttributesController extends AppController {
 
 			// enabling / disabling the distribution field in the edit view based on whether user's org == orgc in the event
 			$this->Event->read();
-			if(!$this->_isRest()) {
+			if (!$this->_isRest()) {
 				$canEditDist = false;
 				if ($this->Event->data['Event']['orgc'] == $this->_checkOrg()) {
 					$this->set('canEditDist', true);
@@ -758,14 +761,14 @@ class AttributesController extends AppController {
 						$keywordArrayElement = '%' . trim($keywordArrayElement) . '%';
 						if ($keywordArrayElement != '%%') array_push($temp, array('Attribute.value LIKE' => $keywordArrayElement));
 						if ($i == 1 && $saveWord != '') $keyWordText = $saveWord;
-						else if (($i > 1 && $i < 10) && $saveWord != '') $keyWordText = $keyWordText .', '. $saveWord;
+						else if (($i > 1 && $i < 10) && $saveWord != '') $keyWordText = $keyWordText . ', ' . $saveWord;
 						else if ($i == 10 && $saveWord != '') $keyWordText = $keyWordText . ' and several other keywords';
 						$i++;
 					}
 					$this->set('keywordSearch', $keyWordText);
-					if (!empty($temp)){
+					if (!empty($temp)) {
 						if (count($temp) == 1) {
-							$conditions['Attribute.value LIKE'] = '%'.$keyWordText.'%';
+							$conditions['Attribute.value LIKE'] = '%' . $keyWordText . '%';
 						} else {
 							$conditions['OR'] = $temp;
 						}
@@ -780,12 +783,12 @@ class AttributesController extends AppController {
 						if (!is_numeric($saveWord) || $saveWord < 1) continue;
 						array_push($temp, array('Attribute.event_id !=' => $keywordArrayElement));
 						if ($i == 1 && $saveWord != '') $keyWordText2 = $saveWord;
-						else if (($i > 1 && $i < 10) && $saveWord != '') $keyWordText2 = $keyWordText2 .', '. $saveWord;
+						else if (($i > 1 && $i < 10) && $saveWord != '') $keyWordText2 = $keyWordText2 . ', ' . $saveWord;
 						else if ($i == 10 && $saveWord != '') $keyWordText2 = $keyWordText2 . ' and several other events';
 						$i++;
 					}
 					$this->set('keywordSearch2', $keyWordText2);
-					if (!empty($temp)){
+					if (!empty($temp)) {
 						if (count($temp) == 1) {
 							$conditions['Attribute.event_id !='] = $keyWordText2;
 						} else {
@@ -825,9 +828,9 @@ class AttributesController extends AppController {
 					foreach ($keywordArray as $keywordArrayElement) {
 						$keywordArrayElement = trim($keywordArrayElement);
 						if ($attribute['Attribute']['type'] == 'malware-sample' || $attribute['Attribute']['type'] == 'link' || $attribute['Attribute']['type'] == 'attachment') {
-							$attribute['Attribute']['valueNoScript'] = preg_replace('%'.$keywordArrayElement.'%i', $keywordArrayElement, $attribute['Attribute']['value']);
+							$attribute['Attribute']['valueNoScript'] = preg_replace('%' . $keywordArrayElement . '%i', $keywordArrayElement, $attribute['Attribute']['value']);
 						}
-						$attribute['Attribute']['value'] = preg_replace('%'.$keywordArrayElement.'%i', '<span style="color:red">'.$keywordArrayElement.'</span>', $attribute['Attribute']['value']);
+						$attribute['Attribute']['value'] = preg_replace('%' . $keywordArrayElement . '%i', '<span style="color:red">' . $keywordArrayElement . '</span>', $attribute['Attribute']['value']);
 					}
 				}
 				$this->set('attributes', $attributes);

app/Controller/EventsController.php

@@ -181,6 +181,7 @@ class EventsController extends AppController {
 
 		$relatedAttributes = array();
 		$this->loadModel('Attribute');
+		$this->loadModel('Event');
 		if ('db' == Configure::read('CyDefSIG.correlation')) {
 			$this->loadModel('Correlation');
 			$fields = array('Correlation.event_id', 'Correlation.attribute_id', 'Correlation.date');
@@ -225,19 +226,31 @@ class EventsController extends AppController {
 				// This is a lot faster (only additional query) than $this->Event->getRelatedEvents()
 				$relatedEventIds = array();
 				$relatedEventDates = array();
+				$relatedEventInfos = array();
 				$relatedEvents = array();
 				foreach ($relatedAttributes as &$relatedAttribute) {
 					if (null == $relatedAttribute) continue;
 					foreach ($relatedAttribute as &$item) {
 						$relatedEventsIds[] = $item['Attribute']['event_id'];
 						$relatedEventsDates[$item['Attribute']['event_id']] = $item['Attribute']['date'];
+						$temp = $this->Event->find('first', array(
+								'conditions' => array('Event.id' => $item['Attribute']['event_id']),
+								'fields' => array('info'),
+								'recursive' => 0,
+								));
+						$item['Attribute']['event_info'] = $temp['Event']['info'];
+						$relatedEventInfos[$item['Attribute']['event_id']] = $temp['Event']['info'];
 					}
 				}
-
 				if (isset($relatedEventsDates)) {
 					foreach ($relatedEventsDates as $key => $relatedEventsDate) {
 						$relatedEvents[] = array('Event' => array('id' => $key, 'date' => $relatedEventsDate));
 					}
+					$i = 0;
+					foreach ($relatedEventInfos as $info) {
+						$relatedEvents[$i]['Event']['info'] = $info;
+						$i++;
+					}
 				}
 				usort($relatedEvents, array($this, 'compareRelatedEvents'));
 			}
@@ -280,7 +293,7 @@ class EventsController extends AppController {
 				$findParams = array(
 						'conditions' => array('OR' => array('Event.id' => $relatedEventsIds)), //array of conditions
 						'recursive' => 0, //int
-						'fields' => array('Event.id', 'Event.date', 'Event.uuid'), //array of field names
+						'fields' => array('Event.id', 'Event.date', 'Event.uuid', 'Event.info'), //array of field names
 						'order' => array('Event.date DESC'), //string or array defining order
 				);
 				$relatedEvents = $this->Event->find('all', $findParams);
@@ -312,7 +325,6 @@ class EventsController extends AppController {
 			}
 		}
 		$this->set('event', $event);
-
 		$this->set('relatedEvents', $relatedEvents);
 
 		$this->set('categories', $this->Attribute->validate['category']['rule'][1]);
@@ -522,7 +534,7 @@ class EventsController extends AppController {
 			}
 		}
 		if (!$this->_isRest()) {
-			if ($this->Event->data['Event']['org'] != $this->_checkOrg()){
+			if ($this->Event->data['Event']['org'] != $this->_checkOrg()) {
 				// throw new MethodNotAllowedException();
 				$this->Session->setFlash(__('Invalid event.'));
 				$this->redirect(array('controller' => 'events', 'action' => 'index'));
@@ -1297,7 +1309,7 @@ class EventsController extends AppController {
 		$params = array('conditions' => $conditions,
 				'recursive' => 1,
 				'fields' => $fields,
-				'contain' =>array(
+				'contain' => array(
 					'Attribute' => array(
 						'fields' => $fieldsAtt,
 						'conditions' => $conditionsAttributes,
@@ -1486,7 +1498,6 @@ class EventsController extends AppController {
 
 		$this->loadModel('Attribute');
 
-
 		//restricting to non-private or same org if the user is not a site-admin.
 		$conditions['AND'] = array('Attribute.type' => $type);
 		if (!$this->isSiteAdmin()) {
@@ -1499,7 +1510,6 @@ class EventsController extends AppController {
 			$conditions['OR'] = $temp;
 		}
 
-
 		$params = array(
 				'conditions' => $conditions, //array of conditions
 				'recursive' => 0, //int

app/Model/Attribute.php

@@ -383,7 +383,6 @@ class Attribute extends AppModel {
 				$this->data['Attribute']['value1'] = $total;
 				$this->data['Attribute']['value2'] = '';
 			}
-			//}
 		}
 		// always return true after a beforeSave()
 		return true;

app/Model/Regexp.php

@@ -15,6 +15,7 @@ class Regexp extends AppModel {
 					'change' => 'full'
 			),
 	);
+
 /**
  * Use table
  *
@@ -23,6 +24,7 @@ class Regexp extends AppModel {
 	public $useTable = 'regexp';
 
 	// this checks whether the regexp would fail and if yes, the entry is blocked from being entered.
+
 	public function beforeValidate($options = array()) {
 		$test = preg_replace($this->data['Regexp']['regexp'], 'success', $this->data['Regexp']['regexp']);
 		if ($test == null) return false;

app/View/Attributes/index.ctp

@@ -1,19 +1,3 @@
-<script>
-function getTitle(incInt, id){
-	if (document.getElementById(incInt).title == "Loading event info..."){
-		$.ajax({
-			type: 'GET',
-			url: "/events/"+id+".xml",
-			dataType: 'xml',
-			async:true,
-			success:function(result){
-				var returnData = $(result).find("info").text();
-				document.getElementById(incInt).title=returnData;
-			},
-		});
-	};
-}
-</script>
 <div class="attributes index">
 	<h2><?php echo __('Attributes');?></h2>
 		<?php
@@ -41,7 +25,7 @@ foreach ($attributes as $attribute): ?>
 	<tr>
 		<td class="short">
 			<?php
-				echo "<div id = \"" . $attribute['Attribute']['id'] . "\" onMouseOver=getTitle(" . $attribute['Attribute']['id'] . "," . $attribute['Event']['id'] . ") title = \"Loading event info...\">";
+				echo "<div id = \"" . $attribute['Attribute']['id'] . "\" title = \"".h($attribute['Event']['info'])."\">";
 				echo $this->Html->link($attribute['Event']['id'], array('controller' => 'events', 'action' => 'view', $attribute['Event']['id']));
 				$currentCount++;
 			?>

app/View/Events/view.ctp

@@ -1,30 +1,3 @@
-<script>
-function getTitle(incInt, incIntb, incIntc){
-	id = incInt;
-	type = null;
-	if (incIntb==0){
-		type = "R";
-	}else{
-		type = "A";
-	}
-	findElementString = type+id;
-	if (type == "A"){
-		findElementString += "X"+incIntc;
-	}
-	if (document.getElementById(findElementString).title == "Loading event info..."){
-		$.ajax({
-			type: 'GET',
-			url: "/events/"+id+".xml",
-			dataType: 'xml',
-			async:false,
-			success:function(result){
-				var returnData = $(result).find("info").text();
-				document.getElementById(findElementString).title=returnData;
-			},
-		});
-	};
-}
-</script>
 <?php
 $mayModify = (($isAclModify && $event['Event']['user_id'] == $me['id']) || ($isAclModifyOrg && $event['Event']['org'] == $me['org']));
 $mayPublish = ($isAclPublish && $event['Event']['org'] == $me['org']);
@@ -129,7 +102,6 @@ endif; ?>
 		</dd>
 	</dl>
 <?php
-	$passAlong = array(0, 0);
 if (!empty($relatedEvents)):?>
 	<div class="related">
 		<h3>Related Events</h3>
@@ -138,9 +110,7 @@ if (!empty($relatedEvents)):?>
 	foreach ($relatedEvents as $relatedEvent): ?>
 		<li><?php
 		$linkText = $relatedEvent['Event']['date'] . ' (' . $relatedEvent['Event']['id'] . ')';
-		$currentID = $relatedEvent['Event']['id'];
+		echo "<div \" title = \"".$relatedEvent['Event']['info']."\">";
-		$passAlong[0] = $relatedEvent['Event']['id'];
-		echo "<div id = \"R" . $currentID . "\" onMouseOver=getTitle(" . $passAlong[0] . "," . $passAlong[1] . ") title = \"Loading event info...\">";
 		echo $this->Html->link($linkText, array('controller' => 'events', 'action' => 'view', $relatedEvent['Event']['id']));
 		?></li>
 		<?php
@@ -178,7 +148,6 @@ if (!empty($event['Attribute'])):?>
 			<?php
 	endif;?>
 		</tr><?php
-	$passAlong = array(0, 1, 0);
 	foreach ($categories as $category):
 		$first = 1;
 		foreach ($event['Attribute'] as $attribute):
@@ -224,12 +193,10 @@ if (!empty($event['Attribute'])):?>
 			$first = 0;
 			if (isset($relatedAttributes[$attribute['id']]) && (null != $relatedAttributes[$attribute['id']])) {
 				foreach ($relatedAttributes[$attribute['id']] as $relatedAttribute) {
-					$passAlong[0] = $relatedAttribute['Attribute']['event_id'];
+					echo "<span title = \"".$relatedAttribute['Attribute']['event_info']."\">";
-					echo "<span id = \"A" . $passAlong[0] . "X" . $passAlong[2] . "\" onMouseOver=getTitle(" . $passAlong[0] . "," . $passAlong[1] . "," . $passAlong[2] . ") title = \"Loading event info...\">";
 					echo $this->Html->link($relatedAttribute['Attribute']['event_id'], array('controller' => 'events', 'action' => 'view', $relatedAttribute['Attribute']['event_id']));
 					echo "</span>";
 					echo ' ';
-					$passAlong[2]++;
 				}
 			}
 				?>&nbsp;