From d5de7346ec39576aa7523ebd5c3281d89f25791e Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 22 Feb 2008 09:17:21 +0000 Subject: [PATCH] Updated environemnt. -Kiosk profiles are detected correctly now git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9053 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/goto/personal/environment/class_environment.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gosa-plugins/goto/personal/environment/class_environment.inc b/gosa-plugins/goto/personal/environment/class_environment.inc index fe0be1d01..01df57a8b 100644 --- a/gosa-plugins/goto/personal/environment/class_environment.inc +++ b/gosa-plugins/goto/personal/environment/class_environment.inc @@ -243,8 +243,6 @@ class environment extends plugin $this->gotoAvailableShares= $config->getShareList(false); $this->update_kiosk_profiles(); - - $this->gotoKioskProfile= preg_replace("/^.*\//i","",$this->gotoKioskProfile); } @@ -258,7 +256,7 @@ class environment extends plugin $cnt = 0; while($attrs = $ldap->fetch()){ for($i = 0 ; $i < $attrs['gotoKioskProfile']['count'] ; $i ++){ - $name = preg_replace("/^.*kiosk\//","",$attrs['gotoKioskProfile'][$i]); + $name = preg_replace("/^.*\//","",$attrs['gotoKioskProfile'][$i]); $tmp1[$attrs['cn'][0]][] = $name; } $tmp2[$attrs['cn'][0]]= $attrs['cn'][0]; @@ -280,6 +278,7 @@ class environment extends plugin $this->gotoKioskProfile_Server = key($this->gotoKioskProfiles['SERVERS']); $error = true; } + if(!in_array($this->gotoKioskProfile_Profile, $this->gotoKioskProfiles['BY_SERVER'][$this->gotoKioskProfile_Server])){ $this->gotoKioskProfile_Profile = $this->gotoKioskProfiles['BY_SERVER'][$this->gotoKioskProfile_Server][0]; $error = true; -- 2.30.2