ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Test for values being trueish as passing null to strcmp is deprecated

pull/3551/head
Isaac Connor 2022-06-01 10:41:07 -04:00 committed by Isaac Connor
parent 1978bc4659
commit d09c4ffc93
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/includes/functions.php
View File

@ -496,9 +496,12 @@ function htmlOptions($options, $values) {
} else {
$text = $option;
}
$selected = is_array($values) ? in_array($value, $values) : (!strcmp($value, $values));
if ( !$has_selected )
$has_selected = $selected;
$selected = false;
if ($values) {
$selected = is_array($values) ? in_array($value, $values) : (!strcmp($value, $values));
if ( !$has_selected )
$has_selected = $selected;
}
$options_html .= '<option value="'.htmlspecialchars($value, ENT_COMPAT | ENT_HTML401, ini_get('default_charset'), false).'"'.
($selected?' selected="selected"':'').
@ -2144,6 +2147,9 @@ function folder_size($dir) {
} // end function folder_size
function human_filesize($size, $precision = 2) {
if ($size === null) {
return 'null';
}
$units = array('B ','kB','MB','GB','TB','PB','EB','ZB','YB');
$step = 1024;
$i = 0;