diff options
| author | michael pereira | 2011-04-25 13:44:04 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-25 13:44:04 +0200 |
| commit | 23f4df1970301bafda9c18837474b5d28359ab05 (patch) | |
| tree | 2f57d7d1a64bb379066d37661ec692ce1fd6beb9 /application | |
| parent | config fix (diff) | |
| download | pbs2-23f4df1970301bafda9c18837474b5d28359ab05.tar.gz pbs2-23f4df1970301bafda9c18837474b5d28359ab05.tar.xz pbs2-23f4df1970301bafda9c18837474b5d28359ab05.zip | |
upload data fix
Diffstat (limited to 'application')
| -rw-r--r-- | application/controllers/ResourceController.php | 1 | ||||
| -rw-r--r-- | application/modules/user/controllers/ConfigController.php | 2 | ||||
| -rw-r--r-- | application/modules/user/forms/Bootos.php | 1 | ||||
| -rw-r--r-- | application/modules/user/forms/Preboot.php | 3 |
4 files changed, 4 insertions, 3 deletions
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 |