From 2b157ab3d5dd306ac396c0f73a94fe0c63a2cd43 Mon Sep 17 00:00:00 2001 From: cajus Date: Thu, 24 Apr 2008 13:30:23 +0000 Subject: [PATCH] Fixed . and _ problem git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10674 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/include/class_config.inc | 3 +-- .../admin/systems/services/kerberos/class_goKrbServer.inc | 4 ++-- gosa-plugins/systems/admin/systems/class_serverService.inc | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc index 3ff6be3f5..4d8b18c8c 100644 --- a/gosa-core/include/class_config.inc +++ b/gosa-core/include/class_config.inc @@ -346,14 +346,13 @@ class config { function encode_server_url($url, $base, $val) { - return (preg_replace("/_+/", "_", "HTTP_".strtr(strtoupper($url."_".md5($base)."_$val"), "-:/", "___"))); + return (preg_replace("/_+/", "_", "HTTP_".strtr(strtoupper($url."_".md5($base)."_$val"), ".-:/", "____"))); } function get_admin_dn() { $enc= $this->encode_server_url($this->current['SERVER'], $this->current['BASE'], "ADMIN"); - /* Answer from http request */ if (isset($_SERVER[$enc])){ return $_SERVER[$enc]; diff --git a/gosa-plugins/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc b/gosa-plugins/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc index 923ec72dc..aea907211 100644 --- a/gosa-plugins/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc +++ b/gosa-plugins/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc @@ -233,7 +233,7 @@ class goKrbServer extends goService{ /* Add new Policy requested */ if(isset($_POST['policy_add'])){ - $this->dialog = new krb5_policy($this->config,array(),&$this); + $this->dialog = new krb5_policy($this->config,array(),$this); $this->id = -1; } @@ -266,7 +266,7 @@ class goKrbServer extends goService{ /* Open dialog */ $this->id = $id; - $this->dialog = new krb5_policy($this->config,$this->policies[$id],&$this); + $this->dialog = new krb5_policy($this->config,$this->policies[$id], $this); } break; } diff --git a/gosa-plugins/systems/admin/systems/class_serverService.inc b/gosa-plugins/systems/admin/systems/class_serverService.inc index b9b7c7381..650859277 100644 --- a/gosa-plugins/systems/admin/systems/class_serverService.inc +++ b/gosa-plugins/systems/admin/systems/class_serverService.inc @@ -59,7 +59,7 @@ class ServerService extends plugin $name= $plug['CLASS']; $this->plugin_names[]= $name; - $this->plugins[$name]= new $name($config, $dn,&$this); + $this->plugins[$name]= new $name($config, $dn, $this); /* Capture all service objectClases, necessary for acl handling */ if(isset($this->plugins[$name]->objectclasses)){ -- 2.30.2