summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--application/controllers/ErrorController.php1
-rw-r--r--application/models/BootMenuEntries.php10
-rw-r--r--application/models/BootMenuEntriesMapper.php6
-rw-r--r--application/modules/dev/controllers/ErrorController.php2
-rw-r--r--application/modules/dev/forms/BootmenuEntriesAdd.php21
-rw-r--r--application/modules/dev/forms/BootmenuEntriesEdit.php19
-rw-r--r--application/modules/dev/views/scripts/bootmenu/index.phtml3
-rw-r--r--pbs-newdata.sql24
-rw-r--r--pbs.sql25
9 files changed, 84 insertions, 27 deletions
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 01ee79b..b081709 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -21,6 +21,7 @@ class ErrorController extends Zend_Controller_Action
// application error
$this->getResponse()->setHttpResponseCode(500);
$this->view->message = 'Application error';
+ print_a($errors);
break;
}
diff --git a/application/models/BootMenuEntries.php b/application/models/BootMenuEntries.php
index ec42507..c20c2d0 100644
--- a/application/models/BootMenuEntries.php
+++ b/application/models/BootMenuEntries.php
@@ -7,6 +7,7 @@ class Application_Model_BootMenuEntries
protected $_bootmenuID;
protected $_title;
protected $_kcl;
+ protected $_kclappend;
protected $_configID;
protected $_order;
@@ -91,6 +92,15 @@ class Application_Model_BootMenuEntries
$this->_kcl = $_kcl;
return $this;
}
+ public function getKclappend()
+ {
+ return $this->_kclappend;
+ }
+ public function setKclappend($_kclappend)
+ {
+ $this->_kclappend = $_kclappend;
+ return $this;
+ }
public function getConfigID()
{
return $this->_configID;
diff --git a/application/models/BootMenuEntriesMapper.php b/application/models/BootMenuEntriesMapper.php
index accb8ff..7a3759f 100644
--- a/application/models/BootMenuEntriesMapper.php
+++ b/application/models/BootMenuEntriesMapper.php
@@ -76,7 +76,7 @@ class Application_Model_BootMenuEntriesMapper
public function save(Application_Model_BootMenuEntries $botmenuentries)
{
- $data = array('bootmenuentriesID' => $botmenuentries->getID(), 'bootosID'=> $botmenuentries->getBootosID() ,'bootmenuID'=> $botmenuentries->getBootmenuID() ,'configID'=> $botmenuentries->getConfigID() ,'title'=> $botmenuentries->getTitle() ,'kcl'=> $botmenuentries->getKcl() ,'order'=> $botmenuentries->getOrder() );
+ $data = array('bootmenuentriesID' => $botmenuentries->getID(), 'bootosID'=> $botmenuentries->getBootosID() ,'bootmenuID'=> $botmenuentries->getBootmenuID() ,'configID'=> $botmenuentries->getConfigID() ,'title'=> $botmenuentries->getTitle() ,'kcl'=> $botmenuentries->getKcl(),'kclappend'=> $botmenuentries->getKclappend() ,'order'=> $botmenuentries->getOrder() );
if (null === ($id = $botmenuentries->getID()) ) {
unset($data['bootmenuentriesID']);
@@ -130,7 +130,7 @@ class Application_Model_BootMenuEntriesMapper
$row = $result->current();
- $botmenuentries->setID($row->bootmenuentriesID)->setBootosID($row->bootosID)->setBootmenuID($row->bootmenuID)->setTitle($row->title)->setConfigID($row->configID)->setKcl($row->kcl)->setOrder($row->order);
+ $botmenuentries->setID($row->bootmenuentriesID)->setBootosID($row->bootosID)->setBootmenuID($row->bootmenuID)->setTitle($row->title)->setConfigID($row->configID)->setKclappend($row->kclappend)->setOrder($row->order);
}
@@ -140,7 +140,7 @@ class Application_Model_BootMenuEntriesMapper
$entries = array();
foreach ($resultSet as $row) {
$entry = new Application_Model_BootMenuEntries();
- $entry->setID($row->bootmenuentriesID)->setBootosID($row->bootosID)->setBootmenuID($row->bootmenuID)->setTitle($row->title)->setConfigID($row->configID)->setKcl($row->kcl)->setOrder($row->order);
+ $entry->setID($row->bootmenuentriesID)->setBootosID($row->bootosID)->setBootmenuID($row->bootmenuID)->setTitle($row->title)->setConfigID($row->configID)->setKcl($row->kcl)->setKclappend($row->kclappend)->setOrder($row->order);
$entries[] = $entry;
}
return $entries;
diff --git a/application/modules/dev/controllers/ErrorController.php b/application/modules/dev/controllers/ErrorController.php
index 189614b..f317494 100644
--- a/application/modules/dev/controllers/ErrorController.php
+++ b/application/modules/dev/controllers/ErrorController.php
@@ -6,7 +6,6 @@ class dev_ErrorController extends Zend_Controller_Action
public function errorAction()
{
$errors = $this->_getParam('error_handler');
-
switch ($errors->type) {
case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ROUTE:
case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER:
@@ -21,6 +20,7 @@ class dev_ErrorController extends Zend_Controller_Action
// application error
$this->getResponse()->setHttpResponseCode(500);
$this->view->message = 'Application error';
+ print_a($errors);
break;
}
diff --git a/application/modules/dev/forms/BootmenuEntriesAdd.php b/application/modules/dev/forms/BootmenuEntriesAdd.php
index 2e1b677..ef6e909 100644
--- a/application/modules/dev/forms/BootmenuEntriesAdd.php
+++ b/application/modules/dev/forms/BootmenuEntriesAdd.php
@@ -54,6 +54,12 @@ class dev_Form_BootmenuEntriesAdd extends Zend_Form
$this->addElement($bootosfield);
+ $kclactive = $this->createElement('checkbox','kclactive');
+ #$kclactive->setAttrib('onChange', "document.getElementById('BootMenuEntryAdd').submit();");
+ $kclactive->setLabel('Use default KCL:');
+ $kclactive->setValue(true);
+ $this->addElement($kclactive);
+
$this->addElement('textarea', 'kcl', array(
'filters' => array('StringTrim'),
'validators' => array(
@@ -63,10 +69,25 @@ class dev_Form_BootmenuEntriesAdd extends Zend_Form
'cols' => 50,
'rows' => 5,
'label' => 'KCL:',
+ 'readOnly' => true,
'value' => $this->bootoslist[$_POST['bootosID']]->getDefaultkcl()
));
+
+
+ $this->addElement('textarea', 'kclappend', array(
+ 'filters' => array('StringTrim'),
+ 'validators' => array(
+ array('StringLength', false, array(0, 50)),
+ ),
+ 'required' => false,
+ 'cols' => 50,
+ 'rows' => 5,
+ 'label' => 'KCL-Append:'
+
+ ));
+
$defaultconfigid = $this->bootoslist[$_POST['bootosID']]->getConfigID();
$configfield = $this->createElement('select','configID');
$configfield->setLabel('Config:');
diff --git a/application/modules/dev/forms/BootmenuEntriesEdit.php b/application/modules/dev/forms/BootmenuEntriesEdit.php
index 57aa053..394563e 100644
--- a/application/modules/dev/forms/BootmenuEntriesEdit.php
+++ b/application/modules/dev/forms/BootmenuEntriesEdit.php
@@ -55,6 +55,12 @@ class dev_Form_BootmenuEntriesEdit extends Zend_Form
$bootosfield->setRegisterInArrayValidator(false);
$this->addElement($bootosfield);
+ $kclactive = $this->createElement('checkbox','kclactive');
+ #$kclactive->setAttrib('onChange', "document.getElementById('BootMenuEntryAdd').submit();");
+ $kclactive->setLabel('Use default KCL:');
+ $kclactive->setValue(true);
+ $this->addElement($kclactive);
+
$this->addElement('textarea', 'kcl', array(
'filters' => array('StringTrim'),
'validators' => array(
@@ -64,9 +70,22 @@ class dev_Form_BootmenuEntriesEdit extends Zend_Form
'cols' => 50,
'rows' => 5,
'label' => 'KCL:',
+ 'readOnly' => true,
'value' => $this->bootoslist[$_POST['bootosID']]->getDefaultkcl()
));
+ $this->addElement('textarea', 'kclappend', array(
+ 'filters' => array('StringTrim'),
+ 'validators' => array(
+ array('StringLength', false, array(0, 50)),
+ ),
+ 'required' => false,
+ 'cols' => 50,
+ 'rows' => 5,
+ 'label' => 'KCL-Append:'
+
+ ));
+
$defaultconfigid = $this->bootoslist[$_POST['bootosID']]->getConfigID();
$configfield = $this->createElement('select','configID');
$configfield->setLabel('Config:');
diff --git a/application/modules/dev/views/scripts/bootmenu/index.phtml b/application/modules/dev/views/scripts/bootmenu/index.phtml
index c42a09a..d321758 100644
--- a/application/modules/dev/views/scripts/bootmenu/index.phtml
+++ b/application/modules/dev/views/scripts/bootmenu/index.phtml
@@ -64,7 +64,7 @@
<!-- <th>BootmenuID</th>-->
<th>BootOS</th>
<th>kcl</th>
-
+ <th>kclappend</th>
<th>Config</th>
<th>Position</th>
<th colspan=2>Actions</th>
@@ -93,6 +93,7 @@
<!--<td><?php echo $this->escape($bootmenuentry->getBootmenuID()); ?></td>
--><td><?php echo "[".$this->escape($bootmenuentry->getBootosID()."] ". $bootos->getTitle()); ?></td>
<td><?php echo $this->escape($bootmenuentry->getkcl()); ?></td>
+ <td><?php echo $this->escape($bootmenuentry->getkclappend()); ?></td>
<td><?php echo "[".$this->escape($bootmenuentry->getConfigID()."] ". $config->getTitle()); ?></td>
<td><?php echo $this->escape($bootmenuentry->getOrder() + 1); ?></td>
<td class='action'><a href="<?php echo $this->url(
diff --git a/pbs-newdata.sql b/pbs-newdata.sql
index ee094f3..7f4b958 100644
--- a/pbs-newdata.sql
+++ b/pbs-newdata.sql
@@ -76,18 +76,18 @@ INSERT INTO `pbs_bootmenu` (`bootmenuID`, `membershipID`, `groupID`, `title`, `c
(5, 1, 1, 'Bootmenu 5', '1299694461');
-- Adding BootOs to BootMenus
-INSERT INTO `pbs_bootmenuentries` (`bootmenuentriesID`, `bootosID`, `bootmenuID`, `title`, `kcl`, `configID`, `order`) VALUES
-(1, 1, 1, 'Select BootOs 1', 'kcl 1', 1, 0),
-(2, 1, 1, 'Select BootOs 1', 'kcl 2', 2, 1),
-(3, 2, 1, 'Select BootOs 2', 'kcl 3', 2, 2),
-(4, 5, 2, 'Select BootOs 5', 'kcl 5', 2, 0),
-(5, 4, 2, 'Select BootOs 4', 'kcl 4', 2, 1),
-(6, 10, 3, 'Select BootOs 10', 'kcl 10', 3, 0),
-(7, 8, 3, 'Select BootOs 8', 'kcl 8', 4, 1),
-(8, 1, 2, 'Select BootOs 7', 'kcl 7', 5, 2),
-(9, 1, 5, 'Select BootOs 3', 'kcl 3', 4, 0),
-(10, 9, 4, 'Select BootOs 9', 'kcl 9', 3, 0),
-(11, 7, 4, 'Select BootOs 7', 'kcl 7', 5, 1);
+INSERT INTO `pbs_bootmenuentries` (`bootmenuentriesID`, `bootosID`, `bootmenuID`, `title`, `kcl`, `kclappend`, `configID`, `order`) VALUES
+(1, 1, 1, 'Select BootOs 1', 'kcl 1', 'kcl 1', 1, 0),
+(2, 1, 1, 'Select BootOs 1', 'kcl 2', 'kcl 2', 2, 1),
+(3, 2, 1, 'Select BootOs 2', 'kcl 3', 'kcl 3', 2, 2),
+(4, 5, 2, 'Select BootOs 5', 'kcl 5', 'kcl 5', 2, 0),
+(5, 4, 2, 'Select BootOs 4', 'kcl 4', 'kcl 4', 2, 1),
+(6, 10, 3, 'Select BootOs 10', 'kcl 10', 'kcl 10', 3, 0),
+(7, 8, 3, 'Select BootOs 8', 'kcl 8', 'kcl 8', 4, 1),
+(8, 1, 2, 'Select BootOs 7', 'kcl 7', 'kcl 7', 5, 2),
+(9, 1, 5, 'Select BootOs 3', 'kcl 3', 'kcl 3', 4, 0),
+(10, 9, 4, 'Select BootOs 9', 'kcl 9', 'kcl 9', 3, 0),
+(11, 7, 4, 'Select BootOs 7', 'kcl 7', 'kcl 7', 5, 1);
-- Adding client to pools (poolentries)
INSERT INTO `pbs_poolentries` (`poolentriesID`, `poolID`, `clientID`) VALUES
diff --git a/pbs.sql b/pbs.sql
index 81c7a3d..4373267 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -129,18 +129,19 @@ CREATE TABLE IF NOT EXISTS `pbs_bootos` (
`description` varchar(140),
`path_init` varchar(140) NOT NULL,
`path_kernel` varchar(140) NOT NULL,
- `defaultkcl` varchar(140) NOT NULL,
+ `defaultkcl` varchar(255) NOT NULL,
`created` VARCHAR(14) NOT NULL,
`expires` VARCHAR(14),
`public` int(11) NOT NULL,
PRIMARY KEY (`bootosID`),
KEY `configID` (`configID`),
KEY `groupID` (`groupID`),
- KEY `membershipID` (`membershipID`)
+ KEY `membershipID` (`membershipID`),
+ KEY `defaultkcl` (`defaultkcl`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
ALTER TABLE `pbs_bootos`
- ADD CONSTRAINT `pbs_bootos_ibfk_1` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`),
+ ADD CONSTRAINT `pbs_bootos_ibfk_1` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`) ON DELETE SET NULL,
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;
@@ -164,20 +165,24 @@ CREATE TABLE IF NOT EXISTS `pbs_bootmenuentries` (
`bootosID` int(11) NOT NULL,
`bootmenuID` int(11) NOT NULL,
`title` varchar(30) NOT NULL,
- `kcl` varchar(140),
+ `kcl` varchar(255),
+ `kclappend` varchar(255),
`configID` int(11),
`order` int(11) NOT NULL,
PRIMARY KEY (`bootmenuentriesID`),
KEY `bootosID` (`bootosID`),
KEY `bootmenuID` (`bootmenuID`),
+ KEY `kcl` (`kcl`),
KEY `configID` (`configID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
ALTER TABLE `pbs_bootmenuentries`
ADD CONSTRAINT `pbs_bootmenuentries_ibfk_1` FOREIGN KEY (`bootmenuID`) REFERENCES `pbs_bootmenu` (`bootmenuID`) ON DELETE CASCADE,
ADD CONSTRAINT `pbs_bootmenuentries_ibfk_2` FOREIGN KEY (`bootosID`) REFERENCES `pbs_bootos` (`bootosID`) ON DELETE CASCADE,
- ADD CONSTRAINT `pbs_bootmenuentries_ibfk_3` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`);
-
+ ADD CONSTRAINT `pbs_bootmenuentries_ibfk_3` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`) ON DELETE SET NULL,
+ ADD CONSTRAINT `pbs_bootmenuentries_ibfk_4` FOREIGN KEY (`kcl`) REFERENCES `pbs_bootos` (`defaultkcl`) ON DELETE CASCADE,
+ ADD CONSTRAINT `pbs_bootmenuentries_ibfk_5` FOREIGN KEY (`kcl`) REFERENCES `pbs_bootos` (`defaultkcl`) ON UPDATE CASCADE;
+
CREATE TABLE IF NOT EXISTS `pbs_bootiso` (
`bootisoID` int(11) NOT NULL AUTO_INCREMENT,
`title` varchar(30) NOT NULL,
@@ -221,10 +226,10 @@ ALTER TABLE `pbs_session` ADD `bootmenuentryID` INT AFTER `clientID` ;
ALTER TABLE `pbs_session` ADD `membershipID` INT NULL AFTER `bootisoID` ;
ALTER TABLE `pbs_session`
- ADD CONSTRAINT `pbs_session_ibfk_1` FOREIGN KEY (`clientID`) REFERENCES `pbs_client` (`clientID`),
- ADD CONSTRAINT `pbs_session_ibfk_2` FOREIGN KEY (`bootosID`) REFERENCES `pbs_bootos` (`bootosID`),
- ADD CONSTRAINT `pbs_session_ibfk_3` FOREIGN KEY (`bootisoID`) REFERENCES `pbs_bootiso` (`bootisoID`),
- ADD CONSTRAINT `pbs_session_ibfk_4` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`);
+ ADD CONSTRAINT `pbs_session_ibfk_1` FOREIGN KEY (`clientID`) REFERENCES `pbs_client` (`clientID`) ON DELETE CASCADE,
+ ADD CONSTRAINT `pbs_session_ibfk_2` FOREIGN KEY (`bootosID`) REFERENCES `pbs_bootos` (`bootosID`) ON DELETE CASCADE,
+ ADD CONSTRAINT `pbs_session_ibfk_3` FOREIGN KEY (`bootisoID`) REFERENCES `pbs_bootiso` (`bootisoID`) ON DELETE CASCADE,
+ ADD CONSTRAINT `pbs_session_ibfk_4` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE CASCADE;
CREATE TABLE IF NOT EXISTS `pbs_pool` (
`poolID` int(11) NOT NULL AUTO_INCREMENT,
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-27 16:46:27 +0100