controller fixes

1 files changed, 22 insertions, 16 deletions

diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 4958f68..b080a3d 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -81,7 +81,7 @@ class ResourceController extends Zend_Controller_Action
 
 			
 	}
-
+//TODO Try/Catch + Metadata check
 	public function addbootosAction()
 	{
 		
@@ -135,13 +135,13 @@ class ResourceController extends Zend_Controller_Action
 		mkdir($kernelpath ,0777, true);
 		mkdir($configpath ,0777, true);
 
-		if(isset($_FILES['config'])){
+		if($_FILES['config']['name'] != ''){
 			move_uploaded_file($_FILES['config']['tmp_name'], $configpath."default.tgz");
 		}
-		if(isset($_FILES['kernel'])){
+		if($_FILES['config']['name'] != ''){
 			move_uploaded_file($_FILES['kernel']['tmp_name'], $kernelpath."kernel");
 		}
-		if(isset($_FILES['init'])){
+		if($_FILES['config']['name'] != ''){
 			move_uploaded_file($_FILES['init']['tmp_name'], $initpath."initramfs");
 		}
 
@@ -184,16 +184,15 @@ class ResourceController extends Zend_Controller_Action
 		}	
 		
 		$bootosID = $bootos->getID();
+		$bootossrc = $bootos->getSource();
 
 		$bootos->setOptions($params);
 		$bootos->setID($bootosID);
 		$bootos->setGroupID($groupID);
-		$bootos->setSource($_SERVER['REMOTE_ADDR']);
+		$bootos->setSource($bootossrc);
 		$bootos->setCreated(time());
 		$bootos->setPublic('-1');
 		
-		$bootosMapper->save($bootos);
-
 		$initpath = "../resources/bootos/".$bootosID."/initramfs/";
 		$kernelpath = "../resources/bootos/".$bootosID."/kernel/";
 		$configpath = "../resources/bootos/".$bootosID."/config/";
@@ -202,16 +201,21 @@ class ResourceController extends Zend_Controller_Action
 		mkdir($kernelpath ,0777, true);
 		mkdir($configpath ,0777, true);
 
-		if(isset($_FILES['config'])){
+		if($_FILES['config']['name'] != ''){
+			$bootos->setSource($_SERVER['REMOTE_ADDR']);
 			move_uploaded_file($_FILES['config']['tmp_name'], $configpath."default.tgz");
 		}
-		if(isset($_FILES['kernel'])){
+		if($_FILES['config']['name'] != ''){
+			$bootos->setSource($_SERVER['REMOTE_ADDR']);
 			move_uploaded_file($_FILES['kernel']['tmp_name'], $kernelpath."kernel");
 		}
-		if(isset($_FILES['init'])){
+		if($_FILES['config']['name'] != ''){
+			$bootos->setSource($_SERVER['REMOTE_ADDR']);
 			move_uploaded_file($_FILES['init']['tmp_name'], $initpath."initramfs");
 		}
 
+		$bootosMapper->save($bootos);
+		
 		header('HTTP/1.0 201 Bootos edited');
 	}
 	
@@ -264,7 +268,7 @@ class ResourceController extends Zend_Controller_Action
 		$prebootpath = "../resources/bootmedium/".$prebootID."/";
 		mkdir($prebootpath ,0777, true);
 
-		if(isset($_FILES['preboot'])){
+		if($_FILES['preboot']['name'] != ''){
 			move_uploaded_file($_FILES['preboot']['tmp_name'], $prebootpath."preboot.zip");
 		}
 
@@ -291,7 +295,7 @@ class ResourceController extends Zend_Controller_Action
 		$params = $this->_request->getParams();
 		$source = $_SERVER['REMOTE_ADDR'];
 		
-		if($params['title'] == '' || $_FILES['preboot']['name'] == ''){
+		if($params['title'] == ''){
 			header('HTTP/1.0 400 Title must be set');
 			die();
 		}
@@ -312,21 +316,23 @@ class ResourceController extends Zend_Controller_Action
 			die();
 		}	
 		
+		$prebootsrc = $preboot->getSource();
 		$prebootID = $preboot->getID();
 
 		$preboot->setOptions($params);
 		$preboot->setGroupID($groupID);
-		$preboot->setSource($source);
+		$preboot->setSource($prebootsrc);
 		$preboot->setCreated(time());
 		
-		$prebootMapper->save($preboot);
-
 		$prebootpath = "../resources/bootmedium/".$prebootID."/";
 		mkdir($prebootpath ,0777, true);
 
-		if(isset($_FILES['preboot'])){
+		if($_FILES['preboot']['name'] != ''){
+			$preboot->setSource($source);			
 			move_uploaded_file($_FILES['preboot']['tmp_name'], $prebootpath."preboot.zip");
 		}
+		
+		$prebootMapper->save($preboot);
 
 		header('HTTP/1.0 201 Preboot edited');