Make sure always use config variable, remove piwik.

scripts/handlemail

@@ -67,7 +67,7 @@ my $mail = mySociety::Email::construct_email({
     From => [ mySociety::Config::get('CONTACTEMAIL'), 'TheyWorkForYou' ],
     To => $data{return_path},
     _template_ => $template,
-    _parameters_ => { },
+    _parameters_ => { email => mySociety::Config::get('CONTACTEMAIL') },
 });
 
 if (mySociety::EmailUtil::EMAIL_SUCCESS

www/docs/alert/index.php

@@ -62,7 +62,7 @@
         incomplete.</p> <p>If you clicked a link in your alert email you may
         need to manually copy and paste the entire link to the 'Location' bar
         of the web browser and try again.</p> <p>If you still get this message,
-        please do <a href='mailto:" . CONTACTEMAIL . "'>email us</a> and let us
+        please do <a href='mailto:" . str_replace('@', '&#64;', CONTACTEMAIL) . "'>email us</a> and let us
         know, and we'll help out!</p>";
 }
 
@@ -224,7 +224,7 @@ function add_alert ($details) {
 		$advert = true;
 	} else {
 		$message = array ('title' => "This alert has not been accepted",
-		'text' => "Sorry, we were unable to create this alert. Please <a href=\"mailto:". CONTACTEMAIL . "\">let us know</a>. Thanks."
+		'text' => "Sorry, we were unable to create this alert. Please <a href=\"mailto:" . str_replace('@', '&#64;', CONTACTEMAIL) . "\">let us know</a>. Thanks."
 		);
 	}
     return $message['text'];

www/docs/down.default.html

@@ -5,7 +5,6 @@
 	<title>TheyWorkForYou.com: Are your MPs and Peers working for you in the UK's Parliament?</title>
 	<meta name="description" content="Making parliament easy.">
 	<meta name="keywords" content="Parliament, government, house of commons, house of lords, MP, Peer, Member of Parliament, MPs, Peers, Lords, Commons, UK, Britain, British, Welsh, Scottish, Wales, Scotland, ">
-		<link rel="author" title="Send feedback" href="mailto:team&#64;theyworkforyou.com">
 	<link rel="home" title="Home" href="http://www.theyworkforyou.com/">
 	<script type="text/javascript" src="/js/main.js"></script>
 	<!-- skin: default -->

www/docs/freeourbills/subscribe.php

