From 9fae7a21933b6fe81aa9ff5fa8602c3a7782af23 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 25 Nov 2014 13:21:25 +0100
Subject: [PATCH] Alternate event org display

- shows both orgc and org to normal users
- naming convention changed (orgc => source org, org => member org)
- this should allow users to see if an event was generated on their instance or not.
---
 app/Model/Server.php      |  8 +++++++
 app/View/Events/index.ctp | 28 +++++++++++++++---------
 app/View/Events/view.ctp  | 46 +++++++++++++++++++++++++++------------
 3 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index c35dc67a5..99aa3d53f 100755
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -373,6 +373,14 @@ class Server extends AppModel {
 							'test' => 'testForTermsFile',
 							'type' => 'string'
 					),
+					'showorgalternate' => array(
+							'level' => 2,
+							'description' => 'True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance.',
+							'value' => '',
+							'errorMessage' => '',
+							'test' => 'testBool',
+							'type' => 'boolean'
+					),
 			),
 			'GnuPG' => array(
 					'branch' => 1,
diff --git a/app/View/Events/index.ctp b/app/View/Events/index.ctp
index c17383778..a3e14fa4d 100755
--- a/app/View/Events/index.ctp
+++ b/app/View/Events/index.ctp
@@ -46,16 +46,24 @@
 				<?php echo $this->Paginator->sort('published');?>
 			</th>
 			<?php
-			if (Configure::read('MISP.showorg') || $isAdmin): ?>
-				<th class="filter"><?php echo $this->Paginator->sort('org'); ?></th>
-			<?php
-			endif;
+				if (Configure::read('MISP.showorgalternate') && Configure::read('MISP.showorg')):
+			?>
+				<th class="filter"><?php echo $this->Paginator->sort('org', 'Source org'); ?></th>
+				<th class="filter"><?php echo $this->Paginator->sort('org', 'Member org'); ?></th>
+			<?php 
+				else:
+					if (Configure::read('MISP.showorg') || $isAdmin): 
+			?>
+						<th class="filter"><?php echo $this->Paginator->sort('org'); ?></th>
+			<?php
+					endif;
+					if ($isSiteAdmin):
+			?>
+				<th class="filter"><?php echo $this->Paginator->sort('owner org');?></th>
+			<?php 
+					endif;
+				endif;
 			?>
-			<?php if ($isSiteAdmin): ?>
-			<th class="filter">
-				<?php echo $this->Paginator->sort('owner org');?>
-			</th>
-			<?php endif; ?>
 			<th><?php echo $this->Paginator->sort('id');?></th>
 			<?php if (Configure::read('MISP.tagging')): ?>
 				<th class="filter">Tags</th>
@@ -101,7 +109,7 @@
 				&nbsp;
 			</td>
 			<?php endif;?>
-			<?php if ('true' == $isSiteAdmin): ?>
+			<?php if ($isSiteAdmin || (Configure::read('MISP.showorgalternate') && Configure::read('MISP.showorg'))): ?>
 			<td class="short" onclick="document.location.href ='/events/view/<?php echo $event['Event']['id'];?>'">
 				<?php
 					$imgRelativePath = 'orgs' . DS . h($event['Event']['org']) . '.png';
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index 8f1b40ca4..92a85340d 100755
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -28,20 +28,38 @@ $mayPublish = ($isAclPublish && $event['Event']['orgc'] == $me['org']);
 					<?php echo h($event['Event']['uuid']); ?>
 					&nbsp;
 				</dd>
-				<?php if (Configure::read('MISP.showorg') || $isAdmin): ?>
-				<dt>Org</dt>
-				<dd>
-					<?php echo h($event['Event']['orgc']); ?>
-					&nbsp;
-				</dd>
-				<?php endif; ?>
-				<?php if ($isSiteAdmin): ?>
-				<dt>Owner org</dt>
-				<dd>
-					<?php echo h($event['Event']['org']); ?>
-					&nbsp;
-				</dd>
-				<?php endif; ?>
+				<?php 
+					if (Configure::read('MISP.showorgalternate') && (Configure::read('MISP.showorg') || $isAdmin)): ?>
+						<dt>Source Organisation</dt>
+						<dd>
+							<?php echo h($event['Event']['orgc']); ?>
+							&nbsp;
+						</dd>
+						<dt>Member Organisation</dt>
+						<dd>
+							<?php echo h($event['Event']['org']); ?>
+							&nbsp;
+						</dd>
+				<?php 	
+					else:
+						if (Configure::read('MISP.showorg') || $isAdmin): ?>
+							<dt>Org</dt>
+							<dd>
+								<?php echo h($event['Event']['orgc']); ?>
+								&nbsp;
+							</dd>
+							<?php endif; ?>
+							<?php if ($isSiteAdmin): ?>
+							<dt>Owner org</dt>
+							<dd>
+								<?php echo h($event['Event']['org']); ?>
+								&nbsp;
+							</dd>
+				<?php 
+						endif; 
+					endif;
+						
+				?>
 				<dt>Contributors</dt>
 				<dd>
 					<?php