Code

Startet porting the application management
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 6 Nov 2009 07:49:41 +0000 (07:49 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 6 Nov 2009 07:49:41 +0000 (07:49 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14770 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-plugins/goto/admin/applications/application-filter.tpl [new file with mode: 0644]
gosa-plugins/goto/admin/applications/application-filter.xml [new file with mode: 0644]
gosa-plugins/goto/admin/applications/application-list.tpl [new file with mode: 0644]
gosa-plugins/goto/admin/applications/application-list.xml [new file with mode: 0644]
gosa-plugins/goto/admin/applications/class_applicationManagement.inc
gosa-plugins/goto/admin/applications/class_divListApplication.inc [deleted file]
gosa-plugins/goto/admin/applications/main.inc

diff --git a/gosa-plugins/goto/admin/applications/application-filter.tpl b/gosa-plugins/goto/admin/applications/application-filter.tpl
new file mode 100644 (file)
index 0000000..ba7af5c
--- /dev/null
@@ -0,0 +1,33 @@
+<div class="contentboxh">
+ <p class="contentboxh">
+  <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
+ </p>
+</div>
+
+<div class="contentboxb">
+
+<div style="border-top:1px solid #AAAAAA"></div>
+
+ {$SCOPE}
+
+ <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
+  <tr>
+   <td>
+    <label for="NAME">
+     <img src="images/lists/search.png" align=middle>&nbsp;Name
+    </label>
+   </td>
+   <td>
+    {$NAME}
+   </td>
+  </tr>
+ </table>
+
+ <table summary=""  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
+  <tr>
+   <td width="100%" align="right">
+    {$APPLY}
+   </td>
+  </tr>
+ </table>
+</div>
diff --git a/gosa-plugins/goto/admin/applications/application-filter.xml b/gosa-plugins/goto/admin/applications/application-filter.xml
new file mode 100644 (file)
index 0000000..bcdcb01
--- /dev/null
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<filterdef>
+  <definition>
+    <category>application</category>
+    <template>application-filter.tpl</template>
+    <initial>true</initial>
+  </definition>
+
+  <search>
+    <query>
+      <backend>LDAP</backend>
+      <filter>(&amp;(objectClass=gosaApplication)$NAME)</filter>
+      <attribute>dn</attribute>
+      <attribute>objectClass</attribute>
+      <attribute>cn</attribute>
+      <attribute>description</attribute>
+    </query>
+    <scope>auto</scope>
+  </search>
+
+  <element>
+    <type>textfield</type>
+    <tag>NAME</tag>
+    <size>20</size>
+    <maxlength>60</maxlength>
+    <default></default>
+    <unset></unset>
+    <set>(|(cn=*$*)(description=*$*))</set>
+    <alphabet>true</alphabet>
+    <autocomplete>
+      <backend>LDAP</backend>
+      <filter>(&amp;(objectClass=gosaApplication)(|(cn=*$NAME*)(description=*$NAME*)))</filter>
+      <attribute>cn</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+    </autocomplete>
+  </element>
+
+</filterdef>
diff --git a/gosa-plugins/goto/admin/applications/application-list.tpl b/gosa-plugins/goto/admin/applications/application-list.tpl
new file mode 100644 (file)
index 0000000..b233c58
--- /dev/null
@@ -0,0 +1,31 @@
+<input type='image' src='images/empty.png' name='no_action_posted' value='do_nothing' alt='' style='width:2px;height:2px;'>
+
+<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=2>
+  <tr>
+    <td style="vertical-align:top; width:50%;">
+      <div class="contentboxh">
+        <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
+      </div>
+      
+      <div class="contentboxb">
+       <div style='background:white;padding:0px;padding:3px;'>
+        <table><tr>
+          <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;<input class='center' type='image' src='images/lists/submit.png' align='middle' title='{t}Update{/t}' name='submit_department' alt='{t}Submit{/t}'>&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
+        </tr></table>
+       </div>
+      </div>
+      
+      <div style='height:4px;'>
+      </div>
+      
+      <input type="hidden" id="d_save" value="450">
+      <input type="hidden" id="d_space" value="760">
+      {$LIST}
+    </td>
+    <td style='vertical-align:top'>
+      {$FILTER}
+    </td>
+  </tr>
+</table>
+
+<input type="hidden" name="ignore">
diff --git a/gosa-plugins/goto/admin/applications/application-list.xml b/gosa-plugins/goto/admin/applications/application-list.xml
new file mode 100644 (file)
index 0000000..07ca737
--- /dev/null
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<list>
+  <definition>
+    <departmentBrowser>true</departmentBrowser>
+    <departmentRootVisible>false</departmentRootVisible>
+    <baseMode>true</baseMode>
+    <multiSelect>true</multiSelect>
+    <template>application-list.tpl</template>
+    <module>applications</module>
+    <label>List of applications</label>
+    <defaultSortColumn>1</defaultSortColumn>
+
+    <objectType>
+      <label>Group</label>
+      <objectClass>posixGroup</objectClass>
+      <category>application</category>
+      <class>application</class>
+      <image>plugins/applications/images/applications.png</image>
+    </objectType>
+
+  </definition>
+
+  <table>
+    <layout>|16px|||120px|150px;r|</layout>
+
+    <department>
+      <value>%{filter:objectType(dn,objectClass)}</value>
+    </department>
+
+    <department>
+      <value>%{filter:departmentLink(row,dn,description)}</value>
+      <span>2</span>
+    </department>
+
+    <column>
+      <value>%{filter:objectType(dn,objectClass)}</value>
+    </column>
+
+    <column>
+      <label>Name</label>
+      <sortAttribute>cn</sortAttribute>
+      <sortType>string</sortType>
+      <value>%{filter:link(row,dn,"%s",cn)}</value>
+      <export>true</export>
+    </column>
+
+    <column>
+      <label>Description</label>
+      <sortAttribute>description</sortAttribute>
+      <sortType>string</sortType>
+      <value>%{filter:link(row,dn,"%s",description)}</value>
+      <export>true</export>
+    </column>
+
+    <column>
+      <label>Properties</label>
+      <value>%{filter:filterProperties(row,objectClass)}</value>
+    </column>
+
+    <column>
+      <label>Actions</label>
+      <value>%{filter:actions(dn,row,objectClass)}</value>
+    </column>
+
+  </table>
+
+  <actionmenu>
+
+    <action>
+     <type>sub</type>
+     <image>images/lists/new.png</image>
+     <label>Create</label>
+
+     <action>
+      <name>new</name>
+      <type>entry</type>
+      <image>plugins/applications/images/new.png</image>
+      <label>Group</label>
+     </action>
+    </action>
+
+    <action>
+      <type>separator</type>
+    </action>
+
+    <action>
+      <name>edit</name>
+      <type>entry</type>
+      <image>images/lists/edit.png</image>
+      <label>Edit</label>
+    </action>
+
+    <action>
+      <name>remove</name>
+      <type>entry</type>
+      <image>images/lists/trash.png</image>
+      <label>Remove</label>
+    </action>
+
+    <action>
+      <name>sendMessage</name>
+      <type>entry</type>
+      <depends>DaemonEvent_notify</depends>
+      <image>plugins/goto/images/notify.png</image>
+      <label>Send message</label>
+    </action>
+
+    <action>
+      <type>exporter</type>
+    </action>
+
+    <action>
+      <type>separator</type>
+    </action>
+
+    <action>
+      <type>copypaste</type>
+    </action>
+
+    <action>
+      <type>snapshot</type>
+    </action>
+
+  </actionmenu>
+
+  <actiontriggers snapshot="true" copypaste="true">
+
+    <action>
+      <name>cp</name>
+      <type>copypaste</type>
+    </action>
+
+    <action>
+      <name>edit</name>
+      <type>entry</type>
+      <image>images/lists/edit.png</image>
+      <label>Edit application</label>
+    </action>
+
+    <action>
+      <name>snapshot</name>
+      <type>snapshot</type>
+    </action>
+
+    <action>
+      <name>remove</name>
+      <type>entry</type>
+      <image>images/lists/trash.png</image>
+      <acl>application/application[d]</acl>
+      <label>Remove application</label>
+    </action>
+
+  </actiontriggers>
+
+</list>
index ddfb16123038a33a898cb866296d080cb6c8d5bf..15bdc7d1ed0dc00eb67e629b8eba3b7a7b64ae00 100644 (file)
 <?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 (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id: class_applicationManagement.inc 14766 2009-11-05 14:30:35Z hickert $$
+ *
+ * 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
  */
 
-class applicationManagement extends plugin
+class applicationManagement extends management
 {
-  /* Definitions */
   var $plHeadline     = "Applications";
-  var $plDescription  = "This does something";
-  var $plIcon         = "plugins/goto/images/application.png";
-
-  /* Dialog attributes */
-  var $apptabs                  = NULL;
-  var $ui                       = NULL;
-  var $CopyPasteHandler         = NULL;
-  var $DivListApplication       = NULL;
-  var $applications             = array();
-  var $enableReleaseManagement  = false;
-  var $start_pasting_copied_objects = FALSE;
-
-  var $acl_base     ="";
-  var $app_base     ="";
-  var $app_release  ="";
-  var $acl_module   = array("application");  
-
-  var $dns = array();
-
-  function IsReleaseManagementActivated()
-  {
-    /* Check if we should enable the release selection */
-    $tmp = $this->config->search("faiManagement", "CLASS",array('menu','tabs'));
-    if(!empty($tmp)){
-      return(true);
-    }
-    return(false);
-  }
-
-
-  function applicationManagement (&$config, &$ui)
-  {
-    /* Save configuration for internal use */
-    $this->config   = &$config;
-    $this->ui       = &$ui;
-
-    /* Check if copy & paste is activated */
-    if($this->config->boolValueIsTrue("MAIN","COPYPASTE")){
-      $this->CopyPasteHandler = new CopyPasteHandler($this->config);
-    }
-
-    /* Creat dialog object */
-    $this->DivListApplication = new divListApplication($this->config,$this);
-
-    if($this->IsReleaseManagementActivated()){
-      $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;
-    }
+  var $plDescription  = "Application administration";
+  var $plIcon  = "plugins/applications/images/plugin.png";
 
-    /* Set default release */
-    if(!$this->IsReleaseManagementActivated()){
-      $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));
-      }
-      $app_filter     = session::get("app_filter");
-    }else{
+  var $app_release = ""; // The currently selected release while in release management mode!
 
-      /* Set intial release */
-      $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];
-      }else{
-        $rel = $this->app_base;
-      }
+  // Tab definition 
+  protected $tabClass = "apptabs";
+  protected $tabType = "APPSTABS";
+  protected $aclCategory = "application";
+  protected $aclPlugin   = "application";
+  protected $objectName   = "application";
 
-      if(!session::is_set("app_filter")){
-        session::set("app_filter",array("app_base" => $this->app_base,"app_release" => $rel));
-      }
-      $app_filter         = session::get("app_filter");
-      $this->app_base     = $app_filter['app_base'];
-      $this->app_release  = $app_filter['app_release'];
-    }
-  }
-
-
-  function getReleases()
+  function __construct($config,$ui)
   {
-    $ldap = $this->config->get_ldap_link();
-    $ret  = array();
-    $base = $this->app_base; 
-
-    $ret[$this->app_base] = "/";
-    $ldap->cd($base);
-    $ldap->search("(&(objectClass=organizationalUnit)(objectClass=FAIbranch))",array("ou"));
-    while($attrs = $ldap->fetch()){
-      $str = str_replace($base,"",$attrs['dn']);
-      $tmp = array_reverse( split("ou=",$str));
-      $str = "";
-      foreach($tmp as $val){
-        $val = trim(preg_replace("/,/","",$val));
-        if(empty($val)) break;
-        $str .= "/".$val;
-      } 
-      if(!empty($str)){
-        $ret[$attrs['dn']]= preg_replace("/^\//","",$str);
-      }
-    }
-    asort($ret);
-    return($ret);
-  }
-
-  function execute()
-  {
-    /* Call parent execute */
-    plugin::execute();
-
-
-    /**************** 
-      Variable init 
-     ****************/
-
-    /* These vars will be stored if you try to open a locked app, 
-        to be able to perform your last requests after showing a warning message */
-    session::set('LOCK_VARS_TO_USE',array("/^act$/","/^id$/","/^appl_edit_/","/^appl_del_/","/^item_selected/","/^remove_multiple_applications/","/^menu_action/"));
-
-    $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
-    
-    /* Test Posts */
-    foreach($_POST as $key => $val){
-      // Post for delete
-      if(preg_match("/appl_del.*/",$key)){
-        $s_action = "del";
-        $s_entry  = preg_replace("/appl_".$s_action."_/i","",$key);
-        // Post for edit
-      }elseif(preg_match("/appl_edit_.*/",$key)){
-        $s_action="edit";
-        $s_entry  = preg_replace("/appl_".$s_action."_/i","",$key);
-        // Post for new
-      }elseif(preg_match("/^copy_.*/",$key)){
-        $s_action="copy";
-        $s_entry  = preg_replace("/^copy_/i","",$key);
-      }elseif(preg_match("/^cut_.*/",$key)){
-        $s_action="cut";
-        $s_entry  = preg_replace("/^cut_/i","",$key);
-        // Post for new
-      }elseif(preg_match("/^appl_new.*/",$key)){
-        $s_action="new";
-      }elseif(preg_match("/^remove_multiple_applications/",$key)){
-        $s_action="del_multiple";
-      }elseif(preg_match("/^editPaste.*/i",$key)){
-        $s_action="editPaste";
-      }elseif(preg_match("/^multiple_copy_groups/",$key)){
-        $s_action = "copy_multiple";
-      }elseif(preg_match("/^multiple_cut_groups/",$key)){
-        $s_action = "cut_multiple";
-      }
-    }
-
-    if((isset($_GET['act']))&&($_GET['act']=="edit_entry")){
-      $s_action ="edit";
-      $s_entry  = $_GET['id'];
-    }
-
-    $s_entry  = preg_replace("/_.$/","",$s_entry);
-
-
-    /* handle C&P from layers menu */
-    if(isset($_POST['menu_action']) && preg_match("/^multiple_copy_systems/",$_POST['menu_action'])){
-      $s_action = "copy_multiple";
-    }
-    if(isset($_POST['menu_action']) && preg_match("/^multiple_cut_systems/",$_POST['menu_action'])){
-      $s_action = "cut_multiple";
-    }
-    if(isset($_POST['menu_action']) && preg_match("/^editPaste/",$_POST['menu_action'])){
-      $s_action = "editPaste";
-    }
-
-    /* Create options */
-    if(isset($_POST['menu_action']) && $_POST['menu_action'] == "appl_new"){
-      $s_action = "new";
-    }
-
-    /* handle remove from layers menu */
-    if(isset($_POST['menu_action']) && preg_match("/^remove_multiple/",$_POST['menu_action'])){
-      $s_action = "del_multiple";
-    }
-
-    /**************** 
-      Copy & Paste handling  
-     ****************/
-
-    /* Display the copy & paste dialog, if it is currently open */
-    $ret = $this->copyPasteHandling_from_queue($s_action,$s_entry);
-    if($ret){
-      return($ret);
-    }
-
-    /**************** 
-      Create a new app 
-     ****************/
-
-    /* New application? */
-    if ($s_action=="new"){
-
-      /* By default we set 'dn' to 'new', all relevant plugins will
-         react on this. */
-      $this->dn= "new";
-
-      /* 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->acl_base);
-    }
-
-
-    /**************** 
-      Edit entry canceled 
-     ****************/
-
-    /* Cancel dialogs */
-    if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){
-      $this->remove_lock();
-      $this->apptabs= NULL;
-      set_object_info();
-    }
-
-
-    /**************** 
-      Edit entry finished 
-     ****************/
-
-    /* Finish apps edit is triggered by the tabulator dialog, so
-       the user wants to save edited data. Check and save at this
-       point. */
-    if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply']) ) && (isset($this->apptabs->config))){
-
-      /* Check tabs, will feed message array */
-      $this->apptabs->last= $this->apptabs->current;
-      $this->apptabs->save_object();
-      $message= $this->apptabs->check();
-
-      /* Save, or display error message? */
-      if (count($message) == 0){
-
-        /* Save data data to ldap */
-        $this->apptabs->save();
-
-        if (!isset($_POST['edit_apply'])){
-          /* Application has been saved successfully, remove lock from
-             LDAP. */
-          if ($this->dn != "new"){
-            $this->remove_lock();
-          }
-          $this->apptabs= NULL;
-          set_object_info();
-        }else{
-
-          /* Reinitialize tab */
-          if($this->apptabs instanceof tabs){
-            $this->apptabs->re_init();
-          }
-        }
-      } else {
-        /* Ok. There seem to be errors regarding to the tab data,
-           show message and continue as usual. */
-        msg_dialog::displayChecks($message);
-      }
-    }
-
-
-    /**************** 
-      Edit entry  
-     ****************/
-
-    /* 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,TRUE));
-      }
-
-      /* Lock the current entry, so everyone will get the
-         above dialog */
-      add_lock ($this->dn, $this->ui->dn);
-
-      /* Register apptabs to trigger edit dialog */
-      $this->apptabs= new apptabs($this->config,$this->config->data['TABS']['APPSTABS'], $this->dn,"application");
-      if($this->IsReleaseManagementActivated()){
-        $this->apptabs->set_FAIstate($this->applications[$s_entry]['FAIstate'][0]);
-      }
-      $this->apptabs->parent = &$this;
-      $this->apptabs->set_acl_base($this->dn);
-      set_object_info($this->dn);
-    }
-
-
-
-    /********************
-      Delete MULTIPLE entries requested, display confirm dialog
-     ********************/
-
-    if ($s_action=="del_multiple"){
-      $ids = $this->list_get_selected_items();
-
-      if(count($ids)){
-        $this->dns = array();
-
-        $disallowed = array();
-        foreach($ids as $id){
-          $dn = $this->applications[$id]['dn'];
-          $acl = $this->ui->get_permissions($dn, "application/application");
-          if(preg_match("/d/",$acl)){
-            $this->dns[$id] = $dn;
-          }else{
-            $disallowed[] = $dn;
-          }
-        }
-
-        if(count($disallowed)){
-          msg_dialog::display(_("Permission"),msgPool::permDelete($disallowed),INFO_DIALOG);
-        }
-
-        if(count($this->dns)){
-
-          if ($user= get_multiple_locks($this->dns)){
-            return(gen_locked_message($user,$this->dns));
-          }
-
-          $dns_names = array();
-          foreach($this->dns as $dn){
-            add_lock ($dn, $this->ui->dn);
-            $dns_names[] =LDAP::fix($dn);
-          }
-
-          /* Lock the current entry, so nobody will edit it during deletion */
-          $smarty->assign("intro",  msgPool::deleteInfo($dns_names,_("application")));
-          $smarty->assign("multiple", true);
-          return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
-        }
-      }
-    }
-
-
-    /********************
-      Delete MULTIPLE entries confirmed
-     ********************/
-
-    /* Confirmation for deletion has been passed. Users should be deleted. */
-    if (isset($_POST['delete_multiple_application_confirm'])){
-
-      /* Remove user by user and check acls before removeing them */
-      foreach($this->dns as $key => $dn){
-
-        $ui = get_userinfo();
-        $acl = $ui->get_permissions($dn ,"application/application");
-        if (preg_match('/d/', $acl)){
-
-          /* Delete request is permitted, perform LDAP action */
-          $this->apptabs= new apptabs($this->config, $this->config->data['TABS']['APPSTABS'], $dn,"application");
-          $this->apptabs->parent = &$this;
-          $this->apptabs->set_acl_base($dn);
-          $this->apptabs->delete ();
-          unset ($this->apptabs);
-          $this->apptabs= NULL;
-
-        } else {
-          /* Normally this shouldn't be reached, send some extra
-             logs to notify the administrator */
-          msg_dialog::display(_("Permission error"), msgPool::permDelete(), INFO_DIALOG);
-          new log("security","application/".get_class($this),$dn,array(),"Tried to trick deletion.");
-        }
-      }
-
-      /* Remove lock file after successfull deletion */
-      $this->remove_lock();
-      $this->dns = array();
-    }
-
-
-    /********************
-      Delete MULTIPLE entries Canceled
-     ********************/
-
-    /* Remove lock */
-    if(isset($_POST['delete_multiple_application_cancel'])){
-
-      /* Remove lock file after successfull deletion */
-      $this->remove_lock();
-      $this->dns = array();
-    }
-
-    /**************** 
-      Delete app 
-     ****************/
-
-    /* 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' */
-      $ui = get_userinfo();
-      $acl = $ui->get_permissions($this->dn ,"application/application");
-
-      if(preg_match("/d/",$acl)){
-        /* 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",msgPool::deleteInfo(LDAP::fix($this->dn),_("application")));
-        $smarty->assign("multiple", false);
-        return($smarty->fetch (get_template_path('remove.tpl', TRUE)));
-      } else {
-
-        /* Obviously the user isn't allowed to delete. Show message and
-           clean session. */
-        msg_dialog::display(_("Permission error"), msgPool::permDelete(), INFO_DIALOG);
-      }
-    }
-
-
-    /**************** 
-      Delete app confirmed 
-     ****************/
-
-    /* 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. */
-      $ui = get_userinfo();
-      $acl = $ui->get_permissions($this->dn ,"application/application");
-
-      if(preg_match("/d/",$acl)){
-
-        /* Delete request is permitted, perform LDAP action */
-        $this->apptabs= new apptabs($this->config, $this->config->data['TABS']['APPSTABS'], $this->dn,"application");
-        $this->apptabs->parent = &$this;
-        $this->apptabs->set_acl_base($this->dn);
-        $this->apptabs->delete ();
-        unset ($this->apptabs);
-        $this->apptabs= NULL;
-
-      } else {
-
-        /* Normally this shouldn't be reached, send some extra
-           logs to notify the administrator */
-        msg_dialog::display(_("Permission error"), msgPool::permDelete(), INFO_DIALOG);
-        new log("security","application/".get_class($this),$dn,array(),"Tried to trick deletion.");
-      }
-
-      /* Remove lock file after successfull deletion */
-      $this->remove_lock();
-    }
-
-
-    /**************** 
-      Delete app canceled 
-     ****************/
-
-    /* Delete application canceled? */
-    if (isset($_POST['delete_cancel'])){
-      $this->remove_lock();
-      set_object_info();
-    }
-
-    /* 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";
-
-        if(($this->apptabs instanceOf tabs || $this->apptabs instanceOf plugin) && $this->apptabs->read_only == TRUE){
-          $display.= "<p style=\"text-align:right\">
-            <input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">
-            </p>";
-        }elseif(isset($this->apptabs->FAIstate) && !preg_match("/freeze/i",$this->apptabs->FAIstate)){
-          $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
-          $display.= "&nbsp;\n";
-          if ($this->dn != "new"){
-            $display.= "<input type=submit name=\"edit_apply\" value=\"".msgPool::applyButton()."\">\n";
-            $display.= "&nbsp;\n";
-          }
-        }
-        $display.= "<input type=\"submit\" name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
-        $display.= "</p>";
-      }
-      return ($display);
-    }
-
-
-    /****************
-      Dialog display
-     ****************/
-
-    /* Check if there is a snapshot dialog open */
-    if($this->IsReleaseManagementActivated()){
-      $base = $this->app_release;  
-    }else{
-      $base = $this->app_base;  
-    }
-    if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases(),$this)){
-      return($str);
-    }
-
-    /* Display dialog with system list */
-    $this->DivListApplication->parent = $this;
-    $this->DivListApplication->execute();
-    if(!$this->IsReleaseManagementActivated()){
-      $this->DivListApplication->AddDepartments($this->DivListApplication->selectedBase,3,1);
-    } 
-    $this->reload();
-    $this->DivListApplication->setEntries($this->applications);
-    return($this->DivListApplication->Draw());
-  }
-
-
-  /* Return departments, that will be included within snapshot detection */
-  function get_used_snapshot_bases()
-  {
-    if($this->IsReleaseManagementActivated()){
-      return(array($this->app_release));  
-    }else{
-      return(array($this->app_base));  
-    }
-  }
-
-
-  function reload()
-  {
-    $this->applications= array();
-
-    /* Set base for all searches */
-    $Regex      = $this->DivListApplication->Regex;
-    $SubSearch  = $this->DivListApplication->SubSearch; 
-    $Flags      =  GL_NONE | GL_SIZELIMIT;
-    $Filter     = "(&(cn=".$Regex.")(objectClass=gosaApplication))";
-    $tmp        = array();
-
-    if(!$this->IsReleaseManagementActivated()){
-      $use_base = $this->app_base;
-      if($SubSearch){
-        $use_base = preg_replace("/^".preg_quote(get_ou("applicationRDN"), '/')."/","",$use_base);
-      }
-    }else{
-      $use_base = $this->app_release;
-      $SubSearch= FALSE;
-    }
-
-    /* Add FAIstate to the search attributes */
-    $search_attrs = array("cn","description","dn","objectClass");
-    if($this->IsReleaseManagementActivated()) {
-      $search_attrs[] = "FAIstate";
-    }
+    $this->config = $config;
+    $this->ui = $ui;
+   
+    $this->storagePoints = array(get_ou("applicationRDN"));
  
-    if($SubSearch){ 
-      $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);
-    }
-    $tmp2 = array();
-    foreach ($res as $val){
-      if(!isset($val['FAIstate'])){
-        $val['FAIstate'][0] = "";
-      }
-      $tmp[strtolower($val['cn'][0]).$val['cn'][0].$val['dn']]=$val;
-      $tmp2[strtolower($val['cn'][0]).$val['cn'][0].$val['dn']] = strtolower($val['cn'][0]).$val['cn'][0].$val['dn'];
-    }
-
-    natcasesort($tmp2);
-    $this->applications=array();
-    foreach($tmp2 as $val){
-      $this->applications[]=$tmp[$val];
-    }
-    reset ($this->applications);
+#   // Build filter
+#   if (session::global_is_set(get_class($this)."_filter")){
+#     $filter= session::global_get(get_class($this)."_filter");
+#   } else {
+     $filter = new filter(get_template_path("application-filter.xml", true));
+     $filter->setObjectStorage($this->storagePoints);
+#   }
+    $this->setFilter($filter);
+
+    // Build headpage
+    $headpage = new listing(get_template_path("application-list.xml", true));
+    $headpage->setFilter($filter);
+
+    // Add copy&paste and snapshot handler.
+    if ($this->config->boolValueIsTrue("main", "copyPaste")){
+      $this->cpHandler = new CopyPasteHandler($this->config);
+    }
+    if($this->config->get_cfg_value("enableSnapshots") == "true"){
+      $this->snapHandler = new SnapshotHandler($this->config);
+    }
+    parent::__construct($config, $ui, "applications", $headpage);
+
+    $this->registerAction("edit_application","editEntry");
+    $this->registerAction("edit_environment","editEntry");
+    $this->registerAction("edit_appapplication","editEntry");
+    $this->registerAction("edit_mailapplication","editEntry");
   }
 
