mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-09-08 11:26:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

Browse Source
This commit is contained in:
Isaac Connor committed 2017-09-26 16:13:51 -04:00
2 parents 8c1cfb28a5 1ba0a52769
commit 35482ba53c
8 files changed
+48 -68
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

web/includes/config.php.in
+3
View File
@@ -46,11 +46,14 @@ $configSubFolder = ZM_CONFIG_SUBDIR;
if ( is_dir($configSubFolder) ) {
if ( is_readable($configSubFolder) ) {
foreach ( glob("$configSubFolder/*.conf") as $filename ) {
error_log("processing $filename");
$configvals = array_replace($configvals, process_configfile($filename) );
}
} else {
error_log( "WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on $configSubFolder." );
}
} else {
error_log( "WARNING: ZoneMinder configuration subfolder found but is not a directory. Check $configSubFolder." );
}
# Now that our array our finalized, define each key => value