diff options
Diffstat (limited to 'web')
| -rwxr-xr-x | web/alert.cgi | 18 | ||||
| -rwxr-xr-x | web/confirm.cgi | 8 |
2 files changed, 15 insertions, 11 deletions
diff --git a/web/alert.cgi b/web/alert.cgi index c22717041..302007dd0 100755 --- a/web/alert.cgi +++ b/web/alert.cgi @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: alert.cgi,v 1.44 2009-09-03 13:36:47 louise Exp $ +# $Id: alert.cgi,v 1.45 2009-09-09 08:32:41 louise Exp $ use strict; use Standard; @@ -334,8 +334,9 @@ sub alert_signed_input { my $id = $q->param('id'); my $secret = scalar(dbh()->selectrow_array('select secret from secret')); my $out; + my $cobrand = Page::get_cobrand($q); if ($signed_email eq sha1_hex("$id-$email-$salt-$secret")) { - my $alert_id = mySociety::Alert::create($email, 'new_updates', $id); + my $alert_id = mySociety::Alert::create($email, 'new_updates', $cobrand, $id); mySociety::Alert::confirm($alert_id); $out = $q->p(_('You have successfully subscribed to that alert.')); $out .= CrossSell::display_advert($q, $email); @@ -384,21 +385,22 @@ sub alert_do_subscribe { } my $alert_id; + my $cobrand = Page::get_cobrand($q); if ($type eq 'updates') { my $id = $q->param('id'); - $alert_id = mySociety::Alert::create($email, 'new_updates', $id); + $alert_id = mySociety::Alert::create($email, 'new_updates', $cobrand, $id); } elsif ($type eq 'problems') { - $alert_id = mySociety::Alert::create($email, 'new_problems'); + $alert_id = mySociety::Alert::create($email, 'new_problems', $cobrand); } elsif ($type eq 'local') { my $feed = $q->param('feed'); if ($feed =~ /^area:(?:\d+:)?(\d+)/) { - $alert_id = mySociety::Alert::create($email, 'area_problems', $1); + $alert_id = mySociety::Alert::create($email, 'area_problems', $cobrand, $1); } elsif ($feed =~ /^council:(\d+)/) { - $alert_id = mySociety::Alert::create($email, 'council_problems', $1, $1); + $alert_id = mySociety::Alert::create($email, 'council_problems', $cobrand, $1, $1); } elsif ($feed =~ /^ward:(\d+):(\d+)/) { - $alert_id = mySociety::Alert::create($email, 'ward_problems', $1, $2); + $alert_id = mySociety::Alert::create($email, 'ward_problems', $cobrand, $1, $2); } elsif ($feed =~ /^local:(\d+):(\d+)/) { - $alert_id = mySociety::Alert::create($email, 'local_problems', $1, $2); + $alert_id = mySociety::Alert::create($email, 'local_problems', $cobrand, $1, $2); } } else { throw mySociety::Alert::Error('Invalid type'); diff --git a/web/confirm.cgi b/web/confirm.cgi index e2cd495b8..32425de5c 100755 --- a/web/confirm.cgi +++ b/web/confirm.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: confirm.cgi,v 1.55 2009-07-16 14:12:14 matthew Exp $ +# $Id: confirm.cgi,v 1.56 2009-09-09 08:32:41 louise Exp $ use strict; use Standard; @@ -100,7 +100,8 @@ sub confirm_update { # Subscribe updater to email updates if requested if ($add_alert) { - my $alert_id = mySociety::Alert::create($email, 'new_updates', $problem_id); + my $cobrand = Page::get_cobrand($q); + my $alert_id = mySociety::Alert::create($email, 'new_updates', $cobrand, $problem_id); mySociety::Alert::confirm($alert_id); } @@ -158,7 +159,8 @@ $q->p('<a href="/report/' . $id . '">' . _('View your report') . '</a>.'); } # Subscribe problem reporter to email updates - my $alert_id = mySociety::Alert::create($email, 'new_updates', $id); + my $cobrand = Page::get_cobrand($q); + my $alert_id = mySociety::Alert::create($email, 'new_updates', $cobrand, $id); mySociety::Alert::confirm($alert_id); return $out; |