-  function remove_from_parent()
+  function renderList()
   {
-    /* Optionally execute a command after we're done */
-    $this->postremove();
+    $headpage = $this->getHeadpage();
+    return(management::renderList());
   }
 
-
-  function copyPasteHandling_from_queue($s_action,$s_entry)
-  {
-    /* Check if Copy & Paste is disabled */
-    if(!is_object($this->CopyPasteHandler)){
-      return("");
-    }
-
-    $ui = get_userinfo();
-
-    /* Add a single entry to queue */
-    if($s_action == "cut" || $s_action == "copy"){
-
-      /* Cleanup object queue */
-      $this->CopyPasteHandler->cleanup_queue();
-      $dn = $this->applications[$s_entry]['dn'];
-      if($s_action == "copy" && $ui->is_copyable($dn,"application","application")){
-        $this->CopyPasteHandler->add_to_queue($dn,$s_action,"apptabs","APPSTABS","application");
-      }
-      if($s_action == "cut" && $ui->is_cutable($dn,"application","application")){ 
-        $this->CopyPasteHandler->add_to_queue($dn,$s_action,"apptabs","APPSTABS","application");
-      }
-    }
-
-
-    /* Add entries to queue */
-    if($s_action == "copy_multiple" || $s_action == "cut_multiple"){
-
-      /* Cleanup object queue */
-      $this->CopyPasteHandler->cleanup_queue();
-
-      /* Add new entries to CP queue */
-      foreach($this->list_get_selected_items() as $id){
-        $dn = $this->applications[$id]['dn'];
-
-        if($s_action == "copy_multiple" && $ui->is_copyable($dn,"application","application")){ 
-          $this->CopyPasteHandler->add_to_queue($dn,"copy","apptabs","APPSTABS","application");
-        }
-        if($s_action == "cut_multiple" && $ui->is_cutable($dn,"application","application")){
-          $this->CopyPasteHandler->add_to_queue($dn,"cut","apptabs","APPSTABS","application");
-        }
-      }
-    }
-
-    /* Start pasting entries */
-    if($s_action == "editPaste"){
-      $this->start_pasting_copied_objects = TRUE;
-    }
-
-
-    /* Return C&P dialog */
-    if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
-
-
-      /* Get dialog */
-      $this->CopyPasteHandler->SetVar("base",$this->app_base);
-      $this->CopyPasteHandler->SetVar("parent",$this);
-      $data = $this->CopyPasteHandler->execute();
-
-      /* Return dialog data */
-      if(!empty($data)){
-        return($data);
-      }
-    }
-
-    /* Automatically disable status for pasting */
-    if(!$this->CopyPasteHandler->entries_queued()){
-      $this->start_pasting_copied_objects = FALSE;
-    }
-    return("");
-  }
-
-
-  function list_get_selected_items()
-  {
-    $ids = array();
-    foreach($_POST as $name => $value){
-      if(preg_match("/^item_selected_[0-9]*$/",$name)){
-        $id   = preg_replace("/^item_selected_/","",$name);
-        $ids[$id] = $id;
-      }
-    }
-    return($ids);
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    /* Optionally execute a command after we're done */
-    $this->postcreate();
-  }
-
-
-  function remove_lock()
-  {
-    if (isset($this->apptabs->dn)){
-      del_lock ($this->apptabs->dn);
-    }elseif(isset($this->dn) && !empty($this->dn) && $this->dn != "new"){
-      del_lock($this->dn);
-    }
-    if(isset($this->dns) && is_array($this->dns) && count($this->dns)){
-      del_lock($this->dns);
-    }
-  }
-
-
-  function save_object() 
+  function IsReleaseManagementActivated()
   {
-    $this->DivListApplication->save_object();
-    if(is_object($this->CopyPasteHandler)){
-      $this->CopyPasteHandler->save_object();
-    }
-    
-    if($this->IsReleaseManagementActivated() && isset($_POST['app_release'])){
-      $sel_rel = get_post('app_release');
-      $releases = array_flip($this->getReleases());
-      if(isset($releases[$sel_rel])){
-        $this->app_release = $releases[$sel_rel];
-      }
-      $app_filter     = session::get("app_filter");
-      $app_filter['app_release'] = $this->app_release;
-      session::set("app_filter",$app_filter);
-    }elseif(!$this->IsReleaseManagementActivated()){
-      $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);
+    /* Check if we should enable the release selection */
+    $tmp = $this->config->search("faiManagement", "CLASS",array('menu','tabs'));
+    if(!empty($tmp)){
+      return(true);
     }
+    return(false);
   }
 
