Browse Source

fixed error without social providers in views & fixed loginFast

v3-dev
REJack 6 years ago
parent
commit
1ca6166561
No known key found for this signature in database
GPG Key ID: 9F3976CC630CC888
  1. 4
      app/Libraries/Aauth.php
  2. 2
      app/Views/Account/Home.php
  3. 16
      app/Views/Account/Login.php

4
app/Libraries/Aauth.php

@ -500,6 +500,8 @@ class Aauth
$userModel->where('id', $userId); $userModel->where('id', $userId);
$userModel->where('banned', 0); $userModel->where('banned', 0);
$user = $userModel->asArray()->first();
$this->session->set('user', [ $this->session->set('user', [
'id' => $user['id'], 'id' => $user['id'],
'username' => $user['username'], 'username' => $user['username'],
@ -612,8 +614,6 @@ class Aauth
$userId = (int) @$this->session->user['id']; $userId = (int) @$this->session->user['id'];
} }
$userModel = $this->getModel('User');
return $this->isMember($this->config->groupAdmin, $userId); return $this->isMember($this->config->groupAdmin, $userId);
} }

2
app/Views/Account/Home.php

@ -22,6 +22,7 @@
<?= $user['email'] ?> <?= $user['email'] ?>
</div> </div>
</div> </div>
<?php if (isset($providers)): ?>
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-4">
<b><?= lang('Account.homeLabelSocial') ?></b> <b><?= lang('Account.homeLabelSocial') ?></b>
@ -34,6 +35,7 @@
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
</div> </div>
<?php endif; ?>
</div> </div>
</div> </div>

16
app/Views/Account/Login.php

@ -11,13 +11,13 @@
<?php endif;?> <?php endif;?>
<div class="form-group"> <div class="form-group">
<div class="form-label-group"> <div class="form-label-group">
<?php if ($useUsername):?> <?php if ($useUsername):?>
<input type="text" name="username" id="inputUsername" class="form-control" placeholder="<?=lang('Account.loginLabelUsername')?>" required autofocus> <input type="text" name="username" id="inputUsername" class="form-control" placeholder="<?=lang('Account.loginLabelUsername')?>" required autofocus>
<label for="inputUsername"><?=lang('Account.loginLabelUsername')?></label> <label for="inputUsername"><?=lang('Account.loginLabelUsername')?></label>
<?php else:?> <?php else:?>
<input type="email" name="email" id="inputEmail" class="form-control" placeholder="<?=lang('Account.loginLabelEmail')?>" required autofocus> <input type="email" name="email" id="inputEmail" class="form-control" placeholder="<?=lang('Account.loginLabelEmail')?>" required autofocus>
<label for="inputEmail"><?=lang('Account.loginLabelEmail')?></label> <label for="inputEmail"><?=lang('Account.loginLabelEmail')?></label>
<?php endif;?> <?php endif;?>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -36,7 +36,7 @@
</div> </div>
<button class="btn btn-primary btn-block" type="submit"><?=lang('Account.loginLabelSubmit')?></button> <button class="btn btn-primary btn-block" type="submit"><?=lang('Account.loginLabelSubmit')?></button>
<?= form_close() ?> <?= form_close() ?>
<?php if ($providers): ?> <?php if (isset($providers) && $providers): ?>
<div class="text-center">&mdash;</div> <div class="text-center">&mdash;</div>
<?php foreach ($providers as $provider): ?> <?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> <a href="<?= site_url('account/social/login/' . $provider) ?>" class="btn btn-info btn-block" type="submit"><?=lang('Account.loginLabelSocial') . $provider?></a>

Loading…
Cancel
Save