diff options
| author | michael pereira | 2011-03-11 10:02:36 +0100 |
|---|---|---|
| committer | michael pereira | 2011-03-11 10:02:36 +0100 |
| commit | 4ec30e83c446ddf0758f015d9ad5c5aebd2f0ca6 (patch) | |
| tree | 12b382b5eba4b864825875df9f36a7026f95a18d | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-4ec30e83c446ddf0758f015d9ad5c5aebd2f0ca6.tar.gz pbs2-4ec30e83c446ddf0758f015d9ad5c5aebd2f0ca6.tar.xz pbs2-4ec30e83c446ddf0758f015d9ad5c5aebd2f0ca6.zip | |
bootos getressources
| -rw-r--r-- | application/controllers/BootosController.php | 11 | ||||
| -rw-r--r-- | application/forms/BootosCreate.php | 4 | ||||
| -rw-r--r-- | application/models/BootOsMapper.php | 2 | ||||
| -rw-r--r-- | public/media/css/style.css | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | resources/bootos/1/initramfs/initramfs | bin | 6077246 -> 6077246 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | resources/bootos/1/kernel/kernel | bin | 4167200 -> 4167200 bytes | |||
| -rw-r--r-- | resources/bootos/18/initramfs/icon_kinoma-play_40.png | bin | 0 -> 2589 bytes | |||
| -rw-r--r-- | resources/bootos/18/kernel/icon_kinoma-play_40.png | bin | 0 -> 2589 bytes |
8 files changed, 20 insertions, 4 deletions
diff --git a/application/controllers/BootosController.php b/application/controllers/BootosController.php index 37886b4..3a7ab90 100644 --- a/application/controllers/BootosController.php +++ b/application/controllers/BootosController.php @@ -10,6 +10,7 @@ class BootosController extends Zend_Controller_Action public function indexAction() { + $bootosmapper = new Application_Model_BootOsMapper(); $groupmapper = new Application_Model_GroupMapper(); @@ -50,13 +51,21 @@ class BootosController extends Zend_Controller_Action $bootos->setCreated(time()); try { - $bootosmapper->save($bootos); + $bootosID = $bootosmapper->save($bootos); + + $initpath = "../resources/bootos/".$bootosID."/initramfs/"; + $kernelpath = "../resources/bootos/".$bootosID."/kernel/"; + + exec("wget -P ".$kernelpath." ".$bootos->getPath_kernel()); + exec("wget -P ".$initpath." ".$bootos->getPath_init()); + }catch(Zend_Exception $e) { echo "Caught exception: " . get_class($e) . "<br/>"; echo "Message: " . $e->getMessage() . "<br/>"; } + $this->_redirect('/bootos'); } } diff --git a/application/forms/BootosCreate.php b/application/forms/BootosCreate.php index 8f699ce..0377197 100644 --- a/application/forms/BootosCreate.php +++ b/application/forms/BootosCreate.php @@ -56,7 +56,7 @@ class Application_Form_BootosCreate extends Zend_Form $this->addElement('text', 'path_init', array( 'filters' => array('StringTrim'), 'validators' => array( - array('StringLength', false, array(0, 50)), + array('StringLength', false, array(0, 250)), ), 'required' => true, 'size' => 50, @@ -66,7 +66,7 @@ class Application_Form_BootosCreate extends Zend_Form $this->addElement('text', 'path_kernel', array( 'filters' => array('StringTrim'), 'validators' => array( - array('StringLength', false, array(0, 50)), + array('StringLength', false, array(0, 250)), ), 'required' => true, 'size' => 50, diff --git a/application/models/BootOsMapper.php b/application/models/BootOsMapper.php index 66de08d..fab73f2 100644 --- a/application/models/BootOsMapper.php +++ b/application/models/BootOsMapper.php @@ -51,7 +51,7 @@ class Application_Model_BootOsMapper $data = array('bootosID'=> $botos->getID() ,'configID'=> $botos->getConfigID() ,'groupID'=> $botos->getGroupID() ,'title'=> $botos->getTitle(), 'membershipID'=> $botos->getMembershipID() ,'path_init'=> $botos->getPath_init() ,'path_kernel'=> $botos->getPath_kernel() ,'defaultkcl'=> $botos->getDefaultkcl() ,'created'=> $botos->getCreated() ,'description'=> $botos->getDescription() ,'expires'=> $botos->getExpires() ,'public'=> $botos->getPublic() ); if (null === ($id = $botos->getID()) ) { unset($data['bootosID']); - $this->getDbTable()->insert($data); + return $this->getDbTable()->insert($data); } else { $this->getDbTable()->update($data, array('bootosID = ?' => $id)); } diff --git a/public/media/css/style.css b/public/media/css/style.css index 1d3da5d..c681674 100644 --- a/public/media/css/style.css +++ b/public/media/css/style.css @@ -112,8 +112,15 @@ tr.entry { background-color:#FFF5CC; } +tr.entry>td { +width:200px; +overflow:hidden; +white-space:nowrap; +} + tr.detail>td { border:none; + } td.arrowtop{ vertical-align:top; diff --git a/resources/bootos/1/initramfs/initramfs b/resources/bootos/1/initramfs/initramfs Binary files differindex 20fc809..20fc809 100644..100755 --- a/resources/bootos/1/initramfs/initramfs +++ b/resources/bootos/1/initramfs/initramfs diff --git a/resources/bootos/1/kernel/kernel b/resources/bootos/1/kernel/kernel Binary files differindex 960d26a..960d26a 100644..100755 --- a/resources/bootos/1/kernel/kernel +++ b/resources/bootos/1/kernel/kernel diff --git a/resources/bootos/18/initramfs/icon_kinoma-play_40.png b/resources/bootos/18/initramfs/icon_kinoma-play_40.png Binary files differnew file mode 100644 index 0000000..7a5b01e --- /dev/null +++ b/resources/bootos/18/initramfs/icon_kinoma-play_40.png diff --git a/resources/bootos/18/kernel/icon_kinoma-play_40.png b/resources/bootos/18/kernel/icon_kinoma-play_40.png Binary files differnew file mode 100644 index 0000000..7a5b01e --- /dev/null +++ b/resources/bootos/18/kernel/icon_kinoma-play_40.png |
