From 1ca61665612f4a7da926f6834801bb8eece2712e Mon Sep 17 00:00:00 2001
From: REJack <info@rejack.de>
Date: Thu, 22 Aug 2019 08:33:51 +0200
Subject: [PATCH] fixed error without social providers in views & fixed
 loginFast

---
 app/Libraries/Aauth.php     |  4 ++--
 app/Views/Account/Home.php  |  2 ++
 app/Views/Account/Login.php | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/Libraries/Aauth.php b/app/Libraries/Aauth.php
index 02c7873..f9701af 100644
--- a/app/Libraries/Aauth.php
+++ b/app/Libraries/Aauth.php
@@ -500,6 +500,8 @@ class Aauth
 		$userModel->where('id', $userId);
 		$userModel->where('banned', 0);
 
+		$user = $userModel->asArray()->first();
+
 		$this->session->set('user', [
 			'id'       => $user['id'],
 			'username' => $user['username'],
@@ -612,8 +614,6 @@ class Aauth
 			$userId = (int) @$this->session->user['id'];
 		}
 
-		$userModel = $this->getModel('User');
-
 		return $this->isMember($this->config->groupAdmin, $userId);
 	}
 
diff --git a/app/Views/Account/Home.php b/app/Views/Account/Home.php
index 16668b2..37d9504 100644
--- a/app/Views/Account/Home.php
+++ b/app/Views/Account/Home.php
@@ -22,6 +22,7 @@
 				<?= $user['email'] ?>
 			</div>
 		</div>
+		<?php if (isset($providers)): ?>
 		<div class="row">
 			<div class="col-sm-4">
 				<b><?= lang('Account.homeLabelSocial') ?></b>
@@ -34,6 +35,7 @@
 				<?php endforeach; ?>
 			</div>
 		</div>
+		<?php endif; ?>
 	</div>
 </div>
 
diff --git a/app/Views/Account/Login.php b/app/Views/Account/Login.php
index 9aacddf..6afdc27 100644
--- a/app/Views/Account/Login.php
+++ b/app/Views/Account/Login.php
@@ -11,13 +11,13 @@
 		<?php endif;?>
 		  <div class="form-group">
 			<div class="form-label-group">
-							<?php if ($useUsername):?>
-								<input type="text" name="username" id="inputUsername" class="form-control" placeholder="<?=lang('Account.loginLabelUsername')?>" required autofocus>
-								<label for="inputUsername"><?=lang('Account.loginLabelUsername')?></label>
-							<?php else:?>
-								<input type="email" name="email" id="inputEmail" class="form-control" placeholder="<?=lang('Account.loginLabelEmail')?>" required autofocus>
-								<label for="inputEmail"><?=lang('Account.loginLabelEmail')?></label>
-							<?php endif;?>
+				<?php if ($useUsername):?>
+					<input type="text" name="username" id="inputUsername" class="form-control" placeholder="<?=lang('Account.loginLabelUsername')?>" required autofocus>
+					<label for="inputUsername"><?=lang('Account.loginLabelUsername')?></label>
+				<?php else:?>
+					<input type="email" name="email" id="inputEmail" class="form-control" placeholder="<?=lang('Account.loginLabelEmail')?>" required autofocus>
+					<label for="inputEmail"><?=lang('Account.loginLabelEmail')?></label>
+				<?php endif;?>
 			</div>
 		  </div>
 		  <div class="form-group">
@@ -36,7 +36,7 @@
 		  </div>
 					<button class="btn btn-primary btn-block" type="submit"><?=lang('Account.loginLabelSubmit')?></button>
 		<?= form_close() ?>
-		<?php if ($providers): ?>
+		<?php if (isset($providers) && $providers): ?>
 			  <div class="text-center">&mdash;</div>
 			<?php foreach ($providers as $provider): ?>
 					<a href="<?= site_url('account/social/login/' . $provider) ?>" class="btn btn-info btn-block" type="submit"><?=lang('Account.loginLabelSocial') . $provider?></a>