Merge branch 'release/3.5.3'

app/Http/Controllers/Auth/AuthController.php

@@ -13,6 +13,7 @@ use Request as Rq;
 use Session;
 use Twig;
 use Validator;
+use Log;
 
 /**
  * Class AuthController
@@ -23,6 +24,19 @@ class AuthController extends Controller
 {
     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.
      *
@@ -75,6 +89,9 @@ class AuthController extends Controller
         if (!is_null($foundUser)) {
             // if it exists, show message:
             $code    = $foundUser->blocked_code;
+            if(strlen($code) == 0) {
+                $code = 'general_blocked';
+            }
             $message = trans('firefly.' . $code . '_error', ['email' => $credentials['email']]);
         }
 

app/Http/Controllers/ProfileController.php

@@ -66,7 +66,7 @@ class ProfileController extends Controller
         }
 
         // 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();
 
         Session::flash('success', trans('firefly.password_changed'));

app/Http/Middleware/Authenticate.php

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

config/firefly.php

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

resources/lang/en/firefly.php

@@ -22,6 +22,7 @@ return [
     'search_results_for'               => 'Search results for ":query"',
     'bounced_error'                    => 'The message sent to :email bounced, so no access for you.',
     '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',
     'added_amount'                     => 'Added :amount',
     'asset_account_role_help'          => 'Any extra options resulting from your choice can be set later.',

resources/lang/en/form.php

@@ -6,7 +6,8 @@ return [
     'bank_balance'                => 'Balance',
     'savings_balance'             => 'Savings balance',
     'credit_card_limit'           => 'Credit card limit',
-
+    'automatch'                   => 'Match automatically',
+    'skip'                        => 'Skip',
     'name'                        => 'Name',
     'active'                      => 'Active',
     'amount_min'                  => 'Minimum amount',

resources/lang/nl/firefly.php

@@ -21,7 +21,8 @@ return [
     'never'                            => 'Nooit',
     'search_results_for'               => 'Zoekresultaten voor ":query"',
     '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',
     'added_amount'                     => ':amount toegevoegd',
     'asset_account_role_help'          => 'Voorkeuren die voortkomen uit je keuze hier kan je later aangeven.',

resources/lang/nl/form.php

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

resources/twig/partials/control-bar.twig

@@ -81,16 +81,6 @@
                     </a>
                 </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>
                     <a href="{{ route('piggy-banks.create') }}">
                         <i class="menu-icon fa fa-sort-amount-asc bg-teal"></i>