Removed old acl functions

[gosa.git] / include / class_SnapShotDialog.inc

diff --git a/include/class_SnapShotDialog.inc b/include/class_SnapShotDialog.inc
index 2a56ee27fb214f768b60ebf58ad1e00fc3e736a0..957a0077c72c16137c853273678a55657b2914fc 100755 (executable)
--- a/include/class_SnapShotDialog.inc
+++ b/include/class_SnapShotDialog.inc
@@ -39,30 +39,25 @@ class SnapShotDialog extends plugin
                                $entry = base64_decode(preg_replace("/_[xy]$/","",$entry));
 
                                $acl                    = get_permissions ($entry, $this->ui->subtreeACL);
-                               $this->acl              = get_module_permission($acl, "snapshot", $entry );
-
-                               if (chkacl($this->acl, "delete") == ""){
-                                       $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')));
-                               } else {
-
-                                       /* Obviously the user isn't allowed to delete. Show message and
-                                          clean session. */
-                                       print_red (_("You are not allowed to delete this snap shot!"));
-                               }
-                       }
-               }
+        $this->acl             = get_module_permission($acl, "snapshot", $entry );
+
+
+        $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')));
+
+        /* Obviously the user isn't allowed to delete. Show message and
+           clean session. 
+           print_red (_("You are not allowed to delete this snapshot!"));
+         */
+      }
+    }
 
-               /* Remove snapshot */
-               if(isset($_POST['delete_confirm']) && !empty($this->del_dn)){
-                       $acl                    = get_permissions ($this->del_dn, $this->ui->subtreeACL);
-                       $this->acl              = get_module_permission($acl, "snapshot", $this->del_dn);
-                       if (chkacl($this->acl, "delete") == ""){
-                               $this->remove_snapshot($this->del_dn);
-                               $this->del_dn = "";
-                       }       
+    /* 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 */
@@ -106,7 +101,7 @@ class SnapShotDialog extends plugin
                                $actions.= "<input type='image' src='images/edittrash.png' name='RemoveSnapShot_%KEY' 
                                                                class='center' title='"._("Remove snapshot")."'>&nbsp;";
 
-                               $time_stamp     = date("d.m.Y H.i.s",preg_replace("/\-.*$/","",$entry['gosaSnapshotTimestamp'][0]));
+                               $time_stamp     = date(_("Y-m-d, H:i:s"),preg_replace("/\-.*$/","",$entry['gosaSnapshotTimestamp'][0]));
                                $display_data   = $entry['description'][0];
 
                                if($this->display_all_removed_objects){
@@ -126,7 +121,7 @@ class SnapShotDialog extends plugin
 
                $smarty->assign("restore_deleted",$this->display_all_removed_objects);
                $smarty->assign("RestoreMode",$this->display_restore_dialog);
-               $smarty->assign("CurrentDate",date("d.m.Y H:i"));
+               $smarty->assign("CurrentDate",date(_("Y-m-d, H:i:s")));
                $smarty->assign("CurrentDN",$this->dn);
                $smarty->assign("CurrentDescription",$this->CurrentDescription);
                return($smarty->fetch(get_template_path("snapshotdialog.tpl")));