@@ -14,7 +14,7 @@
 
 function send_subscribe_email($campaigner, $token) {
     $to = $campaigner;
-    $from = "TheyWorkForYou <team@theyworkforyou.com>";
+    $from = "TheyWorkForYou <" . CONTACTEMAIL . ">";
     $subject = 'Confirm that you want to Free our Bills!';
     $url = "http://" . DOMAIN . '/B/' . $token;
     $message = 'Please click on the link below to confirm your email address.

www/docs/search/rss/desc.xml

@@ -9,7 +9,7 @@
 <Image>http://www.theyworkforyou.com/search/rss/image.gif</Image>
 <SampleSearch>iraq</SampleSearch>
 <Developer>Matthew Somerville</Developer>
-<Contact>team&#64;theyworkforyou.com</Contact>
+<Contact>matthew&#64;mysociety.org</Contact>
 <Attribution>Copyright UK Parliament. Licensed.</Attribution>
 <SyndicationRight>limited</SyndicationRight>
 <AdultContent>false</AdultContent>

www/docs/user/confirm/index.php

@@ -37,7 +37,7 @@
 
 	<p>Feel free to use it to keep an eye on <strong>your MP</strong>, Peers, add <strong>annotations</strong> next to speeches, or help others by contributing your own <strong>links</strong>.</p>
 
-	<p>Do <a href="mailto:<?php echo CONTACTEMAIL; ?>">let us know</a> if you find a bug, or have a suggestion.</p>
+	<p>Do <a href="mailto:<?php echo str_replace('@', '&#64;', CONTACTEMAIL); ?>">let us know</a> if you find a bug, or have a suggestion.</p>
 
 <?php
 		} else {
@@ -92,7 +92,7 @@ function confirm_error() {
 
 	<p>If you clicked a link in your confirmation email you may need to manually copy and paste the entire link to the 'Location' bar of the web browser and try again.</p>
 
-	<p>If you still get this message, please do <a href="mailto:<?php echo CONTACTEMAIL; ?>">email us</a> and let us know, and we'll help out!</p>
+	<p>If you still get this message, please do <a href="mailto:<?php echo str_replace('@', '&#64;', CONTACTEMAIL); ?>">email us</a> and let us know, and we'll help out!</p>
 
 <?php
 

www/docs/user/index.php

@@ -433,7 +433,7 @@ function add_user (	$details) {
 
 		$PAGE->page_start();
 
-		$errors["db"] = "Sorry, we were unable to create an account for you. Please <a href=\"mailto:". CONTACTEMAIL . "\">let us know</a>. Thanks.";
+		$errors["db"] = "Sorry, we were unable to create an account for you. Please <a href=\"mailto:". str_replace('@', '&#64;', CONTACTEMAIL) . "\">let us know</a>. Thanks.";
 
 		display_form( $details, $errors);
 
@@ -487,7 +487,7 @@ function update_user ( $details ) {
 
 		$PAGE->page_start();
 
-		$errors["db"] = "Sorry, we were unable to update $who details. Please <a href=\"mailto:" . CONTACTEMAIL . "\">let us know</a> what you were trying to change. Thanks.";
+		$errors["db"] = "Sorry, we were unable to update $who details. Please <a href=\"mailto:" . str_replace('@', '&#64;', CONTACTEMAIL) . "\">let us know</a> what you were trying to change. Thanks.";
 
 		display_form($details, $errors);
 

www/docs/video/index.php

@@ -406,7 +406,7 @@ function basic_hints($gid_safe, $file, $pid) {
 <?	if (!$THEUSER->loggedin()) { ?>
 <li><a href="/user/login/?ret=/video/"><strong>Sign in</strong></a> if you want to get on the <a href="/video/#top">Top Timestampers league table</a>!
 <?	} ?>
-<li>If the video suddenly <strong>jumps</strong> a couple of hours, or otherwise appears broken, <a href="mailto:team&#64;theyworkforyou.com?subject=Video%20<?=$file?>'%20for%20ID%20'<?=$gid_safe?>'%20broken">let us know</a>.
+<li>If the video suddenly <strong>jumps</strong> a couple of hours, or otherwise appears broken, <a href="mailto:<?=str_replace('@', '&#64;', CONTACTEMAIL) ?>?subject=Video%20<?=$file?>'%20for%20ID%20'<?=$gid_safe?>'%20broken">let us know</a>.
 <li>If the speech you're looking for is <strong>beyond the end</strong> of the video,
 <a href="/video/?gid=<?=$gid_safe?>&amp;file=<?=$file+1?>&amp;start=1<?=$pid_url?>">move on to the next video chunk</a>.
 <li>If you're right at the start of a day, it's quite possible the start of the video
@@ -438,7 +438,7 @@ function advanced_hints($gid_safe, $file, $pid) {
 <?	if (!$THEUSER->loggedin()) { ?>
 <a href="/user/login/?ret=/video/">Log in</a> |
 <?	} ?>
-<a href="mailto:team&#64;theyworkforyou.com?subject=Video%20<?=$file?>'%20for%20ID%20'<?=$gid_safe?>'%20broken">Broken video</a> |
+<a href="mailto:<?=str_replace('@', '&#64;', CONTACTEMAIL) ?>?subject=Video%20<?=$file?>'%20for%20ID%20'<?=$gid_safe?>'%20broken">Broken video</a> |
 <a href="/video/?gid=<?=$gid_safe?>&amp;file=<?=$file+1?>&amp;start=1<?=$pid_url?>" title="Loads the next video chunk">Speech past end of video</a>
 </p>
 

www/includes/easyparliament/page.php

@@ -1084,24 +1084,6 @@ function page_footer ($extra = null) {
 </div> <!-- end #footer -->
 </div> <!-- end #container -->
 
-<?
-		if (DOMAIN == 'www.theyworkforyou.com') { ?>
-<!-- Piwik -->
-<script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.mysociety.org/" : "http://piwik.mysociety.org/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script><script type="text/javascript">
-try {
-var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 7);
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><p><img src="http://piwik.mysociety.org/piwik.php?idsite=7" style="border:0" alt=""/></p></noscript>
-<!-- End Piwik Tag -->
-<?
-		}
-?>
-
 <script type="text/javascript" charset="utf-8">
     barSetup();
 </script>

www/includes/easyparliament/staticpages/help.php

@@ -197,7 +197,7 @@
 measuring competence.
 
 <p>If you have suggestions for other metrics we could add which would be
-useful, send them to the <a href="mailto:team&#64;theyworkforyou.com">usual
+useful, send them to the <a href="mailto:<?=str_replace('@', '&#64;', CONTACTEMAIL) ?>">usual
 address</a>. We've got a few ideas ourselves, to keep you on your toes.
 
 </dd>
@@ -255,7 +255,7 @@
 Alternatively, you can <a href="http://ukparse.kforge.net/parlparse">get XML files</a>,
 which can be loaded into many spreadsheets. If you just need a spreadsheet of
 MPs, you'll find one on the right hand side of <a href="/mps">this page</a>. 
-Please <a href="mailto:team&#64;theyworkforyou.com">mail us</a> if you want help 
+Please <a href="mailto:<?=str_replace('@', '&#64;', CONTACTEMAIL) ?>">mail us</a> if you want help 
 working out how to use the data, or want to hire us to make something specific
 for you.
 </dd>

www/includes/easyparliament/templates/emails/alert_confirmation.txt

@@ -14,11 +14,10 @@ browser, and then press 'enter' or 'return' on your keyboard.
 
 If you have not tried to register for this alert then someone else
 entered your address. If you think this has been done maliciously
-then let us know at team@theyworkforyou.com
+then let us know.
 
 And don't forget to let your friends and family know about
 TheyWorkForYou.com 
 
 Best wishes,
-
-- The TheyWorkForYou.com Volunteers
+TheyWorkForYou

www/includes/easyparliament/templates/emails/join_confirmation.txt

@@ -1,18 +1,19 @@
 Subject: Please confirm your TheyWorkForYou.com account
 Hi {FIRSTNAME},
 
-Welcome to TheyWorkForYou.com, the website which lets you scribble all over the margins of Hansard.
+Welcome to TheyWorkForYou.com, the website which lets you scribble all over the
+margins of Hansard.
 
-Before you can sign in and add annotations, we need you to confirm your registration by clicking on the link below:
+Before you can sign in and add annotations, we need you to confirm your
+registration by clicking on the link below:
 
 {CONFIRMURL}
 
-If clicking the link above doesn't work, you may have to copy it and then paste it into the 'Location' or 'Address' box of your web browser, and then press 'enter' or 'return' on your keyboard.
-
-Please feel free to email us at team@theyworkforyou.com with any comments, problems or suggestions. 
+If clicking the link above doesn't work, you may have to copy it and then paste
+it into the 'Location' or 'Address' box of your web browser, and then press
+'enter' or 'return' on your keyboard.
 
 And don't forget to let your friends and family know about TheyWorkForYou.com 
 
 Best wishes,
-
-- The TheyWorkForYou.com Volunteers
+TheyWorkForYou

www/includes/easyparliament/templates/emails/reply-autoresponse

@@ -12,7 +12,7 @@ click the link in the email that we sent you, or, if you cannot click
 the link, copy and paste it into the address bar of your web browser.
 
 If you have a question or comment about the site, please send your
-email to team@theyworkforyou.com
+email to <?=$values['email']?>
 
 Yours,
 The TheyWorkForYou team

www/includes/easyparliament/templates/html/hansard_gid.php

@@ -841,7 +841,7 @@ function video_sidebar($row, $section, $count, $major) {
 	$out .= video_object($video['id'], $start, "$gid_type/$row[gid]");
 	$flashvars = 'gid=' . "$gid_type/$row[gid]" . '&file=' . $video['id'] . '&start=' . $start;
 	$out .= "<br><b>Add this video to another site:</b><br><input readonly onclick='this.focus();this.select();' type='text' name='embed' size='40' value=\"<embed src='http://www.theyworkforyou.com/video/parlvid.swf' width='320' height='230' allowfullscreen='true' allowscriptaccess='always' flashvars='$flashvars'></embed>\"><br><small>(copy and paste the above)</small>";
-	$out .= "<p style='margin-bottom:0'>Is this not the right video? <a href='mailto:team&#64;theyworkforyou.com?subject=Incorrect%20video,%20id%20$row[gid];$video[id];$ts_id'>Let us know</a></p>";
+	$out .= "<p style='margin-bottom:0'>Is this not the right video? <a href='mailto:" . str_replace('@', '&#64;', CONTACTEMAIL) . "?subject=Incorrect%20video,%20id%20$row[gid];$video[id];$ts_id'>Let us know</a></p>";
 	if ($count > 1) {
 		$out .= '<p style="position:absolute;bottom:0;right:0;margin:0"><a href="" onclick="return showVideo();">Hide</a></p>';
 		$out .= '</div></div>';

www/includes/easyparliament/templates/html/person.php

@@ -172,7 +172,7 @@ function person_ask_for_picture($member) {
 We’re missing a photo of ' .  $member['full_name'] . '. If you have a
 photo <em>that you can release under a Creative Commons Attribution-ShareAlike
 license</em> or can locate a <em>copyright free</em> photo,
-<a href="mailto:' . CONTACTEMAIL . '">please email it to us</a>. Please do not
+<a href="mailto:' . str_replace('@', '&#64;', CONTACTEMAIL) . '">please email it to us</a>. Please do not
 email us about copyrighted photos elsewhere on the internet; we can&rsquo;t use
 them.</p>';
 }