Fixed . and _ problem

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10674 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index 3ff6be3f5f5262c2fe31856bd305dba7fde1eb15..4d8b18c8c325eb34c66232ecfd0012cff7400b34 100644 (file)
--- 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 923ec72dc66e937d7927a662fa103aeead5e9925..aea90721160b80c115b1c7ff113a4d36bc6b4e5b 100644 (file)
--- 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 b9b7c73818c5440f2b044615a413f6685b7a1efd..6508592770ddacdbd4491a595776e2641f61405d 100644 (file)
--- 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)){