kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 12:12:18 +00:00
Code Issues Projects Releases Wiki Activity

Various small updates [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-08-06 07:06:45 +02:00
parent 2d0820873a
commit 5e809633e3
11 changed files with 100 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/Firefly/Helper/Email/EmailHelper.php
View File

@@ -18,7 +18,7 @@ class EmailHelper implements EmailHelperInterface
$reset = \Str::random(32);
$user->reset = $reset;
$user->save();
$user->forceSave();
$email = $user->email;
$data = ['reset' => $reset];
@@ -40,7 +40,7 @@ class EmailHelper implements EmailHelperInterface
$password = \Str::random(12);
$user->password = \Hash::make($password);
$user->reset = \Str::random(32); // new one.
$user->save();
$user->forceSave();
$email = $user->email;
@@ -61,7 +61,7 @@ class EmailHelper implements EmailHelperInterface
{
$reset = \Str::random(32);
$user->reset = $reset;
$user->save();
$user->forceSave();
$email = $user->email;
$data = ['reset' => $reset];

63
app/lib/Firefly/Storage/User/EloquentUserRepository.php
View File

@@ -17,30 +17,6 @@ class EloquentUserRepository implements UserRepositoryInterface
{
}
/**
* @param $array
*
* @return bool|\User
*/
public function register($array)
{
$user = new \User;
$user->email = isset($array['email']) ? $array['email'] : null;
$user->migrated = 0;
$user->reset = \Str::random(32);
$user->password = \Hash::make(\Str::random(12));
if (!$user->save()) {
\Log::error('Invalid user');
\Session::flash('error', 'Input invalid, please try again: ' . $user->errors()->first());
return false;
}
$user->save();
return $user;
}
/**
* @param $array
*
@@ -57,6 +33,16 @@ class EloquentUserRepository implements UserRepositoryInterface
return false;
}
/**
* @param $email
*
* @return mixed
*/
public function findByEmail($email)
{
return \User::where('email', $email)->first();
}
/**
* @param $reset
*
@@ -68,13 +54,26 @@ class EloquentUserRepository implements UserRepositoryInterface
}
/**
* @param $email
* @param $array
*
* @return mixed
* @return bool|\User
*/
public function findByEmail($email)
public function register($array)
{
return \User::where('email', $email)->first();
$user = new \User;
$user->email = isset($array['email']) ? $array['email'] : null;
$user->migrated = 0;
$user->reset = \Str::random(32);
$user->password = \Hash::make(\Str::random(12));
if (!$user->save()) {
\Log::error('Invalid user');
\Session::flash('error', 'Input invalid, please try again: ' . $user->errors()->first());
return false;
}
$user->save();
return $user;
}
/**
@@ -89,13 +88,7 @@ class EloquentUserRepository implements UserRepositoryInterface
/** @noinspection PhpUndefinedFieldInspection */
$user->password = $password;
/** @noinspection PhpUndefinedMethodInspection */
if($user->validate()) {
$user->save();
} else {
var_dump($user->errors()->all());
exit;
}
$user->save();
$user->forceSave();
return true;
}