Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
This commit is contained in:
0
SRC/app/Auteur.php
Normal file → Executable file
0
SRC/app/Auteur.php
Normal file → Executable file
0
SRC/app/ConfigJeu.php
Normal file → Executable file
0
SRC/app/ConfigJeu.php
Normal file → Executable file
0
SRC/app/Datation.php
Normal file → Executable file
0
SRC/app/Datation.php
Normal file → Executable file
0
SRC/app/Domaine.php
Normal file → Executable file
0
SRC/app/Domaine.php
Normal file → Executable file
0
SRC/app/Http/Controllers/APIController.php
Normal file → Executable file
0
SRC/app/Http/Controllers/APIController.php
Normal file → Executable file
@ -89,12 +89,12 @@ 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)
|
||||
{
|
||||
$user->password = Hash::make($password);
|
||||
$user->motdepasse = Hash::make($password);
|
||||
$user->save();
|
||||
});
|
||||
|
||||
|
0
SRC/app/Http/Middleware/ifAdmin.php
Normal file → Executable file
0
SRC/app/Http/Middleware/ifAdmin.php
Normal file → Executable file
0
SRC/app/Http/Middleware/ifGuest.php
Normal file → Executable file
0
SRC/app/Http/Middleware/ifGuest.php
Normal file → Executable file
0
SRC/app/Http/Middleware/ifGuestWithRef.php
Normal file → Executable file
0
SRC/app/Http/Middleware/ifGuestWithRef.php
Normal file → Executable file
0
SRC/app/Http/Middleware/ifReferent.php
Normal file → Executable file
0
SRC/app/Http/Middleware/ifReferent.php
Normal file → Executable file
@ -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'
|
||||
));
|
||||
|
0
SRC/app/Matiere.php
Normal file → Executable file
0
SRC/app/Matiere.php
Normal file → Executable file
0
SRC/app/Oeuvre.php
Normal file → Executable file
0
SRC/app/Oeuvre.php
Normal file → Executable file
0
SRC/app/Referent.php
Normal file → Executable file
0
SRC/app/Referent.php
Normal file → Executable file
0
SRC/app/Technique.php
Normal file → Executable file
0
SRC/app/Technique.php
Normal file → Executable file
Reference in New Issue
Block a user