ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test for existence of filter in query

This commit is contained in:
Isaac Connor 2019-12-02 12:30:15 -05:00
parent 355fceccb4
commit 576dd23907
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
web/includes/functions.php
View File

@ -1449,7 +1449,7 @@ function sortHeader($field, $querySep='&') {
global $view;
return implode($querySep, array(
'?view='.$view,
'page=1'.$_REQUEST['filter']['query'],
'page=1'.(isset($_REQUEST['filter'])?$_REQUEST['filter']['query']:''),
'sort_field='.$field,
'sort_asc='.($_REQUEST['sort_field'] == $field ? !$_REQUEST['sort_asc'] : 0),
'limit='.validInt($_REQUEST['limit']),
@ -2569,4 +2569,37 @@ function array_recursive_diff($aArray1, $aArray2) {
return $aReturn;
}
function html_radio($name, $values, $selected=null, $options=array(), $attrs=array()) {
$html = '';
if ( isset($options['default']) and ( $selected == null ) ) {
$selected = $options['default'];
} # end if
foreach ( $values as $value => $label ) {
if ( isset($options['container']) ) {
$html .= $options['container'][0];
}
$html .= sprintf('
<div class="form-check%7$s">
<label class="form-check-label radio%7$s" for="%1$s%6$s%2$s">
<input class="form-check-input" type="radio" name="%1$s" value="%2$s" id="%1$s%6$s%2$s" %4$s%5$s />
%3$s</label></div>
', $name, $value, $label, ($value==$selected?' checked="checked"':''),
implode(' ', array_map(
function($attr, $value){return $attr.'="'.$value.'"';},
array_keys($attrs),
array_values($attrs)
),
),
( isset($options['id']) ? $options['id'] : ''),
( ( (!isset($options['inline'])) or $options['inline'] ) ? '-inline' : ''),
);
if ( isset($options['container']) ) {
$html .= $options['container'][1];
}
} # end foreach value
return $html;
} # end sub html_radio
?>