From b684e1edc06a3c0215846d334a4f44c36944d22f Mon Sep 17 00:00:00 2001
From: Benjamin Kellermann <Benjamin.Kellermann@gmx.de>
Date: Mon, 9 Aug 2010 13:02:07 +0200
Subject: avoid deletion of comments after reload

---
 participate.rb |  2 +-
 poll.rb        | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/participate.rb b/participate.rb
index 862325d..ff7da89 100755
--- a/participate.rb
+++ b/participate.rb
@@ -40,7 +40,7 @@ unless $cgi.include?("cancel")
 end
 
 $d.table.add_comment($cgi["commentname"],$cgi["comment"]) if $cgi["comment"] != ""
-$d.table.delete_comment($cgi["delete_comment"].to_i) if $cgi.include?("delete_comment")
+$d.table.delete_comment($cgi["delete_comment"]) if $cgi.include?("delete_comment")
 
 
 $d.html.add_atom("atom.cgi") if File.exists?("../atom.rb")
diff --git a/poll.rb b/poll.rb
index 14f30d5..8a45eb2 100644
--- a/poll.rb
+++ b/poll.rb
@@ -302,13 +302,12 @@ TR
 		ret	+= "<h2>" + _("Comments") + "</h2>" if !@comment.empty? || editable
 
 		unless @comment.empty?
-			@comment.each_with_index{|c,i|
-				time,name,comment = c
+			@comment.each{|time,name,comment|
 				ret += "<form method='post' action='.'>"
 				ret += "<div class='textcolumn'><h3 class='comment'>"
 				ret += _("%{user} said on %{time}") % {:user => name, :time => time.strftime("%d.%m., %H:%M")}
 				if editable
-					ret += "<input type='hidden' name='delete_comment' value='#{i}' />"
+					ret += "<input type='hidden' name='delete_comment' value='#{time.strftime("%s")}' />"
 					ret += "&nbsp;"
 					ret += "<input class='delete_comment_button' type='submit' value='"
 					ret += _("Delete")
@@ -432,8 +431,12 @@ FORM
 		store "Comment added by #{name}"
 	end
 
-	def delete_comment index
-		store "Comment from #{@comment.delete_at(index)[1]} deleted"
+	def delete_comment deltime
+		@comment.each_with_index{|c,i|
+			if c[0].strftime("%s") == deltime
+				store "Comment from #{@comment.delete_at(i)[1]} deleted"
+			end
+		}
 	end
 
 	###############################
-- 
cgit v1.2.3