From d5b319ba583a969dcfaf4f553b309c8fc378d14f Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Mon, 25 Apr 2011 13:08:07 +0200
Subject: config fix

---
 .../modules/user/views/scripts/config/index.phtml      | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'application/modules/user')

diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml
index 37f5a9f..8ca5875 100644
--- a/application/modules/user/views/scripts/config/index.phtml
+++ b/application/modules/user/views/scripts/config/index.phtml
@@ -34,7 +34,7 @@
 	<div class='element'>
   		<div class='number'>
 			<div class='smallnumber'>BootOs</div>
-  			<?php echo $k ?>
+  			<?php echo $k+1 ?>
   		</div>
   		<div class='content'>  	
   			<div class='actions'>
@@ -59,7 +59,7 @@
   			<?php  ?>
 	  		<div class='title'><?php echo $this->escape($bootos->getTitle()); ?></div>
 	  		<div class='subtitle'><?php echo $this->escape($bootos->getGroupID()); ?> - <?php echo $this->escape($bootos->getDescription()); ?></div>
-	  		<div class='details'>
+	  		<div class='details dispnone'>
 				<?php if(count($this->configlist[$bootos->getID()])==0)
 					echo "There are no Config's to display." ?>
 				<?php foreach ($this->configlist[$bootos->getID()] as $k => $config): ?>
@@ -110,7 +110,7 @@
 			  				</div>  
 			  				<div class='title'><?php echo $this->escape($config->getTitle()); ?></div>
 			  				<div class='subtitle'><?php echo $this->escape($config->getDescription()) ?></div>	
-			  				<div class='details'>
+			  				<div class='details dispnone'>
 			  					<?php if(Pbs_Acl::checkRight('csai')): ?>
 			  						<label>ConfigID</label>
 			  							<div class='item'><?php echo $this->escape($config->getID()); ?></div>
@@ -135,14 +135,4 @@
 
 <?php echo $this->pagination; ?>
 
-<script type="text/javascript">
-$(document).ready(function(){
-	if($('.element').find('.dispnone').length >= 1){
-		$(this).find('.title').css('cursor','pointer');
-		
-		$('.title').click(function(){
-			$(this).siblings('.dispnone').toggle();
-		});
-	}
-});
-</script>
+
-- 
cgit v1.2.3-55-g7522


From ce81bde26fe30ecec4074287d4e1a4fcfac09da1 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Mon, 25 Apr 2011 13:28:08 +0200
Subject: config fix

---
 application/models/BootOsUserMapper.php                   | 2 +-
 application/modules/user/controllers/ConfigController.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'application/modules/user')

diff --git a/application/models/BootOsUserMapper.php b/application/models/BootOsUserMapper.php
index a50fd02..f93cd3f 100644
--- a/application/models/BootOsUserMapper.php
+++ b/application/models/BootOsUserMapper.php
@@ -88,7 +88,7 @@ class Application_Model_BootOsUserMapper
 			unset($data['bootosuserID']);
 			return $this->getDbTable()->insert($data);
 		} else {
-			$this->getDbTable()->update($data, array('bootosID = ?' => $id));
+			$this->getDbTable()->update($data, array('bootosuserID = ?' => $id));
 		}
 	}
 	
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index 6acb697..c350677 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -361,6 +361,8 @@ class user_ConfigController extends Zend_Controller_Action
 						$this->_redirect('/user/config/showconfig/type/'.$this->type.'/configID/'.$configID.'/modifyresult/forbidden');
 				}
 				 
+				$bootosuser->setID($bootosuserID);
+				$bootosuser->setConfigID($configID);
 				$bootosuser->setHomepath(str_replace("%login-name%", $bootosuser->getLogin(), $bootosuser->getHomepath()));
 				if($bootosuser->getPassword() != '%password%')
 					$bootosuser->setPassword(crypt($bootosuser->getPassword(), '$6$'.randomString(8).'$'));
-- 
cgit v1.2.3-55-g7522


From 23f4df1970301bafda9c18837474b5d28359ab05 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Mon, 25 Apr 2011 13:44:04 +0200
Subject: upload data fix

---
 application/controllers/ResourceController.php            | 1 -
 application/modules/user/controllers/ConfigController.php | 2 +-
 application/modules/user/forms/Bootos.php                 | 1 +
 application/modules/user/forms/Preboot.php                | 3 ++-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'application/modules/user')

diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 7519429..1c28d12 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -389,7 +389,6 @@ class ResourceController extends Zend_Controller_Action
 				chdir("../resources/bootos/$bootosID/config/");
 				passthru( "cat default.tgz");
 			}else{
-				
 				$bootosuserMapper = new Application_Model_BootOsUserMapper();
 				$bootosuser = $bootosuserMapper->findBy(array('configID' => $configID));
 				
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index c350677..eca5d54 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -360,7 +360,7 @@ class user_ConfigController extends Zend_Controller_Action
 					if(!Pbs_Acl::checkRight('ce'))
 						$this->_redirect('/user/config/showconfig/type/'.$this->type.'/configID/'.$configID.'/modifyresult/forbidden');
 				}
-				 
+				
 				$bootosuser->setID($bootosuserID);
 				$bootosuser->setConfigID($configID);
 				$bootosuser->setHomepath(str_replace("%login-name%", $bootosuser->getLogin(), $bootosuser->getHomepath()));
diff --git a/application/modules/user/forms/Bootos.php b/application/modules/user/forms/Bootos.php
index 5e20a8a..432f0c7 100644
--- a/application/modules/user/forms/Bootos.php
+++ b/application/modules/user/forms/Bootos.php
@@ -37,6 +37,7 @@ class user_Form_Bootos extends Zend_Form
     {
         $this->setName("BootOsCreate");
 		$this->setMethod('post');
+		$this->setEnctype("multipart/form-data");
 		
 		if (!Pbs_Acl::checkRight('boe') && $this->action == 'editbootos')
 			$meta = true;
diff --git a/application/modules/user/forms/Preboot.php b/application/modules/user/forms/Preboot.php
index 54dc216..f1a609f 100644
--- a/application/modules/user/forms/Preboot.php
+++ b/application/modules/user/forms/Preboot.php
@@ -27,7 +27,8 @@ class user_Form_Preboot extends Zend_Form
     {
         $this->setName($this->action);
 		$this->setMethod('post');
-
+		$this->setEnctype("multipart/form-data");
+		
 		if (!Pbs_Acl::checkRight('pre') && $this->action == 'editpreboot')
 			$meta = true;
 		else 
-- 
cgit v1.2.3-55-g7522