Code

Fixed acls
[gosa.git] / plugins / admin / groups / class_groupApplication.inc
index 5b42adcde0524569323894690f099e03c798d4dc..8166af28ccfba2cefc2b37966d609bde1f31baa3 100644 (file)
@@ -10,30 +10,65 @@ class appgroup extends plugin
   var $gosaMemberApplication= array();
 
   /* Helpers */
-  var $department= "";
-  var $apps= array();
-  var $used_apps= array();
-  var $opt_edit= FALSE;
-  var $option_name= array();
-  var $option_value= array();
-  var $appoption= array();
-  var $table= "";
-  var $curbase   = "";
-  var $curCatDir;
-  var $curCatDepth=0;
-  var $Categories=array();
+  var $departments        = "";       // All departments within $this->curbase;
+  var $apps               = array();  // All available applications
+  var $used_apps          = array();  // Specifies which applications are currently assigned 
 
+  var $option_name          = array();
+  var $option_value         = array();
+  var $appoption            = array();
+
+  var $table                  = "";
+  var $curbase                = "";
+  var $curCatDir                  ;
+  var $curCatDepth              =0;         //
 
   /* attribute list for save action */
-  var $attributes= array();
-  var $objectclasses= array("gosaApplicationGroup");
+  var $attributes               = array("gosaMemberApplication","gosaApplicationParameter");
+  var $objectclasses            = array("gosaApplicationGroup");
+
+  var $FAIrelease               = "/";
+  var $InitialFAIrelease           = "/";
+  var $Releases                 = array();
+  var $enableReleaseManagement  = false;
+
+  var $AllAppsForRelease        = array();
+  var $AllAppsForReleaseParameter = array();
+
+  var $CopyPasteVars            = array("Categories");
+  var $gosaApplicationParameter ;
+
 
-  function appgroup ($config, $dn= NULL)
+  function appgroup ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+   
+    /* prepare group app for release management */ 
+    $tmp = search_config($config->data,"faiManagement","CLASS");
+    if(!empty($tmp)){
+      $this->enableReleaseManagement = true;
+      $this->objectclasses [] = "FAIreleaseTag";
+      $this->attributes[] =  "FAIrelease";
+    }
+
+    plugin::plugin ($config, $dn, $parent);
+
+    /* In some case of old applikations with old release tag saving, we 
+        must reassign is_account state.
+       (Or if release management wasn't activated before creating this app) */
+    if($this->enableReleaseManagement){
+  
+      /* Release management is activated && this is a valid group app account,
+          but no release class was found, so activate is_account flag  */
+      if($dn != "new" && ( in_array("gosaApplicationGroup",$this->attrs['objectClass'])) && 
+         (!in_array("FAIreleaseTag",$this->attrs['objectClass']))){
+        $this->is_account =true;
+      }
+    }
+    
 
     /* Load member applications */
     if (isset ($this->attrs["gosaMemberApplication"][0])){
+      $this->gosaMemberApplication = array();
       for ($i= 0; $i<$this->attrs["gosaMemberApplication"]["count"]; $i++){
         $this->gosaMemberApplication[]=
           $this->attrs["gosaMemberApplication"][$i];
@@ -51,168 +86,307 @@ class appgroup extends plugin
       }
     }
 
-    $tmp = array();
-    $tmp2 = array();
-  
-    $prios = array();
-
-    $cats = array();
+    /* Parse MemberApplication*/
+    $tmp    = array();
+    $tmp2   = array();
+    $prios  = array();
+    $cats   = array();
 
     foreach($this->gosaMemberApplication as $memberApp){
       if(preg_match("/\|/i",$memberApp)){
-        $tmp = split("\|",$memberApp);
-        $tmp2[$tmp[0]."|".$tmp[1]]['App'] = $tmp[0];
-        $tmp2[$tmp[0]."|".$tmp[1]]['Cat'] = $tmp[1];
-        $tmp2[$tmp[0]."|".$tmp[1]]['Pri'] = $tmp[2];
     
-        $cats [$tmp[1]] = $tmp[1];
+        $tmp = split("\|",$memberApp);
+        if(!empty($tmp[0])){
+          $tmp2[$tmp[1]][$tmp[2]] = array("App"=>$tmp[0]);
+        }
+        if(!empty($tmp[1])){
+          $n = split("/",$tmp[1]);
+          $c = count($n);
+          $cats [$tmp[1]] = $n[$c-1];
+        }
         $prios[$tmp[1]][$tmp[2]] = $tmp[2];
       }else{
-        $tmp2[$memberApp."|"]['App'] = $memberApp;
-        $tmp2[$memberApp."|"]['Cat'] = "";
-        $tmp2[$memberApp."|"]['Pri'] = 1000;
+        $tmp2[]['App'] = $memberApp;
       }
     }
 
+    $this->Categories = $cats;
+
     $this->gosaMemberApplication = $tmp2;
