From 8d5782125d067a3e1dc30218707fbc405cfb7047 Mon Sep 17 00:00:00 2001
From: Christophe Vandeplas <christophe@vandeplas.com>
Date: Tue, 16 Apr 2013 15:29:34 +0200
Subject: [PATCH] removed unused CyDefSIG.showowner field. Closes issue #93

---
 app/Config/bootstrap.default.php | 1 -
 app/View/Events/index.ctp        | 6 +++---
 app/View/Events/view.ctp         | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Config/bootstrap.default.php b/app/Config/bootstrap.default.php
index 1131a67be..011d43a2f 100755
--- a/app/Config/bootstrap.default.php
+++ b/app/Config/bootstrap.default.php
@@ -119,7 +119,6 @@ Configure::write('CyDefSIG.logo', 'orgs/ORGNAME.png');     // used in Events::in
 
 
 Configure::write('CyDefSIG.showorg', 'true');             // show the name/flag of the organisation that uploaded the data
-Configure::write('CyDefSIG.showowner', 'false');           // show the email of the owner that uploaded the data
 Configure::write('CyDefSIG.sync', 'true');                 // enable features related to syncing with other CyDefSIG instances - should be always on because of the current distribution model.
 Configure::write('CyDefSIG.private', 'true');                 // respect private to org or server.
 if ('true' == Configure::read('CyDefSIG.private')) {
diff --git a/app/View/Events/index.ctp b/app/View/Events/index.ctp
index 93e23ef5d..b57b69668 100755
--- a/app/View/Events/index.ctp
+++ b/app/View/Events/index.ctp
@@ -16,7 +16,7 @@ endif; ?>
 			<th><?php echo $this->Paginator->sort('id');?></th>
 			<th><?php echo $this->Paginator->sort('attribute_count', '#Attr.');?></th>
 			<?php
-if ('true' == Configure::read('CyDefSIG.showowner') || $isAdmin): ?>
+if ($isAdmin): ?>
 			<th><?php echo $this->Paginator->sort('user_id', 'Email');?></th>
 			<?php
 endif; ?>
@@ -72,9 +72,9 @@ foreach ($events as $event):?>
 		&nbsp;</td>
 		<td class="short" onclick="document.location ='<?php echo $this->Html->url(array('action' => 'view', $event['Event']['id']), true);?>';">
 		<?php echo $event['Event']['attribute_count']; ?>&nbsp;</td><?php
-	if ('true' == Configure::read('CyDefSIG.showowner') || $isAdmin): ?>
+	if ($isAdmin): ?>
 		<td class="short" onclick="document.location ='<?php echo $this->Html->url(array('action' => 'view', $event['Event']['id']), true);?>';">
-		<?php if('false' == Configure::read('CyDefSIG.showowner') && ($isSiteAdmin || $event['Event']['org'] == $me['org'])) echo h($event['User']['email']);
+		<?php if($isSiteAdmin || $event['Event']['org'] == $me['org']) echo h($event['User']['email']);
 		?>&nbsp;</td><?php
 	endif; ?>
 		<td class="short" onclick="document.location ='<?php echo $this->Html->url(array('action' => 'view', $event['Event']['id']), true);?>';">
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index 058a7f4ab..ee65a2a42 100755
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -55,7 +55,7 @@ endif; ?>
 		</dd>
 		<?php
 endif; ?>
-		<?php if ('true' == Configure::read('CyDefSIG.showowner') || ($isSiteAdmin || ($isAdmin && $me['org'] == $event['Event']['org']))): ?>
+		<?php if ($isSiteAdmin || ($isAdmin && $me['org'] == $event['Event']['org'])): ?>
 		<dt>Email</dt>
 		<dd>
 			<?php echo h($event['User']['email']); ?>