From a4402a3b918aa347a770c2509822731fd08a45ee Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 10 Mar 2011 13:30:30 +0100 Subject: Mapper wieder korrigiert && Controller ergänzt --- application/layouts/main.phtml | 1 + application/models/ConfigMapper.php | 13 ++++++++++--- application/models/GroupMapper.php | 13 ++++++++++--- application/models/MembershipMapper.php | 13 ++++++++++--- application/models/PersonMapper.php | 13 ++++++++++--- 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/application/layouts/main.phtml b/application/layouts/main.phtml index 57d09c7..ca09e42 100644 --- a/application/layouts/main.phtml +++ b/application/layouts/main.phtml @@ -25,6 +25,7 @@ echo $this->headScript()."\n";
  • BootMenu
  • Config
  • BootOs
  • +
  • Resource
  • Client
  • Filter
  • Pool
  • diff --git a/application/models/ConfigMapper.php b/application/models/ConfigMapper.php index da7a073..d8a23c4 100644 --- a/application/models/ConfigMapper.php +++ b/application/models/ConfigMapper.php @@ -66,9 +66,14 @@ class Application_Model_ConfigMapper } } - public function find($id) + public function find($id, Application_Model_Config $config = null) { - $config = new Application_Model_Config(); + if($config == null){ + $return = true; + } + if($return){ + $config = new Application_Model_Config(); + } $result = $this->getDbTable()->find($id); if (0 == count($result)) { return; @@ -77,7 +82,9 @@ class Application_Model_ConfigMapper $row = $result->current(); $config->setID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setCreated($row->created)->setShellscript($row->shellscript)->setTitle($row->title); - return $config; + if($return){ + return $config; + } } public function fetchAll() diff --git a/application/models/GroupMapper.php b/application/models/GroupMapper.php index d43b3f1..463f3d1 100644 --- a/application/models/GroupMapper.php +++ b/application/models/GroupMapper.php @@ -66,9 +66,14 @@ class Application_Model_GroupMapper } } - public function find($id) + public function find($id,Application_Model_Group $group = null) { - $group = new Application_Model_Group(); + if($group == null){ + $return = true; + } + if($return){ + $group = new Application_Model_Group(); + } $result = $this->getDbTable()->find($id); if (0 == count($result)) { return; @@ -77,7 +82,9 @@ class Application_Model_GroupMapper $row = $result->current(); $group->setID($row->groupID)->setTitle($row->title)->setDescription($row->description); - return $group; + if($return){ + return $group; + } } public function fetchAll() diff --git a/application/models/MembershipMapper.php b/application/models/MembershipMapper.php index 2a6e57d..313248c 100644 --- a/application/models/MembershipMapper.php +++ b/application/models/MembershipMapper.php @@ -66,9 +66,14 @@ class Application_Model_MembershipMapper } } - public function find($id) + public function find($id, Application_Model_Membership $membership = null) { - $membership = new Application_Model_Membership(); + if($membership == null){ + $return = true; + } + if($return){ + $membership = new Application_Model_Membership(); + } $result = $this->getDbTable()->find($id); if (0 == count($result)) { return; @@ -77,7 +82,9 @@ class Application_Model_MembershipMapper $row = $result->current(); $membership->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID); - return $membership; + if($return){ + return $membership; + } } public function fetchAll() diff --git a/application/models/PersonMapper.php b/application/models/PersonMapper.php index 038670d..b2cbf39 100644 --- a/application/models/PersonMapper.php +++ b/application/models/PersonMapper.php @@ -66,9 +66,14 @@ class Application_Model_PersonMapper } } - public function find($id) + public function find($id,Application_Model_Person $person = null) { - $person = new Application_Model_Person(); + if($person == null){ + $return = true; + } + if($return){ + $person = new Application_Model_Person(); + } $result = $this->getDbTable()->find($id); if (0 == count($result)) { return; @@ -77,7 +82,9 @@ class Application_Model_PersonMapper $row = $result->current(); $person->setID($row->personID)->setTitle($row->title)->setName($row->name)->setFirstname($row->firstname)->setStreet($row->street)->setHousenumber($row->housenumber)->setCity($row->city)->setPostalcode($row->postalcode)->setLogindate($row->logindate)->setRegisterdate($row->registerdate)->setEmail($row->email)->setLogin($row->login)->setPassword($row->password)->setPasswordSalt($row->password_salt); - return $person; + if($return){ + return $person; + } } public function fetchAll() -- cgit v1.2.3-55-g7522 From bb45b9e1e83caaee9d0d29daec37c345bee47f26 Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Thu, 10 Mar 2011 14:40:05 +0100 Subject: zu allen verknüpfungstabellen zusammengesetzten primary key hinzugefügt, Zend benötigt primary key --- pbs.sql | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pbs.sql b/pbs.sql index f404b0a..5cf0c5a 100644 --- a/pbs.sql +++ b/pbs.sql @@ -33,6 +33,7 @@ ALTER TABLE `pbs_role` CREATE TABLE IF NOT EXISTS `pbs_rightroles` ( `roleID` int(11) NOT NULL, `rightID` int(11) NOT NULL, + PRIMARY KEY (`roleID`,`rightID`), KEY `roleID` (`roleID`), KEY `rightID` (`rightID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; @@ -45,6 +46,7 @@ ALTER TABLE `pbs_rightroles` CREATE TABLE IF NOT EXISTS `pbs_groupgroups` ( `parentID` int(11) NOT NULL, `groupID` int(11) NOT NULL, + PRIMARY KEY (`parentID`,`groupID`), KEY `parentID` (`parentID`), KEY `groupID` (`groupID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; @@ -140,7 +142,7 @@ CREATE TABLE IF NOT EXISTS `pbs_bootos` ( ALTER TABLE `pbs_bootos` ADD CONSTRAINT `pbs_bootos_ibfk_1` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`), ADD CONSTRAINT `pbs_bootos_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE, - ADD CONSTRAINT `pbs_bootos_ibfk_3` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`); + ADD CONSTRAINT `pbs_bootos_ibfk_3` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL; CREATE TABLE IF NOT EXISTS `pbs_bootmenu` ( `bootmenuID` int(11) NOT NULL AUTO_INCREMENT, @@ -192,7 +194,7 @@ CREATE TABLE IF NOT EXISTS `pbs_bootiso` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; ALTER TABLE `pbs_bootiso` - ADD CONSTRAINT `pbs_bootiso_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`), + ADD CONSTRAINT `pbs_bootiso_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL, ADD CONSTRAINT `pbs_bootiso_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE; CREATE TABLE IF NOT EXISTS `pbs_client` ( @@ -204,8 +206,8 @@ CREATE TABLE IF NOT EXISTS `pbs_client` ( CREATE TABLE IF NOT EXISTS `pbs_session` ( `sessionID` int(11) NOT NULL AUTO_INCREMENT, - `clientID` int(11), - `bootosID` int(11), + `clientID` int(11) NOT NULL, + `bootosID` int(11) NOT NULL, `time` varchar(14) NOT NULL, `ip` varchar(15) NOT NULL, `ip6` varchar(45), @@ -231,6 +233,7 @@ CREATE TABLE IF NOT EXISTS `pbs_pool` ( CREATE TABLE IF NOT EXISTS `pbs_poolentries` ( `poolID` int(11) NOT NULL, `clientID` int(11) NOT NULL, + PRIMARY KEY (`poolID`,`clientID`), KEY `poolID` (`poolID`), KEY `clientID` (`clientID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; @@ -263,6 +266,7 @@ ALTER TABLE `pbs_filter` CREATE TABLE IF NOT EXISTS `pbs_membershipfilters` ( `membershipID` int(11) NOT NULL, `filterID` int(11) NOT NULL, + PRIMARY KEY (`membershipID`,`filterID`), KEY `membershipID` (`membershipID`), KEY `filterID` (`filterID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; @@ -274,6 +278,7 @@ ALTER TABLE `pbs_membershipfilters` CREATE TABLE IF NOT EXISTS `pbs_poolfilters` ( `poolID` int(11) NOT NULL, `filterID` int(11) NOT NULL, + PRIMARY KEY (`poolID`,`filterID`), KEY `poolID` (`poolID`), KEY `filterID` (`filterID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; @@ -293,6 +298,7 @@ CREATE TABLE IF NOT EXISTS `pbs_filterentries` ( `filtertypeID` int(11) NOT NULL, `filtervalue` varchar(140) NOT NULL, `filtervalue2` varchar(140) NOT NULL, + PRIMARY KEY (`filterID`,`filtertypeID`), KEY `filterID` (`filterID`), KEY `filtertypeID` (`filtertypeID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; @@ -303,14 +309,5 @@ ALTER TABLE `pbs_filterentries` ADD CONSTRAINT `pbs_filterentries_ibfk_2` FOREIGN KEY (`filtertypeID`) REFERENCES `pbs_filtertype` (`filtertypeID`) ON DELETE CASCADE; --- Insert Filtertypes -INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'IP'); -INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'MAC'); -INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'PoolID'); -INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'BootIso'); -INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Membership'); -INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Group'); -INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Time'); -INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Client'); -- cgit v1.2.3-55-g7522 From 959b12e883b32ff5771cac3fb52c10dc0d018066 Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Thu, 10 Mar 2011 14:46:40 +0100 Subject: ausversehen gelöschtes wiederhergestellt --- pbs.sql | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pbs.sql b/pbs.sql index 5cf0c5a..319e46a 100644 --- a/pbs.sql +++ b/pbs.sql @@ -142,7 +142,7 @@ CREATE TABLE IF NOT EXISTS `pbs_bootos` ( ALTER TABLE `pbs_bootos` ADD CONSTRAINT `pbs_bootos_ibfk_1` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`), ADD CONSTRAINT `pbs_bootos_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE, - ADD CONSTRAINT `pbs_bootos_ibfk_3` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL; + ADD CONSTRAINT `pbs_bootos_ibfk_3` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`); CREATE TABLE IF NOT EXISTS `pbs_bootmenu` ( `bootmenuID` int(11) NOT NULL AUTO_INCREMENT, @@ -194,7 +194,7 @@ CREATE TABLE IF NOT EXISTS `pbs_bootiso` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; ALTER TABLE `pbs_bootiso` - ADD CONSTRAINT `pbs_bootiso_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL, + ADD CONSTRAINT `pbs_bootiso_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`), ADD CONSTRAINT `pbs_bootiso_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE; CREATE TABLE IF NOT EXISTS `pbs_client` ( @@ -206,8 +206,8 @@ CREATE TABLE IF NOT EXISTS `pbs_client` ( CREATE TABLE IF NOT EXISTS `pbs_session` ( `sessionID` int(11) NOT NULL AUTO_INCREMENT, - `clientID` int(11) NOT NULL, - `bootosID` int(11) NOT NULL, + `clientID` int(11), + `bootosID` int(11), `time` varchar(14) NOT NULL, `ip` varchar(15) NOT NULL, `ip6` varchar(45), @@ -308,6 +308,13 @@ ALTER TABLE `pbs_filterentries` ADD CONSTRAINT `pbs_filterentries_ibfk_1` FOREIGN KEY (`filterID`) REFERENCES `pbs_filter` (`filterID`) ON DELETE CASCADE, ADD CONSTRAINT `pbs_filterentries_ibfk_2` FOREIGN KEY (`filtertypeID`) REFERENCES `pbs_filtertype` (`filtertypeID`) ON DELETE CASCADE; - - +-- Insert Filtertypes +-INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'IP'); +-INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'MAC'); +-INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'PoolID'); +-INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'BootIso'); +-INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Membership'); +-INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Group'); +-INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Time'); +-INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Client'); -- cgit v1.2.3-55-g7522 From 4a9b2301390f34f161e17830e4f0cd1df207831c Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Thu, 10 Mar 2011 14:47:55 +0100 Subject: ausversehen gelöschtes wiederhergestellt --- pbs.sql | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pbs.sql b/pbs.sql index 319e46a..f762115 100644 --- a/pbs.sql +++ b/pbs.sql @@ -309,12 +309,12 @@ ALTER TABLE `pbs_filterentries` ADD CONSTRAINT `pbs_filterentries_ibfk_2` FOREIGN KEY (`filtertypeID`) REFERENCES `pbs_filtertype` (`filtertypeID`) ON DELETE CASCADE; -- Insert Filtertypes --INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'IP'); --INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'MAC'); --INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'PoolID'); --INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'BootIso'); --INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Membership'); --INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Group'); --INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Time'); --INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Client'); +INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'IP'); +INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'MAC'); +INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'PoolID'); +INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'BootIso'); +INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Membership'); +INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Group'); +INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Time'); +INSERT INTO `pbs`.`pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES (NULL, 'Client'); -- cgit v1.2.3-55-g7522 From 6f4d014fc23ca0c8f404750b82b8d798c9a59af8 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 10 Mar 2011 15:45:00 +0100 Subject: template angepasst --- application/views/scripts/bootmenu/index.phtml | 9 +++++++-- public/media/img/play.gif | Bin 0 -> 113 bytes 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 public/media/img/play.gif diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml index 6fb55e4..fa722e4 100644 --- a/application/views/scripts/bootmenu/index.phtml +++ b/application/views/scripts/bootmenu/index.phtml @@ -55,7 +55,7 @@ - + @@ -70,7 +70,12 @@ bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?> bootosmapper->find($bootmenuentry->getBootosID());?> configmapper->find($bootmenuentry->getConfigID());?> - + +
    ID Title
    + + + + escape($bootmenuentry->getID()); ?> escape($bootmenuentry->getTitle()); ?>