Updated snapshot restore

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

diff --git a/gosa-core/include/class_SnapShotDialog.inc b/gosa-core/include/class_SnapShotDialog.inc
index 69bef2128af375d15efeef2debac9f00b5977314..894e87d662a755b08f0fb4f9c6f1e50ac0bcf430 100644 (file)
--- a/gosa-core/include/class_SnapShotDialog.inc
+++ b/gosa-core/include/class_SnapShotDialog.inc
@@ -78,7 +78,7 @@ class SnapShotDialog extends plugin
             if((preg_match("/^RemoveSnapShot_/",$name)) && ($once)){
                 $once = false;
                 $entry = preg_replace("/^RemoveSnapShot_/","",$name);
-                $entry = base64_decode(preg_replace("/_[xy]$/","",$entry));
+                $entry = base64_decode($entry);
                 $found = false;
                 foreach($this->last_list as $t_stamp => $obj){
                     if($obj['dn'] == $entry){
@@ -147,7 +147,11 @@ class SnapShotDialog extends plugin
                 $time_stamp    = date(_("Y-m-d, H:i:s"),preg_replace("/\-.*$/","",$entry['gosaSnapshotTimestamp'][0]));
                 $display_data  = $entry['description'][0];
                 $data[$entry['dn']] = $entry;
-                $lData[$entry['dn']] = array('data'=>array($time_stamp,htmlentities (utf8_decode(LDAP::fix($display_data))),str_replace("%KEY",base64_encode($entry['dn']),$actions)));
+                $lData[$entry['dn']] = array('data'=>
+                        array(
+                            $time_stamp,
+                            htmlentities(utf8_decode(LDAP::fix($display_data))),
+                            str_replace("%KEY",base64_encode($entry['dn']), $actions)));
             }          
 
             $this->snapList->setListData($data, $lData);

diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc
index 0015aa90f46989d6e0ebdde0c91ac198a193c3c1..af5c4c01698f4ee8051a1d95474981f0236a5411 100644 (file)
--- a/gosa-core/include/class_management.inc
+++ b/gosa-core/include/class_management.inc
@@ -416,7 +416,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);
       }

diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc
index 20cb44568c0fcf1dfc62d7e3b34e107f8e079c17..5af5652297a8c8bd417dc9bb3c9e37553d105532 100644 (file)
--- a/gosa-core/include/class_plugin.inc
+++ b/gosa-core/include/class_plugin.inc
@@ -1465,7 +1465,7 @@ class plugin
       /* Restore selected snapshot */
       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));
 
         if(!empty($entry) && $ui->allow_snapshot_restore($this->dn,$this->parent->acl_module)){
           $this->restore_snapshot($entry);