Updated "is locked" warning message

[gosa.git] / gosa-core / include / class_management.inc

diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc
index 0015aa90f46989d6e0ebdde0c91ac198a193c3c1..ba745812558848fc7f379e8718f26fd02479c249 100644 (file)
--- a/gosa-core/include/class_management.inc
+++ b/gosa-core/include/class_management.inc
@@ -122,6 +122,7 @@ class management
 
     $this->registerAction("config-filter","editFilter");
     $this->registerAction("saveFilter","saveFilter");
+    $this->registerAction("cancelFilter","cancelFilter");
 
     // To temporay disable the filter caching UNcomment this line.
     #session::global_un_set(get_class($this)."_filter");
@@ -407,7 +408,7 @@ class management
     if(isset($_POST['delete_confirmed'])) $action['action'] = "removeConfirmed";   
     if(isset($_POST['delete_cancel'])) $action['action'] = "cancelDelete";   
     if(isset($_POST['saveFilter'])) $action['action'] = "saveFilter";   
-    if(isset($_POST['cancelFilter'])) $action['action'] = "cancel";   
+    if(isset($_POST['cancelFilter'])) $action['action'] = "cancelFilter";   
 
     // Detect Snapshot actions
     if(isset($_POST['CreateSnapshot'])) $action['action'] = "saveSnapshot";   
@@ -416,7 +417,7 @@ class management
       $once =TRUE;
       if(preg_match("/^RestoreSnapShot_/",$name) && $once){
         $once = FALSE;
-        $entry = base64_decode(preg_replace("/^RestoreSnapShot_([^_]*)_[xy]$/i","\\1",$name));
+        $entry = base64_decode(preg_replace("/^RestoreSnapShot_(.*)$/i","\\1",$name));
         $action['action'] = "restoreSnapshot";
         $action['targets'] = array($entry);
       }
@@ -672,7 +673,7 @@ class management
       set_object_info($this->dn);
       $user = get_lock($this->dn);
       if ($user != ""){
-        return(gen_locked_message ($user, $this->dn,TRUE));
+        return(gen_locked_message ($user, array($this->dn),TRUE));
       }
       add_lock ($this->dn, $this->ui->dn);
 
@@ -719,6 +720,17 @@ class management
   }
 
 
+  /*! \brief  Close filter dialog
+   */
+  protected function cancelFilter()
+  {
+      if($this->dialogObject instanceOf userFilter){
+          $this->remove_lock();
+          $this->closeDialogs();
+      }
+  }
+
+
   /*! \brief  Save filter modifcations.
    */
   protected function saveFilter()