From e973904765e4efb242d09d3d41d7f9eb0a294424 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 10 Jan 2017 14:58:59 +0000
Subject: Move staging flags to their own config variable.

---
 perllib/FixMyStreet/Script/Reports.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/Script/Reports.pm')

diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm
index 7d614bc30..193c5fa41 100644
--- a/perllib/FixMyStreet/Script/Reports.pm
+++ b/perllib/FixMyStreet/Script/Reports.pm
@@ -211,7 +211,7 @@ sub send(;$) {
               . " ]\n\n";
         }
 
-        if (FixMyStreet->config('STAGING_SITE') && !FixMyStreet->config('SEND_REPORTS_ON_STAGING')) {
+        if (FixMyStreet->staging_flag('send_reports', 0)) {
             # on a staging server send emails to ourselves rather than the bodies
             %reporters = map { $_ => $reporters{$_} } grep { /FixMyStreet::SendReport::Email/ } keys %reporters;
             unless (%reporters) {
-- 
cgit v1.2.3


From 34795d026faf45b0a1bfc103362eb118766c46d7 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 22 Sep 2016 16:12:40 +0100
Subject: Add cobrand call_hook fn, calls a fn if defined.

---
 perllib/FixMyStreet/Script/Reports.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'perllib/FixMyStreet/Script/Reports.pm')

diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm
index 193c5fa41..a7f3cb84b 100644
--- a/perllib/FixMyStreet/Script/Reports.pm
+++ b/perllib/FixMyStreet/Script/Reports.pm
@@ -112,9 +112,7 @@ sub send(;$) {
             $h{user_details} .= sprintf(_('Email: %s'), $row->user->email) . "\n\n";
         }
 
-        if ($cobrand->can('process_additional_metadata_for_email')) {
-            $cobrand->process_additional_metadata_for_email($row, \%h);
-        }
+        $cobrand->call_hook(process_additional_metadata_for_email => $row, \%h);
 
         my $bodies = FixMyStreet::DB->resultset('Body')->search(
             { id => $row->bodies_str_ids },
-- 
cgit v1.2.3


From 5df39f76b761d88dfa5ca86e8bf01a73115eba1c Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 17 Feb 2017 15:50:46 +0000
Subject: Send open reports regardless of current state

---
 perllib/FixMyStreet/Script/Reports.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perllib/FixMyStreet/Script/Reports.pm')

diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm
index a7f3cb84b..6057807de 100644
--- a/perllib/FixMyStreet/Script/Reports.pm
+++ b/perllib/FixMyStreet/Script/Reports.pm
@@ -28,7 +28,7 @@ sub send(;$) {
     my $base_url = FixMyStreet->config('BASE_URL');
     my $site = $site_override || CronFns::site($base_url);
 
-    my $states = [ 'confirmed', 'fixed' ];
+    my $states = [ FixMyStreet::DB::Result::Problem::open_states() ];
     $states = [ 'unconfirmed', 'confirmed', 'in progress', 'planned', 'closed', 'investigating' ] if $site eq 'zurich';
     my $unsent = $rs->search( {
         state => $states,
@@ -274,7 +274,7 @@ sub send(;$) {
         }
         my $sending_errors = '';
         my $unsent = $rs->search( {
-            state => [ 'confirmed', 'fixed' ],
+            state => [ FixMyStreet::DB::Result::Problem::open_states() ],
             whensent => undef,
             bodies_str => { '!=', undef },
             send_fail_count => { '>', 0 }
-- 
cgit v1.2.3