diff --git a/web/Makefile.am b/web/Makefile.am index bd34d9b37..e70e58ca4 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -16,6 +16,7 @@ web_DATA = \ zm_config.php \ zm_control_funcs.php \ zm_db.php \ + zm_export_funcs.php \ zm_funcs.php \ zm_html.php \ zm_html_styles.css \ @@ -34,6 +35,7 @@ web_DATA = \ zm_html_view_event.php \ zm_html_view_eventdetail.php \ zm_html_view_events.php \ + zm_html_view_export.php \ zm_html_view_filter.php \ zm_html_view_filtersave.php \ zm_html_view_frame.php \ @@ -108,6 +110,7 @@ EXTRA_DIST = \ zm_config.php.z \ zm_control_funcs.php \ zm_db.php \ + zm_export_funcs.php \ zm_funcs.php \ zm_html.php \ zm_html_styles.css \ @@ -125,6 +128,7 @@ EXTRA_DIST = \ zm_html_view_event.php \ zm_html_view_eventdetail.php \ zm_html_view_events.php \ + zm_html_view_export.php \ zm_html_view_filter.php \ zm_html_view_filtersave.php \ zm_html_view_frame.php \ diff --git a/web/zm_config.php.z b/web/zm_config.php.z index 1e7e937bc..775ffd354 100644 --- a/web/zm_config.php.z +++ b/web/zm_config.php.z @@ -162,6 +162,7 @@ $jws = array( 'event' => array( 'w'=>96, 'h'=>168 ), 'eventdetail' => array( 'w'=>400, 'h'=>220 ), 'events' => array( 'w'=>720, 'h'=>480 ), + 'export' => array( 'w'=>400, 'h'=>340 ), 'filter' => array( 'w'=>560, 'h'=>250 ), 'filtersave' => array( 'w'=>560, 'h'=>220 ), 'frames' => array( 'w'=>500, 'h'=>300 ), diff --git a/web/zm_export_funcs.php b/web/zm_export_funcs.php new file mode 100644 index 000000000..bcada2b59 --- /dev/null +++ b/web/zm_export_funcs.php @@ -0,0 +1,342 @@ + + + + +<?= $title ?> + + + + + + + + + + + + + + + + + + + + + + +
()
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Frame <?= $frame['FrameId'] ?>



+ + + + +; form.unarchive_btn.disabled = ; + form.export_btn.disabled = false; form.delete_btn.disabled = false; form.learn_btn.disabled = false; @@ -165,6 +166,7 @@ function configureButton(form,name) form.edit_btn.disabled = !checked; form.archive_btn.disabled = (!checked)||; form.unarchive_btn.disabled = (!checked)||; + form.export_btn.disabled = !checked; form.delete_btn.disabled = !checked; form.learn_btn.disabled = !checked; @@ -186,6 +188,21 @@ function editEvents( form, name ) } var Name = newWindow( '?view=eventdetail&'+eids.join( '&' ), 'zmEventDetail', , ); } +function exportEvents( form, name ) +{ + var eids = new Array(); + for (var i = 0; i < form.elements.length; i++) + { + if (form.elements[i].name.indexOf(name) == 0) + { + if ( form.elements[i].checked ) + { + eids[eids.length] = 'eids[]='+form.elements[i].value; + } + } + } + var Name = newWindow( '?view=export&'+eids.join( '&' ), 'zmExport', , ); +} function viewEvents( form, name ) { var events = new Array(); @@ -401,6 +418,7 @@ function viewEvents( form, name )          +      diff --git a/web/zm_html_view_export.php b/web/zm_html_view_export.php new file mode 100644 index 000000000..eb4b5eff8 --- /dev/null +++ b/web/zm_html_view_export.php @@ -0,0 +1,157 @@ + + + + +<?= ZM_WEB_TITLE_PREFIX ?> - <?= $zmSlangExport ?> + + + + +
+ + + + + + + + + + +
 
+ + + + + + + + + + +
  
checked>
checked>
checked>
checked>
checked>
checked>    checked> 
 
  
+
+ + + + + +
+ + +"; + for ( $i = 0; $i < 4096/strlen($buffer_string); $i++ ) + { + echo $buffer_string."\n"; + } +?> + + + + + + + + + + + + +



+ + + diff --git a/web/zm_lang_en_gb.php b/web/zm_lang_en_gb.php index 59ff89c36..a18c2cabf 100644 --- a/web/zm_lang_en_gb.php +++ b/web/zm_lang_en_gb.php @@ -89,6 +89,7 @@ $zmSlangApply = 'Apply'; $zmSlangApplyingStateChange = 'Applying State Change'; $zmSlangArchArchived = 'Archived Only'; $zmSlangArchive = 'Archive'; +$zmSlangArchived = 'Archived'; $zmSlangArchUnarchived = 'Unarchived Only'; $zmSlangAttrAlarmFrames = 'Alarm Frames'; $zmSlangAttrArchiveStatus = 'Archive Status'; @@ -218,6 +219,18 @@ $zmSlangEventName = 'Event Name'; $zmSlangEventPrefix = 'Event Prefix'; $zmSlangEvents = 'Events'; $zmSlangExclude = 'Exclude'; +$zmSlangExport = 'Export'; +$zmSlangExportOptions = 'Export Options'; +$zmSlangExportDetails = 'Export Event Details'; +$zmSlangExportFailed = 'Export Failed'; +$zmSlangExportFormat = 'Export File Format'; +$zmSlangExportFormatTar = 'Tar'; +$zmSlangExportFormatZip = 'Zip'; +$zmSlangExportFrames = 'Export Frame Details'; +$zmSlangExportImageFiles = 'Export Image Files'; +$zmSlangExporting = 'Exporting'; +$zmSlangExportVideoFiles = 'Export Video Files (if present)'; +$zmSlangExportMiscFiles = 'Export Other Files (if present)'; $zmSlangFar = 'Far'; $zmSlangFeed = 'Feed'; $zmSlangFilterPx = 'Filter Px';