diff options
6 files changed, 30 insertions, 3 deletions
diff --git a/perllib/Catalyst/Plugin/Session/State/Cookie.pm b/perllib/Catalyst/Plugin/Session/State/Cookie.pm index e0a651ed9..bef0c1e66 100644 --- a/perllib/Catalyst/Plugin/Session/State/Cookie.pm +++ b/perllib/Catalyst/Plugin/Session/State/Cookie.pm @@ -50,6 +50,9 @@ sub update_session_cookie { sub cookie_is_rejecting { my ( $c, $cookie ) = @_; + # Prevent infinite loop in request->path. mySociety addition + return 0 if $c->request->has_uri && !$c->request->_has_path; + # Don't output cookie for JS or JPEG files. mySociety addition return 1 if substr($c->request->path, -3) eq '.js' || substr($c->request->path, -5) eq '.jpeg'; diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm index 53ef13462..6de416c53 100644 --- a/perllib/FixMyStreet/App/Controller/Auth.pm +++ b/perllib/FixMyStreet/App/Controller/Auth.pm @@ -36,10 +36,12 @@ sub general : Path : Args(0) { return unless $c->req->method eq 'POST'; # decide which action to take - my $has_password = $c->get_param('sign_in') || $c->get_param('password_sign_in'); - my $has_email = $c->get_param('email_sign_in') || $c->get_param('name') || $c->get_param('password_register'); + my $clicked_password = $c->get_param('sign_in'); + my $clicked_email = $c->get_param('email_sign_in'); + my $data_password = $c->get_param('password_sign_in'); + my $data_email = $c->get_param('name') || $c->get_param('password_register'); - $c->detach('email_sign_in') if $has_email && !$has_password; + $c->detach('email_sign_in') if $clicked_email || ($data_email && !$data_password); $c->forward( 'sign_in' ) && $c->detach( 'redirect_on_signin', [ $c->get_param('r') ] ); diff --git a/templates/web/fixmystreet-uk-councils/static/privacy.html b/templates/web/fixmystreet-uk-councils/static/privacy.html index 394f3587e..3b077d29e 100644 --- a/templates/web/fixmystreet-uk-councils/static/privacy.html +++ b/templates/web/fixmystreet-uk-councils/static/privacy.html @@ -46,6 +46,13 @@ available).</dd> problem you’ve reported, and send you a questionnaire email four weeks after you submit a problem, asking for a status update; we’ll only ever send you emails in relation to your problem.</dd> + + <dt>How do I stop receiving emails from you?</dt> + <dd>Every alert email we send contains an unsubscribe link at the +bottom for you to stop receiving that alert. After the first questionnaire +email on a report, mentioned above, you have to opt in to receive any further +questionnaire on that report.</dd> + </dl> <h2>Cookies</h2> diff --git a/templates/web/fixmystreet.com/contact/address.html b/templates/web/fixmystreet.com/contact/address.html new file mode 100644 index 000000000..2cea59684 --- /dev/null +++ b/templates/web/fixmystreet.com/contact/address.html @@ -0,0 +1,7 @@ +<hr> + +<p>FixMyStreet is a service provided by mySociety, which is the project of a +registered charity, UK Citizens Online Democracy, charity number 1076346.</p> + +<p>If you wish to contact us by post, our address is +<address>mySociety, 483 Green Lanes, London, N13 4BS, UK.</address></p> diff --git a/templates/web/fixmystreet.com/static/privacy.html b/templates/web/fixmystreet.com/static/privacy.html index 394f3587e..3b077d29e 100755 --- a/templates/web/fixmystreet.com/static/privacy.html +++ b/templates/web/fixmystreet.com/static/privacy.html @@ -46,6 +46,13 @@ available).</dd> problem you’ve reported, and send you a questionnaire email four weeks after you submit a problem, asking for a status update; we’ll only ever send you emails in relation to your problem.</dd> + + <dt>How do I stop receiving emails from you?</dt> + <dd>Every alert email we send contains an unsubscribe link at the +bottom for you to stop receiving that alert. After the first questionnaire +email on a report, mentioned above, you have to opt in to receive any further +questionnaire on that report.</dd> + </dl> <h2>Cookies</h2> diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss index fed24af53..f4c6e649b 100644 --- a/web/cobrands/fixmystreet.com/layout.scss +++ b/web/cobrands/fixmystreet.com/layout.scss @@ -149,6 +149,7 @@ body.fullwidthpage { @media only screen and (min-resolution: 320dpi), only screen and (-webkit-min-device-pixel-ratio: 2) { background-image: url(images/locate-me@2.png); + background-size: 22px 34px; } } } |