Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

web/includes/Filter.php

@@ -11,6 +11,7 @@ public $defaults = array(
     'AutoDelete'      =>  0,
     'AutoArchive'     =>  0,
     'AutoVideo'       =>  0,
+    'AutoUpload'      =>  0,
     'AutoMessage'     =>  0,
     'AutoMove'        =>  0,
     'AutoMoveTo'      =>  0,

web/views/archive.php

@@ -45,6 +45,7 @@ if ( $archivetype ) {
     $filename_path = ZM_DIR_EXPORTS.'/'.$filename;
     Logger::Debug("downloading archive from $filename_path");
     if ( is_readable($filename_path) ) {
+      ob_clean();
       header("Content-type: application/$mimetype" );
       header("Content-Disposition: inline; filename=$filename");
       header('Content-Length: ' . filesize($filename_path) );