summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authormichael pereira2011-04-27 15:36:52 +0200
committermichael pereira2011-04-27 15:36:52 +0200
commitd1f65a46be08f1e61c2d437e02b19531558f69cb (patch)
treec18970c615d91e516d0af667fa815e076d586210 /application/controllers
parentuser (diff)
downloadpbs2-d1f65a46be08f1e61c2d437e02b19531558f69cb.tar.gz
pbs2-d1f65a46be08f1e61c2d437e02b19531558f69cb.tar.xz
pbs2-d1f65a46be08f1e61c2d437e02b19531558f69cb.zip
user
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/ResourceController.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 07c5eab..d9941cd 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -449,10 +449,10 @@ class ResourceController extends Zend_Controller_Action
}
else{
exec("echo 'chroot /mnt useradd -d '".escapeshellarg("'".$homepath."'")."' -m -s /bin/bash -p '".escapeshellarg("'".$password."'")."' '".escapeshellarg("'".$loginname."'")."'' >> $tmp_conf/initramfs/postinit.local",$restul);
- if($anzUsers == 2 && in_array('kiosk',$test) && !in_array('%username%',$test))
+ if($anzUsers <= 2 && $user->getLogin() == 'kiosk' && !in_array('%username%',$test))
exec("echo 'chroot /mnt sed -e \"s/AutoLoginEnable=.*/AutoLoginEnable=true/g;\" /etc/kde4/kdm/kdmrc > /tmp/tmpkdmrc && sed 21iAutoLoginUser=kiosk /tmp/tmpkdmrc > /mnt/etc/kde4/kdm/kdmrc && rm /tmp/tmpkdmrc' >> $tmp_conf/initramfs/postinit.local");
- if($anzUsers == 2 && $user->getLogin() == '%username%')
+ if($anzUsers <= 2 && $user->getLogin() == '%username%')
exec("echo 'chroot /mnt sed -e \"s/AutoLoginEnable=.*/AutoLoginEnable=true/g;\" /etc/kde4/kdm/kdmrc > /tmp/tmpkdmrc && sed 21iAutoLoginUser='".escapeshellarg("'".$loginname."'")."' /tmp/tmpkdmrc > /mnt/etc/kde4/kdm/kdmrc && rm /tmp/tmpkdmrc' >> $tmp_conf/initramfs/postinit.local");
}