bunch of updates

[iankelling.org] / _site / cgi / comment

diff --git a/_site/cgi/comment b/_site/cgi/comment
index b84c45ebe6076132bf81a39b0cb1da5d3820eb00..149799447b0afee0640d587c226d502cd43f8a31 100755 (executable)
--- a/_site/cgi/comment
+++ b/_site/cgi/comment
@@ -26,7 +26,6 @@ require 'cgi'
 require 'fileutils'
 require 'time'
 require 'sqlite3'
-
 Dir.chdir(File.join(File.dirname(__FILE__), '..'))
 
 require '../b'
@@ -85,7 +84,7 @@ def do_captcha
 <p>#{captcha_q}</p>
 
 <form action="/cgi/comment" method="post">
-  <input class="misc" type="text" name="url">
+  <input class="misc-comment-input" type="text" name="url">
   <input name="goto" type="hidden" value="#{GOTO}">
   <input name="question" type="hidden" value="#{captcha_q}">
   <input name="answer">
@@ -312,27 +311,19 @@ new_count = new_count[0][0]
 
 if new_count == 1
   require 'net/smtp'
-  def send_email(opts={})
-    opts[:to]          ||= 'root'
-    opts[:server]      ||= 'localhost'
-    opts[:from]        ||= 'root'
-    opts[:from_alias]  ||= 'root'
-    opts[:subject]     ||= "test subject"
-    opts[:body]        ||= ""
-
-    msg = <<END_OF_MESSAGE
-From: #{opts[:from_alias]} <#{opts[:from]}>
-To: <#{opts[:to]}>
-Subject: #{opts[:subject]}
-
-#{opts[:body]}
+  to = 'root@' + FQDN
+  from = 'www-data@' + FQDN
+  server = 'localhost'
+  msg = <<END_OF_MESSAGE
+From: h <#{from}>
+To: <#{to}>
+Subject: "new comment on #{FQDN}"
+
+empty body
 END_OF_MESSAGE
-
-    Net::SMTP.start(opts[:server]) do |smtp|
-      smtp.send_message msg, opts[:from], opts[:to]
-    end
+  Net::SMTP.start(server) do |smtp|
+    smtp.send_message msg, from, to
   end
-  send_email :subject => "new comment on #{DN}"
 end
 
 post(md_file)