Fixed goShare

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

diff --git a/Changelog b/Changelog
index 8c176e4d3c8503a170ff9b8bb10bbde40266a1a2..ad157e45842fe0a9991c2290b559094228066fb2 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@ GOsa2 changelog
 ===============
 
 * gosa 2.5.3
+  - Fixed environment shares, only available shares will be displayed (gosaUnitTag was ignored)
   - Fixed saving of inherited workstation settings
   - Removed error when no FAI repositories were present
   - Fixed posix group add dialog, filter wasn't working.

diff --git a/include/class_config.inc b/include/class_config.inc
index 080f606cefb11a50c4fc3c313b56d699a368f7e3..f413ecb62a8be8f3b0953dce4f1815322cd1da1a 100644 (file)
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -662,10 +662,12 @@ class config  {
   /* This function returns all available ShareServer */
   function getShareServerList()
   {
-    $ldap= $this->get_ldap_link();
-    $a_res = $ldap->search("(&(objectClass=goShareServer)(goExportEntry=*))",array("goExportEntry","cn"));
-    $return= array();
-    while($entry = $ldap->fetch($a_res)){
+    global $config;
+    $return = array();
+    $ui = get_userinfo();
+    $base = $config->current['BASE'];
+    $res = get_list("(&(objectClass=goShareServer)(goExportEntry=*))",$ui->subtreeACL,$base,array("goExportEntry","cn"),GL_SUBSEARCH);
+    foreach($res as $entry){
       if(isset($entry['goExportEntry']['count'])){
         unset($entry['goExportEntry']['count']);
       }
@@ -674,6 +676,7 @@ class config  {
         $sharename = $a_share[0];
         $return[$entry['cn'][0]."|".$sharename] = $entry['cn'][0]." [".$sharename."]";
       }
+
     }
     return($return);
   }