diff options
| author | Simon | 2011-04-26 17:41:53 +0200 |
|---|---|---|
| committer | Simon | 2011-04-26 17:41:53 +0200 |
| commit | 20e70e18e383d990fe6a231c4da0a3cbd49e55f4 (patch) | |
| tree | 02192ed794ed79af8ddedcc3c31a01ac14b6b351 /application | |
| parent | Filter bugfix (diff) | |
| parent | config fix (diff) | |
| download | pbs2-20e70e18e383d990fe6a231c4da0a3cbd49e55f4.tar.gz pbs2-20e70e18e383d990fe6a231c4da0a3cbd49e55f4.tar.xz pbs2-20e70e18e383d990fe6a231c4da0a3cbd49e55f4.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application')
| -rw-r--r-- | application/controllers/ResourceController.php | 2 | ||||
| -rw-r--r-- | application/modules/user/controllers/BootmenuController.php | 4 | ||||
| -rw-r--r-- | application/modules/user/controllers/ConfigController.php | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 8d52348..c9ade02 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -436,7 +436,7 @@ class ResourceController extends Zend_Controller_Action if($loginname != '' && $password != ''){ // if($user->getHometypeID() == 1) -// //exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ]; then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p '".escapeshellarg("'".$password."'").' ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s '/bin/bash' -p '".$password."' ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s '/bin/bash' -p '".$password."' ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local"); +// //exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d '".escapeshellarg("'"./media/openslx-stick/home/".$loginname."'")."' ]; then \n\t\t chroot /mnt useradd -d '".escapeshellarg("'".$homepath."'")."' -m -s /bin/bash -p '".escapeshellarg("'".$password."'").' ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s '/bin/bash' -p '".$password."' ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s '/bin/bash' -p '".$password."' ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local"); // else exec("echo 'chroot /mnt useradd -d '".escapeshellarg("'".$homepath."'")."' -m -s /bin/bash -p '".escapeshellarg("'".$password."'")."' '".escapeshellarg("'".$loginname."'")."'' >> $tmp_conf/initramfs/postinit.local",$restul); } diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php index 214946c..3d6fbf1 100644 --- a/application/modules/user/controllers/BootmenuController.php +++ b/application/modules/user/controllers/BootmenuController.php @@ -337,7 +337,7 @@ class user_BootmenuController extends Zend_Controller_Action $grouptitle = $groupMapper->find($p)->getTitle(); $bootoslist[$b->getID()] = $b; $bootosanzeige[$grouptitle][$b->getID()] = $b->getTitle(); - $configlist['Preset'][$b->getID()] = $configMapper->findBy(array('groupID' => $groupID, 'bootosID' => $b->getID(), 'visible' => '1')); + $configlist['Preset'][$b->getID()] = $configMapper->findBy(array('bootosID' => $b->getID(), 'visible' => '1')); $configlist['Custom'][$b->getID()] = $configMapper->findBy(array('membershipID' => $this->membership->getID(), 'bootosID' => $b->getID(), 'visible' => '1')); } } @@ -449,7 +449,7 @@ class user_BootmenuController extends Zend_Controller_Action $grouptitle = $groupMapper->find($p)->getTitle(); $bootoslist[$b->getID()] = $b; $bootosanzeige[$grouptitle][$b->getID()] = $b->getTitle(); - $configlist['Preset'][$b->getID()] = $configMapper->findBy(array('groupID' => $groupID, 'bootosID' => $b->getID(), 'visible' => '1')); + $configlist['Preset'][$b->getID()] = $configMapper->findBy(array('bootosID' => $b->getID(), 'visible' => '1')); $configlist['Custom'][$b->getID()] = $configMapper->findBy(array('membershipID' => $this->membership->getID(), 'bootosID' => $b->getID(), 'visible' => '1')); } diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php index eca5d54..9e324c4 100644 --- a/application/modules/user/controllers/ConfigController.php +++ b/application/modules/user/controllers/ConfigController.php @@ -262,6 +262,7 @@ class user_ConfigController extends Zend_Controller_Action foreach($this->view->userlist as $user){ $user->setHometypeID("[".$user->getHometypeID()."] ".$hometypeMapper->find($user->getHometypeID())->getName()); } + } public function adduserAction(){ |