aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perllib/FixMyStreet/App.pm3
-rw-r--r--perllib/FixMyStreet/App/Controller/Report/New.pm27
2 files changed, 1 insertions, 29 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 61c703468..3cbe1422f 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -97,9 +97,6 @@ after 'prepare_headers' => sub {
&& @$ssl_header == 2 && $self->req->header($ssl_header->[0]) eq $ssl_header->[1];
};
-# set up DB handle for old code
-FixMyStreet->configure_mysociety_dbhandle;
-
# disable debug logging unless in debug mode
__PACKAGE__->log->disable('debug') #
unless __PACKAGE__->debug;
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 8eabf64c1..1eb5a8c2f 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -253,7 +253,7 @@ sub report_import : Path('/import') {
my %input =
map { $_ => $c->get_param($_) || '' } (
'service', 'subject', 'detail', 'name', 'email', 'phone',
- 'easting', 'northing', 'lat', 'lon', 'id', 'phone_id',
+ 'easting', 'northing', 'lat', 'lon',
);
my @errors;
@@ -306,31 +306,6 @@ sub report_import : Path('/import') {
return;
}
-### leaving commented out for now as the values stored here never appear to
-### get used and the new user accounts might make them redundant anyway.
- #
- # # Store for possible future use
- # if ( $input{id} || $input{phone_id} ) {
- # my $id = $input{id} || $input{phone_id};
- # my $already =
- # dbh()
- # ->selectrow_array(
- # 'select id from partial_user where service=? and nsid=?',
- # {}, $input{service}, $id );
- # unless ($already) {
- # dbh()->do(
- # 'insert into partial_user (service, nsid, name, email, phone)'
- # . ' values (?, ?, ?, ?, ?)',
- # {},
- # $input{service},
- # $id,
- # $input{name},
- # $input{email},
- # $input{phone}
- # );
- # }
- # }
-
# find or create the user
my $report_user = $c->model('DB::User')->find_or_create(
{