Imported missing files from master to feature-h264-videostorage

2026-05-18 19:46:12 -04:00 · 2014-05-30 01:47:52 +10:00
parent d4654f63ae
commit df3ab025f8
1530 changed files with 350837 additions and 0 deletions
--- a/scripts/ZoneMinder/INSTALL.SKIP
+++ b/scripts/ZoneMinder/INSTALL.SKIP
@@ -0,0 +1 @@
+\.pm\.in$
--- a/scripts/ZoneMinder/MANIFEST.SKIP
+++ b/scripts/ZoneMinder/MANIFEST.SKIP
@@ -0,0 +1 @@
+\.pm\.in$
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm
@@ -0,0 +1,231 @@
+# ==========================================================================
+#
+# ZoneMinder Foscam FI8908W / FI8918W IP Control Protocol Module, $Date$, $Revision$
+# Copyright (C) 2001-2008 Philip Coombes
+# Modified for use with Foscam FI8908W IP Camera by Dave Harris
+#
+# 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.
+#
+# ==========================================================================
+#
+package ZoneMinder::Control::FI8908W;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+# ==========================================================================
+#
+# Foscam FI8908W IP Control Protocol
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+
+sub new
+{ 
+	my $class = shift;
+	my $id = shift;
+	my $self = ZoneMinder::Control->new( $id );
+	bless( $self, $class );
+	srand( time() );
+	return $self;
+}
+
+our $AUTOLOAD;
+
+sub AUTOLOAD
+{
+	my $self = shift;
+	my $class = ref($self) || croak( "$self not object" );
+	my $name = $AUTOLOAD;
+	$name =~ s/.*://;
+	if ( exists($self->{$name}) )
+	{
+		return( $self->{$name} );
+	}
+	Fatal( "Can't access $name member of object of class $class" );
+}
+
+sub open
+{
+	my $self = shift;
+
+	$self->loadMonitor();
+
+	use LWP::UserAgent;
+	$self->{ua} = LWP::UserAgent->new;
+	$self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+
+	$self->{state} = 'open';
+}
+
+sub close
+{ 
+	my $self = shift;
+	$self->{state} = 'closed';
+}
+
+sub printMsg
+{
+	my $self = shift;
+	my $msg = shift;
+	my $msg_len = length($msg);
+
+	Debug( $msg."[".$msg_len."]" );
+}
+
+sub sendCmd
+{
+	my $self = shift;
+	my $cmd = shift;
+	my $result = undef;
+
+	my ($user, $password) = split /:/, $self->{Monitor}->{ControlDevice};
+
+	if ( !defined $password ) {
+		# If value of "Control device" does not consist of two parts, then only password is given and we fallback to default user:
+		$password = $user;
+		$user = 'admin';
+	}
+
+	$cmd .= "user=$user&pwd=$password";
+
+	printMsg( $cmd, "Tx" );
+
+	my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" );
+	my $res = $self->{ua}->request($req);
+
+	if ( $res->is_success )
+	{
+		$result = !undef;
+	}
+	else
+	{
+		Error( "Error check failed: '".$res->status_line()."' for URL ".$req->uri() );
+	}
+
+	return( $result );
+}
+
+sub reset
+{
+	my $self = shift;
+	Debug( "Camera Reset" );
+	$self->sendCmd( 'reboot.cgi?' );
+}
+
+#Up Arrow
+sub moveConUp
+{
+	my $self = shift;
+	Debug( "Move Up" );
+	$self->sendCmd( 'decoder_control.cgi?command=0&' );
+}
+
+#Down Arrow
+sub moveConDown
+{
+	my $self = shift;
+	Debug( "Move Down" );
+	$self->sendCmd( 'decoder_control.cgi?command=2&' );
+}
+
+#Left Arrow
+sub moveConLeft
+{
+	my $self = shift;
+	Debug( "Move Left" );
+	$self->sendCmd( 'decoder_control.cgi?command=6&' );
+}
+
+#Right Arrow
+sub moveConRight
+{
+	my $self = shift;
+	Debug( "Move Right" );
+	$self->sendCmd( 'decoder_control.cgi?command=4&' );
+}
+
+#Diagonally Up Right Arrow
+sub moveConUpRight
+{
+	my $self = shift;
+	Debug( "Move Diagonally Up Right" );
+	$self->sendCmd( 'decoder_control.cgi?command=90&' );
+}
+
+#Diagonally Down Right Arrow
+sub moveConDownRight
+{
+	my $self = shift;
+	Debug( "Move Diagonally Down Right" );
+	$self->sendCmd( 'decoder_control.cgi?command=92&' );
+}
+
+#Diagonally Up Left Arrow
+sub moveConUpLeft
+{
+	my $self = shift;
+	Debug( "Move Diagonally Up Left" );
+	$self->sendCmd( 'decoder_control.cgi?command=91&' );
+}
+
+#Diagonally Down Left Arrow
+sub moveConDownLeft
+{
+	my $self = shift;
+	Debug( "Move Diagonally Down Left" );
+	$self->sendCmd( 'decoder_control.cgi?command=93&' );
+}
+
+#Stop
+sub moveStop
+{
+	my $self = shift;
+	Debug( "Move Stop" );
+	$self->sendCmd( 'decoder_control.cgi?command=1&' );
+}
+
+#Move Camera to Home Position
+sub presetHome
+{
+	my $self = shift;
+	Debug( "Home Preset" );
+	$self->sendCmd( 'decoder_control.cgi?command=25&' );
+}
+
+1;
+
+__END__
+=pod
+
+=head1 DESCRIPTION
+
+This module contains the implementation of the Foscam FI8908W / FI8918W IP camera control
+protocol.
+
+The module uses "Control Device" value to retrieve user and password. User and password should
+be separated by colon, e.g. user:password. If colon is not provided, then "admin" is used
+as a fallback value for the user.
+=cut
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Toshiba_IK_WB11A.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Toshiba_IK_WB11A.pm
@@ -0,0 +1,257 @@
+# ==========================================================================
+#
+# ZoneMinder Toshiba IK WB11A IP Camera Control Protocol Module,
+# Copyright (C) 2013  Tim Craig (timcraigNO@SPAMsonic.net)
+#
+# 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 module contains the implementation of the Airlink SkyIPCam
+# AICN747/AICN747W, TrendNet TV-IP410/TV-IP410W and other OEM versions of the
+# Fitivision CS-130A/CS-131A camera control protocol.
+#
+package ZoneMinder::Control::Toshiba_IK_WB11A;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+# ==========================================================================
+#
+#   Toshiba IK-WB11A IP Camera Control Protocol
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+
+sub new
+{
+    my $class = shift;
+    my $id = shift;
+    my $self = ZoneMinder::Control->new( $id );
+    bless( $self, $class );
+    srand( time() );
+    return $self;
+}
+
+our $AUTOLOAD;
+
+sub AUTOLOAD
+{
+    my $self = shift;
+    my $class = ref($self) || croak( "$self not object" );
+    my $name = $AUTOLOAD;
+    $name =~ s/.*://;
+    if ( exists($self->{$name}) )
+    {
+        return( $self->{$name} );
+    }
+    Fatal( "Can't access $name member of object of class $class" );
+}
+
+sub open
+{
+    my $self = shift;
+
+    $self->loadMonitor();
+
+    use LWP::UserAgent;
+    $self->{ua} = LWP::UserAgent->new;
+    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+
+    $self->{state} = 'open';
+}
+
+sub close
+{
+    my $self = shift;
+    $self->{state} = 'closed';
+}
+
+sub printMsg
+{
+    my $self = shift;
+    my $msg = shift;
+    my $msg_len = length($msg);
+
+    Debug( $msg."[".$msg_len."]" );
+}
+
+sub sendCmd
+{
+    my $self = shift;
+    my $cmd = shift;
+
+    #my $result = undef;
+
+    printMsg( $cmd, "Tx" );
+
+    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."$cmd" );
+    my $res = $self->{ua}->request($req);
+    return( !undef );
+}
+
+sub reset
+{
+    my $self = shift;
+    Debug( "Camera Reset" );
+    my $cmd = "/control.cgi?cont_2=16";
+    $self->sendCmd( $cmd );
+}
+
+sub moveMap
+{
+   Debug("MoveMap");
+   my $self = shift;
+   my $params = shift;
+   my $xcoord = $self->getParam( $params, 'xcoord' );
+   my $ycoord = $self->getParam( $params, 'ycoord' );
+
+   my $hor = $xcoord / $self->{Monitor}->{Width};
+   my $ver = $ycoord / $self->{Monitor}->{Height};
+
+   my $maxver = 10;
+   my $maxhor = 10;
+
+   my $horSteps = 0;
+   my $verSteps = 0;
+
+   $horSteps = $hor * $maxhor;
+   $verSteps = $ver * $maxver;
+
+    my $v = int($verSteps);
+    my $h = int($horSteps);
+
+    Debug( "Move Map to $xcoord,$ycoord, hor=$h, ver=$v");
+    my $cmd = "/cont.cgi?contptpoint_".$h."_".$v."=1";
+    $self->sendCmd( $cmd );
+}
+
+sub moveRelUp
+{
+    my $self = shift;
+    Debug( "Step Up" );
+    my $cmd = "/control.cgi?cont_2=4";
+    $self->sendCmd( $cmd );
+}
+
+sub moveRelDown
+{
+    my $self = shift;
+    Debug( "Step Down" );
+    my $cmd = "/control.cgi?cont_2=8";
+    $self->sendCmd( $cmd );
+}
+
+sub moveRelLeft
+{
+    my $self = shift;
+    Debug( "Step Left" );
+    my $cmd = "/control.cgi?cont_2=1";
+    $self->sendCmd( $cmd );
+}
+
+sub moveRelRight
+{
+    my $self = shift;
+    Debug( "Step Right" );
+    my $cmd = "/control.cgi?cont_2=2";
+    $self->sendCmd( $cmd );
+}
+
+sub presetClear
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    Debug( "Clear Preset $preset" );
+    my $cmdNum = 3 << 8 | $preset;
+    my $cmd = "/control.cgi?cont_4=$cmdNum";
+    $self->sendCmd( $cmd );
+}
+
+sub presetSet
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    Debug( "Set Preset $preset" );
+    my $cmdNum = 2 << 8 | $preset;
+    my $cmd = "/control.cgi?cont_4=$cmdNum";
+    $self->sendCmd( $cmd );
+}
+
+sub presetGoto
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    Debug( "Goto Preset $preset" );
+    my $cmdNum = 1 << 8 | $preset;
+    my $cmd = "/control.cgi?cont_4=$cmdNum";
+    $self->sendCmd( $cmd );
+}
+
+1;
+__END__
+# Below is stub documentation for your module. You'd better edit it!
+
+=head1 NAME
+
+ZoneMinder::Control::Toshiba_IK_WB11A - Zoneminder PTZ control module the Toshiba IK-WB11A IP Camera
+
+=head1 SYNOPSIS
+
+  use ZoneMinder::Control::Toshiba_IK_WB11A;
+  blah blah blah
+
+=head1 DESCRIPTION
+
+   This is for Zoneminder PTZ control module for the Toshib_IK_WB11A camera.
+
+=head2 EXPORT
+
+None by default.
+
+
+
+=head1 SEE ALSO
+
+www.zoneminder.com
+
+=head1 AUTHOR
+
+Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
+Tim Craig, E<lt>timcraigNO@SPAMsonic.netE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2013 by Tim Craig
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Wanscam.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Wanscam.pm
@@ -0,0 +1,502 @@
+# ==========================================================================
+#
+# ZoneMinder Wanscam Control Protocol Module, $Date: 2009-11-25 09:20:00 +0000 (Wed, 04 Nov 2009) $, $Revision: 0001 $
+# Copyright (C) 2001-2008 Philip Coombes
+# Modified for use with Foscam FI8918W IP Camera by Dave Harris
+# Modified Feb 2011 by Howard Durdle (http://durdl.es/x) to:
+#      fix horizontal panning, add presets and IR on/off
+#      use Control Device field to pass username and password
+# Modified June 5th, 2012 by Chris Bagwell to:
+#   Rename to IPCAM since its common protocol with wide range of cameras.
+#   Work with Logger module instead of Debug module.
+#   Fix off-by-1 preset bug.
+#   Support optional autostop timeout.
+#   Add Zoom, Brightness, and Contrast support.
+# Modified July 7th, 2012 by Patrik Brander to:
+#   Rename to Wanscam
+#   Pan Left/Right switched
+#   IR On/Off switched
+#   Brightness Increase/Decrease in 16 steps 
+#   
+#
+# 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 module contains the implementation of the Wanscam camera control
+# protocol.
+#
+# This is a protocol shared by a wide range of affordable cameras that
+# appear to share similar reference design and software.  Examples
+# include Foscam, Agasio, Wansview, etc.
+#
+# The basis for CGI based API can be found on internet by searching for
+# "IPCAM CGI SDK 2.1". Here is sample site that also developes replacement
+# firmware for some hardware versions.
+#
+# http://www.openipcam.com/files/Manuals/IPCAM%20CGI%20SDK%202.1.pdf
+#
+package ZoneMinder::Control::Wanscam;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+# ==========================================================================
+#
+# Wanscam Control Protocol
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+
+sub new
+{
+    my $class = shift;
+    my $id = shift;
+    my $self = ZoneMinder::Control->new( $id );
+    my $logindetails = "";
+    bless( $self, $class );
+    srand( time() );
+    return $self;
+}
+
+our $AUTOLOAD;
+
+sub AUTOLOAD
+{
+    my $self = shift;
+    my $class = ref($self) || croak( "$self not object" );
+    my $name = $AUTOLOAD;
+    $name =~ s/.*://;
+    if ( exists($self->{$name}) )
+    {
+	return( $self->{$name} );
+    }
+    Fatal( "Can't access $name member of object of class $class" );
+}
+
+sub open
+{
+    my $self = shift;
+
+    $self->loadMonitor();
+
+    use LWP::UserAgent;
+    $self->{ua} = LWP::UserAgent->new;
+    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+
+    $self->{state} = 'open';
+}
+
+sub close
+{
+    my $self = shift;
+    $self->{state} = 'closed';
+}
+
+sub printMsg
+{
+    my $self = shift;
+    my $msg = shift;
+    my $msg_len = length($msg);
+
+    Debug( $msg."[".$msg_len."]" );
+}
+
+sub sendCmd
+{
+    my $self = shift;
+    my $cmd = shift;
+    my $result = undef;
+    printMsg( $cmd, "Tx" );
+
+    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd".$self->{Monitor}->{ControlDevice} );
+    my $res = $self->{ua}->request($req);
+
+    if ( $res->is_success )
+    {
+	$result = $res->decoded_content;
+    }
+    else
+    {
+	Error( "Error check failed:'".$res->status_line()."'" );
+    }
+
+    return( $result );
+}
+
+# Turn IO on (can be internally wired to IR's)
+sub wake
+{
+    my $self = shift;
+    Debug( "Wake - IO on" );
+    my $cmd = "decoder_control.cgi?command=94&";
+    $self->sendCmd( $cmd );
+}
+
+# Turn IO off (can be internally wired to IR's)
+sub sleep
+{
+    my $self = shift;
+    Debug( "Sleep - IO off" );
+    my $cmd = "decoder_control.cgi?command=95&";
+    $self->sendCmd( $cmd );
+}
+
+sub reset
+{
+    my $self = shift;
+    Debug( "Camera Reset" );
+    my $cmd = "reboot.cgi?";
+    $self->sendCmd( $cmd );
+}
+
+sub moveConUp
+{
+    my $self = shift;
+    my $params = shift;
+    Debug( "Move Up" );
+    my $cmd = "decoder_control.cgi?command=0&";
+    $self->sendCmd( $cmd );
+    my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+sub moveConDown
+{
+    my $self = shift;
+    my $params = shift;
+    Debug( "Move Down" );
+    my $cmd = "decoder_control.cgi?command=2&";
+    $self->sendCmd( $cmd );
+    my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+sub moveConRight
+{
+    my $self = shift;
+    my $params = shift;
+    Debug( "Move Right" );
+    my $cmd = "decoder_control.cgi?command=4&";
+    $self->sendCmd( $cmd );
+    my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+sub moveConLeft
+{
+    my $self = shift;
+    my $params = shift;
+    Debug( "Move Left" );
+    my $cmd = "decoder_control.cgi?command=6&";
+    $self->sendCmd( $cmd );
+    my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+sub moveConUpLeft
+{
+    my $self = shift;
+    my $params = shift;
+    Debug( "Move Diagonally Up Left" );
+    my $cmd = "decoder_control.cgi?command=91&";
+    $self->sendCmd( $cmd );
+    my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+sub moveConDownLeft
+{
+    my $self = shift;
+    my $params = shift;
+    Debug( "Move Diagonally Down Left" );
+    my $cmd = "decoder_control.cgi?command=93&";
+    $self->sendCmd( $cmd );
+    my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+sub moveConUpRight
+{
+    my $self = shift;
+    my $params = shift;
+    Debug( "Move Diagonally Up Right" );
+    my $cmd = "decoder_control.cgi?command=90&";
+    $self->sendCmd( $cmd );
+    my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+sub moveConDownRight
+{
+    my $self = shift;
+    my $params = shift;
+    Debug( "Move Diagonally Down Right" );
+    my $cmd = "decoder_control.cgi?command=92&";
+    $self->sendCmd( $cmd );
+    my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+        $self->moveStop( $params );
+    }
+}
+
+# command=1 is technically Up Stop but seems to work for all stops.
+sub moveStop
+{
+    my $self = shift;
+    Debug( "Move Stop" );
+    print("autostop\n");
+    my $cmd = "decoder_control.cgi?command=1&";
+    $self->sendCmd( $cmd );
+}
+
+sub zoomConTele
+{
+    my $self = shift;
+    my $params = shift;
+    Debug( "Zoom Tele" );
+    my $cmd = "decoder_control.cgi?command=16&";
+    $self->sendCmd( $cmd );
+    my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+	$cmd = "decoder_control.cgi?command=17&";
+	$self->sendCmd( $cmd );
+    }
+}
+
+sub zoomConWide
+{
+    my $self = shift;
+    my $params = shift;
+    Debug( "Zoom Wide" );
+    my $cmd = "decoder_control.cgi?command=18&";
+    $self->sendCmd( $cmd );
+    my $autostop = $self->getParam( $params, 'autostop', 0 );
+    if ( $autostop && $self->{Monitor}->{AutoStopTimeout} )
+    {
+        usleep( $self->{Monitor}->{AutoStopTimeout} );
+	$cmd = "decoder_control.cgi?command=19&";
+	$self->sendCmd( $cmd );
+    }
+}
+
+sub zoomConStop
+{
+    my $self = shift;
+    my $params = shift;
+    Debug( "Zoom Stop" );
+    my $cmd = "decoder_control.cgi?command=17&";
+    $self->sendCmd( $cmd );
+}
+
+# Increase Brightness
+sub irisAbsOpen
+{
+    my $self = shift;
+    my $params = shift;
+    my $step = $self->getParam( $params, 'step' );
+    my $brightness = 100;
+
+    my $cmd = "get_camera_params.cgi?";
+    my $resp = $self->sendCmd( $cmd );
+
+    $brightness = int($1) if ( $resp =~ m/var brightness=([0-9]*);/ );
+    $brightness += $step * 16;
+    $brightness = 255 if ($brightness > 255);
+    Debug( "Iris Open $brightness" );
+    $cmd = "camera_control.cgi?param=1&value=".$brightness."&";
+    $self->sendCmd( $cmd );
+}
+
+# Decrease Brightness
+sub irisAbsClose
+{
+    my $self = shift;
+    my $params = shift;
+    my $step = $self->getParam( $params, 'step' );
+    my $brightness = 100;
+
+    my $cmd = "get_camera_params.cgi?";
+    my $resp = $self->sendCmd( $cmd );
+
+    $brightness = int($1) if ( $resp =~ m/var brightness=([0-9]*);/ );
+    $brightness -= $step * 16;
+    $brightness = 0 if ($brightness < 0);
+    Debug( "Iris Close $brightness" );
+    $cmd = "camera_control.cgi?param=1&value=".$brightness."&";
+    $self->sendCmd( $cmd );
+}
+
+# Increase Contrast
+sub whiteAbsIn
+{
+    my $self = shift;
+    my $params = shift;
+    my $step = $self->getParam( $params, 'step' );
+    my $contrast = 5;
+
+    my $cmd = "get_camera_params.cgi?";
+    my $resp = $self->sendCmd( $cmd );
+
+    $contrast = int($1) if ( $resp =~ m/var contrast=([0-9]*);/ );
+    $contrast += $step;
+    $contrast = 6 if ($contrast > 6);
+    Debug( "White In $contrast" );
+    $cmd = "camera_control.cgi?param=2&value=".$contrast."&";
+    $self->sendCmd( $cmd );
+}
+
+# Decrease Contrast
+sub whiteAbsOut
+{
+    my $self = shift;
+    my $params = shift;
+    my $step = $self->getParam( $params, 'step' );
+    my $contrast = 5;
+
+    my $cmd = "get_camera_params.cgi?";
+    my $resp = $self->sendCmd( $cmd );
+
+    $contrast = int($1) if ( $resp =~ m/var contrast=([0-9]*);/ );
+    $contrast -= $step;
+    $contrast = 0 if ($contrast < 0);
+    Debug( "White Out $contrast" );
+    $cmd = "camera_control.cgi?param=2&value=".$contrast."&";
+    $self->sendCmd( $cmd );
+}
+
+sub presetHome
+{
+    my $self = shift;
+    Debug( "Home Preset" );
+    my $cmd = "decoder_control.cgi?command=25&";
+    $self->sendCmd( $cmd );
+}
+
+sub presetSet
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    my $presetCmd = 30 + (($preset-1)*2);
+    Debug( "Set Preset $preset with cmd $presetCmd" );
+    my $cmd = "decoder_control.cgi?command=$presetCmd&";
+    $self->sendCmd( $cmd );
+}
+
+sub presetGoto
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    my $presetCmd = 31 + (($preset-1)*2);
+    Debug( "Goto Preset $preset with cmd $presetCmd" );
+    my $cmd = "decoder_control.cgi?command=$presetCmd&";
+    $self->sendCmd( $cmd );
+}
+1;
+__END__
+# Below is stub documentation for your module. You'd better edit it!
+
+=head1 NAME
+
+ZoneMinder::Database - Perl extension for blah blah blah
+
+=head1 SYNOPSIS
+
+  use ZoneMinder::Control::Wanscam
+  blah blah blah
+
+=head1 DESCRIPTION
+
+Stub documentation for ZoneMinder, created by h2xs. It looks like the
+author of the extension was negligent enough to leave the stub
+unedited.
+
+Blah blah blah.
+
+=head2 EXPORT
+
+None by default.
+
+
+
+=head1 SEE ALSO
+
+Mention other useful documentation such as the documentation of
+related modules or operating system documentation (such as man pages
+in UNIX), or any relevant external documentation such as RFCs or
+standards.
+
+If you have a mailing list set up for your module, mention it here.
+
+If you have a web site set up for your module, mention it here.
+
+=head1 AUTHOR
+
+Philip Coombes, <philip.coombes@zoneminder.com>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2008  Philip Coombes
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut
--- a/scripts/zmcamtool.pl.in
+++ b/scripts/zmcamtool.pl.in
@@ -0,0 +1,404 @@
+#!/usr/bin/perl -w
+#
+# ==========================================================================
+#
+# ZoneMinder Update Script, $Date$, $Revision$
+# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+#
+# This script provides a way to import new ptz camera controls & camera presets
+# into existing zoneminder systems. This script also provides a way to export
+# ptz camera controls & camera presets from an existing zoneminder system into
+# a sql file, which can then be easily imported to another zoneminder system.
+#
+use strict;
+use bytes;
+
+@EXTRA_PERL_LIB@
+use ZoneMinder::Config qw(:all);
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Database qw(:all);
+use DBI;
+use Getopt::Long;
+
+$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( $Config{ZM_WEB_USER} ))[2];
+my $use_log = (($> == 0) || ($> == $web_uid));
+
+logInit( toFile=>$use_log?DEBUG:NOLOG );
+logSetSignal();
+
+my $export = 0;
+my $import = 0;
+my $overwrite = 0;
+my $help = 0;
+my $topreset = 0;
+my $noregex = 0;
+my $sqlfile = '';
+my $dbUser = $Config{ZM_DB_USER};
+my $dbPass = $Config{ZM_DB_PASS};
+
+# Process commandline parameters with getopt long
+if ( !GetOptions( 'export'=>\$export, 'import'=>\$import, 'overwrite'=>\$overwrite, 'help'=>\$help, 'topreset'=>\$topreset, 'noregex'=>\$noregex, 'user:s'=>\$dbUser, 'pass:s'=>\$dbPass ) ) {
+	Usage();
+}
+
+$Config{ZM_DB_USER} = $dbUser;
+$Config{ZM_DB_PASS} = $dbPass;
+
+# Check to make sure commandline params make sense
+if ( ((!$help) && ($import + $export + $topreset) != 1 )) {
+	print( STDERR qq/Please give only one of the following: "import", "export", or "topreset".\n/ );
+	Usage();
+}
+
+if ( ($export)&&($overwrite) ) {
+	print( "Warning: Overwrite parameter ignored during an export.\n");
+}
+
+if ( ($noregex)&&(!$topreset) ) {
+	print( qq/Warning: Noregex parameter only applies when "topreset" parameter is also set. Ignoring.\n/);
+}
+
+if ( ($topreset)&&($ARGV[0] !~ /\d\d*/) ) {
+	print( STDERR qq/Parameter "topreset" requires a valid monitor ID.\n/ );
+	Usage();
+}
+
+# Call the appropriate subroutine based on the params given on the commandline
+if ($help) {
+	Usage();
+}
+
+if ($export) {
+	exportsql();
+}
+
+if ($import) {
+	importsql();
+}
+
+if ($topreset) {
+	toPreset();
+}
+
+###############
+# SUBROUTINES #
+###############
+
+# Usage subroutine help text
+sub Usage
+{
+die("
+USAGE: 
+zmcamtool.pl [--user=<dbuser> --pass=<dbpass>]
+	     [--import [file.sql] [--overwrite]]
+	     [--export [name]]
+	     [--topreset id [--noregex]]
+
+PARAMETERS:
+--export            - Export all camera controls and presets to STDOUT.
+		      Optionally specify a control or preset name.
+--import [file.sql] - Import new camera controls and presets found in
+		      zm_create.sql into the ZoneMinder dB.
+		      Optionally specify an alternate sql file to read from.
+--overwrite         - Overwrite any existing controls or presets.
+		      with the same name as the new controls or presets.
+--topreset id       - Copy a monitor to a Camera Preset given the monitor id.
+--noregex	    - Do not try to find and replace fields such as usernames,
+		      passwords, ip addresses, etc with generic placeholders
+		      when converting a monitor to a preset.
+--help		    - Print usage information.
+--user=<dbuser>     - Alternate dB user with privileges to alter dB.
+--pass=<dbpass>     - Password of alternate dB user with privileges to alter dB.
+\n");
+}
+
+# Execute a pre-built sql select query
+sub selectQuery
+{
+	my $dbh = shift;
+	my $sql = shift;
+	my $monitorid = shift;
+
+	my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+	my $res = $sth->execute($monitorid) or die( "Can't execute: ".$sth->errstr() );
+
+	my @data = $sth->fetchrow_array();
+	$sth->finish();
+
+	return @data;
+}
+
+# Exectute a pre-built sql query
+sub runQuery
+{
+	my $dbh = shift;
+	my $sql = shift;
+	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() );
+	$sth->finish();
+
+	return $res;
+}
+
+# Build and execute a sql insert query
+sub insertQuery
+{
+	my $dbh = shift;
+	my $tablename = shift;
+	my @data = @_;
+
+	my $sql = "insert into $tablename values (NULL,".(join ", ", ("?") x @data).")"; # Add "?" for each array element
+
+	my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+	my $res = $sth->execute(@data) or die( "Can't execute: ".$sth->errstr() );
+	$sth->finish();
+
+	return $res;
+}
+
+# Build and execute a sql delete query
+sub deleteQuery
+{
+	my $dbh = shift;
+	my $sqltable = shift;
+	my $sqlname = shift;
+
+	my $sql = "delete from $sqltable where Name = ?";
+	my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+	my $res = $sth->execute($sqlname) or die( "Can't execute: ".$sth->errstr() );
+	$sth->finish();
+
+	return $res;
+}
+
+# Build and execute a sql select count query
+sub checkExists
+{
+	my $dbh = shift;
+	my $sqltable = shift;
+	my $sqlname = shift;
+	my $result = 0;	
+
+	my $sql = "select count(*) from $sqltable where Name = ?";
+	my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+	my $res = $sth->execute($sqlname) or die( "Can't execute: ".$sth->errstr() );
+
+	my $rows = $sth->fetchrow_arrayref();
+	$sth->finish();
+
+	if ($rows->[0] > 0) {
+		$result = 1;
+	}
+
+	return $result;
+}
+
+# Import camera control & presets into the zoneminder dB
+sub importsql 
+{
+	my @newcontrols;
+	my @overwritecontrols;
+	my @skippedcontrols;
+	my @newpresets;
+	my @overwritepresets;
+	my @skippedpresets;
+	my %controls;
+	my %monitorpresets;
+
+	if ($ARGV[0]) {
+		$sqlfile = $ARGV[0];
+	} else {
+		$sqlfile = $Config{ZM_PATH_DATA}.'/db/zm_create.sql';
+	}
+
+	open(my $SQLFILE,"<",$sqlfile) or die( "Can't Open file: $!\n" );
+
+	# Find and extract ptz control and monitor preset records
+	while (<$SQLFILE>) {
+		# Our regex replaces the primary key with NULL
+		if (s/^(INSERT INTO .*?Controls.*? VALUES \().*?(,')(.*?)(',.*)/$1NULL$2$3$4/i) {	
+			$controls{$3} = $_;
+		} elsif (s/^(INSERT INTO .*?MonitorPresets.*? VALUES \().*?(,')(.*?)(',.*)/$1NULL$2$3$4/i) {
+			$monitorpresets{$3} = $_;
+		}
+	}
+	close $SQLFILE;
+
+	if ( ! (%controls || %monitorpresets) ) {
+		die( "Error: No relevant data found in $sqlfile.\n" );
+	}
+
+	# Now that we've got what we were looking for, compare to what is already in the dB
+
+	my $dbh = zmDbConnect();
+	foreach (keys %controls) {
+		if (!checkExists($dbh,"Controls",$_)) {
+			# No existing Control was found.  Add new control to dB.
+			runQuery($dbh,$controls{$_});
+			push @newcontrols, $_;
+		} elsif ($overwrite) {
+			# An existing Control was found and the overwrite flag is set.  Overwrite the control.
+			deleteQuery($dbh,"Controls",$_);
+			runQuery($dbh,$controls{$_});
+			push @overwritecontrols, $_;
+		} else {
+			# An existing Control was found and the overwrite flag was not set. Do nothing.
+			push @skippedcontrols, $_;
+		}	
+	}
+
+	foreach (keys %monitorpresets) {
+		if (!checkExists($dbh,"MonitorPresets",$_)) {
+			# No existing MonitorPreset was found.  Add new MonitorPreset to dB.
+			runQuery($dbh,$monitorpresets{$_});
+			push @newpresets, $_;
+		} elsif ($overwrite) {
+			# An existing MonitorPreset was found and the overwrite flag is set.  Overwrite the MonitorPreset.
+			deleteQuery($dbh,"MonitorPresets",$_);
+			runQuery($dbh,$monitorpresets{$_});
+			push @overwritepresets, $_;
+		} else {
+			# An existing MonitorPreset was found and the overwrite flag was not set. Do nothing.
+			push @skippedpresets, $_;
+		}
+	}
+
+	if (@newcontrols) {
+		print "Number of ptz camera controls added: ".scalar(@newcontrols)."\n";
+	}
+	if (@overwritecontrols) {
+		print "Number of existing ptz camera controls overwritten: ".scalar(@overwritecontrols)."\n";
+	}
+	if (@skippedcontrols) {
+		print "Number of existing ptz camera controls skipped: ".scalar(@skippedcontrols)."\n";
+	}
+
+	if (@newpresets) {
+		print "Number of monitor presets added: ".scalar(@newpresets)."\n";
+	}
+	if (@overwritepresets) {
+		print "Number of existing monitor presets overwritten: ".scalar(@overwritepresets)."\n";
+	}
+	if (@skippedpresets) {
+		print "Number of existing presets skipped: ".scalar(@skippedpresets)."\n";
+	}
+}
+
+# Export camera controls & presets from the zoneminder dB to STDOUT
+sub exportsql
+{
+
+my ( $host, $port ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
+my $command = "mysqldump -t --skip-opt --compact -h".$host;
+$command .= " -P".$port if defined($port);
+if ( $dbUser ) {
+	$command .= " -u".$dbUser;
+	if ( $dbPass ) {
+		$command .= " -p".$dbPass;
+		}
+	}
+
+if ($ARGV[0]) {
+	$command .= qq( --where="Name = '$ARGV[0]'");
+}
+
+$command .= " zm Controls MonitorPresets";
+
+my $output = qx($command);
+my $status = $? >> 8;
+if ( $status || logDebugging() ) {
+	chomp( $output );
+	print( "Output: $output\n" );
+}
+if ( $status ) {
+	die( "Command '$command' exited with status: $status\n" );
+} else {
+	# NULLify the primary keys before printing the output to STDOUT
+	$output =~ s/VALUES \((.*?),'/VALUES \(NULL,'/ig;
+	print $output;
+	}
+}
+
+sub toPreset
+{
+	my $dbh = zmDbConnect();
+	my $monitorid = $ARGV[0];
+
+	# Grap the following fields from the Monitors table
+	my $sql = "select 
+			Name, 
+			Type, 
+			Device, 
+			Channel, 
+			Format, 
+			Protocol, 
+			Method, 
+			Host, 
+			Port, 
+			Path, 
+			SubPath, 
+			Width, 
+			Height, 
+			Palette, 
+			MaxFPS, 
+			Controllable, 
+			ControlId, 
+			ControlDevice, 
+			ControlAddress, 
+			DefaultRate, 
+			DefaultScale 
+		from Monitors where Id = ?";
+	my @data = selectQuery($dbh,$sql,$monitorid);
+
+	if (!@data) {
+		die( "Error: Monitor Id $monitorid does not appear to exist in the database.\n" );
+	}
+
+	# Attempt to search for and replace system specific values such as ip addresses, ports, usernames, etc. with generic placeholders
+	if (!$noregex) {
+		foreach (@data) {
+			s/\b(?:\d{1,3}\.){3}\d{1,3}\b/<ip-address>/; # ip address
+			s/<ip-address>:(6553[0-5]|655[0-2]\d|65[0-4]\d\d|6[0-4]\d{3}|[1-5]\d{4}|[1-9]\d{0,3}|0)$/<ip-address>:<port>/; # tcpip port
+			s/\/\/.*:.*@/\/\/<username>:<pwd>@/; # user & pwd preceeding an ip address
+			s/(&|\?)(user|username)=\w\w*(&|\?)/$1$2=<username>$3/i; # username embeded in url
+			s/(&|\?)(pwd|password)=\w\w*(&|\?)/$1$2=<pwd>$3/i; # password embeded in url
+			s/\w\w*:\w\w*/<username>:<pwd>/; # user & pwd in their own field
+			s/\/dev\/video\d\d*/\/dev\/video<?>/; # local video devices
+		}
+	}
+
+	if (!checkExists($dbh,"MonitorPresets",$data[0])) {
+		# No existing Preset was found.  Add new Preset to dB.
+		print "Adding new preset: $data[0]\n";
+		insertQuery($dbh,"MonitorPresets",@data);
+	} elsif ($overwrite) {
+		# An existing Control was found and the overwrite flag is set.  Overwrite the control.
+		print "Existing preset $data[0] detected.\nOverwriting...\n";
+		deleteQuery($dbh,"MonitorPresets",$data[0]);
+		insertQuery($dbh,"MonitorPresets",@data);
+	} else {
+		# An existing Control was found and the overwrite flag was not set. Do nothing.
+		print "Existing preset $data[0] detected and overwrite flag not set.\nSkipping...\n";
+	}
+}
+