userconfig kiosk/membership angepasst

1 files changed, 32 insertions, 29 deletions

diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index bef5c2c..ee748da 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -87,40 +87,43 @@ class ResourceController extends Zend_Controller_Action
 
 		if(is_dir("../resources/config/$configID/")){
 			
-			$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';
 			header('Content-Disposition:  ' . $content_disp . '; filename="default.tgz"');
 			header('Pragma: no-cache');
 			header('Expires: 0');
-			 
-			// create the gzipped tarfile.
-			chdir($path_userconf);
-			passthru( "tar cz *");
-		}
+			
+			if($this->thisSession->getMembershipID() != null){
+
+				$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");
+				}
+				// create the gzipped tarfile.
+				chdir($path_userconf);
+				passthru( "tar cz *");
+			}else {
+				chdir("../resources/config/$configID/");
+				passthru( "cat default.tgz");	
+			}	
+		}	
 	}
 
 	public function getkernelAction()