Author: julian
Date: 2006-05-10 20:24:31 -0500 (Wed, 10 May 2006)
New Revision: 19

Modified:
   contact_us.html
   marid/index.html
Log:
contact_us.html
* Cleaned up indentation and general HTML formatting.
* Corrected broken HTML.
* Several minor fixes.

marid/index.html
* Fixed broken link that was pointing to /marid/srs.html to instead point to
  /.


Modified: contact_us.html
===================================================================
--- contact_us.html     2006-05-08 20:39:06 UTC (rev 18)
+++ contact_us.html     2006-05-11 01:24:31 UTC (rev 19)
@@ -1,143 +1,195 @@
+<!-- vim:set syn=mason: -->
+
 <%attr>
-title => "Contact Us"
+    title => "Contact Us"
 </%attr>
 
 <%perl>
-my $contact_comment = "";
-my $msgtext;
-my $name    = $ARGS{name};
-my $company = $ARGS{company};
-my $email   = $ARGS{email};
-my $subject = $ARGS{subject};
-my $message = $ARGS{message};
-for my $key (qw(name company email subject message)) {
-  if ($ARGS{$key}) {
-    $msgtext .= "$key: $ARGS{$key}\n";
-  }
-}
-my $from_address = "";
-if ($email =~ /\@/) { $from_address = $email; }
-if ($ARGS{subject} =~ /\W/) { $subject = $ARGS{subject}; }
-if ($ARGS{message} && $from_address ) {
-  if (open SENDMAIL, "|/usr/sbin/sendmail -oi -t") {
-    if ($subject !~ /\W/) { $subject = "mail from SPF contact us form"; }
-    print SENDMAIL "From: $from_address\n";
-    print SENDMAIL "Subject: $subject\n";
-    print SENDMAIL "To: [EMAIL PROTECTED]";
-    print SENDMAIL $msgtext;
-    close SENDMAIL;
-    $contact_comment = "Message sent.";
-    $name    = "";
-    $company = "";
-    $email   = "";
-    $subject = "";
-    $message = "";
-  } else {
-    $contact_comment = "Message failed.  Please try again later.";
-  }
-} elsif ($msgtext) {
-  $contact_comment = "Please enter at least an Email Address and a Message.";
-}
+    my $contact_comment = "";
+    my $msgtext;
+    my $name    = $ARGS{name};
+    my $company = $ARGS{company};
+    my $email   = $ARGS{email};
+    my $subject = $ARGS{subject};
+    my $message = $ARGS{message};
+    for my $key (qw(name company email subject message)) {
+        if ($ARGS{$key}) {
+            $msgtext .= "$key: $ARGS{$key}\n";
+        }
+    }
+    my $from_address = "";
+    if ($email =~ /\@/) {
+        $from_address = $email;
+    }
+    if ($ARGS{subject} =~ /\W/) {
+        $subject = $ARGS{subject};
+    }
+    if ($ARGS{message} && $from_address) {
+        if (open SENDMAIL, "|/usr/sbin/sendmail -oi -t") {
+            if ($subject !~ /\W/) {
+                $subject = "mail from SPF contact us form";
+            }
+            print SENDMAIL "From: $from_address\n";
+            print SENDMAIL "Subject: $subject\n";
+            print SENDMAIL "To: [EMAIL PROTECTED]";
+            print SENDMAIL $msgtext;
+            close SENDMAIL;
+            $contact_comment = "Message sent.";
+            $name    = "";
+            $company = "";
+            $email   = "";
+            $subject = "";
+            $message = "";
+        }
+        else {
+            $contact_comment = "Message failed.  Please try again later.";
+        }
+    }
+    elsif ($msgtext) {
+        $contact_comment = "Please enter at least an Email Address and a 
Message.";
+    }
 </%perl>
 
 <table border="0" cellspacing="0" cellpadding="0" width="721">
