diff --git a/gosa-core/include/class_SnapShotDialog.inc b/gosa-core/include/class_SnapShotDialog.inc
index 894e87d662a755b08f0fb4f9c6f1e50ac0bcf430..5b2b766465c19b1a856a29473f5a2cc3ad3cd37c 100644 (file)
$ui = get_userinfo();
$once = true;
foreach($_POST as $name => $value){
$ui = get_userinfo();
$once = true;
foreach($_POST as $name => $value){
+ $value = get_post($name);
if((preg_match("/^RemoveSnapShot_/",$name)) && ($once)){
$once = false;
$entry = preg_replace("/^RemoveSnapShot_/","",$name);
if((preg_match("/^RemoveSnapShot_/",$name)) && ($once)){
$once = false;
$entry = preg_replace("/^RemoveSnapShot_/","",$name);
if($found){
$this->del_dn = $entry;
$smarty= get_smarty();
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){
/* We must restore a snapshot */
if($this->display_restore_dialog){
or the snapshots for the given object dn */
$res = array();
$tmp = array();
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){
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{
}
}else{
- $tmp = $this->getAllDeletedSnapshots($this->snap_shot_bases,true);
+ $tmp = $handler->getAllDeletedSnapshots($this->snap_shot_bases,true);
}
}else{
}
}else{
- $tmp = $this->Available_SnapsShots($this->dn,true);
+ $tmp = $handler->Available_SnapsShots($this->dn,true);
}
$this->snapList->setAcl('rwcdm');
}
$this->snapList->setAcl('rwcdm');
/* Sort generated list */
krsort($list_of_elements);
/* 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"));
$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;
$time_stamp = date(_("Y-m-d, H:i:s"),preg_replace("/\-.*$/","",$entry['gosaSnapshotTimestamp'][0]));
$display_data = $entry['description'][0];
$data[$entry['dn']] = $entry;
$this->snapList->setListData($data, $lData);
$this->snapList->update();
$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));
}
$smarty->assign("CountSnapShots",count($list_of_elements));
}
$smarty->assign("RestoreMode",$this->display_restore_dialog);
$smarty->assign("CurrentDate",date(_("Y-m-d, H:i:s")));
$smarty->assign("CurrentDN",LDAP::fix($this->dn));
$smarty->assign("RestoreMode",$this->display_restore_dialog);
$smarty->assign("CurrentDate",date(_("Y-m-d, H:i:s")));
$smarty->assign("CurrentDN",LDAP::fix($this->dn));
- $smarty->assign("CurrentDescription",$this->CurrentDescription);
+ $smarty->assign("CurrentDescription",set_post($this->CurrentDescription));
return($smarty->fetch(get_template_path("snapshotdialog.tpl")));
}
return($smarty->fetch(get_template_path("snapshotdialog.tpl")));
}
function save_object()
{
function save_object()
{
- plugin::save_object();
+ // plugin::save_object();
foreach($this->attributes as $name){
if(isset($_POST[$name])){
foreach($this->attributes as $name){
if(isset($_POST[$name])){
- $this->$name = stripslashes($_POST[$name]);
+ $this->$name = get_post($name);
}
}
}
}
}
}