Updated lock handling

-seperate GET & POST variables while locking.

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

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 3c799e8c0227aa881d30eb23bde74cd87bcf78ee..b7a8271d8cb7cb62241caa966595bd66ab4108ed 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -311,9 +311,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
   if (isset($_POST['delete_lock']) || isset($_POST['open_readonly'])){
 
     /* Set old Post data */
-    if(session::global_is_set('LOCK_VARS_USED')){
-      foreach(session::global_get('LOCK_VARS_USED') as $name => $value){
+    if(session::global_is_set('LOCK_VARS_USED_GET')){
+      foreach(session::global_get('LOCK_VARS_USED_GET') as $name => $value){
         $_GET[$name]  = $value;
+      } 
+    } 
+    if(session::global_is_set('LOCK_VARS_USED_POST')){
+      foreach(session::global_get('LOCK_VARS_USED_POST') as $name => $value){
         $_POST[$name] = $value;
       } 
     }

diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc
index 765a7dbd35468d02c1762659af6e7d9c749ab5db..52b3235c510b5db49fffb57cc8b1fd79c3084134 100644 (file)
--- a/gosa-core/include/class_plugin.inc
+++ b/gosa-core/include/class_plugin.inc
@@ -263,7 +263,8 @@ class plugin
 
     /* Reset Lock message POST/GET check array, to prevent perg_match errors*/
     session::set('LOCK_VARS_TO_USE',array());
-    session::set('LOCK_VARS_USED',array());
+    session::set('LOCK_VARS_USED_GET',array());
+    session::set('LOCK_VARS_USED_POST',array());
   }
 
   /*! \brief execute plugin

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index d5338a003c203fb266ec38686f8a28cbbc940e1c..b1ea54525c3dd00399f384faf1eb6a1cf9b84b38 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -1295,7 +1295,8 @@ function gen_locked_message($user, $dn, $allow_readonly = FALSE)
   /* Save variables from LOCK_VARS_TO_USE in session - for further editing */
   if( session::is_set('LOCK_VARS_TO_USE') && count(session::get('LOCK_VARS_TO_USE'))){
 
-    $LOCK_VARS_USED   = array();
+    $LOCK_VARS_USED_GET   = array();
+    $LOCK_VARS_USED_POST   = array();
     $LOCK_VARS_TO_USE = session::get('LOCK_VARS_TO_USE');
 
     foreach($LOCK_VARS_TO_USE as $name){
@@ -1306,18 +1307,19 @@ function gen_locked_message($user, $dn, $allow_readonly = FALSE)
 
       foreach($_POST as $Pname => $Pvalue){
         if(preg_match($name,$Pname)){
-          $LOCK_VARS_USED[$Pname] = $_POST[$Pname];
+          $LOCK_VARS_USED_POST[$Pname] = $_POST[$Pname];
         }
       }
 
       foreach($_GET as $Pname => $Pvalue){
         if(preg_match($name,$Pname)){
-          $LOCK_VARS_USED[$Pname] = $_GET[$Pname];
+          $LOCK_VARS_USED_GET[$Pname] = $_GET[$Pname];
         }
       }
     }
     session::set('LOCK_VARS_TO_USE',array());
-    session::set('LOCK_VARS_USED'  , $LOCK_VARS_USED);
+    session::set('LOCK_VARS_USED_GET'  , $LOCK_VARS_USED_GET);
+    session::set('LOCK_VARS_USED_POST'  , $LOCK_VARS_USED_POST);
   }
 
   /* Prepare and show template */