Removed session::set(dn)

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

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 1d568288ba01de15e9d9b538f444429ed0deab3f..b086da606564fc8cc86c26b6d509510b8c1c3de4 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -196,17 +196,10 @@ if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])){
 }
 
 /* Check if we need to delete a lock */
-
-print_a(array($old_plugin_dir,$plugin_dir,$old_plugin_dir,getcwd()));
-
 if ($old_plugin_dir != $plugin_dir && $old_plugin_dir != ""){
-  
   if (is_file("$old_plugin_dir/main.inc")){
     $remove_lock= true;
-    echo "Jaa . "."$old_plugin_dir/main.inc";
     require_once ("$old_plugin_dir/main.inc");
-  }else{
-    echo "No";
   }
 }
 $remove_lock= false;
@@ -247,10 +240,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
     header ("Location: logout.php");
     exit;
   }
-
-  if (isset($_POST['cancel_lock'])){
-    session::un_set('dn');
-  }
 }
 
 
@@ -305,13 +294,6 @@ $header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
 
 /* React on clicks */
 if ($_SERVER["REQUEST_METHOD"] == "POST"){
-
-  /* 'delete_lock' is set by the lock removal dialog. We should remove the
-     lock at this point globally. Plugins do not need to remove it. */
-  if (isset($_POST['delete_lock']) && session::is_set('dn')){
-    del_lock (session::get('dn'));
-
-  }
   if (isset($_POST['delete_lock']) || isset($_POST['open_readonly'])){
 
     /* Set old Post data */
@@ -321,9 +303,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
         $_POST[$name] = $value;
       } 
     }
-    session::un_set ('dn');
   }
-
 }
 
 /* check if we are using account expiration */

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 0b2457d57024c8f6468c41d6d99fbf5d50d06840..5d500d4b3238afbc06f1f8c28b0fef8ca70bbff5 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -1287,7 +1287,6 @@ function gen_locked_message($user, $dn, $allow_readonly = FALSE)
 {
   global $plug, $config;
 
-  session::global_set('dn', $dn);
   $remove= false;
 
   /* Save variables from LOCK_VARS_TO_USE in session - for further editing */

diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc
index 6e3bfe7b0134cedb616fd0d07aad4d89ecdab843..5d17b7a01dd16d6fa1ed3fa493ce35f118a3e741 100644 (file)
--- a/gosa-core/plugins/personal/generic/main.inc
+++ b/gosa-core/plugins/personal/generic/main.inc
@@ -71,7 +71,6 @@ if ( $remove_lock){
 
       /* Lock the current entry */
       add_lock ($ui->dn, $ui->dn);
-      session::global_set('dn',$ui->dn);
       session::set('edit',TRUE);
     }
   }

diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
index c2e5b3f1d57a70fe4c7c724f9739d21e1dd6b467..dc7007c8912c509c7c6ac301b89d504ba6c00dd4 100644 (file)
--- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
@@ -299,7 +299,6 @@ class blocklist extends plugin
 
       /* Check locking */
       if (($user= get_lock($this->dn)) != ""){
-        session::set('dn',$this->dn);
         return(gen_locked_message($user, $this->dn));
       } else {
 

diff --git a/gosa-plugins/gofax/gofax/faxaccount/main.inc b/gosa-plugins/gofax/gofax/faxaccount/main.inc
index e6772146e4d8a9796a16646d8c8174f42a625577..2bfe4a510fec293a62623b07ba671cf806c2dccc 100644 (file)
--- a/gosa-plugins/gofax/gofax/faxaccount/main.inc
+++ b/gosa-plugins/gofax/gofax/faxaccount/main.inc
@@ -41,7 +41,6 @@ if (!$remove_lock){
 
                        /* Lock the current entry */
                        add_lock ($ui->dn, $ui->dn);
-                       session::set('dn',$ui->dn);
                        session::set('edit',TRUE);
                }
        }

diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
index 97594a94fc2e58bf071351dbd4b0bacbce6088d9..14e6131e8849740305afc6876ba5452d59fea09e 100644 (file)
--- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
+++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
@@ -261,7 +261,6 @@ class phoneConferenceManagment extends plugin
 
         /* Check locking */
         if (($conf= get_lock($this->dn)) != ""){
-          session::set('dn',$this->dn);
           return(gen_locked_message($conf, $this->dn));
         } else {
           add_lock ($this->dn, $this->ui->dn);

diff --git a/gosa-plugins/gofon/gofon/phoneaccount/main.inc b/gosa-plugins/gofon/gofon/phoneaccount/main.inc
index b82e07a33b30b79b31d1e984d34e38879f804cc8..957e31c79bca0c18d68d90ff587dd62d9ec8c39f 100644 (file)
--- a/gosa-plugins/gofon/gofon/phoneaccount/main.inc
+++ b/gosa-plugins/gofon/gofon/phoneaccount/main.inc
@@ -57,7 +57,6 @@ if (!$remove_lock){
 
                        /* Lock the current entry */
                        add_lock ($ui->dn, $ui->dn);
-                       session::set('dn',$ui->dn);
                        session::set('edit',TRUE);
                }