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

Code clean up.

Browse Source
This commit is contained in:
James Cole
2017-11-15 12:25:49 +01:00
parent 57dcdfa0c4
commit ffca858b8d
476 changed files with 2055 additions and 4181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/PreferencesController.php
View File

@@ -18,7 +18,6 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
@@ -34,13 +33,10 @@ use Session;
use View;
/**
* Class PreferencesController
*
* @package FireflyIII\Http\Controllers
* Class PreferencesController.
*/
class PreferencesController extends Controller
{
/**
*
*/
@@ -48,7 +44,6 @@ class PreferencesController extends Controller
{
parent::__construct();
$this->middleware(
function ($request, $next) {
View::share('title', trans('firefly.preferences'));
@@ -71,7 +66,6 @@ class PreferencesController extends Controller
Session::flash('two-factor-secret', $secret);
$image = $google2fa->getQRCodeInline($domain, auth()->user()->email, $secret, 200);
return view('preferences.code', compact('image'));
}
@@ -107,8 +101,8 @@ class PreferencesController extends Controller
$fiscalYearStart = date('Y') . '-' . $fiscalYearStartStr;
$tjOptionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;
$is2faEnabled = Preferences::get('twoFactorAuthEnabled', 0)->data; // twoFactorAuthEnabled
$has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret')); // hasTwoFactorAuthSecret
$showIncomplete = env('SHOW_INCOMPLETE_TRANSLATIONS', false) === true;
$has2faSecret = null !== Preferences::get('twoFactorAuthSecret'); // hasTwoFactorAuthSecret
$showIncomplete = true === env('SHOW_INCOMPLETE_TRANSLATIONS', false);
return view(
'preferences.index',
@@ -148,7 +142,6 @@ class PreferencesController extends Controller
/**
* @param Request $request
*
* @param UserRepositoryInterface $repository
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
@@ -172,13 +165,13 @@ class PreferencesController extends Controller
Session::forget('range');
// custom fiscal year
$customFiscalYear = intval($request->get('customFiscalYear')) === 1;
$customFiscalYear = 1 === intval($request->get('customFiscalYear'));
$fiscalYearStart = date('m-d', strtotime(strval($request->get('fiscalYearStart'))));
Preferences::set('customFiscalYear', $customFiscalYear);
Preferences::set('fiscalYearStart', $fiscalYearStart);
// show deposits frontpage:
$showDepositsFrontpage = intval($request->get('showDepositsFrontpage')) === 1;
$showDepositsFrontpage = 1 === intval($request->get('showDepositsFrontpage'));
Preferences::set('showDepositsFrontpage', $showDepositsFrontpage);
// save page size:
@@ -193,7 +186,7 @@ class PreferencesController extends Controller
if (!$repository->hasRole(auth()->user(), 'demo')) {
// two factor auth
$twoFactorAuthEnabled = intval($request->get('twoFactorAuthEnabled'));
$hasTwoFactorAuthSecret = !is_null(Preferences::get('twoFactorAuthSecret'));
$hasTwoFactorAuthSecret = null !== Preferences::get('twoFactorAuthSecret');
// If we already have a secret, just set the two factor auth enabled to 1, and let the user continue with the existing secret.
if ($hasTwoFactorAuthSecret) {
@@ -222,13 +215,12 @@ class PreferencesController extends Controller
];
Preferences::set('transaction_journal_optional_fields', $optionalTj);
Session::flash('success', strval(trans('firefly.saved_preferences')));
Preferences::mark();
// if we don't have a valid secret yet, redirect to the code page.
// AND USER HAS ACTUALLY ENABLED 2FA
if (!$hasTwoFactorAuthSecret && $twoFactorAuthEnabled === 1) {
if (!$hasTwoFactorAuthSecret && 1 === $twoFactorAuthEnabled) {
return redirect(route('preferences.code'));
}