From 2b1529105b7e1b8b2581d62670e9a3cf9e2f83c5 Mon Sep 17 00:00:00 2001
From: www <www@37.187.101.7>
Date: Mon, 16 Mar 2015 15:40:12 +0100
Subject: [PATCH] 	modified:  
 SRC/app/Http/Controllers/LoginController.php 	modified:  
 SRC/app/Http/routes.php 	modified:  
 SRC/resources/views/auth/register.blade.php 	modified:  
 SRC/resources/views/auth/reset.blade.php

---
 .bash_history                                | 13 +++++++++++++
 SRC/app/Http/Controllers/LoginController.php |  2 +-
 SRC/app/Http/routes.php                      |  2 +-
 SRC/resources/views/auth/register.blade.php  |  2 +-
 SRC/resources/views/auth/reset.blade.php     |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.bash_history b/.bash_history
index f69ce60..cb67a73 100755
--- a/.bash_history
+++ b/.bash_history
@@ -480,3 +480,16 @@ ls
 python loader
 python loader.py
 python loader.py
+ls
+git status
+git pull
+git pull
+nano SRC/config/mail.php 
+git commit -a
+git push
+ls
+ls
+ls
+nano SRC/config/mail.php 
+nano .env 
+nano SRC/.env 
diff --git a/SRC/app/Http/Controllers/LoginController.php b/SRC/app/Http/Controllers/LoginController.php
index d4fcb69..9411942 100755
--- a/SRC/app/Http/Controllers/LoginController.php
+++ b/SRC/app/Http/Controllers/LoginController.php
@@ -89,7 +89,7 @@ class LoginController extends Controller {
     	return View::make('auth.reset')->with('token', $token);
     }
 
-    public function update($token)
+    public function update()
     {
     	$credentials = Input::only('email', 'password','password_confirmation','token');
     	$response = Password::reset($credentials, function($user, $password)
diff --git a/SRC/app/Http/routes.php b/SRC/app/Http/routes.php
index 2ed86b3..b3ab11c 100755
--- a/SRC/app/Http/routes.php
+++ b/SRC/app/Http/routes.php
@@ -24,7 +24,7 @@ Route::get('password/reset/{token}', array(
   'uses' => 'LoginController@reset',
   'as' => 'password.reset'
 ));
-Route::post('password/reset/{token}', array(
+Route::post('password/reset', array(
   'uses' => 'LoginController@update',
   'as' => 'password.update'
 ));
diff --git a/SRC/resources/views/auth/register.blade.php b/SRC/resources/views/auth/register.blade.php
index 1f2ffd0..dc86c27 100755
--- a/SRC/resources/views/auth/register.blade.php
+++ b/SRC/resources/views/auth/register.blade.php
@@ -18,7 +18,7 @@
 						</div>
 					@endif
 
-					<form class="form-horizontal" role="form" method="POST" action="/auth/register">
+					<form class="form-horizontal" role="form" method="POST" action="/password/reset">
 						<input type="hidden" name="_token" value="{{ csrf_token() }}">
 
 						<div class="form-group">
diff --git a/SRC/resources/views/auth/reset.blade.php b/SRC/resources/views/auth/reset.blade.php
index 2420aeb..6674a2a 100644
--- a/SRC/resources/views/auth/reset.blade.php
+++ b/SRC/resources/views/auth/reset.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('backend/template')
 @section('content')
 <div class="container-fluid">
 <div class="row">