Merge branch 'master' into add_manufacturer_model_to_monitors

This commit is contained in:
Isaac Connor 2021-11-17 13:52:53 -05:00
commit 7e1df53aa6
2 changed files with 24 additions and 4 deletions

View File

@ -786,7 +786,7 @@ function exportFileList(
}
closedir($dir);
}
ZM\Debug(print_r($files, true));
ZM\Debug('All available files: '.print_r($files, true));
$exportFileList = array();
@ -843,6 +843,18 @@ function exportFileList(
ZM\Debug('Not including frame images');
} # end if exportImages
if ($exportVideo) {
$filesLeft = array();
foreach ($files as $file) {
if (preg_match('/\.(?:mpg|mpeg|mov|swf|mp4|mkv|avi|asf|3gp)$/', $file)) {
$exportFileList[$file] = $file;
} else {
$filesLeft[$file] = $file;
}
}
$files = $filesLeft;
}
if ($exportMisc) {
foreach ($files as $file) {
$exportFileList[$file] = $file;

View File

@ -44,6 +44,7 @@ $tabs['medband'] = translate('MediumBW');
$tabs['lowband'] = translate('LowBW');
$tabs['users'] = translate('Users');
$tabs['control'] = translate('Control');
$tabs['privacy'] = translate('Privacy');
if (isset($_REQUEST['tab']))
$tab = validHtmlStr($_REQUEST['tab']);
@ -53,7 +54,6 @@ else
$focusWindow = true;
xhtmlHeaders(__FILE__, translate('Options'));
?>
<body>
<?php echo getNavBarHTML(); ?>
@ -194,6 +194,14 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
}
// Have to do this
header('Location: '.$redirect);
} else if ($tab == 'privacy') {
if (canView('System')) {
$redirect = '?view=privacy';
} else {
$redirect = '?view=error';
}
// Have to do this
header('Location: '.$redirect);
} else if ( $tab == 'servers' ) {
?>
<form name="serversForm" method="post" action="?">