kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-21 19:49:54 +00:00
Code Issues 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/Middleware/Sandstorm.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\Middleware;
@@ -33,9 +32,7 @@ use Illuminate\Http\Request;
use View;
/**
* Class Sandstorm
*
* @package FireflyIII\Http\Middleware
* Class Sandstorm.
*/
class Sandstorm
{
@@ -43,18 +40,19 @@ class Sandstorm
* Detects if is using Sandstorm, and responds by logging the user
* in and/or creating an account.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
*
* @return mixed
*
* @throws FireflyException
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function handle(Request $request, Closure $next, $guard = null)
{
// is in Sandstorm environment?
$sandstorm = intval(getenv('SANDSTORM')) === 1;
$sandstorm = 1 === intval(getenv('SANDSTORM'));
View::share('SANDSTORM', $sandstorm);
if (!$sandstorm) {
return $next($request);
@@ -72,7 +70,7 @@ class Sandstorm
// access the same data so we have no choice but to simply login
// the new user to the same account and just forget about Bob and Alice
// and any other differences there may be between these users.
if ($count === 1 && strlen($userId) > 0) {
if (1 === $count && strlen($userId) > 0) {
// login as first user user.
$user = User::first();
Auth::guard($guard)->login($user);
@@ -81,7 +79,7 @@ class Sandstorm
return $next($request);
}
if ($count === 1 && strlen($userId) === 0) {
if (1 === $count && 0 === strlen($userId)) {
// login but indicate anonymous
$user = User::first();
Auth::guard($guard)->login($user);
@@ -90,7 +88,7 @@ class Sandstorm
return $next($request);
}
if ($count === 0 && strlen($userId) > 0) {
if (0 === $count && strlen($userId) > 0) {
// create new user.
$email = $userId . '@firefly';
/** @var User $user */
@@ -110,7 +108,7 @@ class Sandstorm
return $next($request);
}
if ($count === 0 && strlen($userId) === 0) {
if (0 === $count && 0 === strlen($userId)) {
throw new FireflyException('The first visit to a new Firefly III administration cannot be by a guest user.');
}