Add default value for INCOMING_EMAIL_DOMAIN so an error isn't thrown in the case where this isn't defined yet.use-with-alaveteli-0.6.6

2 files changed, 21 insertions, 21 deletions

diff --git a/lib/views/help/officers.rhtml b/lib/views/help/officers.rhtml
index 1fddb5d..0072f1e 100644
--- a/lib/views/help/officers.rhtml
+++ b/lib/views/help/officers.rhtml
@@ -79,8 +79,8 @@ href="/help/contact">Contact us</a> if there is a better address we can
 use.</p>
 <p>Requests are sometimes not delivered because they are quietly removed by
 "spam filters" in the IT department of the authority. Authorities can make
-sure this doesn't happen by asking their IT departments to "whitelist" 
-any email from <strong>@<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN') %></strong>.
+sure this doesn't happen by asking their IT departments to "whitelist"
+any email from <strong>@<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN', 'localhost') %></strong>.
 If you <a href="/help/contact">ask us</a> we will resend any request,
 and/or give technical details of delivery so an IT department can chase
 up what happened to the message.
@@ -159,7 +159,7 @@ during term time, and shows them as definitely overdue after 60 working days
 </li>
 </ul>
 
-<p>If you're getting really nerdy about all this, read the <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/timeforcompliance.pdf">detailed ICO guidance</a>. 
+<p>If you're getting really nerdy about all this, read the <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/timeforcompliance.pdf">detailed ICO guidance</a>.
 Meanwhile, remember that the law says authorities must respond
 <strong>promptly</strong>. That's really what matters.</p>
 
@@ -173,14 +173,14 @@ Meanwhile, remember that the law says authorities must respond
 extension when applying a <strong>public interest test</strong>.  Information
 Commissioner guidance says that it should only be used in "exceptionally
 complex" cases
