From: cajus Date: Mon, 3 Dec 2007 13:34:35 +0000 (+0000) Subject: Fixed display of kiosk server path X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bd623487a57ad860b41e574784e8ffbf8ce83da8;p=gosa.git Fixed display of kiosk server path git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7982 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/admin/systems/class_goKioskService.inc b/plugins/admin/systems/class_goKioskService.inc index 583a489ae..287ed9e36 100644 --- a/plugins/admin/systems/class_goKioskService.inc +++ b/plugins/admin/systems/class_goKioskService.inc @@ -24,6 +24,7 @@ class goKioskService extends goService{ $this->DisplayName = _("Kiosk profile service"); $this->baseDir = $this->config->search('environment', 'kioskpath',array('menu','tabs')); + $this->server_path = preg_replace("/%cn/", $this->cn, $this->server_path); /* Load list of profiles and check if they still exists */ if ($this->baseDir == ""){ @@ -34,7 +35,6 @@ class goKioskService extends goService{ for($i = 0 ; $i < $this->attrs['gotoKioskProfile']['count']; $i ++){ $url = $this->attrs['gotoKioskProfile'][$i]; $this->server_path = preg_replace("/\/[^\/]*$/","",$url); - $this->server_path = preg_replace("/".normalizePreg($this->cn)."/","%cn",$this->server_path); $name= preg_replace("/^.*\//","",$url); $this->gotoKioskProfiles[] = array('url' => $url , 'name' => $name , @@ -186,7 +186,7 @@ class goKioskService extends goService{ { goService::save(); - $method = preg_replace("/%cn/",$this->cn,$this->server_path."/"); + $method = $this->server_path."/"; $method = preg_replace("/\/\/*$/","/",$method); $this->attrs['gotoKioskProfile'] = array(); foreach($this->gotoKioskProfiles as $profile){