Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

2 files changed, 14 insertions, 14 deletions

diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 1c9425b..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/".$this->thisSession->getMembershipID()."/";
+			$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/");
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 6f6c065..72edc6f 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -75,14 +75,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;
@@ -91,14 +91,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 "<a href='/fbgui/auth/login/'>Goto Login to get your Bootmenu</a>";
 			}
 		}