X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_SnapShotDialog.inc;h=315d1525de8e90c3bb4b8e627b4a7a33c7471c5e;hb=d0e6a1983bf4887f5c47dc5f5ddc134083363a20;hp=69bef2128af375d15efeef2debac9f00b5977314;hpb=9d0c4cc18c9ac53e3acbdc59ca81312d8ec085de;p=gosa.git

diff --git a/gosa-core/include/class_SnapShotDialog.inc b/gosa-core/include/class_SnapShotDialog.inc
index 69bef2128..315d1525d 100644
--- 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,18 +90,12 @@ 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 are about to delete the snapshot %s."), bold(LDAP::fix($this->del_dn))));
+                    return($smarty->fetch (get_template_path('removeSnapshots.tpl')));
                 }
             }
         }
 
-        /* Remove snapshot */
-        if(isset($_POST['delete_confirm']) && !empty($this->del_dn)){
-            $this->remove_snapshot($this->del_dn);
-            $this->del_dn = "";
-        }
-
         /* We must restore a snapshot */
 
         if($this->display_restore_dialog){
@@ -110,16 +104,18 @@ class SnapShotDialog extends plugin
                or the snapshots for the given object dn */
             $res = array();
             $tmp = array();
+            $handler = new SnapshotHandler($this->config);
+
             if($this->display_all_removed_objects){
                 if(count($this->snap_shot_bases)){
                     foreach($this->snap_shot_bases as $dn){
-                        $tmp = array_merge($tmp,$this->getAllDeletedSnapshots($dn,true));
+                        $tmp = array_merge($tmp,$handler->getAllDeletedSnapshots($dn,true));
                     }
                 }else{
-                    $tmp = $this->getAllDeletedSnapshots($this->snap_shot_bases,true);
+                    $tmp = $handler->getAllDeletedSnapshots($this->snap_shot_bases,true);
                 }
             }else{
-                $tmp = $this->Available_SnapsShots($this->dn,true);
+                $tmp = $handler->Available_SnapsShots($this->dn,true);
             }
 
             $this->snapList->setAcl('rwcdm');
@@ -137,22 +133,26 @@ class SnapShotDialog extends plugin
             /* Sort generated list */
             krsort($list_of_elements);
 
-            /* Add Elements to divlist */	
+            /* Add Elements to list */	
             $this->last_list = $list_of_elements;
 
             $data = $lData = array();
             foreach($list_of_elements as $entry){
                 $actions=  image('images/lists/restore.png','RestoreSnapShot_%KEY',_("Restore snapshot"));
-                $actions.= image('images/lists/trash.png','RemoveSnapShot_%KEY',_("Remove snapshot"));
+                $actions.= image('images/lists/trash.png','RemoveSnapShot_%KEY',_("Delete snapshot"));
                 $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);
             $this->snapList->update();
-            $smarty->assign("SnapShotDivlist",$this->snapList->render());
+            $smarty->assign("SnapShotList",$this->snapList->render());
             $smarty->assign("CountSnapShots",count($list_of_elements));
         }
 
@@ -179,7 +179,7 @@ class SnapShotDialog extends plugin
 
     function save_object()
     {	
-        plugin::save_object();
+//        plugin::save_object();
         foreach($this->attributes as $name){
             if(isset($_POST[$name])){
                 $this->$name = stripslashes($_POST[$name]);