webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-01 21:06:51 +03:00
Code Activity

psalm fixes (drop safeserver() (not used), $_COOKIE always contains strings etc).

Browse Source
This commit is contained in:
David Goodwin
2022-10-12 20:52:49 +01:00
parent 7caf25244a
commit 3017ea3f3c
1 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
functions.inc.php
View File

@ -403,22 +403,6 @@ function safepost($param, $default = "")
return $retval; return $retval;
} }
/**
* safeserver
* @param string $param
* @param string $default (optional)
* @return string value from $_SERVER[$param] or $default
* @see safeget()
*/
function safeserver($param, $default = "")
{
$retval = $default;
if (isset($_SERVER[$param])) {
$retval = $_SERVER[$param];
}
return $retval;
}
/** /**
* safecookie * safecookie
* @param string $param * @param string $param
@ -429,7 +413,7 @@ function safeserver($param, $default = "")
function safecookie($param, $default = "") function safecookie($param, $default = "")
{ {
$retval = $default; $retval = $default;
if (isset($_COOKIE[$param]) && is_string($_COOKIE[$param])) { if (isset($_COOKIE[$param])) {
$retval = $_COOKIE[$param]; $retval = $_COOKIE[$param];
} }
return $retval; return $retval;
@ -894,13 +878,16 @@ function generate_password($length = 12)
function validate_password($password) function validate_password($password)
{ {
$result = array(); $result = array();
$val_conf = Config::read_array('password_validation');
if (Config::has('min_password_length')) { $config = Config::getInstance()->getAll();
$minlen = (int)Config::read('min_password_length'); # used up to 2.3.x - check it for backward compatibility
if ($minlen > 0) { $val_conf = $config['password_validation'] ?? [];
$val_conf['/.{' . $minlen . '}/'] = "password_too_short $minlen";
} $minlen = $config['min_password_length'] ?? null;
if (is_numeric($minlen) && $minlen > 0) {
$minlen = (int)$minlen; # used up to 2.3.x -
$val_conf['/.{' . $minlen . '}/'] = "password_too_short $minlen";
} }
foreach ($val_conf as $regex => $message) { foreach ($val_conf as $regex => $message) {