diff options
| author | Simon | 2011-03-21 12:52:01 +0100 |
|---|---|---|
| committer | Simon | 2011-03-21 12:52:01 +0100 |
| commit | 22ae267c7013d5ea3f74db9a8485ee80ba15e3a1 (patch) | |
| tree | 5998aff3ca8717f5e6627077912829bc08774ab6 | |
| parent | FilterEntries-Formular steht (diff) | |
| parent | zfproject angepasst (diff) | |
| download | pbs2-22ae267c7013d5ea3f74db9a8485ee80ba15e3a1.tar.gz pbs2-22ae267c7013d5ea3f74db9a8485ee80ba15e3a1.tar.xz pbs2-22ae267c7013d5ea3f74db9a8485ee80ba15e3a1.zip | |
merge
| -rw-r--r-- | .zfproject.xml | 345 | ||||
| -rw-r--r-- | application/modules/dev/controllers/BootisoController.php | 15 | ||||
| -rw-r--r-- | pbs-newdata.sql | 4 | ||||
| -rw-r--r-- | pbs.sql | 7 |
4 files changed, 37 insertions, 334 deletions
diff --git a/.zfproject.xml b/.zfproject.xml index 1eb61e7..2a7a29e 100644 --- a/.zfproject.xml +++ b/.zfproject.xml @@ -12,110 +12,6 @@ <actionMethod actionName="index"/> </controllerFile> <controllerFile controllerName="Error"/> - <controllerFile controllerName="Auth"> - <actionMethod actionName="login"/> - <actionMethod actionName="register"/> - <actionMethod actionName="logout"/> - <actionMethod actionName="recoverpassword"/> - <actionMethod actionName="delete"/> - <actionMethod actionName="index"/> - </controllerFile> - <controllerFile controllerName="Person"> - <actionMethod actionName="index"/> - <actionMethod actionName="show"/> - <actionMethod actionName="edit"/> - <actionMethod actionName="request"/> - <actionMethod actionName="leave"/> - </controllerFile> - <controllerFile controllerName="Filter"> - <actionMethod actionName="index"/> - <actionMethod actionName="addfilter"/> - <actionMethod actionName="removefilter"/> - <actionMethod actionName="editfilter"/> - <actionMethod actionName="addfilterentry"/> - <actionMethod actionName="editfilterentry"/> - <actionMethod actionName="evaluate"/> - <actionMethod actionName="fillIP"/> - <actionMethod actionName="removefilterentry"/> - <actionMethod actionName="testevaluate"/> - </controllerFile> - <controllerFile controllerName="Bootos"> - <actionMethod actionName="index"/> - <actionMethod actionName="createbootos"/> - <actionMethod actionName="editbootos"/> - <actionMethod actionName="deletebootos"/> - </controllerFile> - <controllerFile controllerName="Config"> - <actionMethod actionName="index"/> - <actionMethod actionName="createconfig"/> - <actionMethod actionName="editconfig"/> - <actionMethod actionName="deleteconfig"/> - </controllerFile> - <controllerFile controllerName="Bootmenu"> - <actionMethod actionName="index"/> - <actionMethod actionName="addbootmenuentry"/> - <actionMethod actionName="createbootmenu"/> - <actionMethod actionName="editbootmenu"/> - <actionMethod actionName="editbootmenuentry"/> - <actionMethod actionName="removebootmenuentry"/> - <actionMethod actionName="deletebootmenu"/> - </controllerFile> - <controllerFile controllerName="Client"> - <actionMethod actionName="index"/> - <actionMethod actionName="addclient"/> - <actionMethod actionName="removeclient"/> - <actionMethod actionName="editclient"/> - </controllerFile> - <controllerFile controllerName="Pool"> - <actionMethod actionName="index"/> - <actionMethod actionName="createpool"/> - <actionMethod actionName="deletepool"/> - <actionMethod actionName="editpool"/> - <actionMethod actionName="linkclient"/> - <actionMethod actionName="unlinkclient"/> - </controllerFile> - <controllerFile controllerName="Bootiso"> - <actionMethod actionName="index"/> - <actionMethod actionName="createbootiso"/> - <actionMethod actionName="editbootiso"/> - <actionMethod actionName="deletebootiso"/> - </controllerFile> - <controllerFile controllerName="Session"> - <actionMethod actionName="index"/> - <actionMethod actionName="createsession"/> - <actionMethod actionName="editsession"/> - <actionMethod actionName="deletesession"/> - </controllerFile> - <controllerFile controllerName="Resource"> - <actionMethod actionName="index"/> - <actionMethod actionName="getinitramfs"/> - <actionMethod actionName="getconfig"/> - <actionMethod actionName="getkernel"/> - <actionMethod actionName="getkcl"/> - <actionMethod actionName="getbootmenuentry"/> - </controllerFile> - <controllerFile controllerName="Group"> - <actionMethod actionName="index"/> - <actionMethod actionName="add"/> - <actionMethod actionName="edit"/> - <actionMethod actionName="show"/> - <actionMethod actionName="link"/> - <actionMethod actionName="delete"/> - <actionMethod actionName="grantperson"/> - <actionMethod actionName="revokeperson"/> - </controllerFile> - <controllerFile controllerName="Role"> - <actionMethod actionName="index"/> - <actionMethod actionName="add"/> - <actionMethod actionName="edit"/> - <actionMethod actionName="show"/> - <actionMethod actionName="delete"/> - <actionMethod actionName="linkright"/> - <actionMethod actionName="unlinkright"/> - </controllerFile> - <controllerFile controllerName="Preboot"> - <actionMethod actionName="index"/> - </controllerFile> </controllersDirectory> <formsDirectory enabled="false"/> <layoutsDirectory enabled="false"/> @@ -406,8 +302,8 @@ <actionMethod actionName="delete"/> <actionMethod actionName="index"/> </controllerFile> - <controllerFile controllerName="Person"> - <actionMethod actionName="index"/> + <controllerFile controllerName="Person"> + <actionMethod actionName="index"/> <actionMethod actionName="show"/> <actionMethod actionName="edit"/> <actionMethod actionName="request"/> @@ -499,6 +395,14 @@ <actionMethod actionName="linkright"/> <actionMethod actionName="unlinkright"/> </controllerFile> + <controllerFile controllerName="Preboot"> + <actionMethod actionName="index"/> + <actionMethod actionName="createpreboot"/> + <actionMethod actionName="checkupdate"/> + <actionMethod actionName="updatepreboot"/> + <actionMethod actionName="editpreboot"/> + <actionMethod actionName="deletepreboot"/> + </controllerFile> </controllersDirectory> <formsDirectory> <formFile formName="AuthLogin"/> @@ -533,7 +437,7 @@ </modelsDirectory> <viewsDirectory> <viewScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Index"> + <viewControllerScriptsDirectory forControllerName="Index"> <viewScriptFile forActionName="index"/> </viewControllerScriptsDirectory> <viewControllerScriptsDirectory forControllerName="Error"> @@ -684,7 +588,7 @@ <viewScriptFile forActionName="edit"/> </viewControllerScriptsDirectory> <viewControllerScriptsDirectory forControllerName="Group"> - <viewScriptFile forActionName="show"/> + <viewScriptFile forActionName="show"/> </viewControllerScriptsDirectory> <viewControllerScriptsDirectory forControllerName="Group"> <viewScriptFile forActionName="link"/> @@ -739,10 +643,19 @@ </viewControllerScriptsDirectory> <viewControllerScriptsDirectory forControllerName="Resource"> <viewScriptFile forActionName="getkcl"/> - </viewControllerScriptsDirectory> + </viewControllerScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Preboot"> + <viewScriptFile forActionName="index"/> + </viewControllerScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Preboot"> + <viewScriptFile forActionName="createpreboot"/> + </viewControllerScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Preboot"> + <viewScriptFile forActionName="editpreboot"/> + </viewControllerScriptsDirectory> </viewScriptsDirectory> - <viewHelpersDirectory/> - <viewFiltersDirectory/> + <viewHelpersDirectory/> + <viewFiltersDirectory/> </viewsDirectory> <bootstrapFile filesystemName="Bootstrap.php"/> </moduleDirectory> @@ -755,216 +668,6 @@ <viewControllerScriptsDirectory forControllerName="Error"> <viewScriptFile forActionName="error"/> </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Auth"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Auth"> - <viewScriptFile forActionName="login"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Auth"> - <viewScriptFile forActionName="register"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Person"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Auth"> - <viewScriptFile forActionName="logout"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Auth"> - <viewScriptFile forActionName="recoverpassword"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Auth"> - <viewScriptFile forActionName="deleteAccount"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Filter"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Filter"> - <viewScriptFile forActionName="addfilter"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Filter"> - <viewScriptFile forActionName="editfilter"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Bootos"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Index"> - <viewScriptFile forActionName="createbootos"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Bootos"> - <viewScriptFile forActionName="createbootos"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Bootos"> - <viewScriptFile forActionName="editbootos"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Filter"> - <viewScriptFile forActionName="addfilterentry"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Filter"> - <viewScriptFile forActionName="editfilterentry"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Config"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Config"> - <viewScriptFile forActionName="createconfig"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Config"> - <viewScriptFile forActionName="editconfig"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Bootmenu"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Bootmenu"> - <viewScriptFile forActionName="createbootmenu"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Bootmenu"> - <viewScriptFile forActionName="editbootmenu"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Bootmenu"> - <viewScriptFile forActionName="addbootmenuentry"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Bootmenu"> - <viewScriptFile forActionName="editbootmenuentry"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Client"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Pool"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Client"> - <viewScriptFile forActionName="addclient"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Client"> - <viewScriptFile forActionName="removeclient"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Pool"> - <viewScriptFile forActionName="createpool"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Pool"> - <viewScriptFile forActionName="deletepool"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Pool"> - <viewScriptFile forActionName="editpool"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Bootiso"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Bootiso"> - <viewScriptFile forActionName="createbootiso"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Bootiso"> - <viewScriptFile forActionName="editbootiso"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Pool"> - <viewScriptFile forActionName="linkclient"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Pool"> - <viewScriptFile forActionName="unlinkclient"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Client"> - <viewScriptFile forActionName="editclient"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Session"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Session"> - <viewScriptFile forActionName="createsession"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Session"> - <viewScriptFile forActionName="editsession"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Session"> - <viewScriptFile forActionName="deletesession"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Auth"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Person"> - <viewScriptFile forActionName="show"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Person"> - <viewScriptFile forActionName="edit"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Person"> - <viewScriptFile forActionName="request"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Person"> - <viewScriptFile forActionName="leave"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Group"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Group"> - <viewScriptFile forActionName="add"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Group"> - <viewScriptFile forActionName="edit"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Group"> - <viewScriptFile forActionName="show"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Group"> - <viewScriptFile forActionName="link"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Group"> - <viewScriptFile forActionName="delete"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Group"> - <viewScriptFile forActionName="grantperson"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Group"> - <viewScriptFile forActionName="revokeperson"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Role"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Role"> - <viewScriptFile forActionName="add"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Role"> - <viewScriptFile forActionName="edit"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Role"> - <viewScriptFile forActionName="show"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Role"> - <viewScriptFile forActionName="delete"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Role"> - <viewScriptFile forActionName="linkright"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Role"> - <viewScriptFile forActionName="unlinkright"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Filter"> - <viewScriptFile forActionName="testevaluate"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Resource"> - <viewScriptFile forActionName="getbootmenuentry"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Resource"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Resource"> - <viewScriptFile forActionName="getinitramfs"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Resource"> - <viewScriptFile forActionName="getconfig"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Resource"> - <viewScriptFile forActionName="getkernel"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Resource"> - <viewScriptFile forActionName="getkcl"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Preboot"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> - <viewControllerScriptsDirectory forControllerName="Preboot"> - <viewScriptFile forActionName="index"/> - </viewControllerScriptsDirectory> </viewScriptsDirectory> <viewScriptsDirectory/> <viewHelpersDirectory/> diff --git a/application/modules/dev/controllers/BootisoController.php b/application/modules/dev/controllers/BootisoController.php index 7390c95..b0f4c2f 100644 --- a/application/modules/dev/controllers/BootisoController.php +++ b/application/modules/dev/controllers/BootisoController.php @@ -33,22 +33,21 @@ class dev_BootisoController extends Zend_Controller_Action $this->_helper->layout->disableLayout(); $this->_helper->viewRenderer->setNoRender(); - $prebootID = $this->_request->getParams('prebootID'); + $prebootID = $this->_request->getParam('prebootID'); - // if(is_dir("../resources/bootmedium/$prebootID/") && is_numeric($prebootID)){ + if(is_dir("../resources/bootmedium/$prebootID/") && is_numeric($prebootID)){ header('Content-Type: application/x-gzip'); $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $_SERVER['HTTP_USER_AGENT']) == 'IE') ? 'inline' : 'attachment'; - header('Content-Disposition: ' . $content_disp . '; filename="preboot.tar.gz"'); + header('Content-Disposition: ' . $content_disp . '; filename="preboot.zip"'); header('Pragma: no-cache'); header('Expires: 0'); - + // create the gzipped tarfile. - chdir(APPLICATION_PATH . "/resources/bootmedium/$prebootID/"); - passthru( "tar cz ./"); + chdir("../resources/bootmedium/$prebootID/"); + passthru("zip -r - ./"); - $this->_redirect('/dev/bootiso'); - //} + } diff --git a/pbs-newdata.sql b/pbs-newdata.sql index 8e6fe11..e075c29 100644 --- a/pbs-newdata.sql +++ b/pbs-newdata.sql @@ -88,8 +88,8 @@ INSERT INTO `pbs_bootos` (`bootosID`, `configID`, `groupID`, `membershipID`, `ti -- Adding preboot INSERT INTO `pbs_preboot` (`prebootID`, `title`, `membershipID`, `groupID`, `path_preboot`) VALUES (1, 'Preboot 1', 1, 1, 'path 1'), -(2, 'Preboot 2', 1, 1, 'path 1'), -(3, 'Preboot 3', 1, 1, 'path 1'); +(2, 'Preboot 2', 1, 1, 'path 2'), +(3, 'Preboot 3', 1, 1, 'path 3'); -- Adding bootiso INSERT INTO `pbs_bootiso` (`bootisoID`, `title`, `membershipID`, `groupID`, `prebootID`, `serialnumber`, `created`, `expires`, `public`) VALUES @@ -197,7 +197,8 @@ CREATE TABLE IF NOT EXISTS `pbs_preboot` ( ALTER TABLE `pbs_preboot` ADD CONSTRAINT `pbs_preboot_ibfk_1` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE SET NULL, ADD CONSTRAINT `pbs_preboot_ibfk_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE; - + + CREATE TABLE IF NOT EXISTS `pbs_bootiso` ( `bootisoID` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(30) NOT NULL, @@ -213,12 +214,12 @@ CREATE TABLE IF NOT EXISTS `pbs_bootiso` ( KEY `groupID` (`groupID`) ) 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_2` FOREIGN KEY (`groupID`) REFERENCES `pbs_group` (`groupID`) ON DELETE CASCADE, ADD CONSTRAINT `pbs_bootiso_ibfk_3` FOREIGN KEY (`prebootID`) REFERENCES `pbs_preboot` (`prebootID`) ON DELETE CASCADE; - CREATE TABLE IF NOT EXISTS `pbs_client` ( `clientID` int(11) NOT NULL AUTO_INCREMENT, `macadress` varchar(17) NOT NULL, @@ -328,7 +329,7 @@ CREATE TABLE IF NOT EXISTS `pbs_filterentries` ( `filterID` int(11) NOT NULL, `filtertypeID` int(11) NOT NULL, `filtervalue` varchar(140) NOT NULL, - `filtervalue2` varchar(140) NOT NULL + `filtervalue2` varchar(140) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; ALTER TABLE `pbs_filterentries` CHANGE `filtervalue2` `filtervalue2` VARCHAR( 140 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL; ALTER TABLE `pbs_filterentries` ADD `filterentriesID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST; |