795 lines
29 KiB
Prolog
795 lines
29 KiB
Prolog
#!/usr/bin/perl -w
|
|
#
|
|
# ==========================================================================
|
|
#
|
|
# ZoneMinder Update Script, $Date$, $Revision$
|
|
# Copyright (C) 2003, 2004, 2005, 2006 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
#
|
|
# ==========================================================================
|
|
#
|
|
# This script just checks what the most recent release of ZoneMinder is
|
|
# at the the moment. It will eventually be responsible for applying and
|
|
# configuring upgrades etc, including on the fly upgrades.
|
|
#
|
|
use strict;
|
|
use bytes;
|
|
|
|
# ==========================================================================
|
|
#
|
|
# These are the elements you can edit to suit your installation
|
|
#
|
|
# ==========================================================================
|
|
|
|
use constant DBG_ID => "zmupdate"; # Tag that appears in debug to identify source
|
|
use constant DBG_LEVEL => 0; # 0 is errors, warnings and info only, > 0 for debug
|
|
|
|
use constant CHECK_INTERVAL => (1*24*60*60); # Interval between version checks
|
|
|
|
# ==========================================================================
|
|
#
|
|
# Don't change anything below here
|
|
#
|
|
# ==========================================================================
|
|
|
|
use ZoneMinder::Base qw(:all);
|
|
use ZoneMinder::Config qw(:all);
|
|
use ZoneMinder::Debug qw(:all);
|
|
use ZoneMinder::Database qw(:all);
|
|
use ZoneMinder::ConfigAdmin qw( :functions );
|
|
use POSIX;
|
|
use DBI;
|
|
use Getopt::Long;
|
|
use Data::Dumper;
|
|
|
|
use constant EVENT_PATH => ZM_PATH_WEB.'/'.ZM_DIR_EVENTS;
|
|
|
|
$| = 1;
|
|
|
|
$ENV{PATH} = '/bin:/usr/bin:/usr/local/bin';
|
|
$ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
|
|
delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
|
|
|
|
my $web_uid = (getpwnam( ZM_WEB_USER ))[2];
|
|
my $use_log = (($> == 0) || ($> == $web_uid));
|
|
|
|
zmDbgInit( DBG_ID, level=>DBG_LEVEL, to_log=>$use_log );
|
|
zmDbgSetSignal();
|
|
|
|
my $interactive = 1;
|
|
my $check = 0;
|
|
my $freshen = 0;
|
|
my $rename = 0;
|
|
my $zone_fix = 0;
|
|
my $version = '';
|
|
my $db_user = ZM_DB_USER;
|
|
my $db_pass = ZM_DB_PASS;
|
|
sub Usage
|
|
{
|
|
print( "
|
|
Usage: zmupdate.pl <-c,--check|-f,--freshen|-v<version>,--version=<version>> [-u<dbuser> -p<dbpass>]>
|
|
Parameters are :-
|
|
-c, --check - Check for updated versions of ZoneMinder
|
|
-f, --freshen - Freshen the configuration in the database. Equivalent of old zmconfig.pl -noi
|
|
-v<version>, --version=<version> - Upgrade to the current version from <version>
|
|
-u<dbuser>, --user=<dbuser> - Alternate DB user with privileges to alter DB
|
|
-p<dbpass>, --pass=<dbpass> - Password of alternate DB user with privileges to alter DB
|
|
");
|
|
exit( -1 );
|
|
}
|
|
|
|
if ( !GetOptions( 'check'=>\$check, 'freshen'=>\$freshen, 'rename'=>\$rename, 'zone-fix'=>\$zone_fix, 'version=s'=>\$version, 'interactive!'=>\$interactive, 'user:s'=>\$db_user, 'pass:s'=>\$db_pass ) )
|
|
{
|
|
Usage();
|
|
}
|
|
|
|
if ( ! ($check || $freshen || $rename || $zone_fix || $version) )
|
|
{
|
|
print( STDERR "Please give a valid option\n" );
|
|
Usage();
|
|
}
|
|
|
|
if ( ($check + $freshen + $rename + $zone_fix + ($version?1:0)) > 1 )
|
|
{
|
|
print( STDERR "Please give only one option\n" );
|
|
Usage();
|
|
}
|
|
|
|
if ( $check )
|
|
{
|
|
}
|
|
|
|
print( "Update agent starting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
|
|
|
|
if ( $check && ZM_CHECK_FOR_UPDATES )
|
|
{
|
|
my $dbh = zmDbConnect();
|
|
|
|
my $curr_version = ZM_DYN_CURR_VERSION;
|
|
my $last_version = ZM_DYN_LAST_VERSION;
|
|
my $last_check = ZM_DYN_LAST_CHECK;
|
|
|
|
if ( !$curr_version )
|
|
{
|
|
$curr_version = ZM_VERSION;
|
|
|
|
my $sql = "update Config set Value = ? where Name = 'ZM_DYN_CURR_VERSION'";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute( "$curr_version" ) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
zmDbDisconnect();
|
|
|
|
while( 1 )
|
|
{
|
|
my $now = time();
|
|
if ( !$last_version || !$last_check || (($now-$last_check) > CHECK_INTERVAL) )
|
|
{
|
|
Info( "Checking for updates\n" );
|
|
|
|
use LWP::UserAgent;
|
|
my $ua = LWP::UserAgent->new;
|
|
$ua->agent( "ZoneMinder Update Agent/".ZM_VERSION );
|
|
if ( eval('defined(ZM_UPDATE_CHECK_PROXY)') )
|
|
{
|
|
no strict 'subs';
|
|
if ( ZM_UPDATE_CHECK_PROXY )
|
|
{
|
|
$ua->proxy( "http", ZM_UPDATE_CHECK_PROXY );
|
|
}
|
|
use strict 'subs';
|
|
}
|
|
my $req = HTTP::Request->new( GET=>'http://www.zoneminder.com/version' );
|
|
my $res = $ua->request($req);
|
|
|
|
if ( $res->is_success )
|
|
{
|
|
$last_version = $res->content;
|
|
chomp($last_version);
|
|
$last_check = $now;
|
|
|
|
Info( "Got version: '".$last_version."'\n" );
|
|
|
|
$dbh = zmDbConnect();
|
|
|
|
my $lv_sql = "update Config set Value = ? where Name = 'ZM_DYN_LAST_VERSION'";
|
|
my $lv_sth = $dbh->prepare_cached( $lv_sql ) or die( "Can't prepare '$lv_sql': ".$dbh->errstr() );
|
|
my $lv_res = $lv_sth->execute( $last_version ) or die( "Can't execute: ".$lv_sth->errstr() );
|
|
|
|
my $lc_sql = "update Config set Value = ? where Name = 'ZM_DYN_LAST_CHECK'";
|
|
my $lc_sth = $dbh->prepare_cached( $lc_sql ) or die( "Can't prepare '$lc_sql': ".$dbh->errstr() );
|
|
my $lc_res = $lc_sth->execute( $last_check ) or die( "Can't execute: ".$lc_sth->errstr() );
|
|
|
|
zmDbDisconnect();
|
|
}
|
|
else
|
|
{
|
|
Error( "Error check failed: '".$res->status_line()."'\n" );
|
|
}
|
|
}
|
|
sleep( 3600 );
|
|
}
|
|
}
|
|
if ( $rename )
|
|
{
|
|
require File::Find;
|
|
|
|
chdir( EVENT_PATH );
|
|
|
|
sub renameImage
|
|
{
|
|
my $file = $_;
|
|
|
|
# Ignore directories
|
|
if ( -d $file )
|
|
{
|
|
print( "Checking directory '$file'\n" );
|
|
return;
|
|
}
|
|
if ( $file !~ /(capture|analyse)-(\d+)(\.jpg)/ )
|
|
{
|
|
return;
|
|
}
|
|
my $new_file = "$2-$1$3";
|
|
|
|
print( "Renaming '$file' to '$new_file'\n" );
|
|
rename( $file, $new_file ) or warn( "Can't rename '$file' to '$new_file'" );
|
|
}
|
|
|
|
File::Find::find( \&renameImage, '.' );
|
|
}
|
|
if ( $zone_fix )
|
|
{
|
|
require DBI;
|
|
|
|
my $dbh = zmDbConnect();
|
|
|
|
my $sql = "select Z.*, M.Width as MonitorWidth, M.Height as MonitorHeight from Zones as Z inner join Monitors as M on Z.MonitorId = M.Id where Z.Units = 'Percent'";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
my @zones;
|
|
while( my $zone = $sth->fetchrow_hashref() )
|
|
{
|
|
push( @zones, $zone );
|
|
}
|
|
$sth->finish();
|
|
|
|
foreach my $zone ( @zones )
|
|
{
|
|
my $zone_width = (($zone->{HiX}*$zone->{MonitorWidth})-($zone->{LoX}*$zone->{MonitorWidth}))/100;
|
|
my $zone_height = (($zone->{HiY}*$zone->{MonitorHeight})-($zone->{LoY}*$zone->{MonitorHeight}))/100;
|
|
my $zone_area = $zone_width * $zone_height;
|
|
my $monitor_area = $zone->{MonitorWidth} * $zone->{MonitorHeight};
|
|
my $sql = "update Zones set MinAlarmPixels = ?, MaxAlarmPixels = ?, MinFilterPixels = ?, MaxFilterPixels = ?, MinBlobPixels = ?, MaxBlobPixels = ? where Id = ?";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute(
|
|
($zone->{MinAlarmPixels}*$monitor_area)/$zone_area,
|
|
($zone->{MaxAlarmPixels}*$monitor_area)/$zone_area,
|
|
($zone->{MinFilterPixels}*$monitor_area)/$zone_area,
|
|
($zone->{MaxFilterPixels}*$monitor_area)/$zone_area,
|
|
($zone->{MinBlobPixels}*$monitor_area)/$zone_area,
|
|
($zone->{MaxBlobPixels}*$monitor_area)/$zone_area,
|
|
$zone->{Id}
|
|
) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
}
|
|
if ( $freshen )
|
|
{
|
|
print( "\nFreshening configuration in database\n" );
|
|
loadConfigFromDB();
|
|
saveConfigToDB();
|
|
}
|
|
if ( $version )
|
|
{
|
|
my ( $detaint_version ) = $version =~ /^([\w.]+)$/;
|
|
$version = $detaint_version;
|
|
|
|
print( "\nInitiating database upgrade to version ".ZM_VERSION."\n" );
|
|
if ( $interactive )
|
|
{
|
|
print( "Please ensure that ZoneMinder is stopped on your system prior to upgrading the database.\nPress enter to continue or ctrl-C to stop : " );
|
|
my $response = <STDIN>;
|
|
|
|
print( "\nDo you wish to take a backup of your database prior to upgrading?\nThis may result in a large file if you have a lot of events.\nPress 'y' for a backup or 'n' to continue : " );
|
|
|
|
$response = <STDIN>;
|
|
chomp( $response );
|
|
while ( $response !~ /^[yYnN]$/ )
|
|
{
|
|
print( "Please press 'y' for a backup or 'n' to continue only : " );
|
|
$response = <STDIN>;
|
|
chomp( $response );
|
|
}
|
|
|
|
if ( $response =~ /^[yY]$/ )
|
|
{
|
|
my ( $host, $port ) = ( ZM_DB_HOST =~ /^([^:]+)(?::(.+))?$/ );
|
|
my $command = "mysqldump -h".$host;
|
|
$command .= " -P".$port if defined($port);
|
|
if ( $db_user )
|
|
{
|
|
$command .= " -u".$db_user;
|
|
if ( $db_pass )
|
|
{
|
|
$command .= " -p".$db_pass;
|
|
}
|
|
}
|
|
my $backup = ZM_DB_NAME."-".$version.".dump";
|
|
$command .= " --add-drop-table --databases ".ZM_DB_NAME." > ".$backup;
|
|
print( "Creating backup to $backup. This may take several minutes.\n" );
|
|
print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
|
|
my $output = qx($command);
|
|
my $status = $? >> 8;
|
|
if ( $status || DBG_LEVEL > 0 )
|
|
{
|
|
chomp( $output );
|
|
print( "Output: $output\n" );
|
|
}
|
|
if ( $status )
|
|
{
|
|
die( "Command '$command' exited with status: $status\n" );
|
|
}
|
|
else
|
|
{
|
|
print( "Database successfully backed up to $backup, proceeding to upgrade.\n" );
|
|
}
|
|
}
|
|
elsif ( $response !~ /^[nN]$/ )
|
|
{
|
|
die( "Unexpected response '$response'" );
|
|
}
|
|
}
|
|
sub patchDB
|
|
{
|
|
my $dbh = shift;
|
|
my $version = shift;
|
|
|
|
my ( $host, $port ) = ( ZM_DB_HOST =~ /^([^:]+)(?::(.+))?$/ );
|
|
my $command = "mysql -h".$host;
|
|
$command .= " -P".$port if defined($port);
|
|
if ( $db_user )
|
|
{
|
|
$command .= " -u".$db_user;
|
|
if ( $db_pass )
|
|
{
|
|
$command .= " -p".$db_pass;
|
|
}
|
|
}
|
|
$command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql";
|
|
|
|
print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
|
|
my $output = qx($command);
|
|
my $status = $? >> 8;
|
|
if ( $status || DBG_LEVEL > 0 )
|
|
{
|
|
chomp( $output );
|
|
print( "Output: $output\n" );
|
|
}
|
|
if ( $status )
|
|
{
|
|
die( "Command '$command' exited with status: $status\n" );
|
|
}
|
|
else
|
|
{
|
|
print( "\nDatabase successfully upgraded from version $version.\n" );
|
|
my $sql = "update Config set Value = ? where Name = 'ZM_DYN_DB_VERSION'";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute( $version ) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
}
|
|
|
|
if ( ZM_DYN_DB_VERSION && ZM_DYN_DB_VERSION ne $version )
|
|
{
|
|
# Nothing yet
|
|
}
|
|
|
|
print( "\nUpgrading database to version ".ZM_VERSION."\n" );
|
|
|
|
# Update config first of all
|
|
loadConfigFromDB();
|
|
saveConfigToDB();
|
|
|
|
my $dbh = zmDbConnect();
|
|
|
|
my $cascade = undef;
|
|
if ( $cascade || $version eq "1.19.0" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.19.0" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.19.1" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.19.1");
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.19.2" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.19.2" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.19.3" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.19.3" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.19.4" )
|
|
{
|
|
require DBI;
|
|
|
|
# Rename the event directories and create a new symlink for the names
|
|
chdir( EVENT_PATH );
|
|
|
|
my $sql = "select * from Monitors order by Id";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
while( my $monitor = $sth->fetchrow_hashref() )
|
|
{
|
|
if ( -d $monitor->{Name} )
|
|
{
|
|
rename( $monitor->{Name}, $monitor->{Id} ) or warn( "Can't rename existing monitor directory '$monitor->{Name}' to '$monitor->{Id}': $!" );
|
|
symlink( $monitor->{Id}, $monitor->{Name} ) or warn( "Can't symlink monitor directory '$monitor->{Id}' to '$monitor->{Name}': $!" );
|
|
}
|
|
}
|
|
$sth->finish();
|
|
|
|
# Patch the database
|
|
patchDB( $dbh, "1.19.4" );
|
|
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.19.5" )
|
|
{
|
|
print( "\nThis version now only uses one database user.\nPlease ensure you have run zmconfig.pl and re-entered your database username and password prior to upgrading, or the upgrade will fail.\nPress enter to continue or ctrl-C to stop : " );
|
|
# Patch the database
|
|
my $dummy = <STDIN>;
|
|
patchDB( $dbh, "1.19.5" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.20.0" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.20.0" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.20.1" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.20.1" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.21.0" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.21.0" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.21.1" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.21.1" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.21.2" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.21.2" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.21.3" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.21.3" );
|
|
|
|
# Add appropriate widths and heights to events
|
|
{
|
|
print( "Updating events. This may take a few minutes. Please wait.\n" );
|
|
my $sql = "select * from Monitors order by Id";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
while( my $monitor = $sth->fetchrow_hashref() )
|
|
{
|
|
my $sql = "update Events set Width = ?, Height = ? where MonitorId = ?";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute( $monitor->{Width}, $monitor->{Height}, $monitor->{Id} ) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
$sth->finish();
|
|
}
|
|
|
|
# Add sequence numbers
|
|
{
|
|
print( "Updating monitor sequences. Please wait.\n" );
|
|
my $sql = "select * from Monitors order by Id";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
my $sequence = 1;
|
|
while( my $monitor = $sth->fetchrow_hashref() )
|
|
{
|
|
my $sql = "update Monitors set Sequence = ? where Id = ?";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute( $sequence++, $monitor->{Id} ) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
$sth->finish();
|
|
}
|
|
|
|
# Update saved filters
|
|
{
|
|
print( "Updating saved filters. Please wait.\n" );
|
|
my $sql = "select * from Filters";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
my @filters;
|
|
while( my $filter = $sth->fetchrow_hashref() )
|
|
{
|
|
push( @filters, $filter );
|
|
}
|
|
$sth->finish();
|
|
$sql = "update Filters set Query = ? where Name = ?";
|
|
$sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
foreach my $filter ( @filters )
|
|
{
|
|
if ( $filter->{Query} =~ /op\d=&/ )
|
|
{
|
|
( my $new_query = $filter->{Query} ) =~ s/(op\d=)&/$1=&/g;
|
|
$res = $sth->execute( $new_query, $filter->{Name} ) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
}
|
|
}
|
|
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.21.4" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.21.4" );
|
|
|
|
# Convert zones to new format
|
|
{
|
|
print( "Updating zones. Please wait.\n" );
|
|
|
|
# Get the existing zones from the DB
|
|
my $sql = "select Z.*,M.Width,M.Height from Zones as Z inner join Monitors as M on (Z.MonitorId = M.Id)";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
my @zones;
|
|
while( my $zone = $sth->fetchrow_hashref() )
|
|
{
|
|
push( @zones, $zone );
|
|
}
|
|
$sth->finish();
|
|
|
|
no strict 'refs';
|
|
foreach my $zone ( @zones )
|
|
{
|
|
# Create the coordinate strings
|
|
if ( $zone->{Units} eq "Pixels" )
|
|
{
|
|
my $sql = "update Zones set NumCoords = 4, Coords = concat( LoX,',',LoY,' ',HiX,',',LoY,' ',HiX,',',HiY,' ',LoX,',',HiY ), Area = round( ((HiX-LoX)+1)*((HiY-LoY)+1) ) where Id = ?";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute( $zone->{Id} ) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
else
|
|
{
|
|
my $lo_x = ($zone->{LoX} * ($zone->{Width}-1) ) / 100;
|
|
my $hi_x = ($zone->{HiX} * ($zone->{Width}-1) ) / 100;
|
|
my $lo_y = ($zone->{LoY} * ($zone->{Height}-1) ) / 100;
|
|
my $hi_y = ($zone->{HiY} * ($zone->{Height}-1) ) / 100;
|
|
my $area = (($hi_x-$lo_x)+1)*(($hi_y-$lo_y)+1);
|
|
my $sql = "update Zones set NumCoords = 4, Coords = concat( round(?),',',round(?),' ',round(?),',',round(?),' ',round(?),',',round(?),' ',round(?),',',round(?) ), Area = round(?), MinAlarmPixels = round(?), MaxAlarmPixels = round(?), MinFilterPixels = round(?), MaxFilterPixels = round(?), MinBlobPixels = round(?), MaxBlobPixels = round(?) where Id = ?";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute( $lo_x, $lo_y, $hi_x, $lo_y, $hi_x, $hi_y, $lo_x, $hi_y, $area, ($zone->{MinAlarmPixels}*$area)/100, ($zone->{MaxAlarmPixels}*$area)/100, ($zone->{MinFilterPixels}*$area)/100, ($zone->{MaxFilterPixels}*$area)/100, ($zone->{MinBlobPixels}*$area)/100, ($zone->{MaxBlobPixels}*$area)/100, $zone->{Id} ) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
}
|
|
}
|
|
# Convert run states to new format
|
|
{
|
|
print( "Updating run states. Please wait.\n" );
|
|
|
|
# Get the existing zones from the DB
|
|
my $sql = "select * from States";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
my @states;
|
|
while( my $state = $sth->fetchrow_hashref() )
|
|
{
|
|
push( @states, $state );
|
|
}
|
|
$sth->finish();
|
|
|
|
foreach my $state ( @states )
|
|
{
|
|
my @new_defns;
|
|
foreach my $defn ( split( /,/, $state->{Definition} ) )
|
|
{
|
|
push( @new_defns, $defn.":1" );
|
|
}
|
|
my $sql = "update States set Definition = ? where Name = ?";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute( join( ',', @new_defns ), $state->{Name} ) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
}
|
|
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.22.0" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.22.0" );
|
|
|
|
# Check for maximum FPS setting and update alarm max fps settings
|
|
{
|
|
print( "Updating monitors. Please wait.\n" );
|
|
if ( defined(&ZM_NO_MAX_FPS_ON_ALARM) && &ZM_NO_MAX_FPS_ON_ALARM )
|
|
{
|
|
# Update the individual monitor settings to match the previous global one
|
|
my $sql = "update Monitors set AlarmMaxFPS = NULL";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
else
|
|
{
|
|
# Update the individual monitor settings to match the previous global one
|
|
my $sql = "update Monitors set AlarmMaxFPS = MaxFPS";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
}
|
|
{
|
|
print( "Updating mail configuration. Please wait.\n" );
|
|
my ( $sql, $sth, $res );
|
|
if ( defined(&ZM_EMAIL_TEXT) && &ZM_EMAIL_TEXT )
|
|
{
|
|
my ( $email_subject, $email_body ) = ZM_EMAIL_TEXT =~ /subject\s*=\s*"([^\n]*)".*body\s*=\s*"(.*)"?$/ms;
|
|
$sql = "replace into Config set Id = 0, Name = 'ZM_EMAIL_SUBJECT', Value = '".$email_subject."', Type = 'string', DefaultValue = 'ZoneMinder: Alarm - %MN%-%EI% (%ESM% - %ESA% %EFA%)', Hint = 'string', Pattern = '(?-xism:^(.+)\$)', Format = ' \$1 ', Prompt = 'The subject of the email used to send matching event details', Help = 'This option is used to define the subject of the email that is sent for any events that match the appropriate filters.', Category = 'mail', Readonly = '0', Requires = 'ZM_OPT_EMAIL=1'";
|
|
$sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
$res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
$sql = "replace into Config set Id = 0, Name = 'ZM_EMAIL_BODY', Value = '".$email_body."', Hint = 'free text', Pattern = '(?-xism:^(.+)\$)', Format = ' \$1 ', Prompt = 'The body of the email used to send matching event details', Help = 'This option is used to define the content of the email that is sent for any events that match the appropriate filters.', Category = 'mail', Readonly = '0', Requires = 'ZM_OPT_EMAIL=1'";
|
|
$sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
$res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
if ( defined(&ZM_MESSAGE_TEXT) && &ZM_MESSAGE_TEXT )
|
|
{
|
|
my ( $message_subject, $message_body ) = ZM_MESSAGE_TEXT =~ /subject\s*=\s*"([^\n]*)".*body\s*=\s*"(.*)"?$/ms;
|
|
$sql = "replace into Config set Id = 0, Name = 'ZM_MESSAGE_SUBJECT', Value = '".$message_subject."', Type = 'string', DefaultValue = 'ZoneMinder: Alarm - %MN%-%EI%', Hint = 'string', Pattern = '(?-xism:^(.+)\$)', Format = ' \$1 ', Prompt = 'The subject of the message used to send matching event details', Help = 'This option is used to define the subject of the message that is sent for any events that match the appropriate filters.', Category = 'mail', Readonly = '0', Requires = 'ZM_OPT_MESSAGE=1'";
|
|
$sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
$res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
$sql = "replace into Config set Id = 0, Name = 'ZM_MESSAGE_BODY', Value = '".$message_body."', Type = 'text', DefaultValue = 'ZM alarm detected - %ED% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% score.', Hint = 'free text', Pattern = '(?-xism:^(.+)\$)', Format = ' \$1 ', Prompt = 'The body of the message used to send matching event details', Help = 'This option is used to define the content of the message that is sent for any events that match the appropriate filters.', Category = 'mail', Readonly = '0', Requires = 'ZM_OPT_MESSAGE=1'";
|
|
$sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
$res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
}
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.22.1" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.22.1" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.22.2" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.22.2" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.22.3" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.22.3" );
|
|
|
|
# Convert timestamp strings to new format
|
|
{
|
|
my $sql = "select * from Monitors";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
my @db_monitors;
|
|
while( my $db_monitor = $sth->fetchrow_hashref() )
|
|
{
|
|
push( @db_monitors, $db_monitor );
|
|
}
|
|
$sth->finish();
|
|
foreach my $db_monitor ( @db_monitors )
|
|
{
|
|
if ( $db_monitor->{LabelFormat} =~ /\%\%s/ )
|
|
{
|
|
$db_monitor->{LabelFormat} =~ s/\%\%s/%N/;
|
|
$db_monitor->{LabelFormat} =~ s/\%\%s/%Q/;
|
|
|
|
my $sql = "update Monitors set LabelFormat = ? where Id = ?";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute( $db_monitor->{LabelFormat}, $db_monitor->{Id} ) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
}
|
|
}
|
|
|
|
# Convert filters to new format
|
|
{
|
|
my $sql = "select * from Filters";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
|
|
my @db_filters;
|
|
while( my $db_filter = $sth->fetchrow_hashref() )
|
|
{
|
|
push( @db_filters, $db_filter );
|
|
}
|
|
$sth->finish();
|
|
foreach my $db_filter ( @db_filters )
|
|
{
|
|
my %filter_terms;
|
|
foreach my $filter_parm ( split( '&', $db_filter->{Query} ) )
|
|
{
|
|
my( $key, $value ) = split( '=', $filter_parm, 2 );
|
|
if ( $key )
|
|
{
|
|
$filter_terms{$key} = $value;
|
|
}
|
|
}
|
|
my $filter = { 'terms' => [] };
|
|
for ( my $i = 1; $i <= $filter_terms{trms}; $i++ )
|
|
{
|
|
my $term = {};
|
|
my $conjunction_name = "cnj$i";
|
|
my $obracket_name = "obr$i";
|
|
my $cbracket_name = "cbr$i";
|
|
my $attr_name = "attr$i";
|
|
my $op_name = "op$i";
|
|
my $value_name = "val$i";
|
|
|
|
$term->{cnj} = $filter_terms{$conjunction_name} if ( $filter_terms{$conjunction_name} );
|
|
$term->{obr} = $filter_terms{$obracket_name} if ( $filter_terms{$obracket_name} );
|
|
$term->{attr} = $filter_terms{$attr_name} if ( $filter_terms{$attr_name} );
|
|
$term->{val} = $filter_terms{$value_name} if ( defined($filter_terms{$value_name}) );
|
|
$term->{op} = $filter_terms{$op_name} if ( $filter_terms{$op_name} );
|
|
$term->{cbr} = $filter_terms{$cbracket_name} if ( $filter_terms{$cbracket_name} );
|
|
push( @{$filter->{terms}}, $term );
|
|
}
|
|
$filter->{sort_field} = $filter_terms{sort_field} if ( $filter_terms{sort_field} );
|
|
$filter->{sort_asc} = $filter_terms{sort_asc} if ( $filter_terms{sort_asc} );
|
|
$filter->{limit} = $filter_terms{limit} if ( $filter_terms{limit} );
|
|
|
|
my $new_query = 'a:'.int(keys(%$filter)).':{s:5:"terms";a:'.int(@{$filter->{terms}}).':{';
|
|
my $i = 0;
|
|
foreach my $term ( @{$filter->{terms}} )
|
|
{
|
|
$new_query .= 'i:'.$i.';a:'.int(keys(%$term)).':{';
|
|
while ( my ( $key, $val ) = each( %$term ) )
|
|
{
|
|
$new_query .= 's:'.length($key).':"'.$key.'";';
|
|
$new_query .= 's:'.length($val).':"'.$val.'";';
|
|
}
|
|
$new_query .= '}';
|
|
$i++;
|
|
}
|
|
$new_query .= '}';
|
|
foreach my $field ( "sort_field", "sort_asc", "limit" )
|
|
{
|
|
if ( defined($filter->{$field}) )
|
|
{
|
|
$new_query .= 's:'.length($field).':"'.$field.'";';
|
|
$new_query .= 's:'.length($filter->{$field}).':"'.$filter->{$field}.'";';
|
|
}
|
|
}
|
|
$new_query .= '}';
|
|
|
|
my $sql = "update Filters set Query = ? where Name = ?";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute( $new_query, $db_filter->{Name} ) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
}
|
|
|
|
# Update the stream quality setting to the old image quality ones
|
|
{
|
|
my $dbh = zmDbConnect();
|
|
|
|
my $sql = "update Config set Value = ? where Name = 'ZM_JPEG_STREAM_QUALITY'";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute( ZM_JPEG_IMAGE_QUALITY ) or die( "Can't execute: ".$sth->errstr() );
|
|
}
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.23.0" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.23.0" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade || $version eq "1.23.1" )
|
|
{
|
|
# Patch the database
|
|
patchDB( $dbh, "1.23.1" );
|
|
$cascade = !undef;
|
|
}
|
|
if ( $cascade )
|
|
{
|
|
my $installed_version = ZM_VERSION;
|
|
my $sql = "update Config set Value = ? where Name = ?";
|
|
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
|
my $res = $sth->execute( "$installed_version", "ZM_DYN_DB_VERSION" ) or die( "Can't execute: ".$sth->errstr() );
|
|
$res = $sth->execute( "$installed_version", "ZM_DYN_CURR_VERSION" ) or die( "Can't execute: ".$sth->errstr() );
|
|
$dbh->disconnect();
|
|
}
|
|
else
|
|
{
|
|
$dbh->disconnect();
|
|
die( "Can't find upgrade from version '$version'" );
|
|
}
|
|
print( "\nDatabase upgrade to version ".ZM_VERSION." successful.\n" );
|
|
}
|
|
print( "Update agent exiting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
|
|
exit( 0 );
|