merges

2 files changed, 7 insertions, 5 deletions

diff --git a/library/Pbs/Acl.php b/library/Pbs/Acl.php
index b941694..766274a 100644
--- a/library/Pbs/Acl.php
+++ b/library/Pbs/Acl.php
@@ -16,6 +16,8 @@ class Pbs_Acl
 	public static function checkRight($rightShortcut) {
 
 		$userIDsNamespace = Zend_Session::namespaceGet('userIDs');
+		if(!isset($userIDsNamespace['roleID']))
+			return false;
 		$roleID = $userIDsNamespace['roleID'];
 		
 		$rightMapper = new Application_Model_RightMapper();
diff --git a/library/Pbs/Filter.php b/library/Pbs/Filter.php
index 5231e59..6916c2a 100644
--- a/library/Pbs/Filter.php
+++ b/library/Pbs/Filter.php
@@ -58,7 +58,7 @@ class Pbs_Filter{
 			$sessionmapper = new Application_Model_SessionMapper();
 			$sessionarray = $sessionmapper->findBy(array('alphasessionID' => $_SESSION['alphasessionID']),true);
 			$session->setOptions($sessionarray[0]);
-			$session->setID($sessionarray['sessionID']);
+			@$session->setID($sessionarray['sessionID']);
 			
 			$bootisoMapper = new Application_Model_BootisoMapper();
 			$bootiso = new Application_Model_BootIso();
@@ -124,7 +124,7 @@ class Pbs_Filter{
 				$poolentry = new Application_Model_PoolEntries();
 				$poolentrymapper = new Application_Model_PoolEntriesMapper();
 				$poolentry = $poolentrymapper->findby(array('clientID' => $client->getID()),true);
-				$poolentry = $poolentry[0];		
+				@$poolentry = $poolentry[0];		
 			
 				$poolID = $poolentry['poolID'];
 			}			
@@ -280,7 +280,7 @@ class Pbs_Filter{
 				$client = new Application_Model_Client();
 				$clientmapper = new Application_Model_ClientMapper();
 				$clientmapper->find($session->getClientID(),$client);
-				$macAdress = $client->getHardwarehash();
+				$hardwarehash = $client->getHardwarehash();
 			}
 
 			try{
@@ -359,8 +359,8 @@ class Pbs_Filter{
 			$set = $kk;
 			// counting how often a filter is evaluated at database
 			$a = array();
-			foreach($set as $k=> $s){
-				$a[$s] += 1;
+			foreach($set as $k => $s){
+				@$a[$s] += 1;
 			}
 			if($debuglevel >= 2)
 				print_a('Übereinstimmungen pro Filter',$a);