Code

Fixed display of kiosk server path
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 3 Dec 2007 13:34:35 +0000 (13:34 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 3 Dec 2007 13:34:35 +0000 (13:34 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7982 594d385d-05f5-0310-b6e9-bd551577e9d8

plugins/admin/systems/class_goKioskService.inc

index 583a489ae36245b48ac663394f4f19aa9bde6c55..287ed9e36a45a6fc36168300502cce8c48f3ac37 100644 (file)
@@ -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){