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

File reformatting.

Browse Source
This commit is contained in:
James Cole
2015-12-18 16:38:50 +01:00
parent 813fb679a7
commit ac61dfae6b
24 changed files with 149 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,15 +214,17 @@ class AuthController extends Controller
/**
* @return array
*/
protected function getBlockedDomains() {
$set = Config::get('mail.blocked_domains');
protected function getBlockedDomains()
{
$set = Config::get('mail.blocked_domains');
$domains = [];
foreach($set as $entry) {
foreach ($set as $entry) {
$domain = trim($entry);
if(strlen($domain) > 0) {
if (strlen($domain) > 0) {
$domains[] = $domain;
}
}
return $domains;
}
@@ -234,6 +236,7 @@ class AuthController extends Controller
if (isset($parts[1]) && in_array($parts[1], $blocked)) {
return true;
}
return false;
}

12
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -1,13 +1,12 @@
<?php namespace FireflyIII\Http\Controllers\Auth;
use FireflyIII\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
use FireflyIII\User;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
use Illuminate\Mail\Message;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class PasswordController
*
@@ -50,6 +49,7 @@ class PasswordController extends Controller
* Send a reset link to the given user.
*
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\Response
*/
public function postEmail(Request $request)
@@ -61,9 +61,11 @@ class PasswordController extends Controller
if (!is_null($user) && intval($user->blocked) === 1) {
$response = 'passwords.blocked';
} else {
$response = Password::sendResetLink($request->only('email'), function (Message $message) {
$response = Password::sendResetLink(
$request->only('email'), function (Message $message) {
$message->subject($this->getEmailSubject());
});
}
);
}
switch ($response) {

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

@@ -147,7 +147,7 @@ class CurrencyController extends Controller
public function index(CurrencyRepositoryInterface $repository)
{
$currencies = $repository->get();
$defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', env('DEFAULT_CURRENCY','EUR')));
$defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', env('DEFAULT_CURRENCY', 'EUR')));
if (!Auth::user()->hasRole('owner')) {

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

@@ -192,7 +192,7 @@ class JsonController extends Controller
return Response::json($cache->get()); // @codeCoverageIgnore
}
$accounts = $accountRepository->getAccounts(['Default account', 'Asset account', 'Cash account']);
$amount = $reportQuery->incomeInPeriod($start, $end, $accounts)->sum('amount');
$amount = $reportQuery->incomeInPeriod($start, $end, $accounts)->sum('amount');
$data = ['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount];
$cache->store($data);

8
app/Http/Controllers/ReportController.php
View File

@@ -46,17 +46,17 @@ class ReportController extends Controller
$months = $this->helper->listOfMonths($start);
// does the user have shared accounts?
$accounts = $repository->getAccounts(['Default account', 'Asset account']);
$accounts = $repository->getAccounts(['Default account', 'Asset account']);
// get id's for quick links:
$accountIds = [];
/** @var Account $account */
foreach($accounts as $account) {
foreach ($accounts as $account) {
$accountIds [] = $account->id;
}
$accountList = join(',',$accountIds);
$accountList = join(',', $accountIds);
return view('reports.index', compact('months', 'accounts', 'start','accountList'));
return view('reports.index', compact('months', 'accounts', 'start', 'accountList'));
}
/**

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

@@ -48,7 +48,7 @@ class TransactionController extends Controller
*/
public function create(AccountRepositoryInterface $repository, $what = TransactionType::DEPOSIT)
{
$what = strtolower($what);
$what = strtolower($what);
$maxFileSize = Steam::phpBytes(ini_get('upload_max_filesize'));
$maxPostSize = Steam::phpBytes(ini_get('post_max_size'));
$uploadSize = min($maxFileSize, $maxPostSize);

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

@@ -1,13 +1,14 @@
<?php namespace FireflyIII\Http\Middleware;
use App;
use Auth;
use Carbon\Carbon;
use Closure;
use Config;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\Request;
use Preferences;
use Auth;
/**
* Class Authenticate
*
@@ -55,6 +56,7 @@ class Authenticate
if (intval($this->auth->user()->blocked) == 1) {
Auth::logout();
return redirect()->route('index');
}

2
app/Http/routes.php
View File

@@ -268,7 +268,7 @@ Route::get('/cron/sendgrid', ['uses' => 'CronController@sendgrid']);
Route::controllers(
[
'auth' => 'Auth\AuthController',
'auth' => 'Auth\AuthController',
'password' => 'Auth\PasswordController',
]
);