-(<a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/foi_good_practice_guidance_4.pdf">FOI Good Practice Guidance No. 4</a>). 
+(<a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/detailed_specialist_guides/foi_good_practice_guidance_4.pdf">FOI Good Practice Guidance No. 4</a>).
 <%= site_name %> doesn't specifically handle this case, which is why we use the
 phrase "should normally have responded by" when the 20 working day time is
-exceeded. 
+exceeded.
 </p>
 
 <p>The same guidance says that, even in exceptionally complex cases, no
-Freedom of Information request should take more than <strong>40 working days</strong> 
+Freedom of Information request should take more than <strong>40 working days</strong>
 to answer.  <%= site_name %> displays requests which are overdue by that much
 with stronger wording to indicate they are definitely late.
 </p>
@@ -191,7 +191,7 @@ remove the extension from the UK Act, or to reintroduce an absolute time limit
 of 40 working days even with the extension (the House of Lords <a
 href="http://www.publicwhip.org.uk/division.php?date=2000-10-17&amp;number=1&amp;house=lords">voted
 to remove</a> provision for such a time limit during the initial passage
-of the UK Act through Parliament). 
+of the UK Act through Parliament).
 </p>
 </dd>
 
@@ -214,7 +214,7 @@ circumstances, see our <a href="/help/privacy#takedown">take down policy</a>.
 
 <dd><p>To prevent spam, we automatically remove most emails and some mobile numbers from
 responses to requests.  Please <a href="/help/contact">contact us</a> if we've
-missed one. 
+missed one.
 For technical reasons we don't always remove them from attachments, such as certain PDFs.</p>
 <p>If you need to know what an address was that we've removed, please <a
   href="/help/contact">get in touch with us</a>. Occasionally, an email address
@@ -225,7 +225,7 @@ form in an annotation.
 <dt id="copyright"><a name="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt>
 
 <dd>Our Freedom of Information law is "applicant blind", so anyone in the
-world can request the same document and get a copy of it. 
+world can request the same document and get a copy of it.
 
 If you think our making a document available on the internet infringes your
 copyright, you may <a href="/help/contact">contact us</a> and ask us
diff --git a/lib/views/help/privacy.rhtml b/lib/views/help/privacy.rhtml
index 4f4f2d3..2a4007a 100644
--- a/lib/views/help/privacy.rhtml
+++ b/lib/views/help/privacy.rhtml
@@ -11,8 +11,8 @@
 
 <dd><p>We will not disclose your email address to anyone unless we are obliged to by law,
 or you ask us to. This includes the public authority that you are sending a
-request to.  They only get to see an email address 
-@<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN') %> which is specific to that request.  </p>
+request to.  They only get to see an email address
+@<%= MySociety::Config.get('INCOMING_EMAIL_DOMAIN', 'localhost') %> which is specific to that request.  </p>
 <p>If you send a message to another user on the site, then it will reveal your
 email address to them. You will be told that this is going to happen.</p>
 </dd>
@@ -36,7 +36,7 @@ requests (<a href="#delete_requests">more details</a>).
 Your name is tangled up with your request, so has to be published as well.
 It is only fair, as we're going to publish the name of the civil servant who
 writes the response to your request.  Using your real name also helps people
-get in touch with you to assist you with your research or to campaign with you. 
+get in touch with you to assist you with your research or to campaign with you.
 </p>
 <p>By law, you must use your real name for the request to be a valid Freedom of
 Information request. See the next question for alternatives if you do not want
@@ -67,14 +67,14 @@ Information Commissioner later about the handling of your request.
 <ul>
 <li>Use a different form of your name. The guidance says
 that "Mr Arthur Thomas Roberts" can make a valid request as "Arthur Roberts",
-"A. T. Roberts", or "Mr Roberts", but <strong>not</strong> as "Arthur" or "A.T.R.". 
+"A. T. Roberts", or "Mr Roberts", but <strong>not</strong> as "Arthur" or "A.T.R.".
 </li>
 <li>Women may use their maiden name.</li>
 <li>In most cases, you may use any name by which you are "widely known and/or
 is regularly used".
 <li>Use the name of an organisation, the name of a company, the trading name of
 a company, or the trading name of a sole trader.
-<li>Ask someone else to make the request on your behalf. 
+<li>Ask someone else to make the request on your behalf.
 <li>You may, if you are really stuck, ask us to make the request on
 your behalf. Please <a href="/help/contact">contact us</a> with
 a good reason why you cannot make the request yourself and cannot
@@ -89,19 +89,19 @@ ask a friend to. We don't have the resources to do this for everyone.
 
 <dd>
 <p>If a public authority asks you for your full, physical address, reply to them saying
-that section 8.1.b of the FOI Act asks for an "address for correspondence", 
-and that the email address you are using is sufficient. 
+that section 8.1.b of the FOI Act asks for an "address for correspondence",
+and that the email address you are using is sufficient.
 </p>
 <p>
 The Ministry of Justice has <a href="http://www.justice.gov.uk/guidance/foi-procedural-what.htm">guidance
 on this</a> &ndash;
 <em>"As well as hard copy written correspondence, requests that are
-transmitted electronically (for example, in emails) are acceptable 
+transmitted electronically (for example, in emails) are acceptable
 ... If a request is received by email and no postal address is given, the email
 address should be treated as the return address."
 </em>
 </p>
-<p>As if that isn't enough, the Information Commissioner's 
+<p>As if that isn't enough, the Information Commissioner's
 <a href="http://www.ico.gov.uk/upload/documents/library/freedom_of_information/practical_application/foi_hints_for_practitioners_handing_foi_and_eir_requests_2008_final.pdf">Hints for Practitioners</a> say
 <em>"Any correspondence could include a request for information. If it is written (this includes e-mail), legible, gives the name of the applicant, an address for reply (which could be electronic), and includes a description of the information required, then it will fall within the scope of the legislation."</em>
 </p>
@@ -142,7 +142,7 @@ see the section on <a href="#real_name">pseudonyms</a>.</p>
 
 <dt id="takedown">Can you take down personal information about me? <a href="#takedown">#</a> </dt>
 
-<dd> 
+<dd>
 
 <p>If you see any personal information about you on the site which you'd like
 us to remove or hide, then please <a href="/help/contact">let us know</a>.
@@ -166,8 +166,8 @@ which outweighs the public interest, and must demonstrate that efforts have
 been made to conceal the name on the organisation's own website.</p>
 
 <p>For all other requests we apply a public interest test to decide
-whether information should be removed. 
-<a href="http://www.statutelaw.gov.uk/content.aspx?ActiveTextDocId=3190650"> Section 32</a> 
+whether information should be removed.
+<a href="http://www.statutelaw.gov.uk/content.aspx?ActiveTextDocId=3190650"> Section 32</a>
 of the Data Protection Act 1998 permits us to do this, as the material we
 publish is journalistic. We cannot easily edit many types of attachments (such
 as PDFs, or Microsoft Word or Excel files), so we will usually ask