new contact form, see https://trac.fsfe.org/fsfe-web/ticket/247 for details

svn path=/trunk/; revision=20876

cgi-bin/contact.pl

@@ -8,7 +8,8 @@ use File::Basename;
 use Cwd "abs_path";
 use CGI;
 use POSIX qw(strftime);
-use Text::Format;
+use Text::Wrap;
+$Text::Wrap::columns = 72;
 
 our $base_directory;
 BEGIN { $base_directory = dirname(abs_path("../tools/WebBuild")); }
@@ -41,13 +42,19 @@ print MAIL "Reply-To: " . $query->param("email") . "\n";
 print MAIL "From: office\@fsfeurope.org\n";
 print MAIL "To: office\@fsfeurope.org\n";
 print MAIL "Cc: ato\@fsfe.org\n";
-print MAIL "Subject: New message from website from " . $query->param("name") . "\n";
-print MAIL "Content-Type: text/plain\n\n";
+
+my $subject = $query->param("subject");
+if ($subject eq "") {
+  $subject = "New message from website from " . $query->param("name");
+}
+
+print MAIL "Subject: $subject" . "\n";
+print MAIL "Content-Type: text/plain; charset=UTF-8\n\n";
 print MAIL "We have received a new message from our website contact form.\n\n";
 print MAIL "Name:   " . $query->param("name") . "\n";
 print MAIL "E-mail: " . $query->param("email") . "\n\n";
 print MAIL "---\n";
-print MAIL Text::Format->new({columns => 72})->format($query->param("message")) . "\n";
+print MAIL wrap('','',$query->param("message")) . "\n";
 print MAIL "---\n\n";
 
 my $output = <<ENDHTML;

contact/contact.cs.xhtml

@@ -44,6 +44,10 @@
             <label for="email">E-mail adresa</label>
             <input id="email" name="email" type="email" />
           </p>
+          <p>
+            <label for="subject">Subject</label>
+            <input id="subject" name="subject" type="text" />
+          </p>
           <p>
             <label for="message">Zpráva</label>
             <textarea id="message" name="message" rows="10"></textarea>

contact/contact.de.xhtml

@@ -43,6 +43,10 @@
             <label for="email">E-Mail</label>
             <input id="email" name="email" type="email" />
           </p>
+          <p>
+            <label for="subject">Betreff</label>
+            <input id="subject" name="subject" type="text" />
+          </p>
           <p>
             <label for="message">Nachricht</label>
             <textarea id="message" name="message" rows="10"></textarea>

contact/contact.el.xhtml

@@ -40,6 +40,10 @@
             <label for="email">E-mail</label>
             <input id="email" name="email" type="email" />
           </p>
+          <p>
+            <label for="subject">Subject</label>
+            <input id="subject" name="subject" type="text" />
+          </p>
           <p>
             <label for="message">Message</label>
             <textarea id="message" name="message" rows="10"></textarea>

contact/contact.en.xhtml

@@ -46,6 +46,10 @@
             <label for="email">E-mail</label>
             <input id="email" name="email" type="email" />
           </p>
+          <p>
+            <label for="subject">Subject</label>
+            <input id="subject" name="subject" type="text" />
+          </p>
           <p>
             <label for="message">Message</label>
             <textarea id="message" name="message" rows="10"></textarea>

contact/contact.es.xhtml

@@ -38,6 +38,10 @@
             <label for="email">E-mail</label>
             <input id="email" name="email" type="email" />
           </p>
+          <p>
+            <label for="subject">Subject</label>
+            <input id="subject" name="subject" type="text" />
+          </p>
           <p>
             <label for="message">Mensaje</label>
             <textarea id="message" name="message" rows="10"></textarea>

contact/contact.fi.xhtml

@@ -42,6 +42,10 @@
             <label for="email">Sähköposti</label>
             <input id="email" name="email" type="email" />
           </p>
+          <p>
+            <label for="subject">Subject</label>
+            <input id="subject" name="subject" type="text" />
+          </p>
           <p>
             <label for="message">Viesti (engl)</label>
             <textarea id="message" name="message" rows="10"></textarea>

contact/contact.fr.xhtml

@@ -46,6 +46,10 @@
             <label for="email">Email</label>
             <input id="email" name="email" type="email" />
           </p>
+          <p>
+            <label for="subject">Sujet</label>
+            <input id="subject" name="subject" type="text" />
+          </p>
           <p>
             <label for="message">Message</label>
             <textarea id="message" name="message" rows="10"></textarea>

contact/contact.hr.xhtml

@@ -46,6 +46,10 @@
             <label for="email">E-pošta</label>
             <input id="email" name="email" type="email" />
           </p>
+          <p>
+            <label for="subject">Subject</label>
+            <input id="subject" name="subject" type="text" />
+          </p>
           <p>
             <label for="message">Poruka</label>
             <textarea id="message" name="message" rows="10"></textarea>

contact/contact.pt.xhtml

@@ -46,6 +46,10 @@
             <label for="email">E-mail</label>
             <input id="email" name="email" type="email" />
           </p>
+          <p>
+            <label for="subject">Subject</label>
+            <input id="subject" name="subject" type="text" />
+          </p>
           <p>
             <label for="message">Mensagem</label>
             <textarea id="message" name="message" rows="10"></textarea>

contact/contact.ru.xhtml

@@ -32,6 +32,10 @@
             <label for="email">Электронная почта</label>
             <input id="email" name="email" type="email" />
           </p>
+          <p>
+            <label for="subject">Subject</label>
+            <input id="subject" name="subject" type="text" />
+          </p>
           <p>
             <label for="message">Текст сообщения</label>
             <textarea id="message" name="message" rows="10"></textarea>