From 67bff1f5a6691ccc7e705e141fa609106220121d Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Thu, 17 Apr 2014 00:27:59 +0200
Subject: [PATCH] few fixed for Character permissions

---
 app/controllers/SeminaryRoleController.inc |  2 +-
 controllers/CharactersController.inc       | 10 ++++++++++
 controllers/MenuController.inc             |  1 +
 controllers/SeminarymenuController.inc     |  6 +++---
 views/html/html.tpl                        |  4 +---
 views/html/menu/index.tpl                  |  2 +-
 views/html/seminarymenu/index.tpl          |  1 -
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/controllers/SeminaryRoleController.inc b/app/controllers/SeminaryRoleController.inc
index cb7f6b86..f5bba984 100644
--- a/app/controllers/SeminaryRoleController.inc
+++ b/app/controllers/SeminaryRoleController.inc
@@ -137,7 +137,7 @@
 			
 			
 			// Check permissions
-			if(count(array_intersect(self::$user['seminaryroles'], $permissions)) == 0) {
+			if(!array_key_exists('seminaryroles', self::$user) || count(array_intersect(self::$user['seminaryroles'], $permissions)) == 0) {
 				throw new \nre\exceptions\AccessDeniedException();
 			}
 		}
diff --git a/controllers/CharactersController.inc b/controllers/CharactersController.inc
index 1adab0d3..7046e1a1 100644
--- a/controllers/CharactersController.inc
+++ b/controllers/CharactersController.inc
@@ -158,6 +158,16 @@
 			// Get seminary
 			$seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl);
 			
+			// Check for already existing Character
+			try {
+				$this->Characters->getCharacterForUserAndSeminary($this->Auth->getUserId(), $seminary['id']);
+				throw new \nre\exceptions\AccessDeniedException();
+			}
+			catch(\nre\exceptions\IdNotFoundException $e) {
+				// The should be the case
+			}
+				
+			
 			// Character types
 			$types = $this->Charactertypes->getCharacterTypesForSeminary($seminary['id']);
 			
diff --git a/controllers/MenuController.inc b/controllers/MenuController.inc
index c254a617..b7557c1f 100644
--- a/controllers/MenuController.inc
+++ b/controllers/MenuController.inc
@@ -35,6 +35,7 @@
 			
 			// Set userdata
 			$this->set('loggedUser', IntermediateController::$user);
+			$this->set('loggedCharacter', SeminaryRoleController::$character);
 			$this->set('loggedSeminary', SeminaryRoleController::$seminary);
 		}
 		
diff --git a/controllers/SeminarymenuController.inc b/controllers/SeminarymenuController.inc
index 5b5d780f..8f2957d7 100644
--- a/controllers/SeminarymenuController.inc
+++ b/controllers/SeminarymenuController.inc
@@ -18,7 +18,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class SeminarymenuController extends \hhu\z\Controller
+	class SeminarymenuController extends \hhu\z\controllers\SeminaryRoleController
 	{
 		
 		
@@ -35,8 +35,8 @@
 			parent::preFilter($request, $response);
 			
 			// Set userdata
-			$this->set('loggedUser', IntermediateController::$user);
-			$this->set('loggedSeminary', SeminaryRoleController::$seminary);
+			$this->set('loggedUser', self::$user);
+			$this->set('loggedSeminary', self::$seminary);
 		}
 		
 		
diff --git a/views/html/html.tpl b/views/html/html.tpl
index 9cfcf8f3..a62f4e11 100644
--- a/views/html/html.tpl
+++ b/views/html/html.tpl
@@ -47,11 +47,9 @@
 		<?=$intermediate?>
 	</article>
 	<aside>
-		<?php if(!is_null($loggedUser)) : ?>
-		<?php if(!is_null($loggedCharacter)) : ?>
+		<?php if(!is_null($loggedCharacter) && count($loggedUser['seminaryroles']) > 0) : ?>
 		<?=$seminarybar?>
 		<?php endif ?>
-		<?php endif ?>
 	</aside>
 </body>
 
diff --git a/views/html/menu/index.tpl b/views/html/menu/index.tpl
index c2662789..dbab43c2 100644
--- a/views/html/menu/index.tpl
+++ b/views/html/menu/index.tpl
@@ -1,7 +1,7 @@
 <li><a href="<?=$linker->link(array(), 0, true, array(), true)?>"><i class="fa fa-home fa-fw"></i>The Legend of Z</a></li>
 <?php if(!is_null($loggedUser) && count(array_intersect(array('admin','moderator'),$loggedUser['roles'])) > 0) : ?><li><a href="<?=$linker->link('users')?>"><i class="fa fa-users fa-fw"></i><?=_('Users')?></a></li><?php endif ?>
 <?php if(!is_null($loggedUser)) : ?><li><a href="<?=$linker->link('seminaries')?>"><i class="fa fa-pencil-square-o fa-fw"></i><?=_('Seminaries')?></a></li><?php endif ?>
-<?php if(!is_null($loggedSeminary)) : ?><?=$seminarymenu?><?php endif ?>
+<?php if(!is_null($loggedCharacter) && count($loggedUser['seminaryroles']) > 0) : ?><?=$seminarymenu?><?php endif ?>
 <?php if(is_null($loggedUser)) : ?>
 <li><a href="<?=$linker->link(array('users','login'))?>"><i class="fa fa-sign-in fa-fw"></i><?=_('Login')?></a></li>
 <?php else : ?>
diff --git a/views/html/seminarymenu/index.tpl b/views/html/seminarymenu/index.tpl
index 041c4f43..56b9307b 100644
--- a/views/html/seminarymenu/index.tpl
+++ b/views/html/seminarymenu/index.tpl
@@ -3,4 +3,3 @@
 <li><a href="<?=$linker->link(array('charactergroups','index',$loggedSeminary['url']))?>" class="smnry"><i class="fa fa-users fa-fw"></i><?=_('Character Groups')?></a></li>
 <li><a href="<?=$linker->link(array('achievements','index',$loggedSeminary['url']))?>" class="smnry"><i class="fa fa-trophy fa-fw"></i><?=_('Achievements')?></a></li>
 <li><a href="<?=$linker->link(array('library','index',$loggedSeminary['url']))?>" class="smnry"><i class="fa fa-book fa-fw"></i><?=_('Library')?></a></li>
-