diff options
| -rwxr-xr-x | bin/send-questionnaires | 4 | ||||
| -rwxr-xr-x | bin/send-reports | 4 | ||||
| -rwxr-xr-x | web/index.cgi | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/bin/send-questionnaires b/bin/send-questionnaires index ebd1be8fc..0e3d3c01f 100755 --- a/bin/send-questionnaires +++ b/bin/send-questionnaires @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: send-questionnaires,v 1.8 2008-10-07 16:44:09 matthew Exp $ +# $Id: send-questionnaires,v 1.9 2008-11-18 17:29:50 matthew Exp $ use strict; require 5.8.0; @@ -83,7 +83,7 @@ foreach my $row (@$unsent) { _template_ => $template, _parameters_ => \%h, To => [ [ $row->{email}, $row->{name} ] ], - From => [ $sender, 'FixMyStreet' ], + From => [ $sender, mySociety::Config::get('CONTACT_NAME') ], 'Message-ID' => sprintf('<ques-%s-%s@mysociety.org>', time(), unpack('h*', random_bytes(5, 1))), }); diff --git a/bin/send-reports b/bin/send-reports index facd6e28d..3842bae3b 100755 --- a/bin/send-reports +++ b/bin/send-reports @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: send-reports,v 1.61 2008-11-17 17:52:16 matthew Exp $ +# $Id: send-reports,v 1.62 2008-11-18 17:29:50 matthew Exp $ use strict; require 5.8.0; @@ -48,7 +48,7 @@ $verbose = 1 if $nomail; my $base_url = mySociety::Config::get('BASE_URL'); my $site = 'fixmystreet'; -$site = 'emptyhomes' if $base_url =~ 'emptyhomes'; # || $base_url eq 'http://matthew.fixmystreet.com'; # XXX +$site = 'emptyhomes' if $base_url =~ 'emptyhomes'; my $query = "SELECT id, council, category, title, detail, name, email, phone, used_map, easting, northing, (photo is not null) as has_photo diff --git a/web/index.cgi b/web/index.cgi index e983e1b14..32a19f00c 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -6,7 +6,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: index.cgi,v 1.227 2008-11-17 12:37:17 matthew Exp $ +# $Id: index.cgi,v 1.228 2008-11-18 17:29:51 matthew Exp $ use strict; use Standard; @@ -144,7 +144,8 @@ EOF $out .= $q->h2(_('FixMyStreet updates')); $out .= $q->div({-id => 'front_stats'}, $q->div("<big>$new</big> report" . ($new!=1?'s':''), $new_text), - ($q->{site} ne 'emptyhomes' && $q->div("<big>$fixed</big> fixed in past month")), + ($q->{site} ne 'emptyhomes' ? $q->div("<big>$fixed</big> fixed in past month") + : $q->div("<big>$fixed</big> back in use in past month")), $q->div("<big>$updates</big> update" . ($updates ne '1'?'s':''), "on reports"), ); |