SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'remastering' of https://gitea.steelants.cz/SH/PHP_SMART_HOME_V3 into remastering

Browse Source
This commit is contained in:
GamerClassN7
2020-10-31 21:37:46 +01:00
parent 8a00190850 38cc436f4d
commit 4b94ef29c1
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/managers/UserManager.php
View File

@@ -44,7 +44,6 @@ class UserManager
public static function login ($username, $password, $rememberMe) { public static function login ($username, $password, $rememberMe) {
try { try {
if ($user = Db::loadOne ('SELECT * FROM users WHERE (LOWER(username)=LOWER(?) OR LOWER(email)=LOWER(?))', array ($username, $username))) { if ($user = Db::loadOne ('SELECT * FROM users WHERE (LOWER(username)=LOWER(?) OR LOWER(email)=LOWER(?))', array ($username, $username))) {
var_dump($user);
if ($user['password'] == UserManager::getHashPassword($password)) { if ($user['password'] == UserManager::getHashPassword($password)) {
if (isset($rememberMe) && $rememberMe == 'true') { if (isset($rememberMe) && $rememberMe == 'true') {
setcookie ("rememberMe", self::setEncryptedCookie($user['username']), time () + (30 * 24 * 60 * 60 * 1000), BASEDIR, $_SERVER['HTTP_HOST'], 1); setcookie ("rememberMe", self::setEncryptedCookie($user['username']), time () + (30 * 24 * 60 * 60 * 1000), BASEDIR, $_SERVER['HTTP_HOST'], 1);
@@ -59,7 +58,9 @@ class UserManager
throw new PDOException("Uživatel s tím to jménem neexistuje!"); throw new PDOException("Uživatel s tím to jménem neexistuje!");
} }
} catch(PDOException $error) { } catch(PDOException $error) {
echo $error->getMessage(); $_SESSION['msg'] = $error->getMessage();
unset($_POST);
header('Location: ' . BASEURL . 'login');
die(); die();
} }
} }

4
app/views/templates/part/loginForm.phtml
View File

@@ -14,6 +14,10 @@
<div class="label">Remember me:</div> <div class="label">Remember me:</div>
<input class="" type="checkbox" name="remember" value="true"/> <input class="" type="checkbox" name="remember" value="true"/>
</div> </div>
<?php if (!empty ($_SESSION['msg'])): ?>
<label class="message"><?php echo $_SESSION['msg']; ?></label><br/><br/>
<?php unset ($_SESSION['msg']); ?>
<?php endif; ?>
<input type="submit" class="button" name="login" value="Login"/> <input type="submit" class="button" name="login" value="Login"/>
</form> </form>
</div> </div>

9
public/css/main.css
View File

@@ -475,6 +475,15 @@ html {
color: #a32929; color: #a32929;
} }
.message {
border: 2px solid #a32929;
background-color: #f6cbcb;
color: #a32929;
padding: .75rem 1rem;
margin-bottom: .8em;
width: 100%;
}
.content { .content {
width: fit-content; width: fit-content;
margin: 5px; margin: 5px;