Merge pull request #4 from ygbillet/master
Fix some issues (first pull request :)
This commit is contained in:
commit
4dc72773dd
@ -167,7 +167,7 @@ function set_item_read($id)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function flush_unread($id)
|
function flush_unread()
|
||||||
{
|
{
|
||||||
\PicoTools\singleton('db')
|
\PicoTools\singleton('db')
|
||||||
->table('items')
|
->table('items')
|
||||||
@ -176,7 +176,7 @@ function flush_unread($id)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function flush_read($id)
|
function flush_read()
|
||||||
{
|
{
|
||||||
\PicoTools\singleton('db')
|
\PicoTools\singleton('db')
|
||||||
->table('items')
|
->table('items')
|
||||||
|
6
miniflux/vendor/PicoTools/Crypto.php
vendored
6
miniflux/vendor/PicoTools/Crypto.php
vendored
@ -43,7 +43,7 @@ function password_verify($password, $hash)
|
|||||||
{
|
{
|
||||||
$ret = crypt($password, $hash);
|
$ret = crypt($password, $hash);
|
||||||
|
|
||||||
if (! is_string($ret) || strlen($ret) != strlen($hash) || strlen($ret) <= 13) {
|
if (! is_string($ret) || strlen($ret) != strlen($hash) || strlen($ret) < 13) {
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -69,7 +69,7 @@ function password_hash($password)
|
|||||||
|
|
||||||
$ret = crypt($password, $hash);
|
$ret = crypt($password, $hash);
|
||||||
|
|
||||||
if (! is_string($ret) || strlen($ret) <= 13) {
|
if (! is_string($ret) || strlen($ret) < 13) {
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -147,4 +147,4 @@ function password_salt($required_salt_len)
|
|||||||
$salt = str_replace('+', '.', base64_encode($buffer));
|
$salt = str_replace('+', '.', base64_encode($buffer));
|
||||||
|
|
||||||
return substr($salt, 0, $required_salt_len);
|
return substr($salt, 0, $required_salt_len);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user