1 files changed, 20 insertions, 16 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 0a2a8830c..848871f69 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -312,7 +312,7 @@ sub update_contacts : Private {
     my ( $self, $c ) = @_;
 
     my $posted = $c->req->param('posted');
-    my $editor = $c->req->remote_user || ($c->user && $c->user->name) || _('*unknown*');
+    my $editor = $c->forward('get_user');
 
     if ( $posted eq 'new' ) {
         $c->forward('check_token');
@@ -590,11 +590,7 @@ sub report_edit : Path('report_edit') : Args(1) {
 
     my $site_restriction = $c->cobrand->site_restriction;
 
-    my $problem = $c->cobrand->problems->search(
-        {
-            id => $id,
-        }
-    )->first;
+    my $problem = $c->cobrand->problems->search( { id => $id } )->first;
 
     $c->detach( '/page_error_404_not_found' )
       unless $problem;
@@ -603,6 +599,11 @@ sub report_edit : Path('report_edit') : Args(1) {
 
     $c->forward('get_token');
 
+    if ( $c->req->param('rotate_photo') ) {
+        $c->forward('rotate_photo');
+        return 1;
+    }
+
     if ( $c->cobrand->moniker eq 'zurich' ) {
         my $done = $c->cobrand->admin_report_edit();
         return if $done;
@@ -636,9 +637,6 @@ sub report_edit : Path('report_edit') : Args(1) {
     elsif ( $c->req->param('banuser') ) {
         $c->forward('ban_user');
     }
-    elsif ( $c->req->param('rotate_photo') ) {
-        $c->forward('rotate_photo');
-    }
     elsif ( $c->req->param('submit') ) {
         $c->forward('check_token');
 
@@ -1061,6 +1059,16 @@ sub set_allowed_pages : Private {
     return 1;
 }
 
+sub get_user : Private {
+    my ( $self, $c ) = @_;
+
+    my $user = $c->req->remote_user();
+    $user ||= ($c->user && $c->user->name);
+    $user ||= '';
+
+    return $user;
+}
+
 =item get_token
 
 Generate a token based on user and secret
@@ -1071,12 +1079,8 @@ sub get_token : Private {
     my ( $self, $c ) = @_;
 
     my $secret = $c->model('DB::Secret')->search()->first;
-
-    my $user = $c->req->remote_user();
-    $user ||= '';
-
+    my $user = $c->forward('get_user');
     my $token = md5_hex(($user . $secret->secret));
-
     $c->stash->{token} = $token;
 
     return 1;
@@ -1103,7 +1107,7 @@ sub check_token : Private {
 
     $c->forward( 'log_edit', [ $object_id, $object_type, $action_performed ] );
 
-Adds an entry into the admin_log table using the current remote_user.
+Adds an entry into the admin_log table using the current user.
 
 =cut
 
@@ -1111,7 +1115,7 @@ sub log_edit : Private {
     my ( $self, $c, $id, $object_type, $action ) = @_;
     $c->model('DB::AdminLog')->create(
         {
-            admin_user => ( $c->req->remote_user() || '' ),
+            admin_user => $c->forward('get_user'),
             object_type => $object_type,
             action => $action,
             object_id => $id,