From 3ad2d891e3b9a0e55e9ebdd83eba60d79fc6c154 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Tue, 19 Apr 2011 12:40:47 +0200
Subject: minor fixes

---
 application/modules/user/controllers/BootosController.php   | 6 +++---
 application/modules/user/forms/BootmenuEntries.php          | 5 ++---
 application/modules/user/forms/Bootos.php                   | 2 +-
 application/modules/user/views/scripts/bootmenu/index.phtml | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'application')

diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php
index 511b969..796a2f7 100644
--- a/application/modules/user/controllers/BootosController.php
+++ b/application/modules/user/controllers/BootosController.php
@@ -171,8 +171,8 @@ class user_BootosController extends Zend_Controller_Action
     		      		exec("wget -O '".$path_tmp."initramfs".$hash."' ".escapeshellcmd($bootos->getPath_init())." 2>&1 | grep 'saved'", $status2);
     		    		exec("wget -O '".$path_tmp."config".$hash."' ".escapeshellcmd($bootos->getPath_config())." 2>&1 | grep 'saved'", $status3);
     		      		
-				    	if(!array_pop($status) || !array_pop($status2) || !array_pop($status3)){
- 							$this->view->bootosForm = $bootosForm;
+				  	 	if(!array_pop($status) && $bootos->getPath_kernel() != null || !array_pop($status2)  && $bootos->getPath_init() != null || !array_pop($status3) && $bootos->getPath_config() != null ){
+    		    		 	$this->view->bootosForm = $bootosForm;
  							$pbsNotifier = new Pbs_Notifier();
 							echo $pbsNotifier->notify('The Resource was not found on the specified path','error');
 							
@@ -358,7 +358,7 @@ class user_BootosController extends Zend_Controller_Action
     		      	exec("wget -O '".$path_tmp."initramfs".$hash."' ".escapeshellcmd($bootos->getPath_init())." 2>&1 | grep 'saved'", $status2);
     		    	exec("wget -O '".$path_tmp."config".$hash."' ".escapeshellcmd($bootos->getPath_config())." 2>&1 | grep 'saved'", $status3);
     		    		
-				    if(!array_pop($status) || !array_pop($status2) || !array_pop($status3)){
+				    if(!array_pop($status) && $bootos->getPath_kernel() != null || !array_pop($status2)  && $bootos->getPath_init() != null || !array_pop($status3) && $bootos->getPath_config() != null ){
  						$this->view->bootosForm = $bootosForm;
  						$pbsNotifier = new Pbs_Notifier();
 						echo $pbsNotifier->notify('The Resource was not found on the specified path','error');
diff --git a/application/modules/user/forms/BootmenuEntries.php b/application/modules/user/forms/BootmenuEntries.php
index 9a3cf6a..ded5cc5 100644
--- a/application/modules/user/forms/BootmenuEntries.php
+++ b/application/modules/user/forms/BootmenuEntries.php
@@ -126,17 +126,16 @@ class user_Form_BootmenuEntries extends Zend_Form
 			'description' => 'Chars left: ' . $kcllength
 		));
 		
-		$defaultconfigid = $this->bootoslist[$_POST['bootosID']]->getConfigID();
 		$configfield = $this->createElement('select','configID');
         $configfield->setLabel('Config:');
         $configfield->setAttrib('readOnly', $meta);
         
-        $options = array('Preset' => array($defaultconfigid => 'default'), 'Custom' => array());
+        $options = array('Preset' => array('default' => 'default'), 'Custom' => array());
         
         if(count($this->configlist)>0){
 			foreach($this->configlist as $k => $v){
 				foreach($v as $c)
-					if($c->getID() != $defaultconfigid)
+					//if($c->getID() != $defaultconfigid)
 						$options[$k][$c->getID()] =  $c->getTitle();
 			}    
         }
diff --git a/application/modules/user/forms/Bootos.php b/application/modules/user/forms/Bootos.php
index 81c16bf..1dd0d07 100644
--- a/application/modules/user/forms/Bootos.php
+++ b/application/modules/user/forms/Bootos.php
@@ -68,7 +68,7 @@ class user_Form_Bootos extends Zend_Form
 			'validators' => array(
 				array('StringLength', false, array(0, 250)),
 			),
-			'required' => flase,
+			'required' => false,
 			'size' => 50,
 			'readOnly' => $meta,
 			'label' => 'Init-Path:',
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
index e4e490f..bdaf3a5 100644
--- a/application/modules/user/views/scripts/bootmenu/index.phtml
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -123,6 +123,7 @@
 										'action'     => 'getbootmenuentry',
 										'type'		=> $this->type,
 										'bootmenuentryID'   =>  $bootmenuentry->getID(),
+										'alpha' => '0',
 										'page'		=> $this->page
 									),
 									'default',
-- 
cgit v1.2.3-55-g7522