valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address PHPStan warnings in 'classes/userhelper.php'.

This commit is contained in:
wn_ 2021-11-11 20:25:13 +00:00
parent f704d25ab1
commit 2e3a9098b9
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
classes/userhelper.php
View File

@ -32,7 +32,7 @@ class UserHelper {
/** has administrator permissions */ /** has administrator permissions */
const ACCESS_LEVEL_ADMIN = 10; const ACCESS_LEVEL_ADMIN = 10;
static function authenticate(string $login = null, string $password = null, bool $check_only = false, string $service = null) { static function authenticate(string $login = null, string $password = null, bool $check_only = false, string $service = null): bool {
if (!Config::get(Config::SINGLE_USER_MODE)) { if (!Config::get(Config::SINGLE_USER_MODE)) {
$user_id = false; $user_id = false;
$auth_module = false; $auth_module = false;
@ -99,7 +99,7 @@ class UserHelper {
} }
} }
static function load_user_plugins(int $owner_uid, PluginHost $pluginhost = null) { static function load_user_plugins(int $owner_uid, PluginHost $pluginhost = null): void {
if (!$pluginhost) $pluginhost = PluginHost::getInstance(); if (!$pluginhost) $pluginhost = PluginHost::getInstance();
@ -114,7 +114,7 @@ class UserHelper {
} }
} }
static function login_sequence() { static function login_sequence(): void {
$pdo = Db::pdo(); $pdo = Db::pdo();
if (Config::get(Config::SINGLE_USER_MODE)) { if (Config::get(Config::SINGLE_USER_MODE)) {
@ -159,7 +159,7 @@ class UserHelper {
} }
} }
static function print_user_stylesheet() { static function print_user_stylesheet(): void {
$value = get_pref(Prefs::USER_STYLESHEET); $value = get_pref(Prefs::USER_STYLESHEET);
if ($value) { if ($value) {
@ -170,7 +170,7 @@ class UserHelper {
} }
static function get_user_ip() { static function get_user_ip(): ?string {
foreach (["HTTP_X_REAL_IP", "REMOTE_ADDR"] as $hdr) { foreach (["HTTP_X_REAL_IP", "REMOTE_ADDR"] as $hdr) {
if (isset($_SERVER[$hdr])) if (isset($_SERVER[$hdr]))
return $_SERVER[$hdr]; return $_SERVER[$hdr];
@ -179,7 +179,7 @@ class UserHelper {
return null; return null;
} }
static function get_login_by_id(int $id) { static function get_login_by_id(int $id): ?string {
$user = ORM::for_table('ttrss_users') $user = ORM::for_table('ttrss_users')
->find_one($id); ->find_one($id);
@ -189,7 +189,7 @@ class UserHelper {
return null; return null;
} }
static function find_user_by_login(string $login) { static function find_user_by_login(string $login): ?int {
$user = ORM::for_table('ttrss_users') $user = ORM::for_table('ttrss_users')
->where('login', $login) ->where('login', $login)
->find_one(); ->find_one();
@ -200,7 +200,7 @@ class UserHelper {
return null; return null;
} }
static function logout() { static function logout(): void {
if (session_status() === PHP_SESSION_ACTIVE) if (session_status() === PHP_SESSION_ACTIVE)
session_destroy(); session_destroy();
@ -211,11 +211,11 @@ class UserHelper {
session_commit(); session_commit();
} }
static function get_salt() { static function get_salt(): string {
return substr(bin2hex(get_random_bytes(125)), 0, 250); return substr(bin2hex(get_random_bytes(125)), 0, 250);
} }
static function reset_password($uid, $format_output = false, $new_password = "") { static function reset_password(int $uid, bool $format_output = false, string $new_password = ""): void {
$user = ORM::for_table('ttrss_users')->find_one($uid); $user = ORM::for_table('ttrss_users')->find_one($uid);
$message = ""; $message = "";
@ -298,7 +298,7 @@ class UserHelper {
} }
} }
static function get_otp_secret(int $owner_uid, bool $show_if_enabled = false) { static function get_otp_secret(int $owner_uid, bool $show_if_enabled = false): ?string {
$user = ORM::for_table('ttrss_users')->find_one($owner_uid); $user = ORM::for_table('ttrss_users')->find_one($owner_uid);
if ($user) { if ($user) {
@ -333,7 +333,7 @@ class UserHelper {
return null; return null;
} }
static function is_default_password() { static function is_default_password(): bool {
$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
if ($authenticator && if ($authenticator &&
@ -345,10 +345,12 @@ class UserHelper {
return false; return false;
} }
static function hash_password(string $pass, string $salt, string $algo = "") { /**
* @param UserHelper::HASH_ALGO_* $algo
if (!$algo) $algo = self::HASH_ALGOS[0]; *
* @return false|string False if the password couldn't be hashed, otherwise the hash string.
*/
static function hash_password(string $pass, string $salt, string $algo = self::HASH_ALGOS[0]) {
$pass_hash = ""; $pass_hash = "";
switch ($algo) { switch ($algo) {