forked from leftypol/leftypol
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
This commit is contained in:
commit
b4efebae55
3 changed files with 8 additions and 5 deletions
|
@ -108,7 +108,7 @@ if (isset($_COOKIE[$config['cookies']['mod']])) {
|
|||
$user = $query->fetch();
|
||||
|
||||
// validate password hash
|
||||
if ($cookie[1] != mkhash($cookie[0], $user['password'], $cookie[2])) {
|
||||
if ($cookie[1] !== mkhash($cookie[0], $user['password'], $cookie[2])) {
|
||||
// Malformed cookies
|
||||
destroyCookies();
|
||||
error($config['error']['malformed']);
|
||||
|
|
|
@ -28,7 +28,7 @@ function mod_page($title, $template, $args, $subtitle = false) {
|
|||
);
|
||||
}
|
||||
|
||||
function mod_login() {
|
||||
function mod_login($redirect = false) {
|
||||
global $config;
|
||||
|
||||
$args = array();
|
||||
|
@ -49,6 +49,9 @@ function mod_login() {
|
|||
// Set cookies
|
||||
setCookies();
|
||||
|
||||
if ($redirect)
|
||||
header('Location: ?' . $redirect, true, $config['redirect_http']);
|
||||
else
|
||||
header('Location: ?/', true, $config['redirect_http']);
|
||||
}
|
||||
}
|
||||
|
|
2
mod.php
2
mod.php
|
@ -91,7 +91,7 @@ $pages = array(
|
|||
|
||||
|
||||
if (!$mod) {
|
||||
$pages = array('!!' => 'login');
|
||||
$pages = array('!^(.+)?$!' => 'login');
|
||||
} elseif (isset($_GET['status'], $_GET['r'])) {
|
||||
header('Location: ' . $_GET['r'], true, (int)$_GET['status']);
|
||||
exit;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue