Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
This commit is contained in:
Isaac Connor
commit
234a9ce236
|
|
@ -505,6 +505,20 @@ our @options = (
|
|||
type => $types{directory},
|
||||
category => "paths",
|
||||
},
|
||||
{
|
||||
name => "ZM_DIR_EXPORTS",
|
||||
default => "@ZM_TMPDIR@",
|
||||
description => "Directory where exported archives are stored",
|
||||
help => qqq("
|
||||
This is the path to the exports directory where exported
|
||||
tar.gz and zip archives are stored. By default this points to
|
||||
ZoneMinder's temp folder, which often sits in ram. Since exported
|
||||
archives can potentially become large, it is a good idea to move
|
||||
this folder to some other location on machines with low memory.
|
||||
"),
|
||||
type => $types{directory},
|
||||
category => "paths",
|
||||
},
|
||||
{
|
||||
name => "ZM_PATH_ZMS",
|
||||
default => "/cgi-bin/nph-zms",
|
||||
|
|
|
|||
|
|
@ -100,14 +100,13 @@ GetOptions(
|
|||
'interactive' =>\$interactive,
|
||||
'continuous' =>\$continuous,
|
||||
'version' =>\$version
|
||||
) or pod2usage(-exitstatus => -1);
|
||||
) or pod2usage(-exitstatus => -1);
|
||||
|
||||
if ( $version ) {
|
||||
print( ZoneMinder::Base::ZM_VERSION . "\n");
|
||||
exit(0);
|
||||
}
|
||||
if ( ($report + $interactive + $continuous) > 1 )
|
||||
{
|
||||
if ( ($report + $interactive + $continuous) > 1 ) {
|
||||
print( STDERR "Error, only one option may be specified\n" );
|
||||
pod2usage(-exitstatus => -1);
|
||||
}
|
||||
|
|
@ -128,9 +127,9 @@ MAIN: while( $loop ) {
|
|||
|
||||
if ( $continuous ) {
|
||||
Error("Unable to connect to database");
|
||||
# if we are running continuously, then just skip to the next
|
||||
# interval, otherwise we are a one off run, so wait a second and
|
||||
# retry until someone kills us.
|
||||
# if we are running continuously, then just skip to the next
|
||||
# interval, otherwise we are a one off run, so wait a second and
|
||||
# retry until someone kills us.
|
||||
sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} );
|
||||
} else {
|
||||
Fatal("Unable to connect to database");
|
||||
|
|
@ -138,9 +137,9 @@ MAIN: while( $loop ) {
|
|||
} # end while can't connect to the db
|
||||
|
||||
if ( $continuous ) {
|
||||
# if we are running continuously, then just skip to the next
|
||||
# interval, otherwise we are a one off run, so wait a second and
|
||||
# retry until someone kills us.
|
||||
# if we are running continuously, then just skip to the next
|
||||
# interval, otherwise we are a one off run, so wait a second and
|
||||
# retry until someone kills us.
|
||||
sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} );
|
||||
} else {
|
||||
sleep 1;
|
||||
|
|
@ -162,32 +161,27 @@ MAIN: while( $loop ) {
|
|||
$cleaned = 0;
|
||||
my $res = $monitorSelectSth->execute()
|
||||
or Fatal( "Can't execute: ".$monitorSelectSth->errstr() );
|
||||
while( my $monitor = $monitorSelectSth->fetchrow_hashref() )
|
||||
{
|
||||
while( my $monitor = $monitorSelectSth->fetchrow_hashref() ) {
|
||||
Debug( "Found database monitor '$monitor->{Id}'" );
|
||||
my $db_events = $db_monitors->{$monitor->{Id}} = {};
|
||||
my $res = $eventSelectSth->execute( $monitor->{Id} )
|
||||
or Fatal( "Can't execute: ".$eventSelectSth->errstr() );
|
||||
while ( my $event = $eventSelectSth->fetchrow_hashref() )
|
||||
{
|
||||
while ( my $event = $eventSelectSth->fetchrow_hashref() ) {
|
||||
$db_events->{$event->{Id}} = $event->{Age};
|
||||
}
|
||||
Debug( "Got ".int(keys(%$db_events))." events\n" );
|
||||
}
|
||||
|
||||
my $fs_monitors;
|
||||
foreach my $monitor ( glob("[0-9]*") )
|
||||
{
|
||||
# Thie glob above gives all files starting with a digit. So a monitor with a name starting with a digit will be in this list.
|
||||
foreach my $monitor ( glob("[0-9]*") ) {
|
||||
# Thie glob above gives all files starting with a digit. So a monitor with a name starting with a digit will be in this list.
|
||||
next if $monitor =~ /\D/;
|
||||
Debug( "Found filesystem monitor '$monitor'" );
|
||||
my $fs_events = $fs_monitors->{$monitor} = {};
|
||||
( my $monitor_dir ) = ( $monitor =~ /^(.*)$/ ); # De-taint
|
||||
|
||||
if ( $Config{ZM_USE_DEEP_STORAGE} )
|
||||
{
|
||||
foreach my $day_dir ( glob("$monitor_dir/*/*/*") )
|
||||
{
|
||||
if ( $Config{ZM_USE_DEEP_STORAGE} ) {
|
||||
foreach my $day_dir ( glob("$monitor_dir/*/*/*") ) {
|
||||
Debug( "Checking $day_dir" );
|
||||
( $day_dir ) = ( $day_dir =~ /^(.*)$/ ); # De-taint
|
||||
chdir( $day_dir );
|
||||
|
|
@ -196,86 +190,63 @@ MAIN: while( $loop ) {
|
|||
my @event_links = sort { $b <=> $a } grep { -l $_ } readdir( DIR );
|
||||
closedir( DIR );
|
||||
my $count = 0;
|
||||
foreach my $event_link ( @event_links )
|
||||
{
|
||||
foreach my $event_link ( @event_links ) {
|
||||
Debug( "Checking link $event_link" );
|
||||
( my $event = $event_link ) =~ s/^.*\.//;
|
||||
my $event_path = readlink( $event_link );
|
||||
if ( $count++ > MAX_AGED_DIRS )
|
||||
{
|
||||
if ( $count++ > MAX_AGED_DIRS ) {
|
||||
$fs_events->{$event} = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( !-e $event_path )
|
||||
{
|
||||
} else {
|
||||
if ( !-e $event_path ) {
|
||||
aud_print( "Event link $day_dir/$event_link does not point to valid target" );
|
||||
if ( confirm() )
|
||||
{
|
||||
if ( confirm() ) {
|
||||
( $event_link ) = ( $event_link =~ /^(.*)$/ ); # De-taint
|
||||
unlink( $event_link );
|
||||
$cleaned = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$fs_events->{$event} = (time() - ($^T - ((-M $event_path) * 24*60*60)));
|
||||
}
|
||||
}
|
||||
}
|
||||
} # end foreach event_link
|
||||
chdir( EVENT_PATH );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} # end foreach day_dir
|
||||
} else {
|
||||
chdir( $monitor_dir );
|
||||
opendir( DIR, "." ) or Fatal( "Can't open directory '$monitor_dir': $!" );
|
||||
my @temp_events = sort { $b <=> $a } grep { -d $_ && $_ =~ /^\d+$/ } readdir( DIR );
|
||||
closedir( DIR );
|
||||
my $count = 0;
|
||||
foreach my $event ( @temp_events )
|
||||
{
|
||||
if ( $count++ > MAX_AGED_DIRS )
|
||||
{
|
||||
foreach my $event ( @temp_events ) {
|
||||
if ( $count++ > MAX_AGED_DIRS ) {
|
||||
$fs_events->{$event} = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$fs_events->{$event} = (time() - ($^T - ((-M $event) * 24*60*60)));
|
||||
}
|
||||
}
|
||||
chdir( EVENT_PATH );
|
||||
}
|
||||
Debug( "Got ".int(keys(%$fs_events))." events\n" );
|
||||
}
|
||||
} # end foreach monitor Id
|
||||
redo MAIN if ( $cleaned );
|
||||
|
||||
$cleaned = 0;
|
||||
while ( my ( $fs_monitor, $fs_events ) = each(%$fs_monitors) )
|
||||
{
|
||||
if ( my $db_events = $db_monitors->{$fs_monitor} )
|
||||
{
|
||||
if ( $fs_events )
|
||||
{
|
||||
while ( my ( $fs_event, $age ) = each(%$fs_events ) )
|
||||
{
|
||||
if ( !defined($db_events->{$fs_event}) && ($age < 0 || ($age > $Config{ZM_AUDIT_MIN_AGE})) )
|
||||
{
|
||||
while ( my ( $fs_monitor, $fs_events ) = each(%$fs_monitors) ) {
|
||||
if ( my $db_events = $db_monitors->{$fs_monitor} ) {
|
||||
if ( $fs_events ) {
|
||||
while ( my ( $fs_event, $age ) = each(%$fs_events ) ) {
|
||||
if ( !defined($db_events->{$fs_event}) && ($age < 0 || ($age > $Config{ZM_AUDIT_MIN_AGE})) ) {
|
||||
aud_print( "Filesystem event '$fs_monitor/$fs_event' does not exist in database" );
|
||||
if ( confirm() )
|
||||
{
|
||||
if ( confirm() ) {
|
||||
deleteEventFiles( $fs_event, $fs_monitor );
|
||||
$cleaned = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
aud_print( "Filesystem monitor '$fs_monitor' does not exist in database" );
|
||||
if ( confirm() )
|
||||
{
|
||||
if ( confirm() ) {
|
||||
my $command = "rm -rf $fs_monitor";
|
||||
executeShellCommand( $command );
|
||||
$cleaned = 1;
|
||||
|
|
@ -284,14 +255,12 @@ MAIN: while( $loop ) {
|
|||
}
|
||||
|
||||
my $monitor_links;
|
||||
foreach my $link ( glob("*") )
|
||||
{
|
||||
foreach my $link ( glob("*") ) {
|
||||
next if ( !-l $link );
|
||||
next if ( -e $link );
|
||||
|
||||
aud_print( "Filesystem monitor link '$link' does not point to valid monitor directory" );
|
||||
if ( confirm() )
|
||||
{
|
||||
if ( confirm() ) {
|
||||
( $link ) = ( $link =~ /^(.*)$/ ); # De-taint
|
||||
my $command = qq`rm "$link"`;
|
||||
executeShellCommand( $command );
|
||||
|
|
@ -313,14 +282,10 @@ MAIN: while( $loop ) {
|
|||
my $deleteStatsSql = "delete low_priority from Stats where EventId = ?";
|
||||
my $deleteStatsSth = $dbh->prepare_cached( $deleteStatsSql )
|
||||
or Fatal( "Can't prepare '$deleteStatsSql': ".$dbh->errstr() );
|
||||
while ( my ( $db_monitor, $db_events ) = each(%$db_monitors) )
|
||||
{
|
||||
if ( my $fs_events = $fs_monitors->{$db_monitor} )
|
||||
{
|
||||
if ( $db_events )
|
||||
{
|
||||
while ( my ( $db_event, $age ) = each(%$db_events ) )
|
||||
{
|
||||
while ( my ( $db_monitor, $db_events ) = each(%$db_monitors) ) {
|
||||
if ( my $fs_events = $fs_monitors->{$db_monitor} ) {
|
||||
if ( $db_events ) {
|
||||
while ( my ( $db_event, $age ) = each(%$db_events ) ) {
|
||||
if ( !defined($fs_events->{$db_event}) ) {
|
||||
if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
|
||||
aud_print( "Database event '$db_monitor/$db_event' does not exist in filesystem" );
|
||||
|
|
@ -338,23 +303,21 @@ MAIN: while( $loop ) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} # end if db_events
|
||||
} else {
|
||||
aud_print( "Database monitor '$db_monitor' does not exist in filesystem" );
|
||||
#if ( confirm() )
|
||||
#{
|
||||
# We don't actually do this in case it's new
|
||||
#my $res = $deleteMonitorSth->execute( $db_monitor )
|
||||
# or Fatal( "Can't execute: ".$deleteMonitorSth->errstr() );
|
||||
#$cleaned = 1;
|
||||
#}
|
||||
}
|
||||
#if ( confirm() )
|
||||
#{
|
||||
# We don't actually do this in case it's new
|
||||
#my $res = $deleteMonitorSth->execute( $db_monitor )
|
||||
# or Fatal( "Can't execute: ".$deleteMonitorSth->errstr() );
|
||||
#$cleaned = 1;
|
||||
#}
|
||||
}
|
||||
} # end foreach db_monitor
|
||||
redo MAIN if ( $cleaned );
|
||||
|
||||
# Remove orphaned events (with no monitor)
|
||||
# Remove orphaned events (with no monitor)
|
||||
$cleaned = 0;
|
||||
my $selectOrphanedEventsSql = "SELECT Events.Id, Events.Name
|
||||
FROM Events LEFT JOIN Monitors ON (Events.MonitorId = Monitors.Id)
|
||||
|
|
@ -363,11 +326,9 @@ MAIN: while( $loop ) {
|
|||
or Fatal( "Can't prepare '$selectOrphanedEventsSql': ".$dbh->errstr() );
|
||||
$res = $selectOrphanedEventsSth->execute()
|
||||
or Fatal( "Can't execute: ".$selectOrphanedEventsSth->errstr() );
|
||||
while( my $event = $selectOrphanedEventsSth->fetchrow_hashref() )
|
||||
{
|
||||
while( my $event = $selectOrphanedEventsSth->fetchrow_hashref() ) {
|
||||
aud_print( "Found orphaned event with no monitor '$event->{Id}'" );
|
||||
if ( confirm() )
|
||||
{
|
||||
if ( confirm() ) {
|
||||
$res = $deleteEventSth->execute( $event->{Id} )
|
||||
or Fatal( "Can't execute: ".$deleteEventSth->errstr() );
|
||||
$cleaned = 1;
|
||||
|
|
@ -375,7 +336,7 @@ MAIN: while( $loop ) {
|
|||
}
|
||||
redo MAIN if ( $cleaned );
|
||||
|
||||
# Remove empty events (with no frames)
|
||||
# Remove empty events (with no frames)
|
||||
$cleaned = 0;
|
||||
my $selectEmptyEventsSql = "SELECT E.Id AS Id, E.StartTime, F.EventId FROM Events as E LEFT JOIN Frames as F ON (E.Id = F.EventId)
|
||||
WHERE isnull(F.EventId) AND now() - interval ".$Config{ZM_AUDIT_MIN_AGE}." second > E.StartTime";
|
||||
|
|
@ -383,11 +344,9 @@ MAIN: while( $loop ) {
|
|||
or Fatal( "Can't prepare '$selectEmptyEventsSql': ".$dbh->errstr() );
|
||||
$res = $selectEmptyEventsSth->execute()
|
||||
or Fatal( "Can't execute: ".$selectEmptyEventsSth->errstr() );
|
||||
while( my $event = $selectEmptyEventsSth->fetchrow_hashref() )
|
||||
{
|
||||
while( my $event = $selectEmptyEventsSth->fetchrow_hashref() ) {
|
||||
aud_print( "Found empty event with no frame records '$event->{Id}'" );
|
||||
if ( confirm() )
|
||||
{
|
||||
if ( confirm() ) {
|
||||
$res = $deleteEventSth->execute( $event->{Id} )
|
||||
or Fatal( "Can't execute: ".$deleteEventSth->errstr() );
|
||||
$cleaned = 1;
|
||||
|
|
@ -395,7 +354,7 @@ MAIN: while( $loop ) {
|
|||
}
|
||||
redo MAIN if ( $cleaned );
|
||||
|
||||
# Remove orphaned frame records
|
||||
# Remove orphaned frame records
|
||||
$cleaned = 0;
|
||||
my $selectOrphanedFramesSql = "SELECT DISTINCT EventId FROM Frames
|
||||
WHERE EventId NOT IN (SELECT Id FROM Events)";
|
||||
|
|
@ -403,11 +362,9 @@ MAIN: while( $loop ) {
|
|||
or Fatal( "Can't prepare '$selectOrphanedFramesSql': ".$dbh->errstr() );
|
||||
$res = $selectOrphanedFramesSth->execute()
|
||||
or Fatal( "Can't execute: ".$selectOrphanedFramesSth->errstr() );
|
||||
while( my $frame = $selectOrphanedFramesSth->fetchrow_hashref() )
|
||||
{
|
||||
while( my $frame = $selectOrphanedFramesSth->fetchrow_hashref() ) {
|
||||
aud_print( "Found orphaned frame records for event '$frame->{EventId}'" );
|
||||
if ( confirm() )
|
||||
{
|
||||
if ( confirm() ) {
|
||||
$res = $deleteFramesSth->execute( $frame->{EventId} )
|
||||
or Fatal( "Can't execute: ".$deleteFramesSth->errstr() );
|
||||
$cleaned = 1;
|
||||
|
|
@ -415,7 +372,7 @@ MAIN: while( $loop ) {
|
|||
}
|
||||
redo MAIN if ( $cleaned );
|
||||
|
||||
# Remove orphaned stats records
|
||||
# Remove orphaned stats records
|
||||
$cleaned = 0;
|
||||
my $selectOrphanedStatsSql = "SELECT DISTINCT EventId FROM Stats
|
||||
WHERE EventId NOT IN (SELECT Id FROM Events)";
|
||||
|
|
@ -423,11 +380,9 @@ MAIN: while( $loop ) {
|
|||
or Fatal( "Can't prepare '$selectOrphanedStatsSql': ".$dbh->errstr() );
|
||||
$res = $selectOrphanedStatsSth->execute()
|
||||
or Fatal( "Can't execute: ".$selectOrphanedStatsSth->errstr() );
|
||||
while( my $stat = $selectOrphanedStatsSth->fetchrow_hashref() )
|
||||
{
|
||||
while( my $stat = $selectOrphanedStatsSth->fetchrow_hashref() ) {
|
||||
aud_print( "Found orphaned statistic records for event '$stat->{EventId}'" );
|
||||
if ( confirm() )
|
||||
{
|
||||
if ( confirm() ) {
|
||||
$res = $deleteStatsSth->execute( $stat->{EventId} )
|
||||
or Fatal( "Can't execute: ".$deleteStatsSth->errstr() );
|
||||
$cleaned = 1;
|
||||
|
|
@ -435,7 +390,7 @@ MAIN: while( $loop ) {
|
|||
}
|
||||
redo MAIN if ( $cleaned );
|
||||
|
||||
# New audit to close any events that were left open for longer than MIN_AGE seconds
|
||||
# New audit to close any events that were left open for longer than MIN_AGE seconds
|
||||
my $selectUnclosedEventsSql =
|
||||
"SELECT E.Id,
|
||||
max(F.TimeStamp) as EndTime,
|
||||
|
|
@ -470,13 +425,10 @@ MAIN: while( $loop ) {
|
|||
or Fatal( "Can't prepare '$updateUnclosedEventsSql': ".$dbh->errstr() );
|
||||
$res = $selectUnclosedEventsSth->execute()
|
||||
or Fatal( "Can't execute: ".$selectUnclosedEventsSth->errstr() );
|
||||
while( my $event = $selectUnclosedEventsSth->fetchrow_hashref() )
|
||||
{
|
||||
while( my $event = $selectUnclosedEventsSth->fetchrow_hashref() ) {
|
||||
aud_print( "Found open event '$event->{Id}'" );
|
||||
if ( confirm( 'close', 'closing' ) )
|
||||
{
|
||||
$res = $updateUnclosedEventsSth->execute
|
||||
(
|
||||
if ( confirm( 'close', 'closing' ) ) {
|
||||
$res = $updateUnclosedEventsSth->execute(
|
||||
sprintf("%s%d%s",
|
||||
$event->{Prefix},
|
||||
$event->{Id},
|
||||
|
|
@ -498,24 +450,22 @@ MAIN: while( $loop ) {
|
|||
}
|
||||
}
|
||||
|
||||
# Now delete any old image files
|
||||
if ( my @old_files = grep { -M > $max_image_age } <$image_path/*.{jpg,gif,wbmp}> )
|
||||
{
|
||||
# Now delete any old image files
|
||||
my @old_files = grep { -M > $max_image_age } <$image_path/*.{jpg,gif,wbmp}>;
|
||||
if ( @old_files ) {
|
||||
aud_print( "Deleting ".int(@old_files)." old images\n" );
|
||||
my $untainted_old_files = join( ";", @old_files );
|
||||
( $untainted_old_files ) = ( $untainted_old_files =~ /^(.*)$/ );
|
||||
unlink( split( /;/, $untainted_old_files ) );
|
||||
}
|
||||
|
||||
# Now delete any old swap files
|
||||
# Now delete any old swap files
|
||||
( my $swap_image_root ) = ( $Config{ZM_PATH_SWAP} =~ /^(.*)$/ ); # De-taint
|
||||
File::Find::find( { wanted=>\&deleteSwapImage, untaint=>1 }, $swap_image_root );
|
||||
|
||||
# Prune the Logs table if required
|
||||
if ( $Config{ZM_LOG_DATABASE_LIMIT} )
|
||||
{
|
||||
if ( $Config{ZM_LOG_DATABASE_LIMIT} =~ /^\d+$/ )
|
||||
{
|
||||
if ( $Config{ZM_LOG_DATABASE_LIMIT} ) {
|
||||
if ( $Config{ZM_LOG_DATABASE_LIMIT} =~ /^\d+$/ ) {
|
||||
# Number of rows
|
||||
my $selectLogRowCountSql = "SELECT count(*) as Rows from Logs";
|
||||
my $selectLogRowCountSth = $dbh->prepare_cached( $selectLogRowCountSql )
|
||||
|
|
@ -524,23 +474,17 @@ MAIN: while( $loop ) {
|
|||
or Fatal( "Can't execute: ".$selectLogRowCountSth->errstr() );
|
||||
my $row = $selectLogRowCountSth->fetchrow_hashref();
|
||||
my $logRows = $row->{Rows};
|
||||
if ( $logRows > $Config{ZM_LOG_DATABASE_LIMIT} )
|
||||
{
|
||||
if ( $logRows > $Config{ZM_LOG_DATABASE_LIMIT} ) {
|
||||
my $deleteLogByRowsSql = "DELETE low_priority FROM Logs ORDER BY TimeKey ASC LIMIT ?";
|
||||
my $deleteLogByRowsSth = $dbh->prepare_cached( $deleteLogByRowsSql )
|
||||
or Fatal( "Can't prepare '$deleteLogByRowsSql': ".$dbh->errstr() );
|
||||
$res = $deleteLogByRowsSth->execute( $logRows - $Config{ZM_LOG_DATABASE_LIMIT} )
|
||||
or Fatal( "Can't execute: ".$deleteLogByRowsSth->errstr() );
|
||||
if ( $deleteLogByRowsSth->rows() )
|
||||
{
|
||||
aud_print( "Deleted ".$deleteLogByRowsSth->rows()
|
||||
." log table entries by count\n" )
|
||||
;
|
||||
if ( $deleteLogByRowsSth->rows() ) {
|
||||
aud_print( "Deleted ".$deleteLogByRowsSth->rows() ." log table entries by count\n" );
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
# Time of record
|
||||
my $deleteLogByTimeSql =
|
||||
"DELETE low_priority FROM Logs
|
||||
|
|
@ -550,12 +494,10 @@ MAIN: while( $loop ) {
|
|||
$res = $deleteLogByTimeSth->execute()
|
||||
or Fatal( "Can't execute: ".$deleteLogByTimeSth->errstr() );
|
||||
if ( $deleteLogByTimeSth->rows() ){
|
||||
aud_print( "Deleted ".$deleteLogByTimeSth->rows()
|
||||
." log table entries by time\n" )
|
||||
;
|
||||
}
|
||||
aud_print( "Deleted ".$deleteLogByTimeSth->rows() ." log table entries by time\n" );
|
||||
}
|
||||
}
|
||||
} # end if ( $Config{ZM_LOG_DATABASE_LIMIT} )
|
||||
$loop = $continuous;
|
||||
|
||||
sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} ) if $continuous;
|
||||
|
|
@ -563,52 +505,37 @@ MAIN: while( $loop ) {
|
|||
|
||||
exit( 0 );
|
||||
|
||||
sub aud_print
|
||||
{
|
||||
sub aud_print {
|
||||
my $string = shift;
|
||||
if ( !$continuous )
|
||||
{
|
||||
if ( ! $continuous ) {
|
||||
print( $string );
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
Info( $string );
|
||||
}
|
||||
}
|
||||
|
||||
sub confirm
|
||||
{
|
||||
sub confirm {
|
||||
my $prompt = shift || "delete";
|
||||
my $action = shift || "deleting";
|
||||
|
||||
my $yesno = 0;
|
||||
if ( $report )
|
||||
{
|
||||
if ( $report ) {
|
||||
print( "\n" );
|
||||
}
|
||||
elsif ( $interactive )
|
||||
{
|
||||
} elsif ( $interactive ) {
|
||||
print( ", $prompt y/n: " );
|
||||
my $char = <>;
|
||||
chomp( $char );
|
||||
if ( $char eq 'q' )
|
||||
{
|
||||
if ( $char eq 'q' ) {
|
||||
exit( 0 );
|
||||
}
|
||||
if ( !$char )
|
||||
{
|
||||
if ( !$char ) {
|
||||
$char = 'y';
|
||||
}
|
||||
$yesno = ( $char =~ /[yY]/ );
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( !$continuous )
|
||||
{
|
||||
} else {
|
||||
if ( !$continuous ) {
|
||||
print( ", $action\n" );
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
Info( $action );
|
||||
}
|
||||
$yesno = 1;
|
||||
|
|
@ -616,24 +543,23 @@ sub confirm
|
|||
return( $yesno );
|
||||
}
|
||||
|
||||
sub deleteSwapImage
|
||||
{
|
||||
sub deleteSwapImage {
|
||||
my $file = $_;
|
||||
|
||||
if ( $file !~ /^zmswap-/ )
|
||||
{
|
||||
if ( $file !~ /^zmswap-/ ) {
|
||||
return;
|
||||
}
|
||||
|
||||
# Ignore directories
|
||||
if ( -d $file )
|
||||
{
|
||||
# Ignore directories
|
||||
if ( -d $file ) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ( -M $file > $max_swap_age )
|
||||
{
|
||||
if ( -M $file > $max_swap_age ) {
|
||||
Debug( "Deleting $file" );
|
||||
#unlink( $file );
|
||||
#unlink( $file );
|
||||
}
|
||||
}
|
||||
|
||||
1;
|
||||
__END__
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -24,6 +24,7 @@
|
|||
define( "ZM_CONFIG", "@ZM_CONFIG@" ); // Path to config file
|
||||
// Define, and override any given in config file
|
||||
define( "ZM_VERSION", "@VERSION@" ); // Version
|
||||
define( "ZM_DIR_TEMP", "@ZM_TMPDIR@" );
|
||||
|
||||
$configFile = ZM_CONFIG;
|
||||
$localConfigFile = basename($configFile);
|
||||
|
|
|
|||
|
|
@ -890,7 +890,7 @@ function exportEvents( $eids, $exportDetail, $exportFrames, $exportImages, $expo
|
|||
{
|
||||
$eids = array($eids);
|
||||
}
|
||||
$monitorPath = 'events/';
|
||||
$monitorPath = ZM_DIR_EVENTS."/";
|
||||
$html_eventMaster = 'zmEventImagesMaster_'.date('Ymd_His'). '.html';
|
||||
if ( !($fp = fopen( $monitorPath."/".$html_eventMaster, "w" )) ) Fatal( "Can't open event images export file '$html_eventMaster'" );
|
||||
fwrite( $fp, exportEventImagesMaster( $eids ) );
|
||||
|
|
@ -898,7 +898,7 @@ function exportEvents( $eids, $exportDetail, $exportFrames, $exportImages, $expo
|
|||
$exportFileList[] = $monitorPath."/".$html_eventMaster;
|
||||
}
|
||||
|
||||
$listFile = "temp/".$export_listFile;
|
||||
$listFile = ZM_DIR_EXPORTS."/".$export_listFile;
|
||||
if ( !($fp = fopen( $listFile, "w" )) )
|
||||
{
|
||||
Fatal( "Can't open event export list file '$listFile'" );
|
||||
|
|
@ -911,7 +911,7 @@ function exportEvents( $eids, $exportDetail, $exportFrames, $exportImages, $expo
|
|||
$archive = "";
|
||||
if ( $exportFormat == "tar" )
|
||||
{
|
||||
$archive = "temp/".$export_root.".tar.gz";
|
||||
$archive = ZM_DIR_EXPORTS."/".$export_root.".tar.gz";
|
||||
@unlink( $archive );
|
||||
$command = "tar --create --gzip --file=$archive --files-from=$listFile";
|
||||
exec( escapeshellcmd( $command ), $output, $status );
|
||||
|
|
@ -925,8 +925,7 @@ function exportEvents( $eids, $exportDetail, $exportFrames, $exportImages, $expo
|
|||
}
|
||||
elseif ( $exportFormat == "zip" )
|
||||
{
|
||||
$archive = "temp/zm_export.zip";
|
||||
$archive = "temp/".$export_root.".zip";
|
||||
$archive = ZM_DIR_EXPORTS."/".$export_root.".zip";
|
||||
@unlink( $archive );
|
||||
$command = "cat ".escapeshellarg($listFile)." | zip -q ".escapeshellarg($archive)." -@";
|
||||
//cat zmFileList.txt | zip -q zm_export.zip -@
|
||||
|
|
@ -948,7 +947,7 @@ function exportEvents( $eids, $exportDetail, $exportFrames, $exportImages, $expo
|
|||
}
|
||||
|
||||
}
|
||||
return( $archive );
|
||||
return( '?view=archive%26type='.$exportFormat );
|
||||
}
|
||||
function mygetEventPath( $event )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
<?php
|
||||
//
|
||||
// ZoneMinder file view file, $Date: 2008-09-29 14:15:13 +0100 (Mon, 29 Sep 2008) $, $Revision: 2640 $
|
||||
// Copyright (C) 2001-2008 Philip Coombes
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; either version 2
|
||||
// of the License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
//
|
||||
|
||||
if ( !canView( 'Events' ) )
|
||||
{
|
||||
$view = "error";
|
||||
return;
|
||||
}
|
||||
|
||||
$archivetype = $_REQUEST['type'];
|
||||
|
||||
if ( $archivetype ) {
|
||||
switch ($archivetype) {
|
||||
case "tar":
|
||||
$mimetype = "gzip";
|
||||
$file_ext = "tar.gz";
|
||||
break;
|
||||
case "zip":
|
||||
$mimetype = "zip";
|
||||
$file_ext = "zip";
|
||||
break;
|
||||
default:
|
||||
$mimetype = NULL;
|
||||
$file_ext = NULL;
|
||||
}
|
||||
|
||||
if ( $mimetype ) {
|
||||
$filename = "zmExport.$file_ext";
|
||||
$filename_path = ZM_DIR_TEMP."/".$filename;
|
||||
if ( is_readable($filename_path) ) {
|
||||
header( "Content-type: application/$mimetype" );
|
||||
header( "Content-Disposition: attachment; filename=$filename");
|
||||
readfile( $filename_path );
|
||||
} else {
|
||||
Error("$filename_path does not exist or is not readable.");
|
||||
}
|
||||
} else {
|
||||
Error("Unsupported archive type specified. Supported archives are tar and zip");
|
||||
}
|
||||
} else {
|
||||
Error("No archive type given to archive.php. Please specify a tar or zip archive.");
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue