';
foreach ( $events as $event ) {
if ( $event->MonitorId() == $monitor_id ) {
- eventlist_html($event);
+ echo eventlist_html($event, $exportDetail, $exportFrames);
} # end if its the right monitor
} # end foreach event
echo '
';
} # end foreach monitor
?>
-
-
@@ -681,7 +675,7 @@ function exportEventImagesMaster($eids) {
@@ -751,7 +763,14 @@ function loadintoIframe(iframeid, url) {
return ob_get_clean();
}
-function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $exportVideo, $exportMisc) {
+function exportFileList(
+ $event,
+ $exportDetail,
+ $exportFrames,
+ $exportImages,
+ $exportVideo,
+ $exportMisc
+) {
if ( !canView('Events') or !$event ) {
return;
@@ -773,28 +792,31 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex
if ( $exportDetail ) {
$file = 'zmEventDetail.html';
- if ( !($fp = fopen($eventPath.'/'.$file, 'w')) ) {
- ZM\Fatal("Can't open event detail export file '$file'");
+ if ( $fp = fopen($eventPath.'/'.$file, 'w') ) {
+ fwrite($fp, exportEventDetail($event, $exportFrames, $exportImages));
+ fclose($fp);
+ $exportFileList[$file] = $file;
+ } else {
+ ZM\Error("Can't open event detail export file '$file'");
}
- fwrite($fp, exportEventDetail($event, $exportFrames, $exportImages));
- fclose($fp);
- $exportFileList[$file] = $file;
}
+
if ( $exportFrames ) {
$file = 'zmEventFrames.html';
- if ( !($fp = fopen($eventPath.'/'.$file, 'w')) ) {
- ZM\Fatal("Can't open event frames export file '$file'");
+ if ( $fp = fopen($eventPath.'/'.$file, 'w') ) {
+ fwrite($fp, exportEventFrames($event, $exportDetail, $exportImages));
+ fclose($fp);
+ $exportFileList[$file] = $file;
+ } else {
+ ZM\Error("Can't open event frames export file '$file'");
}
- fwrite($fp, exportEventFrames($event, $exportDetail, $exportImages));
- fclose($fp);
- $exportFileList[$file] = $file;
}
if ( $exportImages ) {
$filesLeft = array();
$myfilelist = array();
foreach ( $files as $file ) {
- if ( preg_match('/-(?:capture|analyse).jpg$/', $file ) ) {
+ if ( preg_match('/-(?:capture|analyse).jpg$/', $file) ) {
$myfilelist[$file] = $exportFileList[$file] = $file;
} else {
$filesLeft[$file] = $file;
@@ -805,11 +827,13 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex
// create an image slider
if ( !empty($myfilelist) ) {
$file = 'zmEventImages.html';
- if ( !($fp = fopen($file, 'w')) )
- ZM\Fatal("Can't open event images export file '$file'");
- fwrite($fp, exportEventImages($event, $exportDetail, $exportFrames, $myfilelist));
- fclose($fp);
- $exportFileList[$file] = $file;
+ if ( $fp = fopen($eventPath.'/'.$file, 'w') ) {
+ fwrite($fp, exportEventImages($event, $exportDetail, $exportFrames, $myfilelist));
+ fclose($fp);
+ $exportFileList[$file] = $file;
+ } else {
+ ZM\Error("Can't open event images export file '$file'");
+ }
}
} # end if exportImages
@@ -823,7 +847,7 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex
}
}
$files = $filesLeft;
- } # end if exportVideo
+ } # end if exportVideo
if ( $exportMisc ) {
foreach ( $files as $file ) {
@@ -869,13 +893,14 @@ function exportEvents(
# Ensure that we are going to be able to do this.
if ( ! ( mkdir($export_dir) or file_exists($export_dir) ) ) {
- ZM\Fatal("Can't create exports dir at '$export_dir'");
- } else {
- ZM\Logger::Debug("Successfully created dir '$export_dir'");
+ ZM\Error("Can't create exports dir at '$export_dir'");
+ return false;
}
+ ZM\Logger::Debug("Successfully created dir '$export_dir'");
chmod($export_dir, 0700);
if ( !chdir($export_dir) ) {
- ZM\Fatal("Can't chdir to $export_dir");
+ ZM\Error("Can't chdir to $export_dir");
+ return;
}
$export_root = 'zmExport';
@@ -886,43 +911,37 @@ function exportEvents(
if ( !is_array($eids) ) {
$eids = array($eids);
}
- ZM\Logger::Debug('Eids: ' . print_r($eids,true));
foreach ( $eids as $eid ) {
$event = new ZM\Event($eid);
$event_dir = $export_dir.'/'.$event->Id();
- if ( !(mkdir($event_dir) or file_exists($event_dir) ) ) {
+ if ( !(mkdir($event_dir) or file_exists($event_dir)) ) {
ZM\Error("Can't mkdir $event_dir");
}
$event_exportFileList = exportFileList($event, $exportDetail, $exportFrames, $exportImages, $exportVideo, $exportMisc);
- ZM\Logger::Debug("File list for event $eid " . print_r($event_exportFileList, true));
- $exportFileList = array_merge($exportFileList,$event_exportFileList);
+ $exportFileList = array_merge($exportFileList, $event_exportFileList);
foreach ( $event_exportFileList as $file ) {
- if ( preg_match('/\.html$/', $file) )
- continue;
- #exec('cp -as '.$event->Path().'/../'.$file.' '.$export_dir.'/'.$file, $output, $return);
+ #if ( preg_match('/\.html$/', $file) )
+ #continue;
$cmd = 'cp -as '.$event->Path().'/'.$file.' '.$export_dir.'/'.$event->Id().'/'.$file. ' 2>&1';
exec($cmd, $output, $return);
ZM\Logger::Debug($cmd.' return code: '.$return.' output: '.print_r($output,true));
- }
+ } # end foreach event_exportFile
} # end foreach event
- // create an master image
- if ( $exportImages ) {
- if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/jquery.js', $export_dir.'/jquery.js') )
- ZM\Error('Failed linking jquery.js');
- //if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/video.js', $export_dir.'/video.js') )
- //Error("Failed linking video.js");
+ if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/jquery.js', $export_dir.'/jquery.js') )
+ ZM\Error('Failed linking jquery.js');
+ //if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/video.js', $export_dir.'/video.js') )
+ //Error("Failed linking video.js");
- $html_eventMaster_file = 'zmEventImagesMaster_'.date('Ymd_His'). '.html';
- $html_eventMaster_path = $export_dir.'/'.$html_eventMaster_file;
+ $html_eventMaster_file = 'zmEventImagesMaster.html';
+ $html_eventMaster_path = $export_dir.'/'.$html_eventMaster_file;
- if ( ($fp = fopen($html_eventMaster_path, 'w')) ) {
- fwrite($fp, exportEventImagesMaster($eids));
- fclose($fp);
- $exportFileList[] = $html_eventMaster_file;
- } else {
- ZM\Error("Can't open event images export file '$html_eventMaster_path'");
- }
+ if ( ($fp = fopen($html_eventMaster_path, 'w')) ) {
+ fwrite($fp, exportEventImagesMaster($eids, $exportDetail, $exportFrames));
+ fclose($fp);
+ $exportFileList[] = $html_eventMaster_file;
+ } else {
+ ZM\Error("Can't open event images export file '$html_eventMaster_path'");
}
$listFile = $export_dir.'/'.$export_listFile;
@@ -949,10 +968,10 @@ function exportEvents(
$exportFormat .= '.gz';
}
if ( $exportStructure == 'flat' ) {
- if (preg_match("/BSD/i", $version)) {
- $command .= " -s '#^.*/##'";
+ if ( preg_match('/BSD/i', $version) ) {
+ $command .= ' -s \'#^.*/##\'';
} else {
- $command .= " --xform='s#^.+/##x'";
+ $command .= ' --xform=\'s#^.+/##x\'';
}
}
$command .= ' --file='.escapeshellarg($archive);
@@ -974,10 +993,10 @@ function exportEvents(
return false;
}
- //clean up temporary files
+ // clean up temporary files
if ( !empty($html_eventMaster) ) {
unlink($monitorPath.'/'.$html_eventMaster);
}
return '?view=archive%26type='.$exportFormat.'%26connkey='.$connkey;
-}
+} // end function exportEvents
diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php
index c008b0f2b..6abfd62bf 100644
--- a/web/skins/classic/views/export.php
+++ b/web/skins/classic/views/export.php
@@ -101,7 +101,7 @@ if ( isset($_REQUEST['eid']) and $_REQUEST['eid'] ) {
$eventsSql .= $_REQUEST['filter']['sql'];
}
$eventsSql .= " ORDER BY $sortColumn $sortOrder";
- if ( isset($_REQUEST['filter']['Query']['limit']) )
+ if ( isset($_REQUEST['filter']['Query']['limit']) )
$eventsSql .= ' LIMIT '.validInt($_REQUEST['filter']['Query']['limit']);
} # end if filter
@@ -244,30 +244,28 @@ while ( $event_row = dbFetchNext($results) ) {
-
-