Log ip addresses for users, threads and replies

driesvints · driesvints · commit e48544b0b603 · 2014-12-13T19:15:09.000+01:00
diff --git a/app/Lio/Accounts/User.php b/app/Lio/Accounts/User.php
@@ -19,7 +19,7 @@ class User extends Entity implements UserInterface, RemindableInterface, Present
 
     protected $table    = 'users';
     protected $hidden   = ['github_id', 'email', 'remember_token'];
-    protected $fillable = ['email', 'name', 'github_url', 'github_id', 'image_url', 'is_banned'];
+    protected $fillable = ['email', 'name', 'github_url', 'github_id', 'image_url', 'is_banned', 'ip'];
     protected $dates    = ['deleted_at'];
 
     protected $validationRules = [
diff --git a/app/Lio/Forum/Replies/Reply.php b/app/Lio/Forum/Replies/Reply.php
@@ -9,7 +9,7 @@ class Reply extends Entity implements PresenterInterface
     use SoftDeletingTrait;
 
     protected $table    = 'forum_replies';
-    protected $fillable = ['body', 'author_id', 'thread_id'];
+    protected $fillable = ['body', 'author_id', 'thread_id', 'ip'];
     protected $with     = ['author'];
     protected $dates    = ['deleted_at'];
 
diff --git a/app/Lio/Forum/Threads/Thread.php b/app/Lio/Forum/Threads/Thread.php
@@ -11,7 +11,7 @@ class Thread extends Entity implements PresenterInterface
     use SoftDeletingTrait;
 
     protected $table    = 'forum_threads';
-    protected $fillable = ['subject', 'body', 'author_id', 'is_question', 'solution_reply_id', 'category_slug', 'laravel_version'];
+    protected $fillable = ['subject', 'body', 'author_id', 'is_question', 'solution_reply_id', 'category_slug', 'laravel_version', 'ip'];
     protected $dates    = ['deleted_at'];
 
     protected $validationRules = [
diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php
@@ -80,7 +80,10 @@ public function postSignupConfirm()
                 ->withErrors($validator->errors());
         }
 
-        return App::make('Lio\Accounts\UserCreator')->create($this, Session::get('userGithubData'));
+        $data = Session::get('userGithubData');
+        $data['ip'] = Request::ip();
+
+        return App::make('Lio\Accounts\UserCreator')->create($this, $data);
     }
 
     /**
diff --git a/app/controllers/Forum/ForumRepliesController.php b/app/controllers/Forum/ForumRepliesController.php
@@ -48,6 +48,7 @@ public function postCreateReply($threadSlug)
         return App::make('Lio\Forum\Replies\ReplyCreator')->create($this, [
             'body'   => Input::get('body'),
             'author' => Auth::user(),
+            'ip' => Request::ip(),
         ], $thread->id, new ReplyForm);
     }
 
diff --git a/app/controllers/Forum/ForumThreadsController.php b/app/controllers/Forum/ForumThreadsController.php
@@ -110,6 +110,7 @@ public function postCreateThread()
             'laravel_version' => Input::get('laravel_version'),
             'is_question' => Input::get('is_question'),
             'tags' => $this->tags->getTagsByIds(Input::get('tags')),
+            'ip' => Request::ip(),
         ], new ThreadForm);
     }
 
diff --git a/app/database/migrations/2014_12_13_164931_create_ip_columns.php b/app/database/migrations/2014_12_13_164931_create_ip_columns.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateIpColumns extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('ip', 100);
+        });
+        Schema::table('forum_threads', function (Blueprint $table) {
+            $table->string('ip', 100);
+        });
+        Schema::table('forum_replies', function (Blueprint $table) {
+            $table->string('ip', 100);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('ip');
+        });
+        Schema::table('forum_threads', function (Blueprint $table) {
+            $table->dropColumn('ip');
+        });
+        Schema::table('forum_replies', function (Blueprint $table) {
+            $table->dropColumn('ip');
+        });
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,10 @@ public function postSignupConfirm()`
`80`	`80`	`->withErrors($validator->errors());`
`81`	`81`	`}`
`82`	`82`
`83`		`- return App::make('Lio\Accounts\UserCreator')->create($this, Session::get('userGithubData'));`
	`83`	`+ $data = Session::get('userGithubData');`
	`84`	`+ $data['ip'] = Request::ip();`
	`85`	`+`
	`86`	`+ return App::make('Lio\Accounts\UserCreator')->create($this, $data);`
`84`	`87`	`}`
`85`	`88`
`86`	`89`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ public function postCreateReply($threadSlug)`
`48`	`48`	`return App::make('Lio\Forum\Replies\ReplyCreator')->create($this, [`
`49`	`49`	`'body' => Input::get('body'),`
`50`	`50`	`'author' => Auth::user(),`
	`51`	`+ 'ip' => Request::ip(),`
`51`	`52`	`], $thread->id, new ReplyForm);`
`52`	`53`	`}`
`53`	`54`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ public function postCreateThread()`
`110`	`110`	`'laravel_version' => Input::get('laravel_version'),`
`111`	`111`	`'is_question' => Input::get('is_question'),`
`112`	`112`	`'tags' => $this->tags->getTagsByIds(Input::get('tags')),`
	`113`	`+ 'ip' => Request::ip(),`
`113`	`114`	`], new ThreadForm);`
`114`	`115`	`}`
`115`	`116`