Fixed dialog ignore account state

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

diff --git a/gosa-core/include/class_SnapShotDialog.inc b/gosa-core/include/class_SnapShotDialog.inc
index 69bef2128af375d15efeef2debac9f00b5977314..a8b07cac9dff87f5efb070aab12b4a8c8d9c86cb 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){
@@ -90,8 +90,8 @@ class SnapShotDialog extends plugin
                 if($found){
                     $this->del_dn      = $entry;
                     $smarty= get_smarty();
-                    $smarty->assign("intro", sprintf(_("You're about to delete the snapshot '%s'."), LDAP::fix($this->del_dn)));
-                    return($smarty->fetch (get_template_path('remove.tpl')));
+                    $smarty->assign("info", sprintf(_("You're about to delete the snapshot '%s'."), LDAP::fix($this->del_dn)));
+                    return($smarty->fetch (get_template_path('removeEntries.tpl')));
                 }
             }
         }
@@ -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);