-  function check() {}
-  function adapt_from_template($dn, $skip= array()) {}
-  function password_change_needed() {}
-}
+} 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>
diff --git a/gosa-plugins/goto/admin/applications/class_divListApplication.inc b/gosa-plugins/goto/admin/applications/class_divListApplication.inc
deleted file mode 100644 (file)
index c281fa2..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-
-class divListApplication extends MultiSelectWindow
-{
-  /* Current base */
-  var $departments        = array();
-  var $parent               ;
-  var $ui                   ;
-
-  /* Regex */
-  var $Regex           = "*";
-
-  /* Subsearch checkbox */
-  var $SubSearch;
-  var $selectedBase ="";
-
-  function divListApplication (&$config,&$parent)
-  {
-    MultiSelectWindow::MultiSelectWindow($config,"Application", "application");
-  
-    $this->parent       = &$parent;
-    $this->ui           = get_userinfo();
-
-    /* Set list strings */
-    $this->SetTitle(_("List of Applications"));
-    $this->SetSummary(_("This table displays all applications in the selected tree."));
-
-    /* Result page will look like a headpage */
-    $this->SetHeadpageMode();
-
-    $this->EnableAplhabet(true);
-  
-    /* Disable buttonsm */
-    $this->EnableCloseButton(false);
-    $this->EnableSaveButton (false);
-
-    /* set Page header */
-    $action_col_size = 80;
-    if($this->parent->snapshotEnabled()){
-      $action_col_size += 38;
-    }
-
-
-    /* Toggle all selected / deselected */
-    $chk = "<input type='checkbox' id='select_all' name='select_all' title='"._("Select all")."'
-               onClick='toggle_all_(\"^item_selected_[0-9]*$\",\"select_all\");' >";
-
-    /* set Page header */
-    $this->AddHeader(array("string"=> $chk,          "attach"=>"style='width:20px;'"));
-    $this->AddHeader(array("string" => "&nbsp;",                "attach" => "style='text-align:center;width:20px;'"));
-    $this->AddHeader(array("string" => _("Application name")." / "._("Department"), "attach" => "style=''"));
-    $this->AddHeader(array("string" => _("Actions"),            "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"));
-
-    /* Add SubSearch checkbox */
-    $this->AddCheckBox("SubSearch",  msgPool::selectToView("","subsearch"), msgPool::selectToView("","subsearch_small"), false);
-
-    /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
-    $this->AddRegex   ("Regex",     _("Display users matching"),"*" , true);
-  }
-
-
-  function AddUserBoxToFilter($position)
-  {
-    $str = "";
-    if(($position  == 2) && ($this->parent->IsReleaseManagementActivated($this->config))){
-      $smarty = get_smarty();
-      $releases = $this->parent->getReleases();
-      $smarty->assign("app_release" , $releases[$this->parent->app_release]);
-      $smarty->assign("app_base"    , $releases[$this->parent->app_base]);
-      $smarty->assign("branchimage","plugins/goto/images/branch.png");
-      $smarty->assign("app_releases", $releases);
-      $str = $smarty->fetch(get_template_path('release_select.tpl', TRUE));
-    }
-    return($str);
-  }
-
-
-  function GenHeader()
-  {
-    /* Add default header */
-    $listhead = MultiSelectWindow::get_default_header(false);
-
-    if(!$this->parent->IsReleaseManagementActivated()){
-      
-      /* Get all departments within this subtree */
-      $base = $this->config->current['BASE'];
-      $options  = $this->create_department_list($this->module);
-
-      /* And the rest, a base selection box */
-      $listhead .= _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-        " <input class='center' type='image' src='images/lists/submit.png' align='middle' 
-          title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;";
-    }
-
-    /* Get acls */
-    $ui = get_userinfo();
-
-    if($this->parent->IsReleaseManagementActivated()){
-      $acl      = $ui->get_permissions($this->parent->acl_base,"application/application");
-      $acl_all  = $ui->has_complete_category_acls($this->parent->acl_base,"application");
-    }else{
-      $acl      = $ui->get_permissions($this->selectedBase,"application/application");
-      $acl_all  = $ui->has_complete_category_acls($this->parent->app_base,"application");
-    }
-
-    /* Create Layers menu */
-    $s  = ".|"._("Actions")."|\n";
-
-    /* Append create options */
-    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
-      "&nbsp;"._("Create")."|\n";
-    if(preg_match("/c/",$acl)) {
-      $s.= "...|<input class='center' type='image' src='images/list_new_app' alt=''>".
-        "&nbsp;"._("Application")."|appl_new|\n";
-    }
-
-    /* Multiple options */
-    $s.= "..|---|\n";
-    $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>".
-      "&nbsp;"._("Remove")."|"."remove_multiple|\n";
-
-    /* Add Copy & Paste header */
-    $s .= $this->parent->get_copypaste_header($this->selectedBase,$this->module);
-
-    /* Add snapshot icons */
-    $s .= $this->parent->get_snapshot_header($this->selectedBase,$this->module);
-
-    $this->SetDropDownHeaderMenu($s);
-    $this->SetListHeader($listhead);
-  }
-
-
-  /* so some basic settings */
-  function execute()
-  {
-    $this->ClearElementsList();
-    $this->GenHeader();
-  }
-
-
-  function setEntries($list)
-  {
-    /********************
-      Variable init
-     ********************/
-  
-    /* Create links */
-    $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
-    $userimg  = "<img class='center' src='plugins/groups/images/groups.png' alt='User'    title='%s'>";
-    $applimg  = "<img class='center' src='plugins/goto/images/select_application.png' alt='A'  title='"._("Application")."'>";
-    $empty    = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>";
-
-    /* set Page header */
-    $action_col_size = 80;
-    if($this->parent->snapshotEnabled()){
-      $action_col_size += 38;
-    }
-
-    /********************
-      Attach objects
-     ********************/
-    
-    $ui = get_userinfo();
-    foreach($list as $key => $val){
-
-      $acl = $ui->get_permissions($val['dn'],"application/application");
-      $acl_all= $ui->has_complete_category_acls($val['dn'],"application");
-
-      /* Check FAI state 
-       */  
-      $FAIstate = $val['FAIstate'][0];
-
-      /* Create action icons */
-      $actions= "";
-
-      /* Add copy & cut functionality */
-      if(!preg_match("/freeze/i",$FAIstate)){
-        $actions.= $this->parent->get_copypaste_action($val['dn'],"application","application");
-      }else{
-        $actions.= "<img src='images/empty.png' class='center' alt=''>&nbsp;";
-        $actions.= "<img src='images/empty.png' class='center' alt=''>&nbsp;";
-      }
-
-      /* Add edit icon */
-      $actions.= "<input class='center' type='image'
-        src='images/lists/edit.png' alt='"._("edit")."' name='appl_edit_%KEY%' title='"._("Edit this entry")."'>";
-
-      /* Add snapshot icon */
-      if(!preg_match("/freeze/i",$FAIstate)){
-        $actions.= $this->parent->get_snapshot_action($val['dn'],$this->module);
-      }else{
-        $actions.= "<img src='images/empty.png' class='center' alt=''>&nbsp;";
-        $actions.= "<img src='images/empty.png' class='center' alt=''>&nbsp;";
-      }
-
-
-      /* If we are allowed to remove the application account, display remove icon */
-      if(preg_match("/freeze/i",$FAIstate)){
-        $actions .= "<img src='plugins/goto/images/freeze.png' class='center' alt='!' title='"._("Freezed")."'>";
-      }elseif(preg_match("/d/",$acl)){
-        $actions.= "<input class='center' type='image'
-          src='images/lists/trash.png' alt='"._("delete")."' name='appl_del_%KEY%' title='"._("Delete this entry")."'>";
-      }else{
-        $actions.= "<img src='images/empty.png' alt='&nbsp;'>";
-      }
-
-      $title = "title='".preg_replace('/ /', '&nbsp;', LDAP::fix($val['dn']))."'";
-
-      if(!isset($val['description'][0])){
-        $desc = "";
-      }else{
-        $desc = " - [ ".$val['description'][0]." ]";
-      }
-
-      /* Cutted objects should be displayed in light grey */
-      $display = $val['cn'][0].$desc;
-      if($this->parent->CopyPasteHandler){
-        foreach($this->parent->CopyPasteHandler->queue as $queue_key => $queue_data){
-          if($queue_data['dn'] == $val['dn']) {
-            $display = "<font color='#999999'>".$display."</font>";
-            break;
-          }
-        }
-      }
-
-      /* Create each field */
-      $field0 = array("string" => "<input type='checkbox' id='item_selected_".$key."' name='item_selected_".$key."'>" ,
-                      "attach" => "style='width:20px;'");
-      $field1 = array("string" => sprintf($applimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
-      $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' ".$title);
-      $field3 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'");
-      $this->AddElement(array($field0,$field1,$field2,$field3));
-    }
-
-    /* Create summary string for list footer */
-    $num_deps=0;
-    if(!$this->SubSearch){
-      $num_deps = count($this->Added_Departments);
-    }
-    $num_apps = count($list);
-
-    $num_app_str = _("Number of listed applications");
-    $num_dep_str = _("Number of listed departments");
-  
-    $str = "<img class='center' src='plugins/goto/images/select_application.png' 
-              title='".$num_app_str."' alt='".$num_app_str."'>&nbsp;".$num_apps."&nbsp;&nbsp;&nbsp;&nbsp;";
-    $str.= "<img class='center' src='images/lists/folder.png' 
-              title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
-
-    $this->set_List_Bottom_Info($str);
-  }
-
-  function Save()
-  {
-    MultiSelectWindow::Save();  
-  }
-
-  function save_object()
-  {
-    /* Save automatic created POSTs like regex, checkboxes */
-    MultiSelectWindow::save_object(); 
-  }
-
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
index 99a7a72c861748f7c93faf8155ac669dd844bed2..12a396a0b9996683d7971b6539fe7ca723e795f6 100644 (file)
@@ -1,24 +1,25 @@
 <?php
 /*
-  This code is part of GOsa (https://gosa.gonicus.de)
-  Copyright (C) 2003  Cajus Pollmeier
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id: main.inc 14740 2009-11-04 09:41:16Z hickert $$
+ *
+ * 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 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
-*/
-
-       
 /* Remove locks created by this plugin
 */
 if ($remove_lock){
@@ -34,30 +35,22 @@ if ( $cleanup ){
   session::un_set('applicationManagement');
 }else{
 
+  /* Create applicationmanagement object on demand */
+  if (!session::is_set('applicationManagement')){
+    $applicationManagement= new applicationManagement ($config, $ui);
+    session::set('applicationManagement',$applicationManagement);
+  }
+  $applicationManagement = session::get('applicationManagement');
+  $display= $applicationManagement->execute();
 
-       /* Create applicationManagement object on demand */
-       if (!session::is_set('applicationManagement')){
-               session::set('applicationManagement',new applicationManagement ($config, $ui));
-       }
-       $applicationManagement = session::get('applicationManagement');
-       $applicationManagement->save_object();
-       $output= $applicationManagement->execute();
-
-       /* Page header*/
-       if (get_object_info() != ""){
-               $display= print_header(get_template_path($applicationManagement->plIcon), _("Application management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".LDAP::fix(get_object_info()));
-       } else {
-               $display= print_header(get_template_path($applicationManagement->plIcon), _("Application management"));
-       }
-
-       /* Reset requested? */
-       if (isset($_GET['reset']) && $_GET['reset'] == 1){
-               session::un_set ('applicationManagement');
-       }
+  /* Reset requested? */
+  if (isset($_GET['reset']) && $_GET['reset'] == 1){
+    session::un_set ('applicationManagement');
+  }
 
-       /* Show and save dialog */
-       $display.= $output;
-       session::set('applicationManagement',$applicationManagement);
+  /* Show and save dialog */
+  session::set('applicationManagement',$applicationManagement);
 }
 
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>