From 2b37bf959538e619702e43dabaf8e859d7414284 Mon Sep 17 00:00:00 2001 From: michael pereira Date: Wed, 13 Apr 2011 20:14:15 +0200 Subject: resource fix membership --- application/controllers/ResourceController.php | 2 +- application/modules/fbgui/controllers/IndexController.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 1c9425b..e65bb28 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -96,7 +96,7 @@ class ResourceController extends Zend_Controller_Action if(is_dir("../resources/config/$configID/")){ - $path_userconf = "../resources/config/$configID/".$this->thisSession->getMembershipID()."/"; + $path_userconf = "../resources/config/$configID/1/"; if(!is_dir($path_userconf)){ mkdir($path_userconf ,0777, true); diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php index 450dd14..3b83008 100644 --- a/application/modules/fbgui/controllers/IndexController.php +++ b/application/modules/fbgui/controllers/IndexController.php @@ -55,14 +55,14 @@ class Fbgui_IndexController extends Zend_Controller_Action $pbsFilter = new Pbs_Filter(); $bootmenuID = $pbsFilter->evaluate(); if($bootmenuID != null){ - /* + print_a('Debug Output', 'Session is now set', 'Your sessionID is '.$session->getID(), 'Your alphasessionID is '.$session->getAlphasessionID(), 'Your client is '.$session->getClientID(), 'goto bootmenu '.$bootmenuID); - */ + $bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper(); $res = $bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID),false); $this->view->entries = $res; @@ -71,14 +71,14 @@ class Fbgui_IndexController extends Zend_Controller_Action } } else{ - /* + print_a('Debug Output', 'Session is now set', 'Your sessionID is '.$session->getID(), 'Your alphasessionID is '.$session->getAlphasessionID(), 'Your client is '.$session->getClientID(), 'there is no bootmenu for you'); - */ + echo "Goto Login to get your Bootmenu"; } } -- cgit v1.2.3-55-g7522 From a1611c74bbf9d6e55e6bd651443dba3fed4ee708 Mon Sep 17 00:00:00 2001 From: michael pereira Date: Wed, 13 Apr 2011 20:25:35 +0200 Subject: resource fix membership --- application/controllers/ResourceController.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index e65bb28..482469d 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -85,20 +85,20 @@ class ResourceController extends Zend_Controller_Action $configID = $bootmenuentry->getConfigID(); - $person = new Application_Model_Person(); - $personMapper = new Application_Model_PersonMapper(); - $membershipMapper = new Application_Model_MembershipMapper(); - $personID = $membershipMapper->find($this->thisSession->getMembershipID())->getPersonID(); - $person = $personMapper->find($personID); - $loginname = strtolower($person->getName()); - $loginname = preg_replace("!\s!","",$loginname); - - if(is_dir("../resources/config/$configID/")){ $path_userconf = "../resources/config/$configID/1/"; if(!is_dir($path_userconf)){ + + $person = new Application_Model_Person(); + $personMapper = new Application_Model_PersonMapper(); + $membershipMapper = new Application_Model_MembershipMapper(); + $personID = $membershipMapper->find($this->thisSession->getMembershipID())->getPersonID(); + $person = $personMapper->find($personID); + $loginname = strtolower($person->getName()); + $loginname = preg_replace("!\s!","",$loginname); + mkdir($path_userconf ,0777, true); exec("tar -C $path_userconf -xvf ../resources/config/$configID/default.tgz"); exec("cp ../resources/config/loginfiles/* $path_userconf/rootfs/etc/"); -- cgit v1.2.3-55-g7522