Releases are now selectable

Still missing : only view if entry is freeze..

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

diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index 90f044b34c753d581d44350bde06711be7f5a5b2..b02c25be47e37737f7865354dcfda49ad9d8442f 100644 (file)
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.inc
@@ -1,22 +1,22 @@
 <?php
 /*
-  This code is part of GOsa (https://gosa.gonicus.de)
-  Copyright (C) 2003  Cajus Pollmeier
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+   This code is part of GOsa (https://gosa.gonicus.de)
+   Copyright (C) 2003  Cajus Pollmeier
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 require "tabs_application.inc";
 
 class applicationManagement extends plugin
@@ -33,52 +33,98 @@ class applicationManagement extends plugin
 
   var $CopyPasteHandler ;
 
+  var $Release  = "";
+  var $Releases = array();
+
   var $enableCopyPaste = false;
 
   function applicationManagement ($config, $ui)
   {
-       /* Save configuration for internal use */
-       $this->config= $config;
-       $this->ui= $ui;
-
-  if( (isset($this->config->data['MAIN']['ENABLECOPYPASTE'])) 
-     && 
-      (preg_match("/true/i",$this->config->data['MAIN']['ENABLECOPYPASTE'] ))){
-    $this->enableCopyPaste = true;
+    /* Save configuration for internal use */
+    $this->config= $config;
+    $this->ui= $ui;
+
+    if( (isset($this->config->data['MAIN']['ENABLECOPYPASTE'])) 
+        && 
+        (preg_match("/true/i",$this->config->data['MAIN']['ENABLECOPYPASTE'] ))){
+      $this->enableCopyPaste = true;
+    }
+
+    $this->CopyPasteHandler = new CopyPasteHandler($this->config);
+
+    /* Get global filter config */
+    if (!is_global("appfilter")){
+      $base= get_base_from_people($ui->dn);
+
+      $appfilter= array("depselect" => $base,
+                        "regex" => "*" ,
+                        "release" => "ou=apps,".$base);
+
+      register_global("appfilter", $appfilter);
+    }
+
+    $appfilter = get_global("appfilter");
+    $this->Releases = $this->getReleases($appfilter['depselect']);
+    $this->Release  = $appfilter['release'];
   }
 
