diff options
| -rw-r--r-- | application/modules/fbgui/controllers/IndexController.php | 7 | ||||
| -rw-r--r-- | library/Pbs/Filter.php | 10 | ||||
| -rw-r--r-- | setup/pbs.sql | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php index 1860297..18498a5 100644 --- a/application/modules/fbgui/controllers/IndexController.php +++ b/application/modules/fbgui/controllers/IndexController.php @@ -21,7 +21,12 @@ class Fbgui_IndexController extends Zend_Controller_Action $membershipMapper = new Application_Model_MembershipMapper(); $this->membership = new Application_Model_Membership(); - $membershipMapper->find($userIDsNamespace['membershipID'],$this->membership); + if(isset($userIDsNamespace['membershipID'])){ + $membershipMapper->find($userIDsNamespace['membershipID'],$this->membership); + } + else{ + $this->membership = null + } } public function errorAction() diff --git a/library/Pbs/Filter.php b/library/Pbs/Filter.php index 1d1051a..85fcf01 100644 --- a/library/Pbs/Filter.php +++ b/library/Pbs/Filter.php @@ -222,12 +222,12 @@ class Pbs_Filter{ $filtertypID = 6; if($this->membership->getID() != null){ if(!$testFilter){ - // get membership from the session - //TODO: GET GROUP from SESSION - $membergroupID = $this->membership->getGroupID(); + // get membership from the session + if(isset($this->membership->getGroupID())) + $membergroupID = $this->membership->getGroupID(); } - } - if(isset($groupID)){ + } + if(isset($membergroupID)){ try{ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE fe.filtertypeID = ".$filtertypID." AND diff --git a/setup/pbs.sql b/setup/pbs.sql index 6d5dbb3..0ddf900 100644 --- a/setup/pbs.sql +++ b/setup/pbs.sql @@ -269,7 +269,7 @@ CREATE TABLE IF NOT EXISTS `pbs_client` ( PRIMARY KEY (`clientID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1; ALTER TABLE `pbs_client` ADD `groupID` INT NOT NULL AFTER `clientID` ; -ALTER TABLE `pbs_client` ADD UNIQUE (`macadress`); +ALTER TABLE `pbs_client` ADD UNIQUE (`groupID` ,`macadress`); ALTER TABLE `pbs_client` ADD CONSTRAINT `pbs_client_ibfk_1` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE; |