Merge pull request #677 from M4ttoF/634

#634

Author: joshi1983

app/app/Http/Controllers/SignUpController.php

@@ -16,7 +16,8 @@ class SignUpController extends Controller
 
     public function showForm(Request $request)
     {
-        return view('pages.signup.form');
+        $after_signup_redirect = Input::get('after_signup_redirect');
+        return view('pages.signup.form', ['after_signup_redirect'=>$after_signup_redirect]);
     }
 
     public function createUser(Request $request)
@@ -52,6 +53,10 @@ public function createUser(Request $request)
             // Generate Confirmation Link after saving the user.
             $confirmationLink = BaseUser::generateConfirmationLink($newUser);
 
+            if (Input::has('after_signup_redirect')) {
+                $confirmationLink.='?after_signup_redirect='.Input::get('after_signup_redirect');
+            }
+            
             //Send the email to the user.
             Mail::send(new ConfirmationMail(
                 $newUser->first_name,
@@ -71,14 +76,23 @@ public function createUser(Request $request)
 
     public function confirmEmail($user_email, $email_verification_token)
     {
+        $after_signup_redirect = Input::get('after_signup_redirect');
         $email = $user_email;
         $confirmCode = $email_verification_token;
         if (BaseUser::confirmEmail($email, $confirmCode)) {
-            return view('pages.signup.success', [
-                'email' => $email,
+            if (Input::has('after_signup_redirect')) {
+                return view('pages.signup.success', [
+                'confirmmessage' => 'Your email has been confirmed.',
+                'can_sign_in' => true,
+                'redirect' => '/signin?after_signin_redirect='.$after_signin_redirect
+                ]);
+            } else {
+                return view('pages.signup.success', [
                 'confirmmessage' => 'Your email has been confirmed.',
-                'can_sign_in' => true
+                'can_sign_in' => true,
+                'redirect' => '/signin'
                 ]);
+            }
         }
 
         return Redirect::to('signup')

app/resources/views/pages/location_search/spreadsheet.blade.php

@@ -23,7 +23,7 @@ class="form-control" id="distance"
 				<h4>Add a new location by</h4>
 				<a class="btn btn-default" href="/signin?after_signin_redirect=%2Flocation%2Fmanagement%2Fadd">Signing In</a>
 				<h4>or</h4>
-				<a class="btn btn-default" href="/signup">Signing Up</a>
+				<a class="btn btn-default" href="/signup?after_signup_redirect=/add-location">Signing Up</a>
 			@endif
 		</div>			
 	@else

app/resources/views/pages/signup/form.blade.php

@@ -12,6 +12,7 @@
 				<form method="post" action="/signup">
 					{!! csrf_field() !!}
 					@include('pages.validation_messages', array('errors'=>$errors))
+					<input type="hidden" name="after_signup_redirect" value="{{ isset($after_signup_redirect) ? $after_signup_redirect : '' }}">
 					<div class="row">
 						<div class="col-xs-12">
 							<input class="clean" name="email" placeholder="Email" value="{{ old('email') }}">

app/resources/views/pages/signup/success.blade.php

@@ -5,7 +5,7 @@
 	<div class="text-center success">
 		<strong>{{ $confirmmessage }}</strong>
 		@if ( $can_sign_in )
-		<p>You can <a href="/signin?email={{ $email }}">sign in</a> with it now.</p>
+		<p>You can <a href="{{ $redirect }}">sign in</a> with it now.</p>
 		@endif
 	</div>
 </div>