summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael pereira2011-04-13 20:42:03 +0200
committermichael pereira2011-04-13 20:42:03 +0200
commit832f3c9099ee711c4bc5ed52a274cd0c663c7657 (patch)
treefec9a7fa414152e31238a6ec6bdbd4dcef9ec989
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-832f3c9099ee711c4bc5ed52a274cd0c663c7657.tar.gz
pbs2-832f3c9099ee711c4bc5ed52a274cd0c663c7657.tar.xz
pbs2-832f3c9099ee711c4bc5ed52a274cd0c663c7657.zip
resource fix
-rw-r--r--application/controllers/ResourceController.php44
1 files changed, 23 insertions, 21 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index e6787e5..bef5c2c 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -87,27 +87,29 @@ class ResourceController extends Zend_Controller_Action
if(is_dir("../resources/config/$configID/")){
- $path_userconf = "../resources/config/$configID/".$this->thisSession->getMembershipID()."/";
-
- 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/");
- exec("tar -C $path_userconf -xvf ../resources/config/$configID/default.tgz");
- exec("echo '$loginname:x:1000:1000:".$person->getName()." ".$person->getFirstname().",,,:/home/$loginname:/bin/bash' >> $path_userconf/rootfs/etc/passwd");
- exec("md5pass ".$person->getPassword(), $pwhash);
- exec("echo '$loginname:$pwhash[0]:0:0:99999:7:::' >> $path_userconf/rootfs/etc/shadow");
- exec("echo 'mkdir /home/$loginname' >> $path_userconf/initramfs/postinit.local");
- }
+ $path_userconf = "../resources/config/$configID/1/";
+
+ //".$this->thisSession->getMembershipID()."/";
+
+// 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/");
+// exec("tar -C $path_userconf -xvf ../resources/config/$configID/default.tgz");
+// exec("echo '$loginname:x:1000:1000:".$person->getName()." ".$person->getFirstname().",,,:/home/$loginname:/bin/bash' >> $path_userconf/rootfs/etc/passwd");
+// exec("md5pass ".$person->getPassword(), $pwhash);
+// exec("echo '$loginname:$pwhash[0]:0:0:99999:7:::' >> $path_userconf/rootfs/etc/shadow");
+// exec("echo 'mkdir /home/$loginname' >> $path_userconf/initramfs/postinit.local");
+// }
header('Content-Type: application/x-gzip');
$content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $_SERVER['HTTP_USER_AGENT']) == 'IE') ? 'inline' : 'attachment';