Updated import

[gosa.git] / gosa-plugins / ldapmanager / addons / ldapmanager / main.inc

diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc
index c1d0b9d7cb84a3c056d1215a3e854a91044bd97f..9cdd97433f1bafd6b57c62c9df562cbac978748b 100644 (file)
--- a/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc
+++ b/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc
@@ -18,9 +18,23 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-if (!$remove_lock){
+
+/* Remove locks created by this plugin
+*/
+if ($remove_lock){
+  if(session::is_set('ldif')){
+    // Nothing to unlock here
+  }
+}
+
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('ldif');
+}else{
+
        /* Create phonelist object on demand */
-       if (!session::is_set('ldif') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('ldif')){
                $ldif= new ldif ($config);
                $ldif->set_acl_category("logview");
                session::set('ldif',$ldif);
@@ -31,9 +45,6 @@ if (!$remove_lock){
        $display= $ldif->execute ();
        $display.= "<input type=\"hidden\" name=\"ignore\">\n";
 
-       /* Page header*/
-       $display= print_header(get_template_path('images/ldif.png'), _("LDAP manager")).$display;
-
        /* Store changes  in session */
        session::set('ldif',$ldif);
 }