Bootos und Configs in Bootmenuentry categorisiert

1 files changed, 17 insertions, 15 deletions

diff --git a/application/modules/user/forms/BootmenuEntries.php b/application/modules/user/forms/BootmenuEntries.php
index 413b09a..56ed5da 100644
--- a/application/modules/user/forms/BootmenuEntries.php
+++ b/application/modules/user/forms/BootmenuEntries.php
@@ -3,6 +3,7 @@
 class user_Form_BootmenuEntries extends Zend_Form
 {
 	private $bootoslist;
+	private $bootosanzeige;
 	private $configlist;
 	private $maxorder;
 	private $action;
@@ -21,6 +22,9 @@ class user_Form_BootmenuEntries extends Zend_Form
     public function setBootoslist($bootoslist){
     	$this->bootoslist = $bootoslist;
     }
+    public function setBootosanzeige($bootosanzeige){
+    	$this->bootosanzeige = $bootosanzeige;
+    }
     
     public function setMaxorder($maxorder){
     	$this->maxorder = $maxorder;
@@ -40,8 +44,9 @@ class user_Form_BootmenuEntries extends Zend_Form
     {
     	
     	if(!isset($_POST['bootosID'])){
-  			$firstbootos = array_slice($this->bootoslist,0,1);
-  			$_POST['bootosID'] = $firstbootos[0]->getID();
+    		@list($key) = array_keys($this->bootoslist);
+  			$firstbootos = $this->bootoslist[$key];
+  			$_POST['bootosID'] = $firstbootos->getID();
   			if(isset($this->kcl))
   				$_POST['kclactive'] = true;
   			else
@@ -69,14 +74,8 @@ class user_Form_BootmenuEntries extends Zend_Form
         $bootosfield ->setLabel('BootOs:');
        	$bootosfield->setAttrib('onChange', "document.getElementById('".$this->action."').submit();");
        	$bootosfield->setAttrib('readOnly', $meta);
-        
-        if(count($this->bootoslist)>0){
-			foreach($this->bootoslist as $bootos => $b){
-				$bootosfield->addMultiOption($b->getID(), $b->getTitle());
-			}       
-        }
+        $bootosfield->addMultiOptions($this->bootosanzeige);
 		$bootosfield->setRegisterInArrayValidator(false);
-		
 		$this->addElement($bootosfield); 
 		
 		$kclactive = $this->createElement('checkbox','kclactive');
@@ -123,16 +122,18 @@ class user_Form_BootmenuEntries extends Zend_Form
 		$defaultconfigid = $this->bootoslist[$_POST['bootosID']]->getConfigID();
 		$configfield = $this->createElement('select','configID');
         $configfield->setLabel('Config:');
-        $configfield->addMultiOption($defaultconfigid, 'default');
         $configfield->setAttrib('readOnly', $meta);
         
+        $options = array('Preset' => array($defaultconfigid => 'default'), 'Custom' => array());
+        
         if(count($this->configlist)>0){
-			foreach($this->configlist as $config => $c){
-				if($c->getID() != $defaultconfigid)
-					$configfield->addMultiOption($c->getID(), $c->getTitle());
-			}       
+			foreach($this->configlist as $k => $v){
+				foreach($v as $c)
+					if($c->getID() != $defaultconfigid)
+						$options[$k][$c->getID()] =  $c->getTitle();
+			}    
         }
-		
+		$configfield->addMultiOptions($options);
 		$configfield->setRegisterInArrayValidator(false);
 		$this->addElement($configfield);
 				
@@ -146,6 +147,7 @@ class user_Form_BootmenuEntries extends Zend_Form
 		$orderfield->setRegisterInArrayValidator(false);
 		$this->addElement($orderfield);
 		
+
 		if($this->action == "addbootmenuentry")
 			$label = "Add Bootmenuentry";
 		else