X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_SnapShotDialog.inc;h=957a0077c72c16137c853273678a55657b2914fc;hb=01f642762ae65b3e4fee377c5a95ea9a901b389c;hp=9391c1370493078d02ab910b7c10d2ec6ba108dc;hpb=365b69553ef4d084fd7bc6bd4fd8aada5918c0ec;p=gosa.git

diff --git a/include/class_SnapShotDialog.inc b/include/class_SnapShotDialog.inc
index 9391c1370..957a0077c 100755
--- a/include/class_SnapShotDialog.inc
+++ b/include/class_SnapShotDialog.inc
@@ -4,14 +4,15 @@
 class SnapShotDialog extends plugin 
 {
 	var $config;
-	var $attributes 				= array("CurrentDescription");
-	var $CurrentDescription 		= "";
-	var $parent						= NULL;
-	var $display_restore_dialog		= false;		/* Defines the restore mode */
-	var $display_all_removed_objects= false; 		/* Specifies which objects will be listed, all snapshots for a single entry 
-														or all snapshots of already deleted objects  */	
-	var $dialog						= true;
-	var $del_dn						= "";
+	var $attributes= array("CurrentDescription");
+	var $CurrentDescription= "";
+	var $parent= NULL;
+	var $display_restore_dialog= false;		      /* Defines the restore mode */
+	var $display_all_removed_objects= false; 		/* Specifies which objects will be listed, all
+                                                 snapshots for a single entry or all snapshots
+                                                 of already deleted objects  */	
+	var $dialog= true;
+	var $del_dn= "";
 	var $ui;
 	var $acl;
 	
@@ -38,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 */
@@ -100,10 +96,12 @@ class SnapShotDialog extends plugin
 			/* Add Elements to divlist */	
 			foreach($list_of_elements as $entry){
 
-				$actions = "<input type='image' src='images/edittrash.png' name='RemoveSnapShot_%KEY' title='"._("Remove snapshot")."'>&nbsp;";
-				$actions.= "<input type='image' src='images/restore.png' name='RestoreSnapShot_%KEY' title='"._("Restore snapshot")."'>&nbsp;";
+				$actions= "<input type='image' src='images/restore.png' name='RestoreSnapShot_%KEY' 
+								class='center' title='"._("Restore snapshot")."'>&nbsp;";
+				$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){
@@ -111,7 +109,7 @@ class SnapShotDialog extends plugin
 				}
 
 				$field0 = array("string"=> $time_stamp , "attach"=> "style='vertical-align:top;width:120px;'");
-				$field1 = array("string"=> $display_data , "attach"=> "");
+				$field1 = array("string"=> htmlentities (utf8_decode($display_data)), "attach"=> "");
 				$field2 = array("string"=> preg_replace("/%KEY/",base64_encode($entry['dn']),$actions) , 
 								"attach"=> "style='border-right:0px;vertical-align:top;width:40px;text-align:right;'");
 				$DivListSnapShots->AddEntry(array($field0,$field1,$field2));
@@ -121,8 +119,9 @@ class SnapShotDialog extends plugin
 			$smarty->assign("CountSnapShots",count($list_of_elements));
 		}
 
+		$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")));
@@ -152,4 +151,5 @@ class SnapShotDialog extends plugin
 	}
 }
 
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>