Updated ACL handling

[gosa.git] / gosa-plugins / goto / admin / applications / class_applicationManagement.inc

diff --git a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
index bf332fed67a4135eee35fc88da6a97963f8fc740..78ec8dede967db3de03095669ac666ad1e540fdb 100644 (file)
--- a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
+++ b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
@@ -34,6 +34,7 @@ class applicationManagement extends plugin
   var $enableReleaseManagement  = false;
   var $start_pasting_copied_objects = FALSE;
 
+  var $acl_base     ="";
   var $app_base     ="";
   var $app_release  ="";
   var $acl_module   = array("application");  
@@ -66,16 +67,20 @@ class applicationManagement extends plugin
     $this->DivListApplication = new divListApplication($this->config,$this);
 
     if($this->IsReleaseManagementActivated()){
-    /* Check if we should enable the release selection */
+      $this->acl_base = $this->config->current['BASE'];
+
+      /* Check if we should enable the release selection */
       $this->enableReleaseManagement = true;
 
       /* Hide SubSearch checkbox */
       $this->DivListApplication->DisableCheckBox("SubSearch");
+    }else{
+      $this->acl_base = &$this->DivListApplication->selectedBase;
     }
 
     /* Set default release */
     if(!$this->IsReleaseManagementActivated()){
-      $this->app_base = get_ou("applicationou").$this->config->current['BASE'];
+      $this->app_base = get_ou("applicationRDN").$this->config->current['BASE'];
       if(!session::is_set("app_filter")){
         session::set("app_filter",array("app_base" => $this->app_base));
       }
@@ -83,8 +88,8 @@ class applicationManagement extends plugin
     }else{
 
       /* Set intial release */
-      $this->app_base = get_ou("applicationou").$this->config->current['BASE'];
-      $rel = $config->search("faiManagement","DEFAULT_RELEASE",array("menu"));
+      $this->app_base = get_ou("applicationRDN").$this->config->current['BASE'];
+      $rel = $config->search("faiManagement","DEFAULTFAIRELEASE",array("menu"));
       $rels = array_flip($this->getReleases());
       if(isset($rels[$rel])){
         $rel = $rels[$rel];
@@ -231,7 +236,7 @@ class applicationManagement extends plugin
       /* Create new usertab object */
       $this->apptabs= new apptabs($this->config,$this->config->data['TABS']['APPSTABS'], $this->dn,"application");
       $this->apptabs->parent = &$this;
-      $this->apptabs->set_acl_base($this->app_base);
+      $this->apptabs->set_acl_base($this->acl_base);
     }
 
 
@@ -356,7 +361,7 @@ class applicationManagement extends plugin
           $dns_names = array();
           foreach($this->dns as $dn){
             add_lock ($dn, $this->ui->dn);
-            $dns_names[] =@LDAP::fix($dn);
+            $dns_names[] =LDAP::fix($dn);
           }
 
           /* Lock the current entry, so nobody will edit it during deletion */
@@ -441,7 +446,7 @@ class applicationManagement extends plugin
         /* Lock the current entry, so nobody will edit it during deletion */
         add_lock ($this->dn, $this->ui->dn);
         $smarty= get_smarty();
-        $smarty->assign("intro",msgPool::deleteInfo(@LDAP::fix($this->dn),_("application")));
+        $smarty->assign("intro",msgPool::deleteInfo(LDAP::fix($this->dn),_("application")));
         $smarty->assign("multiple", false);
         return($smarty->fetch (get_template_path('remove.tpl', TRUE)));
       } else {
@@ -572,7 +577,7 @@ class applicationManagement extends plugin
     if(!$this->IsReleaseManagementActivated()){
       $use_base = $this->app_base;
       if($SubSearch){
-        $use_base = preg_replace("/^".normalizePreg(get_ou("applicationou"))."/","",$use_base);
+        $use_base = preg_replace("/^".preg_quote(get_ou("applicationRDN"), '/')."/","",$use_base);
       }
     }else{
       $use_base = $this->app_release;
@@ -586,7 +591,7 @@ class applicationManagement extends plugin
     }
  
     if($SubSearch){ 
-      $res= get_sub_list($Filter, "application",get_ou("applicationou"), $use_base, $search_attrs, $Flags);
+      $res= get_sub_list($Filter, "application",get_ou("applicationRDN"), $use_base, $search_attrs, $Flags);
     }else{
       $res= get_list($Filter, "application",$use_base, $search_attrs, $Flags);
     }
@@ -738,7 +743,7 @@ class applicationManagement extends plugin
       $app_filter['app_release'] = $this->app_release;
       session::set("app_filter",$app_filter);
     }elseif(!$this->IsReleaseManagementActivated()){
-      $this->app_base = get_ou("applicationou").$this->DivListApplication->selectedBase;
+      $this->app_base = get_ou("applicationRDN").$this->DivListApplication->selectedBase;
       $app_filter     = session::get("app_filter");
       $app_filter['app_base'] = $this->app_base;
       session::set("app_filter",$app_filter);