IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/3.5.3'

Browse Source
This commit is contained in:
James Cole 2015-11-13 07:01:29 +01:00
commit 7a0587f433
9 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/Auth/AuthController.php
View File

@ -13,6 +13,7 @@ use Request as Rq;
use Session; use Session;
use Twig; use Twig;
use Validator; use Validator;
use Log;
/** /**
* Class AuthController * Class AuthController
@ -23,6 +24,19 @@ class AuthController extends Controller
{ {
use AuthenticatesAndRegistersUsers, ThrottlesLogins; use AuthenticatesAndRegistersUsers, ThrottlesLogins;
/**
* Log the user out of the application.
*
* @return \Illuminate\Http\Response
*/
public function getLogout()
{
Auth::logout();
Log::debug('Logout and redirect to root.');
return redirect('/login');
}
/** /**
* Show the application registration form. * Show the application registration form.
* *
@ -75,6 +89,9 @@ class AuthController extends Controller
if (!is_null($foundUser)) { if (!is_null($foundUser)) {
// if it exists, show message: // if it exists, show message:
$code = $foundUser->blocked_code; $code = $foundUser->blocked_code;
if(strlen($code) == 0) {
$code = 'general_blocked';
}
$message = trans('firefly.' . $code . '_error', ['email' => $credentials['email']]); $message = trans('firefly.' . $code . '_error', ['email' => $credentials['email']]);
} }

2
app/Http/Controllers/ProfileController.php
View File

@ -66,7 +66,7 @@ class ProfileController extends Controller
} }
// update the user with the new password. // update the user with the new password.
Auth::user()->password = $request->get('new_password'); Auth::user()->password = bcrypt($request->get('new_password'));
Auth::user()->save(); Auth::user()->save();
Session::flash('success', trans('firefly.password_changed')); Session::flash('success', trans('firefly.password_changed'));

5
app/Http/Middleware/Authenticate.php
View File

@ -7,7 +7,7 @@ use Config;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Preferences; use Preferences;
use Auth;
/** /**
* Class Authenticate * Class Authenticate
* *
@ -54,7 +54,8 @@ class Authenticate
} }
if (intval($this->auth->user()->blocked) == 1) { if (intval($this->auth->user()->blocked) == 1) {
return redirect()->route('logout'); Auth::logout();
return redirect()->route('index');
} }
// if logged in, set user language: // if logged in, set user language:

2
config/firefly.php
View File

@ -2,7 +2,7 @@
return [ return [
'chart' => 'chartjs', 'chart' => 'chartjs',
'version' => '3.5.2', 'version' => '3.5.3',
'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'], 'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], 'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
'csv_import_enabled' => true, 'csv_import_enabled' => true,

1
resources/lang/en/firefly.php
View File

@ -22,6 +22,7 @@ return [
'search_results_for' => 'Search results for ":query"', 'search_results_for' => 'Search results for ":query"',
'bounced_error' => 'The message sent to :email bounced, so no access for you.', 'bounced_error' => 'The message sent to :email bounced, so no access for you.',
'deleted_error' => 'These credentials do not match our records.', 'deleted_error' => 'These credentials do not match our records.',
'general_blocked_error' => 'Your account has been disabled, so you cannot login.',
'removed_amount' => 'Removed :amount', 'removed_amount' => 'Removed :amount',
'added_amount' => 'Added :amount', 'added_amount' => 'Added :amount',
'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.', 'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.',

61
resources/lang/en/form.php
View File

@ -6,7 +6,8 @@ return [
'bank_balance' => 'Balance', 'bank_balance' => 'Balance',
'savings_balance' => 'Savings balance', 'savings_balance' => 'Savings balance',
'credit_card_limit' => 'Credit card limit', 'credit_card_limit' => 'Credit card limit',
'automatch' => 'Match automatically',
'skip' => 'Skip',
'name' => 'Name', 'name' => 'Name',
'active' => 'Active', 'active' => 'Active',
'amount_min' => 'Minimum amount', 'amount_min' => 'Minimum amount',
@ -68,35 +69,35 @@ return [
'size' => 'Size', 'size' => 'Size',
'delete_account' => 'Delete account ":name"', 'delete_account' => 'Delete account ":name"',
'delete_bill' => 'Delete bill ":name"', 'delete_bill' => 'Delete bill ":name"',
'delete_budget' => 'Delete budget ":name"', 'delete_budget' => 'Delete budget ":name"',
'delete_category' => 'Delete category ":name"', 'delete_category' => 'Delete category ":name"',
'delete_currency' => 'Delete currency ":name"', 'delete_currency' => 'Delete currency ":name"',
'delete_journal' => 'Delete transaction with description ":description"', 'delete_journal' => 'Delete transaction with description ":description"',
'delete_attachment' => 'Delete attachment ":name"', 'delete_attachment' => 'Delete attachment ":name"',
'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?', 'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?',
'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?', 'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?',
'bill_areYouSure' => 'Are you sure you want to delete the bill named ":name"?', 'bill_areYouSure' => 'Are you sure you want to delete the bill named ":name"?',
'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?', 'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?',
'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?', 'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?',
'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?', 'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?',
'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?', 'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?',
'journal_areYouSure' => 'Are you sure you want to delete the transaction described ":description"?', 'journal_areYouSure' => 'Are you sure you want to delete the transaction described ":description"?',
'tag_areYouSure' => 'Are you sure you want to delete the tag ":tag"?', 'tag_areYouSure' => 'Are you sure you want to delete the tag ":tag"?',
'permDeleteWarning' => 'Deleting stuff from Firely is permanent and cannot be undone.', 'permDeleteWarning' => 'Deleting stuff from Firely is permanent and cannot be undone.',
'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.' . 'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.' .
'|All :count transactions connected to this account will be deleted as well.', '|All :count transactions connected to this account will be deleted as well.',
'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.' . 'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.' .
'|All :count piggy bank connected to this account will be deleted as well.', '|All :count piggy bank connected to this account will be deleted as well.',
'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.' . 'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.' .
'|All :count transactions connected to this bill will spared deletion.', '|All :count transactions connected to this bill will spared deletion.',
'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.' . 'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.' .
'|All :count transactions connected to this budget will spared deletion.', '|All :count transactions connected to this budget will spared deletion.',
'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.' . 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.' .
'|All :count transactions connected to this category will spared deletion.', '|All :count transactions connected to this category will spared deletion.',
'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.' . 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.' .
'|All :count transactions connected to this tag will spared deletion.', '|All :count transactions connected to this tag will spared deletion.',
]; ];

3
resources/lang/nl/firefly.php
View File

@ -21,7 +21,8 @@ return [
'never' => 'Nooit', 'never' => 'Nooit',
'search_results_for' => 'Zoekresultaten voor ":query"', 'search_results_for' => 'Zoekresultaten voor ":query"',
'bounced_error' => 'Het emailtje naar :email kwam nooit aan.', 'bounced_error' => 'Het emailtje naar :email kwam nooit aan.',
'deleted_error' => 'These credentials do not match our records.', 'deleted_error' => 'Deze gegevens zijn niet correct.',
'general_blocked_error' => 'Je account is uitgeschakeld, je kan helaas niet inloggen.',
'removed_amount' => ':amount weggehaald', 'removed_amount' => ':amount weggehaald',
'added_amount' => ':amount toegevoegd', 'added_amount' => ':amount toegevoegd',
'asset_account_role_help' => 'Voorkeuren die voortkomen uit je keuze hier kan je later aangeven.', 'asset_account_role_help' => 'Voorkeuren die voortkomen uit je keuze hier kan je later aangeven.',

3
resources/lang/nl/form.php
View File

@ -6,7 +6,8 @@ return [
'bank_balance' => 'Saldo', 'bank_balance' => 'Saldo',
'savings_balance' => 'Saldo van spaarrekening', 'savings_balance' => 'Saldo van spaarrekening',
'credit_card_limit' => 'Credit card limiet', 'credit_card_limit' => 'Credit card limiet',
'automatch' => 'Automatisch herkennen',
'skip' => 'Overslaan',
'name' => 'Naam', 'name' => 'Naam',
'active' => 'Actief', 'active' => 'Actief',
'amount_min' => 'Minimumbedrag', 'amount_min' => 'Minimumbedrag',

10
resources/twig/partials/control-bar.twig
View File

@ -81,16 +81,6 @@
</a> </a>
</li> </li>
<li>
<a href="{{ route('accounts.create', 'revenue') }}">
<i class="menu-icon fa fa-download bg-maroon"></i>
<div class="menu-info">
<h4 class="control-sidebar-subheading">{{ 'new_revenue_account'|_ }}</h4>
</div>
</a>
</li>
<li> <li>
<a href="{{ route('piggy-banks.create') }}"> <a href="{{ route('piggy-banks.create') }}">
<i class="menu-icon fa fa-sort-amount-asc bg-teal"></i> <i class="menu-icon fa fa-sort-amount-asc bg-teal"></i>