-  <tr>
-   <td width="180" height="100%" valign="top"><table height="100%" border="0" 
cellpadding="0" cellspacing="0">
-  <tr><td><table cellpadding=0 cellspacing=0><tr>
-
-  <td background="images/m1bg.gif" width="180" class="header">Media 
Enquiries</td>
-    </tr>
-      <tr><td valign="top" bgcolor="#F8F7F9" class="sub_content">
-
-      If you are a media professional interested in interviewing someone about 
SPF, please see our <a href="media.html">Media</a> page for further details.
-
-
-</td>
-</tr>
-</tr>
-  <tr><TD valign="top"><img src="images/m3bgbot.gif"></TD></tr>
-</table>
-</td></tr>
-<tr><td height=2><br></td></tr>
-<tr>
-   <td width="180" height="100%" valign="top"><table height="100%" border="0" 
cellpadding="0" cellspacing="0">
-  <tr>
-  <td background="images/m1bg.gif" width="180" class="header">Questions about 
SPF</td>
-  </tr>
-    <tr><td valign="top" bgcolor="#F8F7F9" class="sub_content">
-
-    General questions about SPF (how it works, setting it up,
-    etc.) are best asked on the <a
-    href="mailinglist.html">Forums</a>.  The SPF community is
-    dedicated to widespread deployment of SPF, so if you have
-    any questions or problems, they are more than willing to help.
-
-    
-
-</td>
-
-</tr>
-  <tr><TD valign="top"><img src="images/m3bgbot.gif"></TD></tr>
-</table>
-</td></tr>
-
-<tr><td height=2><br></td></tr>
-
-  <tr><td><table cellpadding=0 cellspacing=0><tr>
-
-  <td background="images/m1bg.gif" width="180" class="header">Site 
Comments</td>
-    </tr>
-      <tr><td valign="top" bgcolor="#F8F7F9" class="sub_content">
-
-If you encounter a problem while using this site, please email <a 
href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>.
-
-
-</td>
-</tr>
-</tr>
-  <tr><TD valign="top"><img src="images/m3bgbot.gif"></TD></tr>
-</table>
-</td></tr>
-</table>
-</td>
+    <tr>
+        <td width="180" height="100%" valign="top">
+            <table height="100%" border="0" cellpadding="0" cellspacing="0">
+                <tr>
+                    <td>
+                        <table cellpadding=0 cellspacing=0>
+                            <tr>
+                                <td background="images/m1bg.gif" width="180" 
class="header">Media Enquiries</td>
+                            </tr>
+                            <tr>
+                                <td valign="top" bgcolor="#F8F7F9" 
class="sub_content">
+                                    If you are a media professional interested
+                                    in interviewing someone about SPF, please
+                                    see our <a href="media.html">Media</a> page
+                                    for further details.
+                                </td>
+                            </tr>
+                            <tr>
+                                <td valign="top"><img 
src="images/m3bgbot.gif"></td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height=2><br></td>
+                </tr>
+                <tr>
+                    <td width="180" height="100%" valign="top">
+                        <table height="100%" border="0" cellpadding="0" 
cellspacing="0">
+                            <tr>
+                                <td background="images/m1bg.gif" width="180" 
class="header">Questions about SPF</td>
+                            </tr>
+                            <tr>
+                                <td valign="top" bgcolor="#F8F7F9" 
class="sub_content">
+                                    General questions about SPF (how it works,
+                                    setting it up, etc.) are best asked on the
+                                    <a href="mailinglist.html">Forums</a>.  The
+                                    SPF community is dedicated to widespread
+                                    deployment of SPF, so if you have any
+                                    questions or problems, they are more than
+                                    willing to help.
+                                </td>
+                            </tr>
+                            <tr>
+                                <td valign="top"><img 
src="images/m3bgbot.gif"></td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height=2><br></td>
+                </tr>
+                <tr>
+                    <td>
+                        <table cellpadding=0 cellspacing=0>
+                            <tr>
+                                <td background="images/m1bg.gif" width="180" 
class="header">Site Comments</td>
+                            </tr>
+                            <tr>
+                                <td valign="top" bgcolor="#F8F7F9" 
class="sub_content">
+                                    If you encounter a problem while using this
+                                    site, please email <a href="mailto:[EMAIL 
PROTECTED]">[EMAIL PROTECTED]</a>.
+                                </td>
+                            </tr>
+                            <tr>
+                                <td valign="top"><img 
src="images/m3bgbot.gif"></td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </td>
        <td width="5"><img src="images/spacer.gif" width="5" height="1"></td>
-        <td   width="515" height="100%" valign="top"><table width="515" 
height="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td background="images/3menu.gif" class="header">SPF Help</td>
-    </tr>
-      <tr><td valign="top" bgcolor="#F8F7F9" class="sub_content">
+        <td width="515" height="100%" valign="top">
+            <table width="515" height="100%" border="0" cellpadding="0" 
cellspacing="0">
+                <tr>
+                    <td background="images/3menu.gif" class="header">SPF 
Help</td>
+                </tr>
+                <tr>
+                    <td valign="top" bgcolor="#F8F7F9" class="sub_content">
 % if ($contact_comment) {
-<font size="+1" color="red"><% $contact_comment |h%></font>
+                        <font size="+1" color="red"><% $contact_comment |h 
%></font>
 % }