-  $this->CopyPasteHandler = new CopyPasteHandler($this->config);
+  function getReleases($base)
+  {
+    $dn   = "ou=fai,ou=configs,ou=systems,".$base;
+
+    $ret  = array();
 
-       /* Get global filter config */
-        if (!is_global("appfilter")){
-                $base= get_base_from_people($ui->dn);
-                $appfilter= array("depselect" => $base,
-                                  "regex" => "*");
-                register_global("appfilter", $appfilter);
-        }
+    $ret ["ou=apps,".$base] = "/";
+
+    $ldap = $this->config->get_ldap_link();
+    $ldap->cd($dn);
+
+    $ldap->search("ou=apps",array("ou"));
+
+    while($attrs = $ldap->fetch()){
+      $str = str_replace($dn,"",$attrs['dn']);
+      $tmp = array_reverse( split("ou=",$str));
+      $str = "";
+      foreach($tmp as $val){
+        $val = trim(preg_replace("/,/","",$val));
+        if($val == "apps") break;
+        $str .= "/".$val;
+      }
+      $ret[$attrs['dn']]= $str;
+    }
+    return($ret);
   }
 
   function execute()
   {
-       /* Call parent execute */
-       plugin::execute();
-
-//   print_a($_POST);
-//   print_a($_GET);
-  $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^appl_edit_/","/^appl_del_/");
-
-         /* Save data */
-         $appfilter    = get_global("appfilter");
-         $smarty       = get_smarty();             // Smarty instance
-         $s_action     = "";                       // Contains the action to proceed
-         $s_entry      = "";                       // The value for s_action
+    /* Call parent execute */
+    plugin::execute();
+
+    $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^appl_edit_/","/^appl_del_/");
+
+    /* Save data */
+    $appfilter    = get_global("appfilter");
+    $smarty       = get_smarty();             // Smarty instance
+    $s_action     = "";                       // Contains the action to proceed
+    $s_entry      = "";                       // The value for s_action
     $base_back    = "";                       // The Link for Backbutton
 
     /* Start for New List Managment */
     if(isset($_GET['act'])&&($_GET['act']=="dep_open")){
-            $s_action="open";
-            $s_entry = base64_decode($_GET['dep_id']);
-            $appfilter['depselect']= "".$this->config->departments[trim($s_entry)];
+      $s_action="open";
+      $s_entry = base64_decode($_GET['dep_id']);
+      $appfilter['depselect']= "".$this->config->departments[trim($s_entry)];
+    }
+
+    /* Get posted release */
+    if(isset($_POST['select_release'])){
+      $r = $_POST['select_release'];
+      if((isset($this->Releases[$r])) && ($this->Release != $r)){
+        $this->Release = $r;
+        $appfilter = get_global("appfilter");
+        $appfilter['release'] = $r;
+        register_global("appfilter",$appfilter);      
+      }
     }
 
     /* Test Posts */
@@ -171,8 +217,8 @@ class applicationManagement extends plugin
     /* Only perform copy / paste if it is enabled 
      */
     if($this->enableCopyPaste){
-    
-       /* Paste copied/cutted object in here
+
+      /* Paste copied/cutted object in here
        */
       if(($s_action == "editPaste") || ($this->CopyPasteHandler->stillOpen())){
         $this->CopyPasteHandler->save_object();
@@ -238,340 +284,344 @@ class applicationManagement extends plugin
 
         /* Save data data to ldap */
         $this->apptabs->save();
-                       gosa_log ("Application object'".$this->dn."' has been saved");
-
-                       /* Application has been saved successfully, remove lock from
-                          LDAP. */
-                       if ($this->dn != "new"){
-                               del_lock ($this->dn);
-                       }
-
-                       /* There's no page reload so we have to read new apps at
-                          this point. */
-                       $this->reload ();
-                       unset ($this->apptabs);
-                       $this->apptabs= NULL;
-                       unset ($_SESSION['objectinfo']);
-               } else {
-                       /* Ok. There seem to be errors regarding to the tab data,
-                          show message and continue as usual. */
-                       show_errors($message);
-               }
-       }
-
-       /* User wants to edit data? */
-       if (($s_action=="edit") && (!isset($this->apptabs->config))){
-
-               /* Get 'dn' from posted 'applist', must be unique */
-               $this->dn= $this->applications[$s_entry]['dn'];
-
-               /* Check locking, save current plugin in 'back_plugin', so
-                  the dialog knows where to return. */
-               if (($user= get_lock($this->dn)) != ""){
-                       return(gen_locked_message ($user, $this->dn));
-               }
-
-               /* Lock the current entry, so everyone will get the
-                  above dialog */
-               add_lock ($this->dn, $this->ui->dn);
-
-               /* Set up the users ACL's for this 'dn' */
-               $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-
-               /* Register apptabs to trigger edit dialog */
-               $this->apptabs= new apptabs($this->config,
-                               $this->config->data['TABS']['APPSTABS'], $this->dn);
-               $this->apptabs->set_acl($acl);
-               $_SESSION['objectinfo']= $this->dn;
-       }
-
-       /* Remove user was requested */
-       if ($s_action == "del"){
-
-               /* Get 'dn' from posted 'uid' */
-               $this->dn= $this->applications[$s_entry]['dn'];
-
-               /* Load permissions for selected 'dn' and check if
-                  we're allowed to remove this 'dn' */
-               $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-               $this->acl= get_module_permission($acl, "application", $this->dn);
-               if (chkacl($this->acl, "delete") == ""){
-
-                       /* Check locking, save current plugin in 'back_plugin', so
-                          the dialog knows where to return. */
-                       if (($user= get_lock($this->dn)) != ""){
-                               return (gen_locked_message ($user, $this->dn));
-                       }
-
-                       /* Lock the current entry, so nobody will edit it during deletion */
-                       add_lock ($this->dn, $this->ui->dn);
-                       $smarty= get_smarty();
-                       $smarty->assign("intro", sprintf(_("You're about to delete the application '%s'."), LDAP::fix($this->dn)));
-                       return($smarty->fetch (get_template_path('remove.tpl', TRUE)));
-               } else {
-
-                       /* Obviously the user isn't allowed to delete. Show message and
-                          clean session. */
-                       print_red (_("You are not allowed to delete this application!"));
-               }
-       }
-
-       /* Confirmation for deletion has been passed. Group should be deleted. */
-       if (isset($_POST['delete_app_confirm'])){
-
-               /* Some nice guy may send this as POST, so we've to check
-                  for the permissions again. */
-               if (chkacl($this->acl, "delete") == ""){
-
-                       /* Delete request is permitted, perform LDAP action */
-                       $this->apptabs= new apptabs($this->config,
-                                       $this->config->data['TABS']['APPSTABS'], $this->dn);
-                       $this->apptabs->set_acl(array($this->acl));
-                       $this->apptabs->delete ();
-                       gosa_log ("Application object'".$this->dn."' has been removed");
-                       unset ($this->apptabs);
-                       $this->apptabs= NULL;
-
-                       /* Group list has changed, reload it. */
-                       $this->reload ();
-               } else {
-
-                       /* Normally this shouldn't be reached, send some extra
-                          logs to notify the administrator */
-                       print_red (_("You are not allowed to delete this application!"));
-                       gosa_log ("Warning: '".$this->ui->uid."' tried to trick group deletion.");
-               }
-
-               /* Remove lock file after successfull deletion */
-               del_lock ($this->dn);
-       }
-
-
-       /* Delete application canceled? */
-       if (isset($_POST['delete_cancel'])){
-               del_lock ($this->dn);
-               unset($_SESSION['objectinfo']);
-       }
-
-        /* Show tab dialog if object is present */
-        if (($this->apptabs) && (isset($this->apptabs->config))){
-                $display= $this->apptabs->execute();
-
-                /* Don't show buttons if tab dialog requests this */
-                if (!$this->apptabs->by_object[$this->apptabs->current]->dialog){
-                        $display.= "<p style=\"text-align:right\">\n";
-                        $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Finish")."\">\n";
-                        $display.= "&nbsp;\n";
-                        $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
-                        $display.= "</p>";
-                }
-                return ($display);
+        gosa_log ("Application object'".$this->dn."' has been saved");
+
+        /* Application has been saved successfully, remove lock from
+           LDAP. */
+        if ($this->dn != "new"){
+          del_lock ($this->dn);
         }
 
-        /* Show main page */
+        /* There's no page reload so we have to read new apps at
+           this point. */
+        $this->reload ();
+        unset ($this->apptabs);
+        $this->apptabs= NULL;
+        unset ($_SESSION['objectinfo']);
+      } else {
+        /* Ok. There seem to be errors regarding to the tab data,
+           show message and continue as usual. */
+        show_errors($message);
+      }
+    }
+
+    /* User wants to edit data? */
+    if (($s_action=="edit") && (!isset($this->apptabs->config))){
+
+      /* Get 'dn' from posted 'applist', must be unique */
+      $this->dn= $this->applications[$s_entry]['dn'];
+
+      /* Check locking, save current plugin in 'back_plugin', so
+         the dialog knows where to return. */
+      if (($user= get_lock($this->dn)) != ""){
+        return(gen_locked_message ($user, $this->dn));
+      }
+
+      /* Lock the current entry, so everyone will get the
+         above dialog */
+      add_lock ($this->dn, $this->ui->dn);
+
+      /* Set up the users ACL's for this 'dn' */
+      $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
+
+      /* Register apptabs to trigger edit dialog */
+      $this->apptabs= new apptabs($this->config,
+          $this->config->data['TABS']['APPSTABS'], $this->dn);
+      $this->apptabs->set_acl($acl);
+      $_SESSION['objectinfo']= $this->dn;
+    }
 
