Beautify ldap lists

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

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
index 0b12ac8e898d69eba6195bfa8f641fb780949189..0e0fcb87af66863a77691756f973c9de2b9ec7ed 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
@@ -543,13 +543,22 @@ class workstartup extends plugin
       } 
     }
   
-    /* Add Entries 
-     */
+    /* Add Entries */
     foreach($this->gotoLdapServers as $key => $server){
+      /* Announce missing entries */
       if(!in_array($server,$this->gotoLdapServerList)){
         $server = $server."&nbsp;<font style='color:red'>(missing)</font>";
       }
 
+      /* Convert old style entry */
+      if (!preg_match('%:ldap://%', $server)){
+        $server= "ldap://".preg_replace('/^([^:]+):/', '\1/', $server);
+
+      /* Beautify new style entries */
+      } else {
+        $server= preg_replace("/^[^:]+:/", "", $server);
+      }
+
       $SelectBoxLdapServer->AddEntry(
           array(array("string" => $server),
             array("string" => 
@@ -568,6 +577,16 @@ class workstartup extends plugin
     $list = array();
     foreach($this->gotoLdapServerList as $key => $entry){
       if(!in_array($entry,$this->gotoLdapServers)){
+
+        /* Convert old style entry */
+        if (!preg_match('%:ldap://%', $entry)){
+          $entry= "ldap://".preg_replace('/^([^:]+):/', '\1/', $entry);
+
+        /* Beautify new style entries */
+        } else {
+          $entry= preg_replace("/^[^:]+:/", "", $entry);
+        }
+
         $list[$key] = $entry;
       }
     }