-<p>General questions about SPF or support questions for self-publishing 
domains should be directed to the <a href="mailinglist.html">SPF mailing 
lists</a>.</p>
-
-<p>You can also enter a request for support with the form below. Your
-request will be entered in the SPF help ticket system, and will be
-handled by a team of volunteers who are knowledgeable on SPF in
-particular and email in general. This form is meant for questions about
-publishing, implementations for your mail server and questions about how
-to integrate SPF with your mail server.</p>
-
-<table><form METHOD=POST>
-<tr><td>Your Name:</td><td><INPUT TYPE="text" NAME="name" VALUE="<% $name 
|h%>" SIZE=40></TD></TR>
-<tr><td>Company Name:</td><td><INPUT TYPE="text" NAME="company" VALUE="<% 
$company |h%>" SIZE=40></TD></TR>
-<tr><td> <small>*</small>&nbsp;Contact Email:</td><td> <INPUT TYPE="text" 
NAME="email" VALUE="<% $email |h%>"SIZE=40></TD></TR>
-<tr><td>&nbsp;</tr></td>
-<tr><td>Subject:</td><td> <INPUT TYPE="text" NAME="subject" VALUE="<% $subject 
|h%>" SIZE=40></TD></TR>
-<tr><td valign="top"> <small>*</small>&nbsp;Message:</td><td> <textarea 
NAME="message" cols=60 rows=6><% $message |h%></textarea></TD></TR>
-<tr><td colspan=2><small>* = Required Fields</small></td></tr>
-<tr><td colspan=2 align="center"><input type="submit" value="Submit"></td></tr>
-</form></table>
- 
-  </td>
-  </tr>
-  <tr><td valign="top"><img src="images/5mbot.gif"></td></tr>
+                        <p>General questions about SPF or support questions for
+                        self-publishing domains should be directed to the <a
+                        href="mailinglist.html">SPF mailing lists</a>.</p>
+                        
+                        <p>You can also enter a request for support with the
+                        form below. Your request will be entered in the SPF
+                        help ticket system, and will be handled by a team of
+                        volunteers who are knowledgeable on SPF in particular
+                        and email in general. This form is meant for questions
+                        about publishing, implementations for your mail server
+                        and questions about how to integrate SPF with your mail
+                        server.</p>
+                        
+                        <form method=post>
+                            <table>
+                                <tr>
+                                    <td>Your Name:</td>
+                                    <td><input type="text" name="name" 
value="<% $name |h %>" size=40></td>
+                                </tr>
+                                <tr>
+                                    <td>Company Name:</td>
+                                    <td><input type="text" name="company" 
value="<% $company |h %>" size=40></td>
+                                </tr>
+                                <tr>
+                                    <td><small>*</small>&nbsp;Contact 
Email:</td>
+                                    <td><input type="text" name="email" 
value="<% $email |h %>" size=40></td>
+                                </tr>
+                                <tr>
+                                    <td>&nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td>Subject:</td>
+                                    <td><input type="text" name="subject" 
value="<% $subject |h %>" size=40></td>
+                                </tr>
+                                <tr>
+                                    <td 
valign="top"><small>*</small>&nbsp;Message:</td>
+                                    <td><textarea name="message" cols=60 
rows=6><% $message |h %></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan=2><small>* = Required 
Fields</small></td>
+                                </tr>
+                                <tr>
+                                    <td colspan=2 align="center"><input 
type="submit" value="Submit"></td>
+                                </tr>
+                            </table>
+                        </form>
+                    </td>
+                </tr>
+                <tr>
+                    <td valign="top"><img src="images/5mbot.gif"></td>
+                </tr>
+            </table>
+        </td>
+    </tr>
 </table>
-</td>
-</tr></table>
 
 <%method small_panel>
-
-<span class="txtheader">Contact Us</span>
-
+    <span class="txtheader">Contact Us</span>
 </%method>

Modified: marid/index.html
===================================================================
--- marid/index.html    2006-05-08 20:39:06 UTC (rev 18)
+++ marid/index.html    2006-05-11 01:24:31 UTC (rev 19)
@@ -3,7 +3,7 @@
 autohandler_skip => 1
 </%attr>
 
-<a href="srs.html">&lt;&lt; Return to www.openspf.org</a>
+<a href="/">&lt;&lt; Return to www.openspf.org</a>
 <p>
 
 <P>For the Seoul BOF on the MARID (<B>M</B>TA

-------
To unsubscribe, change your address, or temporarily deactivate your 
subscription, 
please go to http://v2.listbox.com/member/[EMAIL PROTECTED]

Reply via email to