-        /* Prepare departments */
-        $options= "";
-        foreach ($this->config->idepartments as $key => $value){
-          if ($appfilter['depselect'] == $key){
-            $options.= "<option selected='selected' value='$key'>$value</option>";
-          } else {
-            $options.= "<option value='$key'>$value</option>";
-          }
+    /* Remove user was requested */
+    if ($s_action == "del"){
+
+      /* Get 'dn' from posted 'uid' */
+      $this->dn= $this->applications[$s_entry]['dn'];
+
+      /* Load permissions for selected 'dn' and check if
+         we're allowed to remove this 'dn' */
+      $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
+      $this->acl= get_module_permission($acl, "application", $this->dn);
+      if (chkacl($this->acl, "delete") == ""){
+
+        /* Check locking, save current plugin in 'back_plugin', so
+           the dialog knows where to return. */
+        if (($user= get_lock($this->dn)) != ""){
+          return (gen_locked_message ($user, $this->dn));
         }
 
-        if($this->enableCopyPaste){
-          $Copy_Paste = " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;";
+        /* Lock the current entry, so nobody will edit it during deletion */
+        add_lock ($this->dn, $this->ui->dn);
+        $smarty= get_smarty();
+        $smarty->assign("intro", sprintf(_("You're about to delete the application '%s'."), LDAP::fix($this->dn)));
+        return($smarty->fetch (get_template_path('remove.tpl', TRUE)));
+      } else {
 
-          if($this->CopyPasteHandler->isCurrentObjectPastAble()){
+        /* Obviously the user isn't allowed to delete. Show message and
+           clean session. */
+        print_red (_("You are not allowed to delete this application!"));
+      }
+    }
 
-            if($this->CopyPasteHandler->isCurrentCutted()){
-              $img = "images/cutpaste.png";
-            }else{
-              $img = "images/copypaste.png";
-            }
+    /* Confirmation for deletion has been passed. Group should be deleted. */
+    if (isset($_POST['delete_app_confirm'])){
+
+      /* Some nice guy may send this as POST, so we've to check
+         for the permissions again. */
+      if (chkacl($this->acl, "delete") == ""){
+
+        /* Delete request is permitted, perform LDAP action */
+        $this->apptabs= new apptabs($this->config,
+            $this->config->data['TABS']['APPSTABS'], $this->dn);
+        $this->apptabs->set_acl(array($this->acl));
+        $this->apptabs->delete ();
+        gosa_log ("Application object'".$this->dn."' has been removed");
+        unset ($this->apptabs);
+        $this->apptabs= NULL;
+
+        /* Group list has changed, reload it. */
+        $this->reload ();
+      } else {
+
+        /* Normally this shouldn't be reached, send some extra
+           logs to notify the administrator */
+        print_red (_("You are not allowed to delete this application!"));
+        gosa_log ("Warning: '".$this->ui->uid."' tried to trick group deletion.");
+      }
+
+      /* Remove lock file after successfull deletion */
+      del_lock ($this->dn);
+    }
+
+
+    /* Delete application canceled? */
+    if (isset($_POST['delete_cancel'])){
+      del_lock ($this->dn);
+      unset($_SESSION['objectinfo']);
+    }
 
-            $Copy_Paste .= "<input type='image' name='editPaste' class='center' 
-                              src='".$img."' alt='"._("Paste")."' title='".$this->CopyPasteHandler->GetCurrentDn()."'>&nbsp;";
-          }else{
-            $Copy_Paste .= "<img class='center' src='images/cant_editpaste.png' alt='"._("Can't paste")."'>&nbsp;";
-          }
+    /* Show tab dialog if object is present */
+    if (($this->apptabs) && (isset($this->apptabs->config))){
+      $display= $this->apptabs->execute();
+
+      /* Don't show buttons if tab dialog requests this */
+      if (!$this->apptabs->by_object[$this->apptabs->current]->dialog){
+        $display.= "<p style=\"text-align:right\">\n";
+        $display.= "<input type=\"submit\" name=\"edit_finish\" value=\""._("Finish")."\">\n";
+        $display.= "&nbsp;\n";
+        $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+        $display.= "</p>";
+      }
+      return ($display);
+    }
+
+    /* Show main page */
+
+    /* Prepare departments */
+    $options= "";
+    foreach ($this->config->idepartments as $key => $value){
+      if ($appfilter['depselect'] == $key){
+        $options.= "<option selected='selected' value='$key'>$value</option>";
+      } else {
+        $options.= "<option value='$key'>$value</option>";
+      }
+    }
+
+    if($this->enableCopyPaste){
+      $Copy_Paste = " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;";
+
+      if($this->CopyPasteHandler->isCurrentObjectPastAble()){
+
+        if($this->CopyPasteHandler->isCurrentCutted()){
+          $img = "images/cutpaste.png";
         }else{
-          $Copy_Paste ="";
+          $img = "images/copypaste.png";
         }
-       
-        // Managment
-        $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
-          " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
-          " <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
-          " <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
-          " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
-          " <input class='center' type='image' align='middle' src='images/list_new_app.png' alt='"._("new")."' title='"._("Create new application")."' name='appl_new'>&nbsp;".
-          $Copy_Paste.
-          " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
-          _("Base")."&nbsp;<select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
-          " <input class='center' type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
-          "</div>";
-
-
-
-        if($this->enableCopyPaste){
-          $actions = "<input class='center' type='image' 
-            src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
-          $actions.= "<input class='center' type='image' 
-            src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
-          $actions.= "<input class='center' type='image' 
-            src='images/edit.png' alt='"._("edit")."' name='appl_edit_%KEY%' title='"._("Edit this entry")."'>";
-          $actions.= "<input class='center' type='image' 
-            src='images/edittrash.png' alt='"._("delete")."' name='appl_del_%KEY%' title='"._("Delete this entry")."'>";
-        }else{
 
-          $actions = "<input class='center' type='image' 
-            src='images/edit.png' alt='"._("edit")."' name='appl_edit_%KEY%' title='"._("Edit this entry")."'>";
-          $actions.= "<input class='center' type='image' 
-            src='images/edittrash.png' alt='"._("delete")."' name='appl_del_%KEY%' title='"._("Delete this entry")."'>";
-        }
+        $Copy_Paste .= "<input type='image' name='editPaste' class='center' 
+          src='".$img."' alt='"._("Paste")."' title='".$this->CopyPasteHandler->GetCurrentDn()."'>&nbsp;";
+      }else{
+        $Copy_Paste .= "<img class='center' src='images/cant_editpaste.png' alt='"._("Can't paste")."'>&nbsp;";
+      }
+    }else{
+      $Copy_Paste ="";
+    }
 
+    // Managment
+    $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
+      " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
+      " <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+      " <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+      " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
+      " <input class='center' type='image' align='middle' src='images/list_new_app.png' alt='"._("new")."' title='"._("Create new application")."' name='appl_new'>&nbsp;".
+      $Copy_Paste.
+      " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
+      _("Base")."&nbsp;<select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
+      " <input class='center' type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
+      "</div>";
 
-        // Defining Links
-        $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
 
-        // image Buttons
-        $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
-        $userimg  = "<img class='center' src='images/select_groups.png' alt='User'    title='%s'>";
 
-        // Extension images
-        $applimg  = "<img class='center' src='images/select_application.png' alt='A'  title='"._("Application")."'>";
+    if($this->enableCopyPaste){
+      $actions = "<input class='center' type='image' 
+        src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+      $actions.= "<input class='center' type='image' 
+        src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
+      $actions.= "<input class='center' type='image' 
+        src='images/edit.png' alt='"._("edit")."' name='appl_edit_%KEY%' title='"._("Edit this entry")."'>";
+      $actions.= "<input class='center' type='image' 
+        src='images/edittrash.png' alt='"._("delete")."' name='appl_del_%KEY%' title='"._("Delete this entry")."'>";
+    }else{
+
+      $actions = "<input class='center' type='image' 
+        src='images/edit.png' alt='"._("edit")."' name='appl_edit_%KEY%' title='"._("Edit this entry")."'>";
+      $actions.= "<input class='center' type='image' 
+        src='images/edittrash.png' alt='"._("delete")."' name='appl_del_%KEY%' title='"._("Delete this entry")."'>";
+    }
+
 
-        // Space
-        $empty    = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>";
+    // Defining Links
+    $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
 
+    // image Buttons
+    $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
+    $userimg  = "<img class='center' src='images/select_groups.png' alt='User'    title='%s'>";
 
-        $divlist = new divlist("applicationtabs");
-        $divlist->SetHeader(array(
-              array("string" => "&nbsp;", "attach" => "style='text-align:center;width:20px;'"),
-              array("string" => _("Application name")." / "._("Department"), "attach" => "style=''"),
-              array("string" => _("Actions"), "attach" => "style='width:80px;border-right:0px;text-align:right;'")
-              ));
+    // Extension images
+    $applimg  = "<img class='center' src='images/select_application.png' alt='A'  title='"._("Application")."'>";
 
+    // Space
+    $empty    = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>";
 
-        $divlist->SetSummary(_("This table displays all groups, in the selected tree."));
-        $divlist->SetEntriesPerPage(0);
 
-        foreach($this->departments as $key=> $val){
+    $divlist = new divlist("applicationtabs");
+    $divlist->SetHeader(array(
+          array("string" => "&nbsp;", "attach" => "style='text-align:center;width:20px;'"),
+          array("string" => _("Application name")." / "._("Department"), "attach" => "style=''"),
+          array("string" => _("Actions"), "attach" => "style='width:80px;border-right:0px;text-align:right;'")
+          ));
 
-          if(!isset($this->config->departments[trim($key)])){
-            $this->config->departments[trim($key)]="";
-          }
 
-          $non_empty="";
-          $keys= str_replace("/","\/",$key);
-          foreach($this->config->departments as $keyd=>$vald ){
-            if(preg_match("/".$keys."\/.*/",$keyd)){
-              $non_empty="full";
-            }
-          }
+    $divlist->SetSummary(_("This table displays all groups, in the selected tree."));
+    $divlist->SetEntriesPerPage(0);
 
-          $field1 = array("string" => "<img src='images/".$non_empty."folder.png' alt='department'>", "attach" => "style='text-align:center;width:20px;'");
-          $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
-          $field3 = array("string" => "&nbsp;", "attach" => "style='width:80px;border-right:0px;text-align:right;'");
+    foreach($this->departments as $key=> $val){
 
-          $divlist->AddEntry(array($field1,$field2,$field3));
+      if(!isset($this->config->departments[trim($key)])){
+        $this->config->departments[trim($key)]="";
+      }
+
+      $non_empty="";
+      $keys= str_replace("/","\/",$key);
+      foreach($this->config->departments as $keyd=>$vald ){
+        if(preg_match("/".$keys."\/.*/",$keyd)){
+          $non_empty="full";
         }
+      }
 
-        foreach($this->applications as $key => $val){
-          $title = "title='dn : ".$val['dn']."'";
+      $field1 = array("string" => "<img src='images/".$non_empty."folder.png' alt='department'>", "attach" => "style='text-align:center;width:20px;'");
+      $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
+      $field3 = array("string" => "&nbsp;", "attach" => "style='width:80px;border-right:0px;text-align:right;'");
 
-          if(!isset($val['description'][0])){
-            $desc = "";
-          }else{
-            $desc = " - [ ".$val['description'][0]." ]";
-          }
-          $field1 = array("string" => sprintf($applimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
-          $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
-          $field3 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:80px;border-right:0px;text-align:right;'");
+      $divlist->AddEntry(array($field1,$field2,$field3));
+    }
 
-          $divlist->AddEntry(array($field1,$field2,$field3));
-        }
+    foreach($this->applications as $key => $val){
+      $title = "title='dn : ".$val['dn']."'";
 
-        $smarty->assign("applicationshead", $listhead);
-        $smarty->assign("applications", $divlist->DrawList());
-        $smarty->assign("search_image", get_template_path('images/search.png'));
-        $smarty->assign("tree_image", get_template_path('images/tree.png'));
-        $smarty->assign("infoimage", get_template_path('images/info.png'));
-        $smarty->assign("launchimage", get_template_path('images/launch.png'));
-        $smarty->assign("branchimage"   , get_template_path('images/branch.png'));
-        $smarty->assign("deplist", $this->config->idepartments);
-        $smarty->assign("regex", $appfilter['regex']);
-
-        /* Extend if we are not using javascript */
-        $smarty->assign("apply", apply_filter());
-        $smarty->assign("alphabet", generate_alphabet());
-        $smarty->assign("hint", print_sizelimit_warning());
-
-        return($smarty->fetch(get_template_path('headpage.tpl', TRUE)));
+      if(!isset($val['description'][0])){
+        $desc = "";
+      }else{
+        $desc = " - [ ".$val['description'][0]." ]";
+      }
+      $field1 = array("string" => sprintf($applimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
+      $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
+      $field3 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:80px;border-right:0px;text-align:right;'");
+
+      $divlist->AddEntry(array($field1,$field2,$field3));
+    }
+
+    $smarty->assign("applicationshead", $listhead);
+    $smarty->assign("applications", $divlist->DrawList());
+    $smarty->assign("search_image", get_template_path('images/search.png'));
+    $smarty->assign("tree_image", get_template_path('images/tree.png'));
+    $smarty->assign("infoimage", get_template_path('images/info.png'));
+    $smarty->assign("launchimage", get_template_path('images/launch.png'));
+    $smarty->assign("releaseimage"   , get_template_path('images/release.png'));
+    $smarty->assign("deplist", $this->config->idepartments);
+    $smarty->assign("regex", $appfilter['regex']);
+
+    $smarty->assign("releases",     $this->Releases );
+    $smarty->assign("releaseKeys",   array_flip($this->Releases));
+    $smarty->assign("select_release",$this->Release);
+
+    /* Extend if we are not using javascript */
+    $smarty->assign("apply", apply_filter());
+    $smarty->assign("alphabet", generate_alphabet());
+    $smarty->assign("hint", print_sizelimit_warning());
+
+    return($smarty->fetch(get_template_path('headpage.tpl', TRUE)));
   }
 
 
   function reload()
   {
-        /* Get config */
-        $appfilter= get_global('appfilter');
+    /* Get config */
+    $appfilter= get_global('appfilter');
 
-        /* Set base for all searches */
-        $base= $appfilter['depselect'];
+    /* Set base for all searches */
+    $base= $this->Release;
+    
+    /* Regex filter? */
+    if ($appfilter['regex'] != ""){
+      $regex= $appfilter['regex'];
+    } else {
+      $regex= "*";
+    }
 
-        /* Regex filter? */
-        if ($appfilter['regex'] != ""){
-                $regex= $appfilter['regex'];
-        } else {
-                $regex= "*";
-        }
-      
-        /* Generate application list */
-        $res= get_list($this->ui->subtreeACL, "(&(cn=$regex)(objectClass=gosaApplication))", FALSE, "ou=apps,".$base, array("*"), TRUE);
-        $this->applications= array();
-        foreach ($res as $value){
-          $this->applications[]= $value;
-        }
-        reset ($this->applications);
+    /* Generate application list */
+    $res= get_list($this->ui->subtreeACL, "(&(cn=$regex)(objectClass=gosaApplication))", FALSE, $base, array("*"), FALSE);
+    $this->applications= array();
+    foreach ($res as $value){
+      $this->applications[]= $value;
+    }
+    reset ($this->applications);
 
 
 
-        /* NEW LIST MANAGMENT
-         * We also need to search for the departments
-         * So we are able to navigate like in konquerer
-         */
-        $peopleOU = get_people_ou();
+    /* NEW LIST MANAGMENT
+     * We also need to search for the departments
+     * So we are able to navigate like in konquerer
+     */
+    $peopleOU = get_people_ou();
 
-        if(empty($peopleOU)){
-          $base2 = $base;
-        }else{
-          $base2 = preg_replace("/".$peopleOU."/i","",$base);    
-        }
+    if(empty($peopleOU)){
+      $base2 = $base;
+    }else{
+      $base2 = preg_replace("/".$peopleOU."/i","",$base);    
+    }
 
-        $res3 =  get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
-            TRUE, $base2, array("ou", "description"), TRUE);
+    $res3 =  get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
+        TRUE, $base2, array("ou", "description"), TRUE);
 
-        $this->departments= array();
-        $tmp = array();
-        foreach ($res3 as $value){
-          $tmp[strtolower($value['dn']).$value['dn']]=$value;
-        }
-        ksort($tmp);
-        foreach($tmp as $value){
-          if(isset($value["description"][0])){
-            $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
-          }else{
-            $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
-          }
-        }
+    $this->departments= array();
+    $tmp = array();
+    foreach ($res3 as $value){
+      $tmp[strtolower($value['dn']).$value['dn']]=$value;
+    }
+    ksort($tmp);
+    foreach($tmp as $value){
+      if(isset($value["description"][0])){
+        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+      }else{
+        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
+      }
+    }
 
 
-        /* END NEW LIST MANAGMENT
-         */
+    /* END NEW LIST MANAGMENT
+     */
 
-      $tmp=array();
+    $tmp=array();
     foreach($this->applications as $tkey => $val ){
       $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val;
     }
@@ -587,8 +637,8 @@ class applicationManagement extends plugin
 
   function remove_from_parent()
   {
-       /* Optionally execute a command after we're done */
-       $this->postremove();
+    /* Optionally execute a command after we're done */
+    $this->postremove();
   }
 
 
@@ -607,8 +657,8 @@ class applicationManagement extends plugin
   /* Save to LDAP */
   function save()
   {
-       /* Optionally execute a command after we're done */
-       $this->postcreate();
+    /* Optionally execute a command after we're done */
+    $this->postcreate();
   }
 
   function adapt_from_template($dn)

diff --git a/plugins/admin/applications/headpage.tpl b/plugins/admin/applications/headpage.tpl
index 376f19bee15329d59631303675934925576c7862..a8a06329ab382ba3f3dbad8f5f9163623a36af15 100644 (file)
--- a/plugins/admin/applications/headpage.tpl
+++ b/plugins/admin/applications/headpage.tpl
@@ -26,15 +26,15 @@
    </div>
    <br>
    <div class="contentboxh" style="border-bottom:1px solid #B0B0B0;">
-    <p class="contentboxh"><img src="{$branchimage}" align="right" alt="[F]">{t}Branches{/t}</p>
+    <p class="contentboxh"><img src="{$releaseimage}" align="right" alt="[F]">{t}Releases{/t}</p>
    </div>
    <div class="contentboxb">
         <table summary="" style="width:100%;">
          <tr>
           <td>
         {t}Current release{/t}&nbsp;
-        <select name="select_branch" onChange="document.mainform.submit();">
-                {*{html_options values=$branchKeys output=$branches selected=$select_branch}*}
+        <select name="select_release" onChange="document.mainform.submit();">
+                {html_options values=$releaseKeys output=$releases selected=$select_release}
         </select>
           </td>
          </tr>