From b5146a067c9a07eeaa991d44880e401cc5728d20 Mon Sep 17 00:00:00 2001
From: stagecoach <stagecoach@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Tue, 19 Oct 2010 21:14:08 +0000
Subject: [PATCH] Updated skins/classic/includes/export_functions.php: -
 human-readable time and date stamp in file name of master .html file - after
 download to client, master .html file is being removed from server

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3149 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/skins/classic/includes/export_functions.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php
index 5f489d11f..c9e01a45a 100644
--- a/web/skins/classic/includes/export_functions.php
+++ b/web/skins/classic/includes/export_functions.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 //
 // ZoneMinder web export function library, $Date$, $Revision$
 // Copyright (C) 2001-2008 Philip Coombes
@@ -1046,6 +1046,7 @@ function exportEvents( $eids, $exportDetail, $exportFrames, $exportImages, $expo
         $export_root = "zmExport";
         $export_listFile = "zmFileList.txt";
         $exportFileList = array();
+		$html_eventMaster = '';
         
 
         if ( is_array( $eids ) )
@@ -1070,11 +1071,11 @@ function exportEvents( $eids, $exportDetail, $exportFrames, $exportImages, $expo
 				$eids = array($eids);
 			}
 			$monitorPath = 'events/';
-			$file = "zmEventImagesMaster" . time() . ".html";
-			if ( !($fp = fopen( $monitorPath."/".$file, "w" )) ) die( "Can't open event images export file '$file'" );
+			$html_eventMaster = 'zmEventImagesMaster_'.date('Ymd_H:i:s'). '.html';
+			if ( !($fp = fopen( $monitorPath."/".$html_eventMaster, "w" )) ) die( "Can't open event images export file '$html_eventMaster'" );
 			fwrite( $fp, exportEventImagesMaster( $eids ) );
 			fclose( $fp );
-			$exportFileList[] = $monitorPath."/".$file;
+			$exportFileList[] = $monitorPath."/".$html_eventMaster;
 		}
 
         $listFile = "temp/".$export_listFile;
@@ -1120,6 +1121,12 @@ function exportEvents( $eids, $exportDetail, $exportFrames, $exportImages, $expo
                 return( false );
             }
         }
+		
+		//clean up temporary files
+		if(!empty($html_eventMaster)) {
+			unlink($monitorPath.'/'.$html_eventMaster);
+		}
+
     }
     return( $archive );
 }