From d5b319ba583a969dcfaf4f553b309c8fc378d14f Mon Sep 17 00:00:00 2001 From: michael pereira Date: Mon, 25 Apr 2011 13:08:07 +0200 Subject: config fix --- application/controllers/ResourceController.php | 22 ++++++++++++++-------- .../modules/user/views/scripts/config/index.phtml | 18 ++++-------------- 2 files changed, 18 insertions(+), 22 deletions(-) (limited to 'application') diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index d48867a..fa3b214 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -59,7 +59,7 @@ class ResourceController extends Zend_Controller_Action $session->setBootosID($bootmenuentry->getBootosID()) ->setBootmenuentryID($bootmenuentry->getID()) ->setTime(time()) - ->setMembershipID($bootmenuMapper->find($bootmenuentry->getBootmenuID())->getMembershipID()) + ->setMembershipID('1') ->setIp($_SERVER['REMOTE_ADDR']) ->setAlphasessionID('0'); @@ -396,8 +396,11 @@ class ResourceController extends Zend_Controller_Action $hash = md5(microtime(1)); $tmp_conf = "../resources/config/$hash"; mkdir($tmp_conf ,0777, true); - exec("tar -C $tmp_conf -xvf ../resources/bootos/$bootosID/config/default.tgz"); + exec("tar -C $tmp_conf -xvf ../resources/bootos/$bootosID/config/default.tgz",$restul); + //exec("cp ../resources/config/loginfiles/* $path_userconf/rootfs/etc/"); + $username = ''; + $userpassword = ''; if($this->thisSession->getMembershipID() != null){ $person = new Application_Model_Person(); @@ -409,15 +412,16 @@ class ResourceController extends Zend_Controller_Action $username = preg_replace("!\s!","",$username); $userpassword = $person->getLoginPassword(); } - - foreach($bootosuser as $user){ - if($user->getLogin == '%username%'){ + + foreach($bootosuser as $user){ + + if($user->getLogin() == '%username%'){ $loginname = $username; }else{ $loginname = $user->getLogin(); } - if($user->getPassword == '%password%'){ + if($user->getPassword() == '%password%'){ $password = $userpassword; }else{ $password = $user->getPassword(); @@ -431,9 +435,11 @@ class ResourceController extends Zend_Controller_Action $homepath = "/home/$loginname"; } - exec("echo 'chroot /mnt useradd -d ".$homepath." -m -p '".$password."'".$loginname."' >> $tmp_conf/initramfs/postinit.local"); - + if($loginname != '' && $password != '') + exec("echo 'chroot /mnt useradd -d ".$homepath." -m -p \"".$password."\" ".$loginname."' >> $tmp_conf/initramfs/postinit.local",$restul); + } + // create the gzipped tarfile. chdir($tmp_conf); passthru( "tar cz *"); 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 @@
BootOs
- +
@@ -59,7 +59,7 @@
escape($bootos->getTitle()); ?>
escape($bootos->getGroupID()); ?> - escape($bootos->getDescription()); ?>
-
+
configlist[$bootos->getID()])==0) echo "There are no Config's to display." ?> configlist[$bootos->getID()] as $k => $config): ?> @@ -110,7 +110,7 @@
escape($config->getTitle()); ?>
escape($config->getDescription()) ?>
-
+
escape($config->getID()); ?>
@@ -135,14 +135,4 @@ pagination; ?> - + -- cgit v1.2.3-55-g7522 From b17baa42c84f8c9d719a8a06ade694ce0a0dc4a9 Mon Sep 17 00:00:00 2001 From: michael pereira Date: Mon, 25 Apr 2011 13:09:10 +0200 Subject: kcl fix --- application/controllers/ResourceController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application') diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index fa3b214..7519429 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -503,7 +503,7 @@ class ResourceController extends Zend_Controller_Action }else{ $result = "alpha=" . $this->_request->getParam('alpha') . " file=http://".$_SERVER['HTTP_HOST']."/c/".$this->_request->getParam('alpha')."/default.tgz ".$bme->getKclappend(); } - + $result = trim($result); header("Content-Length: ".(strlen($result))); echo $result; -- 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') 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') 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