From 8a465417889f38c6e58d314928eef20acc01a253 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Wed, 29 Oct 2014 10:56:28 +0100
Subject: [PATCH] Rename registration action, pass in IP address.

---
 src/FluxBB/Actions/{Register.php => CreateUser.php} | 4 ++--
 src/FluxBB/Server/ServiceProvider.php               | 2 +-
 src/FluxBB/Web/Controllers/AuthController.php       | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename src/FluxBB/Actions/{Register.php => CreateUser.php} (92%)

diff --git a/src/FluxBB/Actions/Register.php b/src/FluxBB/Actions/CreateUser.php
similarity index 92%
rename from src/FluxBB/Actions/Register.php
rename to src/FluxBB/Actions/CreateUser.php
index cfba21a..8ace307 100644
--- a/src/FluxBB/Actions/Register.php
+++ b/src/FluxBB/Actions/CreateUser.php
@@ -7,7 +7,7 @@
 use FluxBB\Models\User;
 use FluxBB\Models\ConfigRepositoryInterface;
 
-class Register extends Action
+class CreateUser extends Action
 {
     protected $config;
 
@@ -34,7 +34,7 @@ protected function run()
             'dst'               => $this->config->get('o_default_dst'),
             'language'          => $this->config->get('o_default_lang'),
             'style'             => $this->config->get('o_default_style'),
-            //'registration_ip'   => $this->request->getClientIp(),
+            'registration_ip'   => $this->get('ip'),
             //'last_visit'        => $this->request->server('REQUEST_TIME', time()),
         ]);
 
diff --git a/src/FluxBB/Server/ServiceProvider.php b/src/FluxBB/Server/ServiceProvider.php
index 8a53876..ea942ff 100644
--- a/src/FluxBB/Server/ServiceProvider.php
+++ b/src/FluxBB/Server/ServiceProvider.php
@@ -58,7 +58,7 @@ protected function registerActions(Server $server)
         $server->registerAction('category', 'FluxBB\Actions\ViewCategory');
         $server->registerAction('conversation', 'FluxBB\Actions\GetConversation');
         $server->registerAction('post', 'FluxBB\Actions\GetPost');
-        $server->registerAction('handle_registration', 'FluxBB\Actions\Register');
+        $server->registerAction('handle_registration', 'FluxBB\Actions\CreateUser');
         $server->registerAction('handle_login', 'FluxBB\Actions\Login');
         $server->registerAction('logout', 'FluxBB\Actions\Logout');
         $server->registerAction('post_edit_handler', 'FluxBB\Actions\EditPost');
diff --git a/src/FluxBB/Web/Controllers/AuthController.php b/src/FluxBB/Web/Controllers/AuthController.php
index 9f122d9..fc4b366 100644
--- a/src/FluxBB/Web/Controllers/AuthController.php
+++ b/src/FluxBB/Web/Controllers/AuthController.php
@@ -16,7 +16,9 @@ public function registerForm()
     public function register()
     {
         try {
-            $this->execute('handle_registration');
+            $this->execute('handle_registration', [
+                'ip' => $this->request->getClientIp(),
+            ]);
 
             return $this->redirect('index', trans('fluxbb::register.reg_complete'));
         } catch (ValidationFailed $e) {