+    $cats[""]="";
     foreach($cats as $cat ){
-      $max = max($prios[$cat]);
-      $min = 1;//min($prios[$cat]);  
-      $last = false;
-      for($i = $min ; $i < $max ; $i++){
-        if(!isset($prios[$cat][$i])){
-          if($last == false){
-            $this->gosaMemberApplication["__SEPARATOR__".$i."|".$cat]['Pri'] = $i;
-            $this->gosaMemberApplication["__SEPARATOR__".$i."|".$cat]['Cat'] = $this->curCatDir;
-            $this->gosaMemberApplication["__SEPARATOR__".$i."|".$cat]['App'] = "__SEPARATOR__".$i;
-          
-            $last = true;
+      if((isset($prios[$cat]))&&(count($prios[$cat]))){
+        $max = max($prios[$cat]);
+        $min = 1;//min($prios[$cat]);  
+        $last = false;
+        for($i = $min ; $i < $max ; $i++){
+          if(!isset($prios[$cat][$i])){
+            if($last == false){
+              $this->gosaMemberApplication[$cat][$i]['App'] = "__SEPARATOR__".$i;
+            
+              $last = true;
+            }
+          }else{
+            $last = false;
           }
-        }else{
-          $last = false;
         }
       }
     }
 
-    /* Append at last*/
-    foreach($this->gosaMemberApplication as $key => $app){
-      if($app['Pri'] == 1000){
-        $this->gosaMemberApplication[$key]['Pri'] = $this->getNextFree(1,$app['Cat']);
+    $tmp = array();
+    foreach($this->gosaMemberApplication as $key =>  $entries){
+      ksort ($entries);
+      foreach($entries as $entry){
+        $tmp[$key][]= $entry;
       }
     }
-  
-  
+    $this->gosaMemberApplication = $tmp;
     $this->curbase = $this->config->current['BASE'];
+    
+    /* Get required release informations */
+    if($this->enableReleaseManagement){
+      $this->InitialFAIrelease = $this->FAIrelease;
+      $this->Releases       = $this->getReleases();
+    }
   }
 
-  function getOneUp($appl)
+
+  /* Combine new array */
+  function combineArrays($ar0,$ar1,$ar2)
   {
-    $prio = $this->gosaMemberApplication[$appl]['Pri'];
-    $prios = array();
-    $next = 0;
-    $key_use = false;
-    foreach($this->gosaMemberApplication as $key => $app){
-      if($app['Cat'] != $this->gosaMemberApplication[$appl]['Cat']) continue;
-      if($app['Pri']< $prio){
-        if($app['Pri'] > $next){
-          $next     = $app['Pri'];
-          $key_use  = $key;
-        }
-      }        
+    $ret = array();
+    if(is_array($ar0))
+    foreach($ar0 as $ar => $a){
+        $ret[$ar]=$a;
+    }
+    if(is_array($ar1))
+    foreach($ar1 as $ar => $a){
+        $ret[$ar]=$a;
     }
+    if(is_array($ar2))
+    foreach($ar2 as $ar => $a){
+        $ret[$ar]=$a;
+    }
+    return($ret);
+  }
 
-    if($next != 0){
-      $this->gosaMemberApplication[$appl]['Pri']= $next;
-      $this->gosaMemberApplication[$key_use]['Pri']= $prio;
+  function getpos($atr,$attrs)
+  {
+    $i = 0;
+    foreach($attrs as $attr => $name)    {
+      $i++;
+      if($attr == $atr){
+        return($i);
+      }
     }
+    return(-1);
   }
-  
-  function getOneDown($appl){
-    $prio = $this->gosaMemberApplication[$appl]['Pri'];
-    $prios = array();
-    $next = 10000;
-    $key_use = false;
-    foreach($this->gosaMemberApplication as $key => $app){
-      if($app['Cat'] != $this->gosaMemberApplication[$appl]['Cat']) continue;
 
-      
+  function diffAppsInReleases()
+  {
+    /* Only diff if it is required 
+     */
+    $ret =array();
+
+    /* If current release has changed */
+    if($this->FAIrelease != $this->InitialFAIrelease){
+
+      /* Walk through all apps which are currently displayed */
+      if(isset($this->gosaMemberApplication[$this->curCatDir])){
+
+        foreach($this->gosaMemberApplication[$this->curCatDir] as $entry){
+
+          /* If application is also available in new release, check if parameter differs */
+          if(in_array($entry['App'],$this->AllAppsForRelease)){ 
+
+            $old = array();   // Old application parameter
+            $new = array();   // New parameters 
+
+            /* There are possibly no parameters specified */
+            if(isset($this->AllAppsForReleaseParameter[$this->InitialFAIrelease][$entry['App']])){
+              $old = $this->AllAppsForReleaseParameter[$this->InitialFAIrelease][$entry['App']];
+            }
 
-      if($app['Pri']> $prio){
-        if($app['Pri'] < $next){
-          $next     = $app['Pri'];
-          $key_use  = $key;
+            if(isset($this->AllAppsForReleaseParameter[$this->FAIrelease][$entry['App']])){
+              $new = $this->AllAppsForReleaseParameter[$this->FAIrelease][$entry['App']];
+            }
+
+            /*  Both (old & new) have no gosaApplicationParameter
+             */
+            if((!isset($old['gosaApplicationParameter'])) && (!isset($new['gosaApplicationParameter']))){
+              $ret[$entry['App']] = false; 
+
+              /* Both got gosaApplicationParameter
+               */
+            }elseif((isset($old['gosaApplicationParameter'])) && (isset($new['gosaApplicationParameter']))){
+              if(array_differs($old['gosaApplicationParameter'],$new['gosaApplicationParameter'])){
+                $ret[$entry['App']]  = true;
+              }else{
+                $ret[$entry['App']]  = false;
+              }
+            }
+            /* Initialy had gosaApplicationParameter bot in new release not 
+             */
+          }elseif((isset($old['gosaApplicationParameter'])) && (!isset($new['gosaApplicationParameter']))){
+            $ret[$entry['App']]  = true;
+
+            /* Old release had no gosaApplicationParameter but new got some
+             */
+          }elseif((!isset($old['gosaApplicationParameter'])) && (isset($new['gosaApplicationParameter']))){
+            $ret[$entry['App']]  = true;
+          }
         }
       }
     }
+    return($ret);
+  }
 
-    if($next != 0){
-      $this->gosaMemberApplication[$appl]['Pri']= $next;
-      $this->gosaMemberApplication[$key_use]['Pri']= $prio;
+  /* TRansports the geiven Arraykey one position up*/
+  function ArrayUp($atr,$attrs)
+  {
+    $ret = $attrs;
+    $pos = $this->getpos($atr,$attrs) ;
+    $cn = count($attrs);
+    if(!(($pos == -1)||($pos == 1))){
+      $before = array_slice($attrs,0,($pos-2));
+      $mitte  = array_reverse(array_slice($attrs,($pos-2),2));
+      $unten  = array_slice($attrs,$pos);
+      $ret = array();
+      $ret = $this->combineArrays($before,$mitte,$unten);
     }
+    return($ret);
   }
-  
-  function getNextFree($prio,$cat)
+
+
+  /* TRansports the geiven Arraykey one position up*/
+  function ArrayDown($atr,$attrs)
   {
-    $ret = $prio;
-    $prios =array();
-    foreach($this->gosaMemberApplication as $app){
-      if($cat == $app['Cat']){
-        $prios[$app['Pri']]=$app['Pri'];
-      }
-    }
-    while(isset($prios[$ret])){
-      $ret ++;
+    $ret = $attrs;
+    $pos = $this->getpos($atr,$attrs) ;
+    $cn = count($attrs);
+    if(!(($pos == -1)||($pos == $cn))){
+      $before = array_slice($attrs,0,($pos-1));
+      $mitte  = array_reverse(array_slice($attrs,($pos-1),2));
+      $unten  = array_slice($attrs,($pos+1));
+      $ret = array();
+      $ret = $this->combineArrays($before,$mitte,$unten);
     }
     return($ret);
   }
 
-  function AddSeperator()
+
+  function catUp($id)
   {
-    $i = 1;
-    while(isset($this->gosaMemberApplication["__SEPARATOR__".$i."|".$this->curCatDir])){
-      $i ++;
+    /* Get all cats depinding on current dir */
+    $cats = $this->GetSubdirs($this->curCatDir);
+    $newcats =$this->ArrayUp($id,$cats);
+
+    foreach($newcats as $cat => $name){
+      unset($this->Categories[$cat]);
+    }
+    foreach($newcats as $cat => $name){
+      $this->Categories[$cat]=$name;
     }
-    $this->gosaMemberApplication["__SEPARATOR__".$i."|".$this->curCatDir]['Pri'] = $this->getNextFree(1,$this->curCatDir);
-    $this->gosaMemberApplication["__SEPARATOR__".$i."|".$this->curCatDir]['Cat'] = $this->curCatDir; 
-    $this->gosaMemberApplication["__SEPARATOR__".$i."|".$this->curCatDir]['App'] = "__SEPARATOR__".$i;
   }
 
-  function execute()
+
+  function catDown($id)
   {
-         /* Call parent execute */
-       //plugin::execute();
-    if((isset($_GET['act']))&&($_GET['act']=="depopen")){
-      $dep = base64_decode($_GET['depid']);  
-      if(isset($this->config->idepartments[$dep])){
-        $this->curbase = $dep;
-      }
+    /* Get all cats depinding on current dir */
+    $cats = $this->GetSubdirs($this->curCatDir);
+
+    $newcats =$this->ArrayDown($id,$cats);
+
+    foreach($newcats as $cat => $name){
+      unset($this->Categories[$cat]);
+    }
+    foreach($newcats as $cat => $name){
+      $this->Categories[$cat]=$name;
     }
+  }
+
+
+  function getOneUp($appl)
+  { 
+    $cat  = $this->curCatDir;
+    $apps = $this->gosaMemberApplication[$cat];
 
-    if(isset($_POST['AddSeperator'])){
-      $this->AddSeperator();
+    $appsA = array();
+    foreach ($apps as $appkey => $name){
+      $appsA[$name['App']] =$name['App'];
     }
 
-    if((isset($_GET['act']))&&($_GET['act']=="open")){
-      $this->curCatDir = $_GET['id'];
+    $result = $this->ArrayUp($appl,$appsA);
 
-      $found = false;
-      foreach($this->Categories as $key => $name ){
-        if($this->curCatDir==$name){
-          $tmp = array_flip(split("\/",$key));
+    $ret = array();
+    foreach($result as $app){
+      $ret[]=array("App"=>$app);
+    }
+    $this->gosaMemberApplication[$cat] = $ret;
+  }
 
-          $this->curCatDepth = ($tmp[$this->curCatDir]);
-          $found= true;
-        }
-      }
-      if(!$found){
-        $this->curCatDir = "";
-        $this->curCatDepth = 0;
+
+  function getOneDown($appl)
+  {
+    $cat  = $this->curCatDir;
+    $apps = $this->gosaMemberApplication[$cat];
+
+    $appsA = array();
+    foreach ($apps as $appkey => $name){
+      $appsA[$name['App']] =$name['App'];
+    }
+
+    $result = $this->ArrayDown($appl,$appsA);
+
+    $ret = array();
+    foreach($result as $app){
+      $ret[]=array("App"=>$app);
+    }
+    $this->gosaMemberApplication[$cat] = $ret;
+  } 
+
+
+
+  function AddSeperator($id)
+  {
+    $found  = false;
+    $cat    = "";
+    $tmp = array();
+    foreach($this->gosaMemberApplication[$this->curCatDir] as $appID => $app){  
+      $tmp[] = $app;    
+      if(($app['App'] == $id)&&(!$found)){
+        $cnt = count($this->gosaMemberApplication[$this->curCatDir]);
+        $tmp[] = array("App" => "__SEPARATOR__".($cnt+1));
+        $found = true;
       }
     }
+    if($found){
+      $this->gosaMemberApplication[$this->curCatDir]=$tmp;
+    }
+  }
+
+  function execute()
+  {
+    /* Call parent execute */
+    plugin::execute();
+
+    if((isset($_GET['act']))&&($_GET['act']=="depopen")){
+      $dep = base64_decode($_GET['depid']); 
+      $this->curbase =$dep;
+    }
+
+    if((isset($_GET['act']))&&($_GET['act']=="open")){
+      $this->curCatDir = base64_decode($_GET['id']);
+    }
 
     /* Do we need to flip is_account state? */
-    if (isset($_POST['modify_state'])){
-      $this->is_account= !$this->is_account;
+    if(isset($_POST['modify_state'])){
+      if($this->is_account && $this->acl_is_removeable()){
+        $this->is_account= FALSE;
+      }elseif(!$this->is_account && $this->acl_is_createable()){
+        $this->is_account= TRUE;
+      }
     }
 
     /* Do we represent a valid group? */
@@ -226,70 +400,172 @@ class appgroup extends plugin
     $display= "";
     if ($this->parent != NULL){
       if ($this->is_account){
-        $display= $this->show_header(_("Remove applications"),
+        $display= $this->show_disable_header(_("Remove applications"),
             _("This group has application features enabled. You can disable them by clicking below."));
       } else {
-        $display.= $this->show_header(_("Create applications"),
+        $display.= $this->show_enable_header(_("Create applications"),
             _("This group has application features disabled. You can enable them by clicking below."));
         return ($display);
       }
     }
 
+
+    /* Add Categorie */ 
+    if((isset($_POST['AddCat']))&&(isset($_POST['CatName']))&&(!empty($_POST['CatName']))){
+
+      /* Only allow adding a category, if it is allowed */  
+      if($this->acl_is_writeable("gosaMemberApplication")){
+
+        if(preg_match("/[\\\\\/]/i",$_POST['CatName'])){
+          print_red(_("Invalid character in category name."));
+        }elseif(!in_array($_POST['CatName'],$this->Categories)){ 
+          if(empty($this->curCatDir)){
+            $this->Categories[$_POST['CatName']]=$_POST['CatName'];
+          }else{
+            $this->Categories[$this->curCatDir."/".$_POST['CatName']]=$_POST['CatName'];
+          }
+        }else{
+          print_red(_("The specified category already exists."));
+        }
+      }
+    }
+
+
     $this->reload();
-    foreach($_POST as $name => $value){
-      if(preg_match("/DelApp_/",$name)){
-        $app = $value; 
-        unset($this->used_apps[$app]);
-        unset($this->gosaMemberApplication[$app."|".$this->curCatDir]);
-      }
-      if(preg_match("/EdiApp_/",$name)){
-        $appname = $value;
-        /* We've got the appname, get parameters from ldap */
-        $ldap= $this->config->get_ldap_link();
-        $ldap->cd($this->config->current['BASE']);
-        $ldap->search("(&(objectClass=gosaApplication)(cn=$appname))");
-        if ($ldap->count() != 1){
-          print_red (_("The selected application name is not uniq. Please check your LDAP."));
-        } else {
-          $attrs= $ldap->fetch();
-          if(isset($attrs['gosaApplicationParameter'])){
-            $this->dialog= TRUE;
-
-            /* Fill name and value arrays */
-            for ($i= 0; $i<$attrs['gosaApplicationParameter']['count']; $i++){
-              $option= preg_replace('/^[^:]+:/', '',
-                  $attrs['gosaApplicationParameter'][$i]);
-              $name= preg_replace('/:.*$/', '', 
-                  $attrs['gosaApplicationParameter'][$i]);
-              $this->option_name[$i]= $name;
-
-              /* Fill with values from application, default should be
-                 loaded by the external scripts */
-              if (isset($this->appoption[$name])){
-                $this->option_value[$i]= $this->appoption[$name];
+
+    $this->diffAppsInReleases();
+    $only_once = false;
+
+    /* Check POST variables for commands to add/remove some applications */
+    if($this->acl_is_writeable("gosaMemberApplication")){
+      foreach($_POST as $name => $value){
+
+        if((preg_match("/AddSep_/",$name))&&(!$only_once)){
+          $only_once = true;
+          $n = preg_replace("/AddSep_/","",$name);
+          $val= preg_replace("/_.*$/","",$n);
+          $this->AddSeperator($val);
+        }
+
+        if((preg_match("/DelApp_/",$name))&&(!$only_once)){
+          $only_once = true;
+
+          if(preg_match("/DelApp___SEPARATOR__/",$name)) {
+            $n=  preg_replace("/DelApp___SEPARATOR__/","",$name);
+            $val= "__SEPARATOR__".preg_replace("/_.*$/","",$n);
+          }else{
+            $n = preg_replace("/DelApp_/","",$name);
+            $val= preg_replace("/_.*$/","",$n);
+          }
+
+          foreach($this->gosaMemberApplication as $key =>  $cat){
+            foreach($cat as $key2 => $app){
+
+              if($app['App'] == $val){
+                unset($this->gosaMemberApplication[$key][$key2]);
+                if(isset($this->used_apps[$val])){
+                  foreach($this->getParameters($val) as $para){
+                    if(isset($this->appoption[$para])){
+                      unset($this->appoption[$para]);
+                    }
+                  }
+                  unset($this->used_apps[$val]);
+                }
               }
             }
+          }
+        }
+
+        if(preg_match("/DelCat_/",$name)){
+          $n = preg_replace("/DelCat_/","",$name);
+          $app = base64_decode( preg_replace("/_.*$/","",$n));
+          foreach($this->Categories as $key =>  $cat){
+            if($cat == $app){
+              foreach($this->Categories as $p => $n){
+                if(preg_match("/^".$key."\/.*/",$p)){
+                  unset($this->Categories[$p]);    
+                }
+              }
+              unset($this->Categories[$key]);
+            }
+          }
+        }
+
+        if((preg_match("/EdiApp_/",$name))&&(!$only_once)){
+
+          $only_once = true;
+          $appname = $value;
+          $appname = preg_replace("/EdiApp_/","",$name);  
+          $appname = preg_replace("/_.*$/","",$appname);
 
-            /* Create edit field */
-            $table= "<table summary=\"\">";
-            for ($i= 0; $i < count($this->option_name); $i++){
-              if (isset($this->option_value[$i])){
-                $value= $this->option_value[$i];
-              } else {
-                $value= "";
+          /* We've got the appname, get parameters from ldap 
+           */
+          $ldap= $this->config->get_ldap_link();
+
+          $tmp = search_config($this->config->data,"faiManagement","CLASS");
+          if(!empty($tmp)){
+            $tmp = array_flip($this->Releases);
+            $base = $tmp[$this->FAIrelease];
+
+            $ldap->cd($this->config->current['BASE']);
+            $ldap->search("(&(objectClass=gosaApplication)(cn=$appname))",array("gosaApplicationParameter"));
+            $found = "";
+            while($attrs = $ldap->fetch()) {
+              if(preg_match("/cn=".$appname.",".$base."/",$attrs['dn'])){
+                $found = $attrs['dn'];
               }
-              $table.="<tr><td>".$this->option_name[$i]."</td><td>".
-                "<input name=\"value$i\" size=60 maxlength=250 ".
-                "value=\"".$value."\"><br></td></tr>";
             }
-            $table.= "</table>";
-            $this->table= $table;
+            $ldap->cat($found, array("gosaApplicationParameter"));
+          }else{
+            $ldap->cd($this->config->current['BASE']);
+            $ldap->search("(&(objectClass=gosaApplication)(cn=$appname))",array("gosaApplicationParameter"));
+          }
+
+
+          if ($ldap->count() != 1){
+            print_red (_("The selected application name is not uniq. Please check your LDAP."));
           } else {
-            print_red (_("The selected application has no options."));
+            $attrs= $ldap->fetch();
+            if(isset($attrs['gosaApplicationParameter'])){
+              $this->dialog= TRUE;
+
+              /* Fill name and value arrays */
+              for ($i= 0; $i<$attrs['gosaApplicationParameter']['count']; $i++){
+                $option= preg_replace('/^[^:]+:/', '',
+                    $attrs['gosaApplicationParameter'][$i]);
+                $name= preg_replace('/:.*$/', '', 
+                    $attrs['gosaApplicationParameter'][$i]);
+                $this->option_name[$i]= $name;
+
+                /* Fill with values from application, default should be
+                   loaded by the external scripts */
+                if (isset($this->appoption[$name])){
+                  $this->option_value[$i]= $this->appoption[$name];
+                }
+              }
+
+              /* Create edit field */
+              $table= "<table summary=\"\">";
+              for ($i= 0; $i < count($this->option_name); $i++){
+                if (isset($this->option_value[$i])){
+                  $value= $this->option_value[$i];
+                } else {
+                  $value= "";
+                }
+                $table.="<tr><td>".$this->option_name[$i]."</td><td>".
+                  "<input name=\"value$i\" size=60 maxlength=250 ".
+                  "value=\"".$value."\"><br></td></tr>";
+              }
+              $table.= "</table>";
+              $this->table= $table;
+            } else {
+              print_red (_("The selected application has no options."));
+            }
           }
         }
       }
     }
+  
     $this->reload();
 
     /* Add group with post */
@@ -341,73 +617,67 @@ class appgroup extends plugin
 
     $div->SetHeight(300);
 
-    /* NEW LIST MANAGMENT
-     * We also need to search for the departments
-     * So we are able to navigate like in konquerer
-     */
-
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cd($this->curbase) ;
-    $ldap->ls("(objectClass=gosaDepartment)"); 
-    $departments= array();
-    $tmp = array();
-    while ($value = $ldap->fetch()){
-      $tmp[strtolower($value['dn']).$value['dn']]=$value;
-    }
-    ksort($tmp);
-    foreach($tmp as $value){
+    /* get departments */  
+    $ui = get_userinfo();
+    $departments = array();
+    $res = get_list("(objectClass=gosaDepartment)", "department", $this->curbase,array("description","cn","ou"),GL_SIZELIMIT);
+    foreach($res as $value){
+      $fdn= @LDAP::fix(str_replace($this->curbase,"",$value['dn']));
       if($value["description"][0]!=".."){
-        $departments[$value['dn']]=convert_department_dn($value['dn'])." - [".$value["description"][0]."]";
+        $departments[$value['dn']]= convert_department_dn($fdn)." - [".$value["description"][0]."]";
       }else{
-        $departments[$value['dn']]=convert_department_dn($value['dn']);
+        $departments[$value['dn']]=convert_department_dn($fdn);
       }
     }
-    
-    /* END NEW LIST MANAGMENT
-     */
+
+    if($this->acl_is_writeable("gosaMemberApplication")){
+      $linkadd  = "<a href='?plug=".$_GET['plug']."&amp;act=add&amp;id=%s'>%s</a>";
+    }else{
+      $linkadd = "%s";
+    }
 
     $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=depopen&amp;depid=%s'>%s</a>";
-    $linkadd  = "<a href='?plug=".$_GET['plug']."&amp;act=add&amp;id=%s'>%s</a>";
 
     $base_back = preg_replace("/^[^,]+,/","",$this->curbase);
     if((strlen($base_back)>= strlen($this->config->current['BASE']))&&($this->curbase!=$this->config->current['BASE'])){
       $div->AddEntry(array(
             array("string"=>sprintf($linkopen,base64_encode($base_back),".. ["._("back")."]"),
-                  "attach"=>"style='border:0px;'")
+              "attach"=>"style='border:0px;'")
             ));
     }
     foreach($departments as $key => $app){
       $div->AddEntry(array(
-                            array("string"=>"<img src='images/folder.png' alt='"._("department")."'>&nbsp;".sprintf($linkopen,base64_encode($key),$app),
-                                  "attach"=>"style='border:0px;'")
-                          ));
+            array("string"=>"<img class='center' src='images/folder.png' alt='"._("department")."'>&nbsp;".sprintf($linkopen,base64_encode($key),$app),
+              "attach"=>"style='border:0px;'")
+            ));
     }
-    
+
     foreach($apps as $key => $app){
       $div->AddEntry(array(
-                            array("string"=>sprintf("<input type='checkbox' value='1' name='AddApp_%s'>",$key).
-                                  "<img src='images/select_application.png' alt='"._("application")."'>&nbsp;".sprintf($linkadd,$key,$app),
-                                  "attach"=>"style='border:0px;'")
-                          ));
+            array("string"=>sprintf("<input class='center' type='checkbox' value='1' name='AddApp_%s'>",$key).
+              "<img class='center' src='images/select_application.png' alt='"._("application")."'>&nbsp;".sprintf($linkadd,$key,$app),
+              "attach"=>"style='border:0px;'")
+            ));
+    }
+
+    if((isset($_GET['act']))&&(($_GET['act'] == "cat_up")||($_GET['act']=="cat_down"))){
+      if($_GET['act']=="cat_up"){
+        $this->catUp(base64_decode($_GET['id']));
+      }
+      if($_GET['act']=="cat_down"){
+        $this->catDown(base64_decode($_GET['id']));
+      }
     }
 
     if((isset($_GET['act']))&&(($_GET['act'] == "one_up")||($_GET['act']=="one_down"))){
       if(isset($_GET['id'])){
         $id   = $_GET['id'];
         $act  = $_GET['act']; 
-        $found = false;
-        foreach($this->gosaMemberApplication as $key =>  $member){
-          if($id == $member['App']){
-            $found = $key;
-          }
-        }
 
-        if($found != false){
-          if($act == "one_up"){
-            $this->getOneUp($found);
-          }elseif($act == "one_down")   { 
-            $this->getOneDown($found);
-          }
+        if($act == "one_up"){
+          $this->getOneUp($id);
+        }elseif($act == "one_down")   { 
+          $this->getOneDown($id);
         }
       }
     }
@@ -415,47 +685,131 @@ class appgroup extends plugin
     $div2 = new DivSelectBox("appgroup");
     $div2->SetHeight(300);
 
-    $menu           = $this->CreateCatMenu();
-    $str_noprio     = " %s ";
-    $linkopen       = "<img src='images/folder.png'>            &nbsp;<a href='?plug=".$_GET['plug']."&amp;act=open&amp;id=%s'>%s</a>";
-    $app   = "<img src='images/select_application.png'>&nbsp;%s".$str_noprio;
+    if(!$this->acl_is_writeable("gosaMemberApplication")){
+      $linkopen       = "<img class='center' src='images/folder.png' alt=\"\">&nbsp;<a href='?plug=".$_GET['plug']."&amp;act=open&amp;id=%s'>%s</a>";
+      $catremove      = "&nbsp;<img src='images/empty.png' alt='&nbsp;'>";
+      $catupdown      = "";
+    }else{
+      $linkopen       = "<img class='center' src='images/folder.png' alt=\"\">&nbsp;<a href='?plug=".$_GET['plug']."&amp;act=open&amp;id=%s'>%s</a>";
+      $catremove      = "&nbsp;<input type='image' src='images/edittrash.png' title='"._("Delete entry")."' name='DelCat_%s' value='%s'>";
+      $catupdown      = "<a href='?plug=".$_GET['plug']."&amp;act=cat_up&amp;id=%s'>".
+        "<img align='top' alt=\"\" src='images/sort_up.png' border=0 title='"._("Move up")."'>".
+        "</a>&nbsp;".
+        "<a href='?plug=".$_GET['plug']."&amp;act=cat_down&amp;id=%s'>".
+        "<img alt=\"\" src='images/sort_down.png' title='"._("Move down")."' border=0>".
+        "</a>";
+    }
 
-        /* append back entry */
-    if($menu["__BACK__"] != false){
-        $div2 ->AddEntry(array(
-                    array("string"=>sprintf($linkopen,$menu["__BACK__"],".. [ "._("back")." ]")),
-                    array("string"=>"&nbsp;","attach"=>"style='border-right:0px;'")
-                    ));
+    if(empty($this->curCatDir)){
+      $cnt =0;
+    }else{
+      $cnt = count(split("/",$this->curCatDir));
+      $tmp = split("/",$this->curCatDir);
+      $bbk = "";
+      for($i = 0 ; $i < ($cnt -1 ) ; $i++){
+        $bbk .= $tmp[$i];
+      }
+      $div2 ->AddEntry(array(array("string"=>sprintf($linkopen,base64_encode($bbk),"..")),array("string"=>"&nbsp;","attach"=>"style='border-right:0px;'")));
     }
 
-    foreach($menu['__CATEGORY__'] as $path => $name){
-      $div2 ->AddEntry(array(array("string"=>sprintf($linkopen,$path,$name)),array("string"=>"&nbsp;","attach"=>"style='border-right:0px;'"))); 
+    $this->GetSubdirs($this->curCatDir);
+
+    foreach($this->GetSubdirs($this->curCatDir) as $path => $name){
+      $div2 ->AddEntry(array( 
+            array("string"=>sprintf($linkopen,base64_encode($path),$name)),
+            array("string"=>preg_replace("/%s/",base64_encode($path),$catupdown.$catremove),
+              "attach"=>"align='right' style='width:80px;border-right:0px;'"))); 
     }
 
-      /* Append entries */
+    /* Append entries */
 
-    $separator ="<hr height=1  size=1></hr>"; 
-    $upudown = "<a href='?plug=".$_GET['plug']."&amp;act=one_up&id=%s'>   <img src='images/sort_up.png' border=0></a>".
-          "&nbsp;<a href='?plug=".$_GET['plug']."&amp;act=one_down&id=%s'> <img src='images/sort_down.png' border=0></a>".
-          "&nbsp;<input type='image' src='images/edittrash.png' name='DelApp_%s' value='%s'>";
-    $edit=      "&nbsp;<input type='image' src='images/edit.png' name='EdiApp_%s' value='%s'>";
-    foreach($menu["__ENTRY__"] as $path => $entry){
+    $separator ="<hr size=1>"; 
 
-      if(preg_match("/__SEPARATOR__/",$path)){
-        $div2 ->AddEntry(array(array("string"=>$separator),
-                         array("string"=>preg_replace("/\%s/",$entry['name'],$upudown),"attach"=>"style='border-right:0px;'")));
+    if($this->acl_is_writeable("gosaMemberApplication")){
+      $sep      = "<input type='image' src='images/back.png' title='"._("Insert seperator")."' value='%s' name='AddSep_%s'>";
+      $upudown  = "<a href='?plug=".$_GET['plug']."&amp;act=one_up&amp;id=%s'>".
+                  " <img alt='{t}sort{/t}' align='top' src='images/sort_up.png' title='"._("Move up")."' border=0>".
+                  "</a>&nbsp;".
+                  "<a href='?plug=".$_GET['plug']."&amp;act=one_down&amp;id=%s'>".
+                  " <img alt='{t}sort{/t}' src='images/sort_down.png' title='"._("Move down")."' border=0>".
+                  "</a>&nbsp;".
+                  "<input type='image' src='images/edittrash.png' title='"._("Delete entry")."' name='DelApp_%s' value='%s' alt='{t}delete{/t}' >";
+    }else{
+      $sep      = "";
+      $upudown  = "";
+    }
+      
+    if($this->acl_is_writeable("gosaApplicationParameter")){
+      $edit=      "&nbsp;<input type='image' src='images/edit.png' title='"._("Edit entry")."' name='EdiApp_%s' value='%s' alt='{t}edit{/t}' >";
+    }else{
+      $edit=      "";
+    }
 
-      }else{
-        $div2 ->AddEntry(array(array("string"=>sprintf($app,$entry['name'],$entry['prio'])),
-                         array("string"=>preg_replace("/\%s/",$entry['name'],$upudown.$edit),"attach"=>"style='border-right:0px;'")));
+    $Differences = $this->diffAppsInReleases();
+
+    if(isset($this->gosaMemberApplication[$this->curCatDir])){
+      foreach($this->gosaMemberApplication[$this->curCatDir] as $cat => $entry){
+
+        
+        if(preg_match("/__SEPARATOR__/",$entry['App'])){
+          $div2 ->AddEntry(array(array("string"=>$separator),
+                array("string"=>preg_replace("/\%s/",htmlentities($entry['App']),$upudown),"attach"=>"align='right' style='border-right:0px;'")));
+        }else{
+
+          $image = "";
+          /* Check if application was available within selected release
+           *  or application list if release management is not active
+           */
+          if(!in_array($entry['App'],$this->AllAppsForRelease)){
+
+            /*  release managent is active
+             */
+            if(!$this->enableReleaseManagement){
+              $image = "<img class='center' src='images/select_invalid_application.png' 
+                          title='"._("This application is no longer available.")."'>&nbsp;";
+            }else{
+              $image = "<img class='center' src='images/select_invalid_application.png' 
+                          title='".sprintf(_("This application is not available in any release named %s."),$this->FAIrelease)."'>&nbsp;";
+            }
+      
+          }elseif(isset($Differences[$entry['App']]) && ($Differences[$entry['App']] == true)) {
+            $entry['App'].=" <i>["._("Check parameter")."]</i>";
+              $image = "<img class='center' src='images/select_invalid_application.png' 
+                          title='"._("This application has changed parameters.")."'>&nbsp;";
+          }else{
+            $image = "<img class='center' src='images/select_application.png' alt=\"\">&nbsp;"; 
+          }
+          
+          $div2->AddEntry(array(array("string"=>sprintf($image."%s",$entry['App'])),
+                array("string"=>preg_replace("/\%s/",htmlentities($entry['App']),$sep.$edit.$upudown),
+                      "attach"=>"align='right' style='width:100px;border-right:0px;'")));
+        }
       }
     }
 
     $smarty->assign("UsedApps", $div2->DrawList());
     $smarty->assign("List", $div->DrawList());
     $smarty->assign("apps", $apps);
+   
+    $smarty->assign("enableReleaseManagement",$this->enableReleaseManagement);
+    if($this->enableReleaseManagement){
+      $smarty->assign("FAIrelease",  $this->FAIrelease);
+      $smarty->assign("Releases", $this->Releases);
+
+      if(count($this->used_apps)){
+        $smarty->assign("ReleaseSelectAble", false);
+      }else{
+        $smarty->assign("ReleaseSelectAble", true);
+      }
+    }
+    $smarty->assign("ReleaseSelectAble", true);
+
+    /* Set acls to  template */
+    $tmp = $this->plInfo();
+    foreach($tmp['plProvidedAcls'] as $acl => $translation){
+      $smarty->assign($acl."ACL",$this->getacl($acl));
+    }
 
     /* Show main page */
     if ($this->dialog){
@@ -464,43 +818,84 @@ class appgroup extends plugin
     } else {
       $display.= $smarty->fetch (get_template_path('application.tpl', TRUE));
     }
+    
     return ($display);
   }
 
 
+  function getReleases()
+  {
+    $dn     = $this->config->current['BASE'];
+    $filter = "(&(objectClass=organizationalUnit)(objectClass=FAIbranch))";
+    $res    = get_list($filter,"groups", $dn, array("ou"), GL_SUBSEARCH);
+
+    $ret =array();
+    foreach($res as $attrs){
+      if(preg_match("/ou=apps,/",$attrs['dn'])){
+        $bb = preg_replace("/ou=apps,.*/","",$attrs['dn']);
+        $parts = array_reverse(split("ou=",$bb));
+
+        $str ="";
+        foreach($parts as $part){
+          if(empty($part)) {
+            continue;
+          }
+          $str .= str_replace(",","",$part)."/";
+        }    
+        $name = preg_replace("/\/$/","",$str);
+        if(empty($name)) {
+          $name ="/";
+        }
+        $ret[$attrs['dn']] = $name;
+      }
+    }
+    return($ret);
+  }
+
+  function save_object()
+  {
+    plugin::save_object();
+  }
+
   function remove_from_parent()
   {
     plugin::remove_from_parent();
 
-    $this->attrs["gosaMemberApplication"]= array();
-
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());
+    $this->cleanup();
+    
+    $ldap->modify ($this->attrs); 
+
+    show_ldap_error($ldap->get_error(), sprintf(_("Removing of groups/applications with dn '%s' failed."),$this->dn));
 
     /* Optionally execute a command after we're done */
     $this->handle_post_events("remove");
   }
 
 
-  /* Save data to object */
-#  function save_object()
-#  {
-#    plugin::save_object();
-#  }
-
-
   /* Save to LDAP */
   function save()
   {
     plugin::save();
 
     /* Copy members */
+    $this->Categories[""]=""; 
     $this->attrs["gosaMemberApplication"]= array();
-    foreach ($this->gosaMemberApplication as $val){
-      if(!preg_match("/__SEPARATOR__/i",$val['App'])){
-        $this->attrs["gosaMemberApplication"][]= $val['App']."|".$val['Cat']."|".$val['Pri'];
+    $this->attrs["gosaApplicationParameter"]= array();
+    foreach($this->Categories as $name => $cats){
+      $i =0;
+      if(isset($this->gosaMemberApplication[$name])){
+        foreach($this->gosaMemberApplication[$name] as $entry){
+          if(!preg_match("/__SEPARATOR__/",$entry['App'])){
+            $this->attrs["gosaMemberApplication"][]= $entry['App']."|".$name."|".$i;
+          }
+          $i ++;
+        }
+      }
+      if(($i==0)&&(!empty($name))){
+        $this->attrs["gosaMemberApplication"][]= "|".$name."|".$i;
       }
     }
 
@@ -515,13 +910,15 @@ class appgroup extends plugin
     /* Write back to LDAP */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());
+    $this->cleanup();
+    $ldap->modify ($this->attrs); 
+
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of groups/applications with dn '%s' failed."),$this->dn));
 
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){
       if ($this->is_modified){
-        $this->handle_post_events("mofify");
+        $this->handle_post_events("modify");
       }
     } else {
       $this->handle_post_events("add");
@@ -531,7 +928,9 @@ class appgroup extends plugin
 
   function check()
   {
-    $message= array();
+    /* Call common method to give check the hook */
+    $message= plugin::check();
+
     return ($message);
   }
 
@@ -540,10 +939,39 @@ class appgroup extends plugin
   {
     /* Generate applist */
     $this->apps= array();
-    $ldap= $this->config->get_ldap_link();
-    $ldap->cd ("ou=apps,".$this->curbase);
 
-    $ldap->ls ("(objectClass=gosaApplication)","ou=apps,".$this->curbase);
+    /* Special handling for release managed apps 
+     */
+    $tmp = search_config($this->config->data,"faiManagement","CLASS");
+    if(!empty($tmp)){
+      $this->enableReleaseManagement = true;
+
+      $tmp = array_flip($this->Releases);
+      if(isset($tmp[$this->FAIrelease])){
+        $base =  $tmp[$this->FAIrelease];
+      }else{
+        $old_r =  $this->FAIrelease;
+        $k = key($tmp);
+        $r = $tmp[$k];
+        $this->FAIrelease = $k;
+        $base = $r; 
+
+        if(!(!$this->initially_was_account && $old_r =="/")){
+          print_red(sprintf(_("Can't resolve the release name '%s', setting release name to '%s'. Possibly the objects base has changed."),$this->FAIrelease,$k));    
+        }
+      }
+
+      $base = preg_replace("/ou=apps,.*$/","ou=apps,".$this->curbase,$base);
+    
+      $ldap   = $this->config->get_ldap_link();
+      $ldap->cd ($base);
+      $ldap->ls ("(objectClass=gosaApplication)",$base);
+    }else{
+      $ldap   = $this->config->get_ldap_link();
+      $ldap->cd ("ou=apps,".$this->curbase);
+      $ldap->ls ("(objectClass=gosaApplication)","ou=apps,".$this->curbase);
+    }
+    
     while ($attrs= $ldap->fetch()){
       if (isset($attrs["description"][0])){    
         $this->apps[$attrs["cn"][0]]=
@@ -554,126 +982,58 @@ class appgroup extends plugin
           $attrs["cn"][0];
       }
     }
-    natcasesort ($this->apps);
-    reset ($this->apps);
-
-    foreach ($this->gosaMemberApplication as $value){
-      $this->used_apps[$value['App']]= $value['App'];
-    }
-  }
-
-
-
-
-
-
-
-
-
-
-  function CreateCatMenu()
-  {
-    /* The current category */
-    $na = $this->curCatDir;
-
-    /* the current folder depth */
-    $nd = $this->curCatDepth;
-
-    /* init array */
-    $return = array();
-
-    $return["__CATEGORY__"] = array();  // Categories
-    $return["__ENTRY__"]    = array();  // Entries in this category
-    $return["__BACK__"]     = false;    // The back entry
-
-    $tmp = new xmlParse();
-
-    $this->Categories= array();
-    if(!isset($this->config->data['MAIN']['KDE_APPLICATIONS_MENU']))    {
-        print_red(_("There is no value for 'KDE_APPLICATIONS_MENU' specified in your gosa.conf."));
-    }else{
-        $path = $this->config->data['MAIN']['KDE_APPLICATIONS_MENU'];
-        if(file_exists($path)){
-            if(is_readable($path)){
-                $tmp->parseMenu($path);
-                $this->Categories = $tmp->GetData();
-            }else{
-                print_red(sprintf(_("The specified file '%s' for 'KDE_APPLICATIONS_MENU' in your gosa.conf is not accessable."),$path));
-            }
-        }else{
-            print_red(sprintf(_("The specified file '%s' for 'KDE_APPLICATIONS_MENU' in your gosa.conf is not accessable."),$path));
-        }
-    }
-
-
-    /* Create new categories to return */
-    foreach($this->Categories as $key => $val){
-
-        /* Split categories by | to get name and priority */
-        $nk = split("\/",$key);
-
-        /* Check if this category must be shown */
-        if((isset($nk[$nd]))&&(is_array($nk))&&($nk[$nd] == $na)){
-
-            /* Add this to the list, if theres is a sub category */
-            if(isset($nk[($nd+1)])){
-                $return["__CATEGORY__"][$nk[($nd+1)]] = $nk[($nd+1)];
-            }
-
-            /* Create back entry */
-            if($nd !=0 ){
-                $return['__BACK__'] = $nk[($nd-1)];
-            }else{
-                $return['__BACK__'] = "..";
-            }
-
-        }elseif($na==""){
-            $return["__CATEGORY__"][$nk[0]] = $nk[0];
-        }
 
+    $ldap->cd($this->config->current['BASE']);
+    $ldap->search("objectClass=gosaApplication",array("gosaApplicationParameter","cn"));
+    $tmp = search_config($this->config->data,"faiManagement","CLASS");
+    $this->AllAppsForRelease = array();
+    if(!empty($tmp)){
 
+      $tmp = array_flip($this->Releases);
 
-    }
+      while($attrs = $ldap->fetch()){
+        
+        $testdn = preg_replace("/ou=apps,.*$/","ou=apps",$attrs['dn']);
+        $testdn = preg_replace("/^[^,]+/","",$testdn);
+        $testdn = preg_replace("/^,/","",$testdn);
 
-    /* If back entry isn't set, set it to false (none) or to ..(base)*/
-    if($return["__BACK__"] == false){
-        $return['__BACK__'] = "..";
-        if($nd == 0 ){
-            $return['__BACK__'] = false;
+        if($testdn == preg_replace("/ou=apps,.*$/","ou=apps",$tmp[$this->FAIrelease])){
+          $this->AllAppsForRelease[$attrs['dn']] = $attrs['cn'][0];
+          $this->AllAppsForReleaseParameter[$this->FAIrelease][$attrs['cn'][0]] = $attrs;
         }
-    }
-
-    foreach($this->gosaMemberApplication as $app){
-      if($app['Cat'] == $this->curCatDir){
-       $return["__ENTRY__"][$app['Pri']][$app['App']]  =  array("name"=>$app['App'],"prio" => $app['Pri']) ;
       }
-    }    
-
-
-    ksort($return["__ENTRY__"]);
- /* recreate array index */
-    $tmp = array();
-    foreach($return["__ENTRY__"] as $prio => $entries){
-        ksort($entries);
-        foreach($entries as $entry){
-            $tmp[$entry['name']] = $entry;
-        }
+    }else{
+      while($attrs = $ldap->fetch()){
+        $this->AllAppsForRelease[$attrs['dn']] = $attrs['cn'][0];
+      }
     }
 
-    /* Assign sorted entries */
-    $return['__ENTRY__'] = ($tmp);
+    natcasesort ($this->apps);
+    reset ($this->apps);
 
-    /* Return this all ..*/
-    return($return);
+    if(is_array($this->gosaMemberApplication))
+      foreach ($this->gosaMemberApplication as $cat){   
+        if(is_array($cat))
+          foreach($cat as $entry){
+            $this->used_apps[$entry['App']]= $entry['App'];
+          }
+      }
   }
 
+
   function addApp($cn)
   {
-    $this->gosaMemberApplication[$cn."|".$this->curCatDir]= array("App"=>$cn,"Cat"=>$this->curCatDir,"Pri"=>$this->getNextFree(1,$this->curCatDir));
+    if((isset($this->gosaMemberApplication[$this->curCatDir]))&&(is_array($this->gosaMemberApplication[$this->curCatDir]))){
+      foreach($this->gosaMemberApplication[$this->curCatDir] as $entry){
+        if($entry['App'] == $cn) return;
+      }
+    }
+    $this->gosaMemberApplication[$this->curCatDir][]= array("App"=>$cn);
     $this->used_apps[$cn]=$cn;
     $this->is_modified= TRUE;
   }
 
+
   function removeApp($cn)
   {
     $temp= array();
@@ -686,7 +1046,72 @@ class appgroup extends plugin
     $this->is_modified= TRUE;
   }
 
-}
+  function getParameters($app)
+  {
+    $tmp = $this->getReleases();
+    $ret = array();
+    if(in_array($this->FAIrelease,$tmp)){
+      $tmp2 = array_flip($tmp);
+      $base = $tmp2[$this->FAIrelease];
+      $ldap = $this->config->get_ldap_link();
+      $ldap->cd($this->config->current['BASE']);
+      $ldap->search("(&(objectClass=gosaApplication)(cn=".$app.")(gosaApplicationParameter=*))",array("gosaApplicationParameter"));
+      if($ldap->count()){
+        $attrs = $ldap->fetch();
+        for($i = 0 ; $i < $attrs['gosaApplicationParameter']['count'] ; $i ++ ){
+          $name = preg_replace("/:.*$/","",$attrs['gosaApplicationParameter'][$i]);
+          $ret[$name] = $name;
+        } 
+      }
+    }
+    return($ret);
+  }
 
+  function GetSubdirs($dir)
+  {
+    $ret = array();
+    $tmp1 = split("/",$this->curCatDir);
+    foreach($this->Categories as $path=>$cat){
+      $tmp2 = split("/",$path);
+      
+      if((empty($this->curCatDir))&&(!preg_match("/\//",$path))){
+        $abort = false;
+      }elseif(((count($tmp1))+1) == (count($tmp2))){
+        $abort = false;
+        for($i = 0 ; $i < count($tmp1) ; $i++){
+          if($tmp1[$i] != $tmp2[$i]){
+            $abort = true;
+          }
+        }
+      }else{
+        $abort= true;
+      }
+      if(!$abort){
+        $ret[$path]=$cat;
+      } 
+    }
+    return($ret);
+  }
+
+
+  /* Return plugin informations for acl handling  */ 
+  function plInfo()
+  {
+    return (array(
+          "plShortName"   => _("Applications"),
+          "plDescription" => _("Group applications"),
+          "plSelfModify"  => FALSE,
+          "plDepends"     => array(),
+          "plPriority"    => 0,
+          "plSection"     => array("admin"),
+          "plCategory"    => array("groups"),
+          "plProvidedAcls"=> array(
+            "gosaMemberApplication"     => _("Application"),
+            "FAIrelease"                => _("Release"),
+            "gosaApplicationParameter"  => _("Application parameter"))
+          ));
+  }
+}
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>