summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/models/BootOsMapper.php12
-rw-r--r--application/modules/dev/controllers/BootisoController.php17
-rw-r--r--application/modules/dev/controllers/PrebootController.php2
-rw-r--r--application/modules/fbgui/controllers/IndexController.php1
4 files changed, 21 insertions, 11 deletions
diff --git a/application/models/BootOsMapper.php b/application/models/BootOsMapper.php
index fab73f2..1856384 100644
--- a/application/models/BootOsMapper.php
+++ b/application/models/BootOsMapper.php
@@ -66,7 +66,7 @@ class Application_Model_BootOsMapper
}
}
- public function find($id)
+ public function find($id, Application_Model_BootOs $botos = null)
{
$botos = new Application_Model_BootOs();
$result = $this->getDbTable()->find($id);
@@ -76,8 +76,14 @@ class Application_Model_BootOsMapper
$row = $result->current();
- $botos->setID($row->bootosID)->setConfigID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPath_init($row->path_init)->setPath_kernel($row->path_kernel)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public);
- return $botos;
+ if($botos == null){
+ $botos = new Application_Model_BootOs();
+ $botos->setID($row->bootosID)->setConfigID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPath_init($row->path_init)->setPath_kernel($row->path_kernel)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public);
+ return $botos;
+ }else{
+ $botos->setID($row->bootosID)->setConfigID($row->configID)->setGroupID($row->groupID)->setMembershipID($row->membershipID)->setTitle($row->title)->setPath_init($row->path_init)->setPath_kernel($row->path_kernel)->setDefaultkcl($row->defaultkcl)->setCreated($row->created)->setDescription($row->description)->setExpires($row->expires)->setPublic($row->public);
+ }
+
}
public function fetchAll()
diff --git a/application/modules/dev/controllers/BootisoController.php b/application/modules/dev/controllers/BootisoController.php
index 901c901..dc4ec58 100644
--- a/application/modules/dev/controllers/BootisoController.php
+++ b/application/modules/dev/controllers/BootisoController.php
@@ -40,19 +40,22 @@ class dev_BootisoController extends Zend_Controller_Action
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.zip"');
+ header('Content-Disposition: ' . $content_disp . '; filename="preboot.tgz"');
header('Pragma: no-cache');
header('Expires: 0');
- $fp = fopen("bootisoSerial.txt", "w");
- fputs ($fp, $serialnumber);
- fclose ($fp);
+ chdir("../resources/bootmedium/$prebootID/preboot/");
+
+// $fp = fopen("bootisoSerial.txt", "w");
+// fputs ($fp, $serialnumber);
+// fclose ($fp);
// create the gzipped tarfile.
- chdir("../resources/bootmedium/$prebootID/preboot/");
- passthru("zip -r - ./");
+
+ passthru("tar -cz ./");
- }
+
+ }
diff --git a/application/modules/dev/controllers/PrebootController.php b/application/modules/dev/controllers/PrebootController.php
index cfcbeca..df8daf2 100644
--- a/application/modules/dev/controllers/PrebootController.php
+++ b/application/modules/dev/controllers/PrebootController.php
@@ -65,7 +65,7 @@ class dev_PrebootController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
}
- //$this->_redirect('/dev/preboot');
+ $this->_redirect('/dev/preboot');
}
}
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 906de49..53eb6ab 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -10,6 +10,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
public function indexAction()
{
+ print_a($_POST);
$params = $this->_request->getParam('data');
$keys = $this->_request->getParam('keys');
$post = $this->_request->getParam('post');