From ffa18a6ceb5995602f12faf43ae058fe711af980 Mon Sep 17 00:00:00 2001 From: Kyle Johnson Date: Mon, 27 Jan 2014 14:26:03 -0500 Subject: [PATCH 1/2] Xdditional Makefile.am pointing to classic skin in flat skin. Fixes #313 --- web/skins/flat/ajax/Makefile.am | 2 +- web/skins/flat/css/Makefile.am | 2 +- web/skins/flat/graphics/Makefile.am | 2 +- web/skins/flat/includes/Makefile.am | 2 +- web/skins/flat/js/Makefile.am | 2 +- web/skins/flat/lang/Makefile.am | 2 +- web/skins/flat/views/Makefile.am | 2 +- web/skins/flat/views/css/Makefile.am | 2 +- web/skins/flat/views/js/Makefile.am | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/skins/flat/ajax/Makefile.am b/web/skins/flat/ajax/Makefile.am index f910cbc5c..fd511eb0f 100644 --- a/web/skins/flat/ajax/Makefile.am +++ b/web/skins/flat/ajax/Makefile.am @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS = gnu -webdir = @WEB_PREFIX@/skins/classic/ajax +webdir = @WEB_PREFIX@/skins/flat/ajax dist_web_DATA = # No files here diff --git a/web/skins/flat/css/Makefile.am b/web/skins/flat/css/Makefile.am index 5b0cbe135..de6601fca 100644 --- a/web/skins/flat/css/Makefile.am +++ b/web/skins/flat/css/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -webdir = @WEB_PREFIX@/skins/classic/css +webdir = @WEB_PREFIX@/skins/flat/css dist_web_DATA = \ skin.css \ diff --git a/web/skins/flat/graphics/Makefile.am b/web/skins/flat/graphics/Makefile.am index c5c7b6bba..81ac1b7e0 100644 --- a/web/skins/flat/graphics/Makefile.am +++ b/web/skins/flat/graphics/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -webdir = @WEB_PREFIX@/skins/classic/graphics +webdir = @WEB_PREFIX@/skins/flat/graphics dist_web_DATA = \ arrow-d.gif \ diff --git a/web/skins/flat/includes/Makefile.am b/web/skins/flat/includes/Makefile.am index 690df231a..71817400a 100644 --- a/web/skins/flat/includes/Makefile.am +++ b/web/skins/flat/includes/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -webdir = @WEB_PREFIX@/skins/classic/includes +webdir = @WEB_PREFIX@/skins/flat/includes dist_web_DATA = \ init.php \ diff --git a/web/skins/flat/js/Makefile.am b/web/skins/flat/js/Makefile.am index 22f944d9e..a5b95f5e6 100644 --- a/web/skins/flat/js/Makefile.am +++ b/web/skins/flat/js/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -webdir = @WEB_PREFIX@/skins/classic/js +webdir = @WEB_PREFIX@/skins/flat/js dist_web_DATA = \ skin.js \ diff --git a/web/skins/flat/lang/Makefile.am b/web/skins/flat/lang/Makefile.am index 6a089b4fa..272014a19 100644 --- a/web/skins/flat/lang/Makefile.am +++ b/web/skins/flat/lang/Makefile.am @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS = gnu -webdir = @WEB_PREFIX@/skins/classic/lang +webdir = @WEB_PREFIX@/skins/flat/lang dist_web_DATA = # No files here diff --git a/web/skins/flat/views/Makefile.am b/web/skins/flat/views/Makefile.am index 58c72b78f..84b6b9811 100644 --- a/web/skins/flat/views/Makefile.am +++ b/web/skins/flat/views/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = \ css \ js -webdir = @WEB_PREFIX@/skins/classic/views +webdir = @WEB_PREFIX@/skins/flat/views dist_web_DATA = \ bandwidth.php \ diff --git a/web/skins/flat/views/css/Makefile.am b/web/skins/flat/views/css/Makefile.am index 39c270cf7..3e0ef100b 100644 --- a/web/skins/flat/views/css/Makefile.am +++ b/web/skins/flat/views/css/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -webdir = @WEB_PREFIX@/skins/classic/views/css +webdir = @WEB_PREFIX@/skins/flat/views/css dist_web_DATA = \ console.css \ diff --git a/web/skins/flat/views/js/Makefile.am b/web/skins/flat/views/js/Makefile.am index ba1845e0c..2b2c1a53d 100644 --- a/web/skins/flat/views/js/Makefile.am +++ b/web/skins/flat/views/js/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -webdir = @WEB_PREFIX@/skins/classic/views/js +webdir = @WEB_PREFIX@/skins/flat/views/js dist_web_DATA = \ console.js \ From c492d421e53d1c01d5c896f04a24521b4f915d12 Mon Sep 17 00:00:00 2001 From: Kyle Johnson Date: Tue, 28 Jan 2014 08:13:44 -0500 Subject: [PATCH 2/2] Initial commit of zm-alarm.pl, example script to react to monitor alarms --- utils/zm-alarm.pl | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 utils/zm-alarm.pl diff --git a/utils/zm-alarm.pl b/utils/zm-alarm.pl new file mode 100644 index 000000000..542a2a09e --- /dev/null +++ b/utils/zm-alarm.pl @@ -0,0 +1,43 @@ +#!/usr/bin/env perl + +# While this script is running, it will print out the state of each alarm on the system. +# This script is an example of calling external scripts in reaction to a +# monitor changing state. Simply replace the print() commands with system(), +# for example, to call external scripts. + +use strict; +use warnings; +use ZoneMinder; +use Switch; + +$| = 1; + +my @monitors; +my $dbh = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS ) or die "Could not connect to the database.\n"; +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 '$sql': ".$sth->errstr() ); + +while ( my $monitor = $sth->fetchrow_hashref() ) { + push( @monitors, $monitor ); +} + +while (1) { + foreach my $monitor (@monitors) { + my $monitorState = zmGetMonitorState($monitor); + printState($monitor->{Id}, $monitor->{Name}, $monitorState); + } + sleep 1; +} + +sub printState { + my ($monitor_id, $monitor_name, $state) = @_; + my $time = localtime(); + + switch ($state) { + case 0 { print "$time - $monitor_name:\t Idle!\n" } + case 1 { print "$time - $monitor_name:\t Prealarm!\n" } + case 2 { print "$time - $monitor_name:\t Alarm!\n" } + case 3 { print "$time - $monitor_name:\t Alert!\n" } + } +}