Implement ReCaptcha on threads

driesvints · driesvints · commit 2bb3b2419ba6 · 2014-12-06T18:27:08.000+01:00
diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php
@@ -48,7 +48,9 @@ public function postSignupConfirm()
         }
 
         /** @var \Illuminate\Validation\Validator $validator */
-        $validator = Validator::make(Input::all(), ['g-recaptcha-response' => 'required|recaptcha']);
+        $validator = Validator::make(Input::only('g-recaptcha-response'), [
+            'g-recaptcha-response' => 'required|recaptcha'
+        ]);
 
         if ($validator->fails()) {
             return Redirect::action('AuthController@getSignupConfirm')
diff --git a/app/controllers/Forum/ForumThreadsController.php b/app/controllers/Forum/ForumThreadsController.php
@@ -92,6 +92,17 @@ public function postCreateThread()
             return Redirect::action('ForumThreadsController@getCreateThread');
         }
 
+        /** @var \Illuminate\Validation\Validator $validator */
+        $validator = Validator::make(Input::only('g-recaptcha-response'), [
+            'g-recaptcha-response' => 'required|recaptcha'
+        ]);
+
+        if ($validator->fails()) {
+            return Redirect::action('ForumThreadsController@getCreateThread')
+                ->exceptInput('g-recaptcha-response')
+                ->withErrors($validator->errors());
+        }
+
         return $this->threadCreator->create($this, [
             'subject' => Input::get('subject'),
             'body' => Input::get('body'),
diff --git a/app/views/forum/threads/create.blade.php b/app/views/forum/threads/create.blade.php
@@ -8,6 +8,9 @@
         <div class="header">
             <h1>Create Thread</h1>
         </div>
+
+        {{ ReCaptcha::getScript() }}
+
         {{ Form::open(['data-persist' => 'garlic', 'data-expires' => '600']) }}
 
         <section class="padding">
@@ -72,6 +75,14 @@
                 @include('forum._tag_chooser')
             </div>
 
+            <div class="form-row">
+                <p>{{ ReCaptcha::getWidget() }}</p>
+
+                @if ($errors->has('g-recaptcha-response'))
+                    <p>Please fill in the captcha field correctly.</p>
+                @endif
+            </div>
+
             <div class="form-row">
                 {{ Form::button('Save', ['type' => 'submit', 'class' => 'button']) }}
             </div>

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ public function postSignupConfirm()`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/** @var \Illuminate\Validation\Validator $validator */`
`51`		`- $validator = Validator::make(Input::all(), ['g-recaptcha-response' => 'required\|recaptcha']);`
	`51`	`+ $validator = Validator::make(Input::only('g-recaptcha-response'), [`
	`52`	`+ 'g-recaptcha-response' => 'required\|recaptcha'`
	`53`	`+ ]);`
`52`	`54`
`53`	`55`	`if ($validator->fails()) {`
`54`	`56`	`return Redirect::action('AuthController@getSignupConfirm')`