summaryrefslogtreecommitdiffstats
path: root/application/controllers/ResourceController.php
diff options
context:
space:
mode:
authorSimon2011-04-13 20:29:08 +0200
committerSimon2011-04-13 20:29:08 +0200
commitd2dd03c98e1abb2faefe6e1e2e6396548e0287e6 (patch)
treec9458d975cb5b30e19ceaf6811672a621cb17644 /application/controllers/ResourceController.php
parentMembershipID wird gesetzt, Session wird nich doppelt erstellt (diff)
parentresource fix membership (diff)
downloadpbs2-d2dd03c98e1abb2faefe6e1e2e6396548e0287e6.tar.gz
pbs2-d2dd03c98e1abb2faefe6e1e2e6396548e0287e6.tar.xz
pbs2-d2dd03c98e1abb2faefe6e1e2e6396548e0287e6.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/controllers/ResourceController.php')
-rw-r--r--application/controllers/ResourceController.php20
1 files changed, 10 insertions, 10 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/");