ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

This commit is contained in:
Isaac Connor 2017-05-30 10:22:17 -04:00
parent 2a2d667afb 32daa4faed
commit 845ef6c05a
5 changed files with 1600 additions and 1614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distros/ubuntu1604/control
View File

@ -5,29 +5,23 @@ Maintainer: Dmitry Smirnov <onlyjob@debian.org>
Uploaders: Vagrant Cascadian <vagrant@debian.org> Uploaders: Vagrant Cascadian <vagrant@debian.org>
Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree
,cmake ,cmake
<<<<<<< HEAD
,libx264-dev, libmp4v2-dev ,libx264-dev, libmp4v2-dev
,libavcodec-dev, libavformat-dev, libswscale-dev
,libavutil-dev, libavdevice-dev, libavresample-dev
,libboost-dev
=======
,libboost-dev ,libboost-dev
,libavdevice-dev (>= 6:10~) ,libavdevice-dev (>= 6:10~)
,libavcodec-dev (>= 6:10~) ,libavcodec-dev (>= 6:10~)
,libavformat-dev (>= 6:10~) ,libavformat-dev (>= 6:10~)
,libavutil-dev (>= 6:10~) ,libavutil-dev (>= 6:10~)
,libswscale-dev (>= 6:10~) ,libswscale-dev (>= 6:10~)
>>>>>>> dragndrop_monitor_sorting
,libbz2-dev ,libbz2-dev
,libgcrypt-dev ,libgcrypt-dev
,libcurl4-gnutls-dev ,libcurl4-gnutls-dev
,libgnutls-openssl-dev ,libgnutls-openssl-dev
, libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev ,libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev
,libmysqlclient-dev ,libmysqlclient-dev
,libpcre3-dev ,libpcre3-dev
,libpolkit-gobject-1-dev ,libpolkit-gobject-1-dev
,libv4l-dev (>= 0.8.3) [!hurd-any] ,libv4l-dev (>= 0.8.3) [!hurd-any]
,libvlc-dev, ,libvlc-dev
,libdate-manip-perl ,libdate-manip-perl
,libdbd-mysql-perl ,libdbd-mysql-perl
,libphp-serialization-perl ,libphp-serialization-perl

223
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
View File

@ -94,7 +94,7 @@ our %types = (
hint => 'yes|no', hint => 'yes|no',
pattern => qr|^([yn])|i, pattern => qr|^([yn])|i,
check => q( $1 ), check => q( $1 ),
format => q( ($1 =~ /^y/) ? 'yes' : 'no') format => q( ($1 =~ /^y/) ? 'yes' : 'no' )
}, },
integer => { integer => {
db_type => 'integer', db_type => 'integer',
@ -117,8 +117,8 @@ our %types = (
tristate => { tristate => {
db_type => 'string', db_type => 'string',
hint => 'auto|yes|no', hint => 'auto|yes|no',
pattern => qr|^([ayn])|i, check=> q( $1 ), pattern => qr|^([ayn])|i, check=>q( $1 ),
format => q( ($1 =~ /^y/) ? 'yes' : ($1 =~ /^n/ ? 'no' : 'auto' )) format => q( ($1 =~ /^y/) ? 'yes' : ($1 =~ /^n/ ? 'no' : 'auto' ) )
}, },
abs_path => { abs_path => {
db_type => 'string', db_type => 'string',
@ -158,7 +158,7 @@ our %types = (
}, },
email => { email => {
db_type => 'string', db_type => 'string',
hint => 'your.name\@your.domain', hint => 'your.name@your.domain',
pattern => qr|^([a-zA-Z0-9_.-]+)\@([a-zA-Z0-9_.-]+)$|, pattern => qr|^([a-zA-Z0-9_.-]+)\@([a-zA-Z0-9_.-]+)$|,
format => q( $1\@$2 ) format => q( $1\@$2 )
}, },
@ -238,7 +238,7 @@ our @options = (
supplied user without additional authentication provided such a supplied user without additional authentication provided such a
user is configured ion ZoneMinder. user is configured ion ZoneMinder.
`, `,
requires => [ { name=> 'ZM_OPT_USE_AUTH', value=>'yes' } ], requires => [ { name=>'ZM_OPT_USE_AUTH', value=>'yes' } ],
type => { type => {
db_type => 'string', db_type => 'string',
hint => 'builtin|remote', hint => 'builtin|remote',
@ -263,7 +263,7 @@ our @options = (
external access. You can also switch off authentication external access. You can also switch off authentication
relaying if your system is isolated in other ways. relaying if your system is isolated in other ways.
`, `,
requires => [ { name=> 'ZM_OPT_USE_AUTH', value=>'yes' } ], requires => [ { name=>'ZM_OPT_USE_AUTH', value=>'yes' } ],
type => { type => {
db_type => 'string', db_type => 'string',
hint => 'hashed|plain|none', hint => 'hashed|plain|none',
@ -284,8 +284,8 @@ our @options = (
secret increases security substantially. secret increases security substantially.
`, `,
requires => [ requires => [
{ name=> 'ZM_OPT_USE_AUTH', value=>'yes' }, { name=>'ZM_OPT_USE_AUTH', value=>'yes' },
{ name=> 'ZM_AUTH_RELAY', value=>'hashed' } { name=>'ZM_AUTH_RELAY', value=>'hashed' }
], ],
type => $types{string}, type => $types{string},
category => 'system', category => 'system',
@ -307,8 +307,8 @@ our @options = (
authentication, switching this option off may help. authentication, switching this option off may help.
`, `,
requires => [ requires => [
{ name=> 'ZM_OPT_USE_AUTH', value=>'yes' }, { name=>'ZM_OPT_USE_AUTH', value=>'yes' },
{ name=> 'ZM_AUTH_RELAY', value=>'hashed' } { name=>'ZM_AUTH_RELAY', value=>'hashed' }
], ],
type => $types{boolean}, type => $types{boolean},
category => 'system', category => 'system',
@ -348,8 +348,8 @@ our @options = (
ZM_AUTH_HASH_SECRET to something unique to your system. ZM_AUTH_HASH_SECRET to something unique to your system.
`, `,
requires => [ requires => [
{ name=> 'ZM_OPT_USE_AUTH', value=>'yes' }, { name=>'ZM_OPT_USE_AUTH', value=>'yes' },
{ name=> 'ZM_AUTH_RELAY', value=>'hashed' } { name=>'ZM_AUTH_RELAY', value=>'hashed' }
], ],
type => $types{boolean}, type => $types{boolean},
category => 'system', category => 'system',
@ -407,7 +407,7 @@ our @options = (
and they will fail the reCaptcha test. and they will fail the reCaptcha test.
`, `,
requires => [ requires => [
{name=> 'ZM_OPT_USE_AUTH', value=>'yes'} {name=>'ZM_OPT_USE_AUTH', value=>'yes'}
], ],
type => $types{boolean}, type => $types{boolean},
category => 'system', category => 'system',
@ -422,7 +422,7 @@ our @options = (
for more details. for more details.
`, `,
requires => [ requires => [
{name=> 'ZM_OPT_USE_GOOG_RECAPTCHA', value=>'yes'} {name=>'ZM_OPT_USE_GOOG_RECAPTCHA', value=>'yes'}
], ],
type => $types{string}, type => $types{string},
category => 'system', category => 'system',
@ -437,7 +437,7 @@ our @options = (
for more details. for more details.
`, `,
requires => [ requires => [
{name=> 'ZM_OPT_USE_GOOG_RECAPTCHA', value=>'yes'} {name=>'ZM_OPT_USE_GOOG_RECAPTCHA', value=>'yes'}
], ],
type => $types{string}, type => $types{string},
category => 'system', category => 'system',
@ -473,7 +473,7 @@ our @options = (
than 32k files in a single folder inherent in some filesystems. than 32k files in a single folder inherent in some filesystems.
It is important to note that you cannot simply change this It is important to note that you cannot simply change this
option. You must stop zoneminder, enable USE_DEEP_STORAGE, and option. You must stop zoneminder, enable USE_DEEP_STORAGE, and
then run 'sudo zmupdate.pl --migrate-events'. FAILURE TO DO then run "sudo zmupdate.pl --migrate-events". FAILURE TO DO
SO WILL RESULT IN LOSS OF YOUR DATA! Consult the ZoneMinder SO WILL RESULT IN LOSS OF YOUR DATA! Consult the ZoneMinder
WiKi for further details. WiKi for further details.
`, `,
@ -751,7 +751,7 @@ our @options = (
installed in the same directory as the ZoneMinder web client installed in the same directory as the ZoneMinder web client
files. files.
`, `,
requires => [ { name=> 'ZM_OPT_CAMBOZOLA', value=>'yes' } ], requires => [ { name=>'ZM_OPT_CAMBOZOLA', value=>'yes' } ],
type => $types{rel_path}, type => $types{rel_path},
category => 'images', category => 'images',
}, },
@ -1017,7 +1017,7 @@ our @options = (
default => '@PATH_FFMPEG@', default => '@PATH_FFMPEG@',
description => 'Path to (optional) ffmpeg mpeg encoder', description => 'Path to (optional) ffmpeg mpeg encoder',
help => 'This path should point to where ffmpeg has been installed.', help => 'This path should point to where ffmpeg has been installed.',
requires => [ { name=> 'ZM_OPT_FFMPEG', value=>'yes' } ], requires => [ { name=>'ZM_OPT_FFMPEG', value=>'yes' } ],
type => $types{abs_path}, type => $types{abs_path},
category => 'images', category => 'images',
}, },
@ -1032,7 +1032,7 @@ our @options = (
are given before the -i option). Check the ffmpeg documentation are given before the -i option). Check the ffmpeg documentation
for a full list of options which may be used here. for a full list of options which may be used here.
`, `,
requires => [ { name=> 'ZM_OPT_FFMPEG', value=>'yes' } ], requires => [ { name=>'ZM_OPT_FFMPEG', value=>'yes' } ],
type => $types{string}, type => $types{string},
category => 'images', category => 'images',
}, },
@ -1049,7 +1049,7 @@ our @options = (
common one will often be to force an output frame rate common one will often be to force an output frame rate
supported by the video encoder. supported by the video encoder.
`, `,
requires => [ { name=> 'ZM_OPT_FFMPEG', value=>'yes' } ], requires => [ { name=>'ZM_OPT_FFMPEG', value=>'yes' } ],
type => $types{string}, type => $types{string},
category => 'images', category => 'images',
}, },
@ -1066,7 +1066,7 @@ our @options = (
web video, adding '**' defines the default format for phone web video, adding '**' defines the default format for phone
video. video.
`, `,
requires => [ { name=> 'ZM_OPT_FFMPEG', value=>'yes' } ], requires => [ { name=>'ZM_OPT_FFMPEG', value=>'yes' } ],
type => $types{string}, type => $types{string},
category => 'images', category => 'images',
}, },
@ -1081,7 +1081,7 @@ our @options = (
seconds to pass before closing the stream and trying to reopen seconds to pass before closing the stream and trying to reopen
it again. it again.
`, `,
requires => [ { name=> 'ZM_OPT_FFMPEG', value=>'yes' } ], requires => [ { name=>'ZM_OPT_FFMPEG', value=>'yes' } ],
type => $types{integer}, type => $types{integer},
category => 'images', category => 'images',
}, },
@ -1555,9 +1555,9 @@ our @options = (
help => q` help => q`
The camera probe function uses Address Resolution Protocol in The camera probe function uses Address Resolution Protocol in
order to find known devices on the network. Optionally supply order to find known devices on the network. Optionally supply
the full path to 'ip neigh', 'arp -a', or any other tool on the full path to \"ip neigh\", \"arp -a\", or any other tool on
your system that returns ip/mac address pairs. If this field is your system that returns ip/mac address pairs. If this field is
left empty, ZoneMinder will search for the command 'arp' and left empty, ZoneMinder will search for the command \"arp\" and
attempt to use that. attempt to use that.
`, `,
type => $types{abs_path}, type => $types{abs_path},
@ -1594,8 +1594,7 @@ our @options = (
name => 'ZM_WEB_EVENT_DISK_SPACE', name => 'ZM_WEB_EVENT_DISK_SPACE',
default => 'no', default => 'no',
description => 'Whether to show disk space used by each event.', description => 'Whether to show disk space used by each event.',
help => q` help => q`Adds another column to the listing of events
Adds another column to the listing of events
showing the disk space used by the event. This will impart a small showing the disk space used by the event. This will impart a small
overhead as it will call du on the event directory. In practice overhead as it will call du on the event directory. In practice
this overhead is fairly small but may be noticeable on IO-constrained this overhead is fairly small but may be noticeable on IO-constrained
@ -1624,7 +1623,8 @@ our @options = (
name => 'ZM_WEB_ID_ON_CONSOLE', name => 'ZM_WEB_ID_ON_CONSOLE',
default => 'no', default => 'no',
description => 'Should the console list the monitor id', description => 'Should the console list the monitor id',
help => q`Some find it useful to have the id always visible help => q`
Some find it useful to have the id always visible
on the console. This option will add a column listing it. on the console. This option will add a column listing it.
`, `,
type => $types{boolean}, type => $types{boolean},
@ -1681,7 +1681,7 @@ our @options = (
belonging to one House Code. This option details what that is. belonging to one House Code. This option details what that is.
It should be a single letter between A and P. It should be a single letter between A and P.
`, `,
type => { db_type=> 'string', hint=>'A-P', pattern=> qr|^([A-P])|i, format=> q( uc($1) ) }, type => { db_type=>'string', hint=>'A-P', pattern=>qr|^([A-P])|i, format=>q( uc($1) ) },
category => 'x10', category => 'x10',
}, },
{ {
@ -1779,11 +1779,13 @@ our @options = (
{ {
name => 'ZM_LD_PRELOAD', name => 'ZM_LD_PRELOAD',
default => '', default => '',
description => 'Path to library to preload before launching daemons', description => "Path to library to preload before launching daemons",
help => q`Some older cameras require the use of the v4l1 compat help => q`
Some older cameras require the use of the v4l1 compat
library. This setting allows the setting of the path library. This setting allows the setting of the path
to the library, so that it can be loaded by zmdc.pl to the library, so that it can be loaded by zmdc.pl
before launching zmc.`, before launching zmc.
`,
type => $types{abs_path}, type => $types{abs_path},
category => 'config', category => 'config',
}, },
@ -1825,7 +1827,7 @@ our @options = (
ZM_CAPTURES_PER_FRAME option and you should normally change the ZM_CAPTURES_PER_FRAME option and you should normally change the
value of only one of the options at a time. If you have value of only one of the options at a time. If you have
different capture cards that need different values you can different capture cards that need different values you can
ovveride them in each individual monitor on the source page. override them in each individual monitor on the source page.
`, `,
type => $types{boolean}, type => $types{boolean},
category => 'config', category => 'config',
@ -1849,7 +1851,7 @@ our @options = (
ZM_V4L_MULTI_BUFFER option and you should normally change the ZM_V4L_MULTI_BUFFER option and you should normally change the
value of only one of the options at a time. If you have value of only one of the options at a time. If you have
different capture cards that need different values you can different capture cards that need different values you can
ovveride them in each individual monitor on the source page. override them in each individual monitor on the source page.
`, `,
type => $types{integer}, type => $types{integer},
category => 'config', category => 'config',
@ -1913,10 +1915,10 @@ our @options = (
installed. installed.
`, `,
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'tar|zip', hint =>'tar|zip',
pattern => qr|^([tz])|i, pattern =>qr|^([tz])|i,
format => q( $1 =~ /^t/ ? 'tar' : 'zip' ) format =>q( $1 =~ /^t/ ? 'tar' : 'zip' )
}, },
category => 'upload', category => 'upload',
}, },
@ -1968,10 +1970,10 @@ our @options = (
on your choice. on your choice.
`, `,
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'ftp|sftp', hint =>'ftp|sftp',
pattern => qr|^([tz])|i, pattern =>qr|^([tz])|i,
format => q( $1 =~ /^f/ ? 'ftp' : 'sftp' ) format =>q( $1 =~ /^f/ ? 'ftp' : 'sftp' )
}, },
category => 'upload', category => 'upload',
}, },
@ -2108,7 +2110,6 @@ our @options = (
a remote ftp server. This option indicates the remote directory a remote ftp server. This option indicates the remote directory
that ZoneMinder should use to upload event files to. that ZoneMinder should use to upload event files to.
`, `,
requires => [ { name => 'ZM_OPT_UPLOAD', value => 'yes' } ],
type => $types{rel_path}, type => $types{rel_path},
category => 'hidden', category => 'hidden',
}, },
@ -2292,7 +2293,7 @@ our @options = (
}, },
{ {
name => 'ZM_EMAIL_BODY', name => 'ZM_EMAIL_BODY',
default => " default => '
Hello, Hello,
An alarm has been detected on your installation of the ZoneMinder. An alarm has been detected on your installation of the ZoneMinder.
@ -2307,7 +2308,7 @@ our @options = (
This alarm was matched by the %FN% filter and can be viewed at %EPS% This alarm was matched by the %FN% filter and can be viewed at %EPS%
ZoneMinder", ZoneMinder',
description => 'The body of the email used to send matching event details', description => 'The body of the email used to send matching event details',
requires => [ { name => 'ZM_OPT_EMAIL', value => 'yes' } ], requires => [ { name => 'ZM_OPT_EMAIL', value => 'yes' } ],
help => q` help => q`
@ -2350,8 +2351,8 @@ our @options = (
}, },
{ {
name => 'ZM_MESSAGE_TEXT', name => 'ZM_MESSAGE_TEXT',
default => q`subject = "ZoneMinder: Alarm - %MN%-%EI%" default => 'subject = "ZoneMinder: Alarm - %MN%-%EI%"
body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% score."`, body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% score."',
description => 'The text of the message used to send matching event details', description => 'The text of the message used to send matching event details',
requires => [ { name => 'ZM_OPT_MESSAGE', value => 'yes' } ], requires => [ { name => 'ZM_OPT_MESSAGE', value => 'yes' } ],
help => q` help => q`
@ -2625,10 +2626,10 @@ our @options = (
`, `,
type => $types{boolean}, type => $types{boolean},
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'time|idle|alarm', hint =>'time|idle|alarm',
pattern => qr|^([tia])|i, pattern =>qr|^([tia])|i,
format => q( ($1 =~ /^t/) format =>q( ($1 =~ /^t/)
? 'time' ? 'time'
: ($1 =~ /^i/ ? 'idle' : 'time' ) : ($1 =~ /^i/ ? 'idle' : 'time' )
) )
@ -2884,10 +2885,10 @@ our @options = (
have to be done manually. have to be done manually.
`, `,
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'javascript|http', hint =>'javascript|http',
pattern => qr|^([jh])|i, pattern =>qr|^([jh])|i,
format => q( $1 =~ /^j/ format =>q( $1 =~ /^j/
? 'javascript' ? 'javascript'
: 'http' : 'http'
) )
@ -2907,10 +2908,10 @@ our @options = (
ordering in the lists and so not always to time based ordering. ordering in the lists and so not always to time based ordering.
`, `,
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'Id|Name|Cause|MonitorName|DateTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore', hint =>'Id|Name|Cause|MonitorName|DateTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore',
pattern => qr|.|, pattern =>qr|.|,
format => q( $1 ) format =>q( $1 )
}, },
category => 'web', category => 'web',
}, },
@ -2928,10 +2929,10 @@ our @options = (
always to time based ordering. always to time based ordering.
`, `,
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'asc|desc', hint =>'asc|desc',
pattern => qr|^([ad])|i, pattern =>qr|^([ad])|i,
format => q( $1 =~ /^a/i ? 'asc' : 'desc' ) format =>q( $1 =~ /^a/i ? 'asc' : 'desc' )
}, },
category => 'web', category => 'web',
}, },
@ -3122,17 +3123,17 @@ our @options = (
Explorer Explorer
`, `,
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'mpeg|jpeg', hint =>'mpeg|jpeg',
pattern => qr|^([mj])|i, pattern =>qr|^([mj])|i,
format => q( $1 =~ /^m/ ? 'mpeg' : 'jpeg' ) format =>q( $1 =~ /^m/ ? 'mpeg' : 'jpeg' )
}, },
category => 'highband', category => 'highband',
}, },
{ {
name => 'ZM_WEB_H_DEFAULT_SCALE', name => 'ZM_WEB_H_DEFAULT_SCALE',
default => '100', default => '100',
description => q`What the default scaling factor applied to 'live' or 'event' views is (%)`, description => 'What the default scaling factor applied to \'live\' or \'event\' views is (%)',
help => q` help => q`
Normally ZoneMinder will display 'live' or 'event' streams in Normally ZoneMinder will display 'live' or 'event' streams in
their native size. However if you have monitors with large their native size. However if you have monitors with large
@ -3143,17 +3144,17 @@ our @options = (
is double size etc. is double size etc.
`, `,
type => { type => {
db_type => 'integer', db_type =>'integer',
hint => '25|33|50|75|100|150|200|300|400', hint =>'25|33|50|75|100|150|200|300|400',
pattern => qr|^(\d+)$|, pattern =>qr|^(\d+)$|,
format => q( $1 ) format =>q( $1 )
}, },
category => 'highband', category => 'highband',
}, },
{ {
name => 'ZM_WEB_H_DEFAULT_RATE', name => 'ZM_WEB_H_DEFAULT_RATE',
default => '100', default => '100',
description => q`What the default replay rate factor applied to 'event' views is (%)`, description => 'What the default replay rate factor applied to \'event\' views is (%)',
help => q` help => q`
Normally ZoneMinder will display 'event' streams at their Normally ZoneMinder will display 'event' streams at their
native rate, i.e. as close to real-time as possible. However if native rate, i.e. as close to real-time as possible. However if
@ -3163,10 +3164,10 @@ our @options = (
100 is normal rate, 200 is double speed etc. 100 is normal rate, 200 is double speed etc.
`, `,
type => { type => {
db_type => 'integer', db_type =>'integer',
hint => '25|50|100|150|200|400|1000|2500|5000|10000', hint =>'25|50|100|150|200|400|1000|2500|5000|10000',
pattern => qr|^(\d+)$|, pattern =>qr|^(\d+)$|,
format => q( $1 ) format =>q( $1 )
}, },
category => 'highband', category => 'highband',
}, },
@ -3241,10 +3242,10 @@ our @options = (
view is currently being used. view is currently being used.
`, `,
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'events|timeline', hint =>'events|timeline',
pattern => qr|^([lt])|i, pattern =>qr|^([lt])|i,
format => q( $1 =~ /^e/ ? 'events' : 'timeline' ) format =>q( $1 =~ /^e/ ? 'events' : 'timeline' )
}, },
category => 'highband', category => 'highband',
}, },
@ -3385,10 +3386,10 @@ our @options = (
Explorer Explorer
`, `,
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'mpeg|jpeg', hint =>'mpeg|jpeg',
pattern => qr|^([mj])|i, pattern =>qr|^([mj])|i,
format => q( $1 =~ /^m/ ? 'mpeg' : 'jpeg' ) format =>q( $1 =~ /^m/ ? 'mpeg' : 'jpeg' )
}, },
category => 'medband', category => 'medband',
}, },
@ -3406,10 +3407,10 @@ our @options = (
is double size etc. is double size etc.
`, `,
type => { type => {
db_type => 'integer', db_type =>'integer',
hint => '25|33|50|75|100|150|200|300|400', hint =>'25|33|50|75|100|150|200|300|400',
pattern => qr|^(\d+)$|, pattern =>qr|^(\d+)$|,
format => q( $1 ) format =>q( $1 )
}, },
category => 'medband', category => 'medband',
}, },
@ -3426,10 +3427,10 @@ our @options = (
100 is normal rate, 200 is double speed etc. 100 is normal rate, 200 is double speed etc.
`, `,
type => { type => {
db_type => 'integer', db_type =>'integer',
hint => '25|50|100|150|200|400|1000|2500|5000|10000', hint =>'25|50|100|150|200|400|1000|2500|5000|10000',
pattern => qr|^(\d+)$|, pattern =>qr|^(\d+)$|,
format => q( $1 ) format =>q( $1 )
}, },
category => 'medband', category => 'medband',
}, },
@ -3504,10 +3505,10 @@ our @options = (
view is currently being used. view is currently being used.
`, `,
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'events|timeline', hint =>'events|timeline',
pattern => qr|^([lt])|i, pattern =>qr|^([lt])|i,
format => q( $1 =~ /^e/ ? 'events' : 'timeline' ) format =>q( $1 =~ /^e/ ? 'events' : 'timeline' )
}, },
category => 'medband', category => 'medband',
}, },
@ -3648,10 +3649,10 @@ our @options = (
Explorer Explorer
`, `,
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'mpeg|jpeg', hint =>'mpeg|jpeg',
pattern => qr|^([mj])|i, pattern =>qr|^([mj])|i,
format => q( $1 =~ /^m/ ? 'mpeg' : 'jpeg' ) format =>q( $1 =~ /^m/ ? 'mpeg' : 'jpeg' )
}, },
category => 'lowband', category => 'lowband',
}, },
@ -3669,10 +3670,10 @@ our @options = (
is double size etc. is double size etc.
`, `,
type => { type => {
db_type => 'integer', db_type =>'integer',
hint => '25|33|50|75|100|150|200|300|400', hint =>'25|33|50|75|100|150|200|300|400',
pattern => qr|^(\d+)$|, pattern =>qr|^(\d+)$|,
format => q( $1 ) format =>q( $1 )
}, },
category => 'lowband', category => 'lowband',
}, },
@ -3689,9 +3690,9 @@ our @options = (
100 is normal rate, 200 is double speed etc. 100 is normal rate, 200 is double speed etc.
`, `,
type => { type => {
db_type => 'integer', db_type =>'integer',
hint => '25|50|100|150|200|400|1000|2500|5000|10000', hint =>'25|50|100|150|200|400|1000|2500|5000|10000',
pattern => qr|^(\d+)$|, format=> q( $1 ) pattern =>qr|^(\d+)$|, format=>q( $1 )
}, },
category => 'lowband', category => 'lowband',
}, },
@ -3766,10 +3767,10 @@ our @options = (
view is currently being used. view is currently being used.
`, `,
type => { type => {
db_type => 'string', db_type =>'string',
hint => 'events|timeline', hint =>'events|timeline',
pattern => qr|^([lt])|i, pattern =>qr|^([lt])|i,
format => q( $1 =~ /^e/ ? 'events' : 'timeline' ) format =>q( $1 =~ /^e/ ? 'events' : 'timeline' )
}, },
category => 'lowband', category => 'lowband',
}, },

1
src/zm_remote_camera_http.h
View File

@ -25,7 +25,6 @@
#include "zm_buffer.h" #include "zm_buffer.h"
#include "zm_regexp.h" #include "zm_regexp.h"
#include "zm_utils.h" #include "zm_utils.h"
#include "zm_packetqueue.h"
// //
// Class representing 'http' cameras, i.e. those which are // Class representing 'http' cameras, i.e. those which are

16
utils/do_debian_package.sh
View File

@ -259,22 +259,22 @@ fi
if [ $TYPE == "binary" ]; then if [ $TYPE == "binary" ]; then
if [ "$INTERACTIVE" != "no" ]; then if [ "$INTERACTIVE" != "no" ]; then
echo "Not doing dput since it's a binary release. Do you want to install it? (Y/N)" read -p "Not doing dput since it's a binary release. Do you want to install it? (Y/N)"
read install if [[ $REPLY == [yY] ]]; then
if [ "$install" == "Y" ]; then
sudo dpkg -i $DIRECTORY*.deb sudo dpkg -i $DIRECTORY*.deb
else
echo $REPLY;
fi; fi;
if [ "$DISTRO" == "jessie" ]; then if [ "$DISTRO" == "jessie" ]; then
echo "Do you want to upload this binary to zmrepo? (y/N)" read -p "Do you want to upload this binary to zmrepo? (y/N)"
read install if [[ $REPLY == [yY] ]]; then
if [ "$install" == "Y" ]; then
if [ "$RELEASE" != "" ]; then if [ "$RELEASE" != "" ]; then
scp "zoneminder_${VERSION}-${DISTRO}*" "zmrepo@zmrepo.connortechnology.com:debian/stable/mini-dinstall/incoming/" scp "zoneminder_${VERSION}-${DISTRO}*" "zmrepo@zmrepo.connortechnology.com:debian/stable/mini-dinstall/incoming/"
else else
if [ "$BRANCH" == "" ]; then if [ "$BRANCH" == "" ]; then
scp "zoneminder_${VERSION}-${DISTRO}*" "zmrepo@zmrepo.connortechnology.com:debian/master/mini-dinstall/incoming/" scp "zoneminder_${VERSION}-${DISTRO}*" "zmrepo@zmrepo.connortechnology.com:debian/master/mini-dinstall/incoming/"
else else
scp "zoneminder_${VERSION}-${DISTRO}*" "zmrepo@zmrepo.connortechnology.com:debian/${BRANCH}/mini-dinstall/incoming/" scp "$DIRECTORY-${DISTRO}*" "zmrepo@zmrepo.connortechnology.com:debian/${BRANCH}/mini-dinstall/incoming/"
fi; fi;
fi; fi;
fi; fi;
@ -298,7 +298,7 @@ else
echo "Ready to dput $SC to $PPA ? Y/N..."; echo "Ready to dput $SC to $PPA ? Y/N...";
read dput read dput
fi fi
if [ "$dput" == "Y" -o "$dput" == "y" ]; then if [ "$dput" == [Yy] ]; then
dput $PPA $SC dput $PPA $SC
fi; fi;
fi; fi;

320
web/includes/functions.php
View File

@ -53,7 +53,7 @@ function userLogin( $username, $password='', $passwordHashed=false ) {
Info( "Login successful for user \"$username\"" ); Info( "Login successful for user \"$username\"" );
$_SESSION['user'] = $user = $dbUser; $_SESSION['user'] = $user = $dbUser;
unset($_SESSION['loginFailed']); unset($_SESSION['loginFailed']);
if ( ZM_AUTH_TYPE == "builtin" ) { if ( ZM_AUTH_TYPE == 'builtin' ) {
$_SESSION['passwordHash'] = $user['Password']; $_SESSION['passwordHash'] = $user['Password'];
} }
session_regenerate_id(); session_regenerate_id();
@ -76,11 +76,11 @@ function userLogout() {
} }
function noCacheHeaders() { function noCacheHeaders() {
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
header("Last-Modified: ".gmdate( "D, d M Y H:i:s" )." GMT"); // always modified header('Last-Modified: '.gmdate( 'D, d M Y H:i:s' ).' GMT'); // always modified
header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1 header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
header("Cache-Control: post-check=0, pre-check=0", false); header('Cache-Control: post-check=0, pre-check=0', false);
header("Pragma: no-cache"); // HTTP/1.0 header('Pragma: no-cache'); // HTTP/1.0
} }
function CORSHeaders() { function CORSHeaders() {
@ -96,13 +96,13 @@ function CORSHeaders() {
foreach( $servers as $row ) { foreach( $servers as $row ) {
$Server = new Server( $row ); $Server = new Server( $row );
if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) { if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) {
header("Access-Control-Allow-Origin: " . $Server->Url() );
header("Access-Control-Allow-Headers: x-requested-with,x-request");
$valid = true; $valid = true;
header('Access-Control-Allow-Origin: ' . $Server->Url() );
header('Access-Control-Allow-Headers: x-requested-with,x-request');
} }
} }
if ( ! $valid ) { if ( ! $valid ) {
Warning( $_SERVER['HTTP_ORIGIN'] . " is not found in servers list." ); Warning( $_SERVER['HTTP_ORIGIN'] . ' is not found in servers list.' );
} }
} }
} }
@ -176,24 +176,24 @@ function getStreamSrc( $args, $querySep='&amp;' ) {
$streamSrc = ZM_BASE_URL.ZM_PATH_ZMS; $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
if ( ZM_OPT_USE_AUTH ) { if ( ZM_OPT_USE_AUTH ) {
if ( ZM_AUTH_RELAY == "hashed" ) { if ( ZM_AUTH_RELAY == 'hashed' ) {
$args[] = "auth=".generateAuthHash( ZM_AUTH_HASH_IPS ); $args[] = 'auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
} elseif ( ZM_AUTH_RELAY == "plain" ) { } elseif ( ZM_AUTH_RELAY == 'plain' ) {
$args[] = "user=".$_SESSION['username']; $args[] = 'user='.$_SESSION['username'];
$args[] = "pass=".$_SESSION['password']; $args[] = 'pass='.$_SESSION['password'];
} elseif ( ZM_AUTH_RELAY == "none" ) { } elseif ( ZM_AUTH_RELAY == 'none' ) {
$args[] = "user=".$_SESSION['username']; $args[] = 'user='.$_SESSION['username'];
} }
} }
if ( !in_array( "mode=single", $args ) && !empty($GLOBALS['connkey']) ) { if ( !in_array( 'mode=single', $args ) && !empty($GLOBALS['connkey']) ) {
$args[] = "connkey=".$GLOBALS['connkey']; $args[] = 'connkey='.$GLOBALS['connkey'];
} }
if ( ZM_RAND_STREAM ) { if ( ZM_RAND_STREAM ) {
$args[] = "rand=".time(); $args[] = 'rand='.time();
} }
if ( count($args) ) { if ( count($args) ) {
$streamSrc .= "?".join( $querySep, $args ); $streamSrc .= '?'.join( $querySep, $args );
} }
return( $streamSrc ); return( $streamSrc );
@ -211,11 +211,11 @@ function getMimeType( $file ) {
return( trim( exec( 'file -bi '.escapeshellarg( $file ).' 2>/dev/null' ) ) ); return( trim( exec( 'file -bi '.escapeshellarg( $file ).' 2>/dev/null' ) ) );
} }
function outputVideoStream( $id, $src, $width, $height, $format, $title="" ) { function outputVideoStream( $id, $src, $width, $height, $format, $title='' ) {
echo getVideoStreamHTML( $id, $src, $width, $height, $format, $title ); echo getVideoStreamHTML( $id, $src, $width, $height, $format, $title );
} }
function getVideoStreamHTML( $id, $src, $width, $height, $format, $title="" ) { function getVideoStreamHTML( $id, $src, $width, $height, $format, $title='' ) {
$html = ''; $html = '';
$width = validInt($width); $width = validInt($width);
$height = validInt($height); $height = validInt($height);
@ -226,24 +226,24 @@ function getVideoStreamHTML( $id, $src, $width, $height, $format, $title="" ) {
} else { } else {
switch( $format ) { switch( $format ) {
case 'asf' : case 'asf' :
$mimeType = "video/x-ms-asf"; $mimeType = 'video/x-ms-asf';
break; break;
case 'avi' : case 'avi' :
case 'wmv' : case 'wmv' :
$mimeType = "video/x-msvideo"; $mimeType = 'video/x-msvideo';
break; break;
case 'mov' : case 'mov' :
$mimeType = "video/quicktime"; $mimeType = 'video/quicktime';
break; break;
case 'mpg' : case 'mpg' :
case 'mpeg' : case 'mpeg' :
$mimeType = "video/mpeg"; $mimeType = 'video/mpeg';
break; break;
case 'swf' : case 'swf' :
$mimeType = "application/x-shockwave-flash"; $mimeType = 'application/x-shockwave-flash';
break; break;
case '3gp' : case '3gp' :
$mimeType = "video/3gpp"; $mimeType = 'video/3gpp';
break; break;
default : default :
$mimeType = "video/$format"; $mimeType = "video/$format";
@ -254,9 +254,9 @@ function getVideoStreamHTML( $id, $src, $width, $height, $format, $title="" ) {
$mimeType = 'video/'.$format; $mimeType = 'video/'.$format;
if ( ZM_WEB_USE_OBJECT_TAGS ) { if ( ZM_WEB_USE_OBJECT_TAGS ) {
switch( $mimeType ) { switch( $mimeType ) {
case "video/x-ms-asf" : case 'video/x-ms-asf' :
case "video/x-msvideo" : case 'video/x-msvideo' :
case "video/mp4" : case 'video/mp4' :
{ {
if ( isWindows() ) { if ( isWindows() ) {
return '<object id="'.$id.'" width="'.$width.'" height="'.$height.' return '<object id="'.$id.'" width="'.$width.'" height="'.$height.'
@ -279,7 +279,7 @@ function getVideoStreamHTML( $id, $src, $width, $height, $format, $title="" ) {
</object>'; </object>';
} }
} }
case "video/quicktime" : case 'video/quicktime' :
{ {
return '<object id="'.$id.'" width="'.$width.'" height="'.$height.'" return '<object id="'.$id.'" width="'.$width.'" height="'.$height.'"
classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
@ -297,7 +297,7 @@ function getVideoStreamHTML( $id, $src, $width, $height, $format, $title="" ) {
</embed> </embed>
</object>'; </object>';
} }
case "application/x-shockwave-flash" : case 'application/x-shockwave-flash' :
{ {
return '<object id="'.$id.'" width="'.$width.'" height="'.$height.'" return '<object id="'.$id.'" width="'.$width.'" height="'.$height.'"
classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
@ -378,15 +378,14 @@ function getHelperStream( $id, $src, $width, $height, $title="" ) {
</applet>'; </applet>';
} }
function outputImageStill( $id, $src, $width, $height, $title="" ) { function outputImageStill( $id, $src, $width, $height, $title='' ) {
echo getImageStill( $id, $src, $width, $height, $title="" ); echo getImageStill( $id, $src, $width, $height, $title='' );
} }
function getImageStill( $id, $src, $width, $height, $title="" ) { function getImageStill( $id, $src, $width, $height, $title='' ) {
return '<img id="'.$id.'" src="'.$src.'" alt="'.$title.'" width="'.$width.'" height="'.$height.'"/>'; return '<img id="'.$id.'" src="'.$src.'" alt="'.$title.'" width="'.$width.'" height="'.$height.'"/>';
} }
function outputControlStill( $src, $width, $height, $monitor, $scale, $target ) function outputControlStill( $src, $width, $height, $monitor, $scale, $target ) {
{
?> ?>
<form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>"> <form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>">
<input type="hidden" name="view" value="blank"> <input type="hidden" name="view" value="blank">
@ -417,18 +416,12 @@ function outputControlStill( $src, $width, $height, $monitor, $scale, $target )
function getZmuCommand( $args ) { function getZmuCommand( $args ) {
$zmuCommand = ZMU_PATH; $zmuCommand = ZMU_PATH;
if ( ZM_OPT_USE_AUTH ) if ( ZM_OPT_USE_AUTH ) {
{ if ( ZM_AUTH_RELAY == 'hashed' ) {
if ( ZM_AUTH_RELAY == "hashed" ) $zmuCommand .= ' -A '.generateAuthHash( false );
{ } elseif ( ZM_AUTH_RELAY == 'plain' ) {
$zmuCommand .= " -A ".generateAuthHash( false ); $zmuCommand .= ' -U ' .escapeshellarg($_SESSION['username']).' -P '.escapeshellarg($_SESSION['password']);
} } elseif ( ZM_AUTH_RELAY == 'none' ) {
elseif ( ZM_AUTH_RELAY == "plain" )
{
$zmuCommand .= " -U " .escapeshellarg($_SESSION['username'])." -P ".escapeshellarg($_SESSION['password']);
}
elseif ( ZM_AUTH_RELAY == "none" )
{
$zmuCommand .= " -U ".escapeshellarg($_SESSION['username']); $zmuCommand .= " -U ".escapeshellarg($_SESSION['username']);
} }
} }
@ -458,7 +451,7 @@ function canEdit( $area, $mid=false ) {
function getEventPath( $event ) { function getEventPath( $event ) {
if ( ZM_USE_DEEP_STORAGE ) if ( ZM_USE_DEEP_STORAGE )
$eventPath = $event['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['StartTime']) ); $eventPath = $event['MonitorId'].'/'.strftime( '%y/%m/%d/%H/%M/%S', strtotime($event['StartTime']) );
else else
$eventPath = $event['MonitorId'].'/'.$event['Id']; $eventPath = $event['MonitorId'].'/'.$event['Id'];
return( $eventPath ); return( $eventPath );
@ -473,7 +466,7 @@ function getEventDefaultVideoPath( $event ) {
function deletePath( $path ) { function deletePath( $path ) {
if ( is_dir( $path ) ) { if ( is_dir( $path ) ) {
Logger::Debug("deletePath rm -rf $path"); Logger::Debug("deletePath rm -rf $path");
system( escapeshellcmd( "rm -rf ".$path ) ); system( escapeshellcmd( 'rm -rf '.$path ) );
} else { } else {
Logger::Debug("deletePath unlink $path"); Logger::Debug("deletePath unlink $path");
unlink( $path ); unlink( $path );
@ -483,7 +476,7 @@ Logger::Debug("deletePath unlink $path");
function deleteEvent( $event ) { function deleteEvent( $event ) {
if ( empty($event) ) { if ( empty($event) ) {
Error( "Empty event passed to deleteEvent."); Error( 'Empty event passed to deleteEvent.');
return; return;
} }
@ -501,8 +494,8 @@ Logger::Debug("Event type: " . gettype($event));
} # CAN EDIT } # CAN EDIT
} }
function makeLink( $url, $label, $condition=1, $options="" ) { function makeLink( $url, $label, $condition=1, $options='' ) {
$string = ""; $string = '';
if ( $condition ) { if ( $condition ) {
$string .= '<a href="'.$url.'"'.($options?(' '.$options):'').'>'; $string .= '<a href="'.$url.'"'.($options?(' '.$options):'').'>';
} }
@ -513,8 +506,8 @@ function makeLink( $url, $label, $condition=1, $options="" ) {
return( $string ); return( $string );
} }
function makePopupLink( $url, $winName, $winSize, $label, $condition=1, $options="" ) { function makePopupLink( $url, $winName, $winSize, $label, $condition=1, $options='' ) {
$string = ""; $string = '';
if ( $condition ) { if ( $condition ) {
if ( is_array( $winSize ) ) if ( is_array( $winSize ) )
$popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2]; $popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2];
@ -530,7 +523,7 @@ function makePopupLink( $url, $winName, $winSize, $label, $condition=1, $options
return( $string ); return( $string );
} }
function makePopupButton( $url, $winName, $winSize, $buttonValue, $condition=1, $options="" ) { function makePopupButton( $url, $winName, $winSize, $buttonValue, $condition=1, $options='' ) {
if ( is_array( $winSize ) ) if ( is_array( $winSize ) )
$popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2]; $popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2];
else else
@ -541,7 +534,7 @@ function makePopupButton( $url, $winName, $winSize, $buttonValue, $condition=1,
function htmlSelect( $name, $contents, $values, $behaviours=false ) { function htmlSelect( $name, $contents, $values, $behaviours=false ) {
$behaviourText = ""; $behaviourText = '';
if ( !empty($behaviours) ) { if ( !empty($behaviours) ) {
if ( is_array($behaviours) ) { if ( is_array($behaviours) ) {
foreach ( $behaviours as $event=>$action ) { foreach ( $behaviours as $event=>$action ) {
@ -557,24 +550,23 @@ function htmlSelect( $name, $contents, $values, $behaviours=false ) {
$selected = is_array( $values ) ? in_array( $value, $values ) : $value==$values; $selected = is_array( $values ) ? in_array( $value, $values ) : $value==$values;
$html .= "<option value=\"$value\"".($selected?" selected=\"selected\"":'').">$text</option>"; $html .= "<option value=\"$value\"".($selected?" selected=\"selected\"":'').">$text</option>";
} }
$html .= "</select>"; $html .= '</select>';
return $html; return $html;
} }
function truncText( $text, $length, $deslash=1 ) { function truncText( $text, $length, $deslash=1 ) {
return( preg_replace( "/^(.{".$length.",}?)\b.*$/", "\\1&hellip;", ($deslash?stripslashes($text):$text) ) ); return( preg_replace( '/^(.{'.$length.',}?)\b.*$/', '\\1&hellip;', ($deslash?stripslashes($text):$text) ) );
} }
function buildSelect( $name, $contents, $behaviours=false ) function buildSelect( $name, $contents, $behaviours=false ) {
{ $value = '';
$value = ""; if ( preg_match( '/^\s*(\w+)\s*(\[.*\])?\s*$/', $name, $matches ) && count($matches) > 2 ) {
if ( preg_match( "/^\s*(\w+)\s*(\[.*\])?\s*$/", $name, $matches ) && count($matches) > 2 ) {
$arr = $matches[1]; $arr = $matches[1];
if ( isset($GLOBALS[$arr]) ) if ( isset($GLOBALS[$arr]) )
$value = $GLOBALS[$arr]; $value = $GLOBALS[$arr];
elseif ( isset($_REQUEST[$arr]) ) elseif ( isset($_REQUEST[$arr]) )
$value = $_REQUEST[$arr]; $value = $_REQUEST[$arr];
if ( !preg_match_all( "/\[\s*['\"]?(\w+)[\"']?\s*\]/", $matches[2], $matches ) ) { if ( !preg_match_all( '/\[\s*[\'"]?(\w+)["\']?\s*\]/', $matches[2], $matches ) ) {
Fatal( "Can't parse selector '$name'" ); Fatal( "Can't parse selector '$name'" );
} }
for ( $i = 0; $i < count($matches[1]); $i++ ) { for ( $i = 0; $i < count($matches[1]); $i++ ) {
@ -588,7 +580,7 @@ function buildSelect( $name, $contents, $behaviours=false )
$value = $_REQUEST[$name]; $value = $_REQUEST[$name];
} }
ob_start(); ob_start();
$behaviourText = ""; $behaviourText = '';
if ( !empty($behaviours) ) { if ( !empty($behaviours) ) {
if ( is_array($behaviours) ) { if ( is_array($behaviours) ) {
foreach ( $behaviours as $event=>$action ) { foreach ( $behaviours as $event=>$action ) {
@ -642,10 +634,10 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
{ {
if ( is_array( $newValues[$key] ) ) { if ( is_array( $newValues[$key] ) ) {
$imageData = getimagesize( $newValues[$key]['tmp_name'] ); $imageData = getimagesize( $newValues[$key]['tmp_name'] );
$changes[$key.'Width'] = $key."Width = ".$imageData[0]; $changes[$key.'Width'] = $key.'Width = '.$imageData[0];
$changes[$key.'Height'] = $key."Height = ".$imageData[1]; $changes[$key.'Height'] = $key.'Height = '.$imageData[1];
$changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'"; $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
$changes[$key.'Size'] = $key."Size = ".$newValues[$key]['size']; $changes[$key.'Size'] = $key.'Size = '.$newValues[$key]['size'];
ob_start(); ob_start();
readfile( $newValues[$key]['tmp_name'] ); readfile( $newValues[$key]['tmp_name'] );
$changes[$key] = $key." = ".dbEscape( ob_get_contents() ); $changes[$key] = $key." = ".dbEscape( ob_get_contents() );
@ -660,20 +652,20 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
if ( is_array( $newValues[$key] ) ) { if ( is_array( $newValues[$key] ) ) {
$imageData = getimagesize( $newValues[$key]['tmp_name'] ); $imageData = getimagesize( $newValues[$key]['tmp_name'] );
$changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'"; $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
$changes[$key.'Size'] = $key."Size = ".$newValues[$key]['size']; $changes[$key.'Size'] = $key.'Size = '.$newValues[$key]['size'];
ob_start(); ob_start();
readfile( $newValues[$key]['tmp_name'] ); readfile( $newValues[$key]['tmp_name'] );
$changes[$key] = $key." = ".dbEscape( ob_get_contents() ); $changes[$key] = $key.' = '.dbEscape( ob_get_contents() );
ob_end_clean(); ob_end_clean();
} else { } else {
$changes[$key] = "$key = ".dbEscape($value); $changes[$key] = $key . ' = '.dbEscape($value);
} }
break; break;
} }
case 'file' : case 'file' :
{ {
$changes[$key.'Type'] = $key."Type = ".dbEscape($newValues[$key]['type']); $changes[$key.'Type'] = $key.'Type = '.dbEscape($newValues[$key]['type']);
$changes[$key.'Size'] = $key."Size = ".dbEscape($newValues[$key]['size']); $changes[$key.'Size'] = $key.'Size = '.dbEscape($newValues[$key]['size']);
ob_start(); ob_start();
readfile( $newValues[$key]['tmp_name'] ); readfile( $newValues[$key]['tmp_name'] );
$changes[$key] = $key." = '".dbEscape( ob_get_contents() )."'"; $changes[$key] = $key." = '".dbEscape( ob_get_contents() )."'";
@ -683,7 +675,7 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
case 'raw' : case 'raw' :
{ {
if ( $values[$key] != $value ) { if ( $values[$key] != $value ) {
$changes[$key] = "$key = ".dbEscape($value); $changes[$key] = $key . ' = '.dbEscape($value);
} }
break; break;
} }
@ -693,7 +685,7 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
if ( ! isset($value) || $value == '' ) { if ( ! isset($value) || $value == '' ) {
$changes[$key] = "$key = NULL"; $changes[$key] = "$key = NULL";
} else { } else {
$changes[$key] = "$key = ".dbEscape(trim($value)); $changes[$key] = $key . ' = '.dbEscape(trim($value));
} }
} }
break; break;
@ -758,43 +750,43 @@ function getBrowser( &$browser, &$version ) {
function isMozilla() { function isMozilla() {
getBrowser( $browser, $version ); getBrowser( $browser, $version );
return( $browser == "mozilla" ); return( $browser == 'mozilla' );
} }
function isKonqueror() { function isKonqueror() {
getBrowser( $browser, $version ); getBrowser( $browser, $version );
return( $browser == "konqueror" ); return( $browser == 'konqueror' );
} }
function isInternetExplorer() { function isInternetExplorer() {
getBrowser( $browser, $version ); getBrowser( $browser, $version );
return( $browser == "ie" ); return( $browser == 'ie' );
} }
function isOldChrome() { function isOldChrome() {
getBrowser( $browser, $version ); getBrowser( $browser, $version );
return( $browser == "oldchrome" ); return( $browser == 'oldchrome' );
} }
function isChrome() { function isChrome() {
getBrowser( $browser, $version ); getBrowser( $browser, $version );
return( $browser == "chrome" ); return( $browser == 'chrome' );
} }
function isOpera() { function isOpera() {
getBrowser( $browser, $version ); getBrowser( $browser, $version );
return( $browser == "opera" ); return( $browser == 'opera' );
} }
function isSafari() { function isSafari() {
getBrowser( $browser, $version ); getBrowser( $browser, $version );
return( $browser == "safari" ); return( $browser == 'safari' );
} }
function isWindows() { function isWindows() {
@ -807,12 +799,12 @@ function canStreamIframe() {
function canStreamNative() { function canStreamNative() {
// Old versions of Chrome can display the stream, but then it blocks everything else (Chrome bug 5876) // Old versions of Chrome can display the stream, but then it blocks everything else (Chrome bug 5876)
return( ZM_WEB_CAN_STREAM == "yes" || ( ZM_WEB_CAN_STREAM == "auto" && (!isInternetExplorer() && !isOldChrome()) ) ); return( ZM_WEB_CAN_STREAM == 'yes' || ( ZM_WEB_CAN_STREAM == 'auto' && (!isInternetExplorer() && !isOldChrome()) ) );
} }
function canStreamApplet() { function canStreamApplet() {
if ( (ZM_OPT_CAMBOZOLA && !file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) ) { if ( (ZM_OPT_CAMBOZOLA && !file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) ) {
Warning ( "ZM_OPT_CAMBOZOLA is enabled, but the system cannot find ".ZM_PATH_WEB."/".ZM_PATH_CAMBOZOLA ); Warning ( 'ZM_OPT_CAMBOZOLA is enabled, but the system cannot find '.ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA );
} }
return( (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) ); return( (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) );
@ -824,7 +816,7 @@ function canStream() {
function packageControl( $command ) { function packageControl( $command ) {
$string = ZM_PATH_BIN.'/zmpkg.pl '.escapeshellarg( $command ); $string = ZM_PATH_BIN.'/zmpkg.pl '.escapeshellarg( $command );
$string .= " 2>/dev/null >&- <&- >/dev/null"; $string .= ' 2>/dev/null >&- <&- >/dev/null';
exec( $string ); exec( $string );
} }
@ -883,27 +875,27 @@ function zmcControl( $monitor, $mode=false ) {
function zmaControl( $monitor, $mode=false ) { function zmaControl( $monitor, $mode=false ) {
if ( !is_array( $monitor ) ) { if ( !is_array( $monitor ) ) {
$monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) ); $monitor = dbFetchOne( 'select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?', NULL, array($monitor) );
} }
if ( (!defined('ZM_SERVER_ID')) or ( ZM_SERVER_ID==$monitor['ServerId'] ) ) { if ( (!defined('ZM_SERVER_ID')) or ( ZM_SERVER_ID==$monitor['ServerId'] ) ) {
if ( !$monitor || $monitor['Function'] == 'None' || $monitor['Function'] == 'Monitor' || $mode == "stop" ) { if ( !$monitor || $monitor['Function'] == 'None' || $monitor['Function'] == 'Monitor' || $mode == 'stop' ) {
if ( ZM_OPT_CONTROL ) { if ( ZM_OPT_CONTROL ) {
daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] ); daemonControl( 'stop', 'zmtrack.pl', '-m '.$monitor['Id'] );
} }
daemonControl( "stop", "zma", "-m ".$monitor['Id'] ); daemonControl( 'stop', 'zma', '-m '.$monitor['Id'] );
} else { } else {
if ( $mode == "restart" ) { if ( $mode == 'restart' ) {
if ( ZM_OPT_CONTROL ) { if ( ZM_OPT_CONTROL ) {
daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] ); daemonControl( 'stop', 'zmtrack.pl', '-m '.$monitor['Id'] );
} }
daemonControl( "stop", "zma", "-m ".$monitor['Id'] ); daemonControl( 'stop', 'zma', '-m '.$monitor['Id'] );
} }
daemonControl( "start", "zma", "-m ".$monitor['Id'] ); daemonControl( 'start', 'zma', '-m '.$monitor['Id'] );
if ( ZM_OPT_CONTROL && $monitor['Controllable'] && $monitor['TrackMotion'] && ( $monitor['Function'] == 'Modect' || $monitor['Function'] == 'Mocord' ) ) { if ( ZM_OPT_CONTROL && $monitor['Controllable'] && $monitor['TrackMotion'] && ( $monitor['Function'] == 'Modect' || $monitor['Function'] == 'Mocord' ) ) {
daemonControl( "start", "zmtrack.pl", "-m ".$monitor['Id'] ); daemonControl( 'start', 'zmtrack.pl', '-m '.$monitor['Id'] );
} }
if ( $mode == "reload" ) { if ( $mode == 'reload' ) {
daemonControl( "reload", "zma", "-m ".$monitor['Id'] ); daemonControl( 'reload', 'zma', '-m '.$monitor['Id'] );
} }
} }
} // end if we are on the recording server } // end if we are on the recording server
@ -917,7 +909,7 @@ function initDaemonStatus() {
$string = ZM_PATH_BIN."/zmdc.pl status"; $string = ZM_PATH_BIN."/zmdc.pl status";
$daemon_status = shell_exec( $string ); $daemon_status = shell_exec( $string );
} else { } else {
$daemon_status = ""; $daemon_status = '';
} }
} }
} }
@ -950,7 +942,7 @@ function zmaStatus( $monitor ) {
} }
function daemonCheck( $daemon=false, $args=false ) { function daemonCheck( $daemon=false, $args=false ) {
$string = ZM_PATH_BIN."/zmdc.pl check"; $string = ZM_PATH_BIN.'/zmdc.pl check';
if ( $daemon ) { if ( $daemon ) {
$string .= ' ' . $daemon; $string .= ' ' . $daemon;
if ( $args ) if ( $args )
@ -1083,54 +1075,54 @@ function parseSort( $saveToSession=false, $querySep='&amp;' ) {
if ( empty($_REQUEST['sort_field']) ) { if ( empty($_REQUEST['sort_field']) ) {
$_REQUEST['sort_field'] = ZM_WEB_EVENT_SORT_FIELD; $_REQUEST['sort_field'] = ZM_WEB_EVENT_SORT_FIELD;
$_REQUEST['sort_asc'] = (ZM_WEB_EVENT_SORT_ORDER == "asc"); $_REQUEST['sort_asc'] = (ZM_WEB_EVENT_SORT_ORDER == 'asc');
} }
switch( $_REQUEST['sort_field'] ) { switch( $_REQUEST['sort_field'] ) {
case 'Id' : case 'Id' :
$sortColumn = "E.Id"; $sortColumn = 'E.Id';
break; break;
case 'MonitorName' : case 'MonitorName' :
$sortColumn = "M.Name"; $sortColumn = 'M.Name';
break; break;
case 'Name' : case 'Name' :
$sortColumn = "E.Name"; $sortColumn = 'E.Name';
break; break;
case 'Cause' : case 'Cause' :
$sortColumn = "E.Cause"; $sortColumn = 'E.Cause';
break; break;
case 'DateTime' : case 'DateTime' :
$_REQUEST['sort_field'] = 'StartTime'; $_REQUEST['sort_field'] = 'StartTime';
case 'StartTime' : case 'StartTime' :
$sortColumn = "E.StartTime"; $sortColumn = 'E.StartTime';
break; break;
case 'Length' : case 'Length' :
$sortColumn = "E.Length"; $sortColumn = 'E.Length';
break; break;
case 'Frames' : case 'Frames' :
$sortColumn = "E.Frames"; $sortColumn = 'E.Frames';
break; break;
case 'AlarmFrames' : case 'AlarmFrames' :
$sortColumn = "E.AlarmFrames"; $sortColumn = 'E.AlarmFrames';
break; break;
case 'TotScore' : case 'TotScore' :
$sortColumn = "E.TotScore"; $sortColumn = 'E.TotScore';
break; break;
case 'AvgScore' : case 'AvgScore' :
$sortColumn = "E.AvgScore"; $sortColumn = 'E.AvgScore';
break; break;
case 'MaxScore' : case 'MaxScore' :
$sortColumn = "E.MaxScore"; $sortColumn = 'E.MaxScore';
break; break;
default: default:
$sortColumn = "E.StartTime"; $sortColumn = 'E.StartTime';
break; break;
} }
$sortOrder = $_REQUEST['sort_asc']?"asc":"desc"; $sortOrder = $_REQUEST['sort_asc']?'asc':'desc';
if ( !$_REQUEST['sort_asc'] ) if ( !$_REQUEST['sort_asc'] )
$_REQUEST['sort_asc'] = 0; $_REQUEST['sort_asc'] = 0;
$sortQuery = $querySep."sort_field=".validHtmlStr($_REQUEST['sort_field']).$querySep."sort_asc=".validHtmlStr($_REQUEST['sort_asc']); $sortQuery = $querySep.'sort_field='.validHtmlStr($_REQUEST['sort_field']).$querySep.'sort_asc='.validHtmlStr($_REQUEST['sort_asc']);
if ( !isset($_REQUEST['limit']) ) if ( !isset($_REQUEST['limit']) )
$_REQUEST['limit'] = ""; $_REQUEST['limit'] = '';
if ( $saveToSession ) { if ( $saveToSession ) {
$_SESSION['sort_field'] = validHtmlStr($_REQUEST['sort_field']); $_SESSION['sort_field'] = validHtmlStr($_REQUEST['sort_field']);
$_SESSION['sort_asc'] = validHtmlStr($_REQUEST['sort_asc']); $_SESSION['sort_asc'] = validHtmlStr($_REQUEST['sort_asc']);
@ -1167,16 +1159,16 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' ) {
$filter['sql'] .= 'M.ServerId'; $filter['sql'] .= 'M.ServerId';
break; break;
case 'DateTime': case 'DateTime':
$filter['sql'] .= "E.StartTime"; $filter['sql'] .= 'E.StartTime';
break; break;
case 'Date': case 'Date':
$filter['sql'] .= "to_days( E.StartTime )"; $filter['sql'] .= 'to_days( E.StartTime )';
break; break;
case 'Time': case 'Time':
$filter['sql'] .= "extract( hour_second from E.StartTime )"; $filter['sql'] .= 'extract( hour_second from E.StartTime )';
break; break;
case 'Weekday': case 'Weekday':
$filter['sql'] .= "weekday( E.StartTime )"; $filter['sql'] .= 'weekday( E.StartTime )';
break; break;
case 'Id': case 'Id':
case 'Name': case 'Name':
@ -1265,19 +1257,19 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' ) {
case '>' : case '>' :
case '<' : case '<' :
case '<=' : case '<=' :
$filter['sql'] .= " ".$filter['terms'][$i]['op']." $value"; $filter['sql'] .= ' '.$filter['terms'][$i]['op']." $value";
break; break;
case '=~' : case '=~' :
$filter['sql'] .= " regexp ".$value; $filter['sql'] .= ' regexp '.$value;
break; break;
case '!~' : case '!~' :
$filter['sql'] .= " not regexp ".$value; $filter['sql'] .= ' not regexp '.$value;
break; break;
case '=[]' : case '=[]' :
$filter['sql'] .= " in (".join( ",", $valueList ).")"; $filter['sql'] .= ' in ('.join( ",", $valueList ).')';
break; break;
case '![]' : case '![]' :
$filter['sql'] .= " not in (".join( ",", $valueList ).")"; $filter['sql'] .= ' not in ('.join( ',', $valueList ).')';
break; break;
} }
@ -1288,12 +1280,12 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' ) {
} }
if ( isset($filter['terms'][$i]['cbr']) ) { if ( isset($filter['terms'][$i]['cbr']) ) {
$filter['query'] .= $querySep."filter[terms][$i][cbr]=".urlencode($filter['terms'][$i]['cbr']); $filter['query'] .= $querySep."filter[terms][$i][cbr]=".urlencode($filter['terms'][$i]['cbr']);
$filter['sql'] .= " ".str_repeat( ")", $filter['terms'][$i]['cbr'] )." "; $filter['sql'] .= ' '.str_repeat( ')', $filter['terms'][$i]['cbr'] ).' ';
$filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cbr]\" value=\"".htmlspecialchars($filter['terms'][$i]['cbr'])."\"/>\n"; $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cbr]\" value=\"".htmlspecialchars($filter['terms'][$i]['cbr'])."\"/>\n";
} }
} }
if ( $filter['sql'] ) if ( $filter['sql'] )
$filter['sql'] = " and ( ".$filter['sql']." )"; $filter['sql'] = ' and ( '.$filter['sql'].' )';
if ( $saveToSession ) { if ( $saveToSession ) {
$_SESSION['filter'] = $filter; $_SESSION['filter'] = $filter;
} }
@ -1325,7 +1317,7 @@ function delFilterTerm( $filter, $position ) {
function getPagination( $pages, $page, $maxShortcuts, $query, $querySep='&amp;' ) { function getPagination( $pages, $page, $maxShortcuts, $query, $querySep='&amp;' ) {
global $view; global $view;
$pageText = ""; $pageText = '';
if ( $pages > 1 ) { if ( $pages > 1 ) {
if ( $page ) { if ( $page ) {
if ( $page < 0 ) if ( $page < 0 )
@ -1414,7 +1406,7 @@ function getDiskPercent($path = ZM_DIR_EVENTS) {
Error('disk_total_space returned false. Verify the web account user has access to ' . $path ); Error('disk_total_space returned false. Verify the web account user has access to ' . $path );
return 0; return 0;
} elseif ( $total == 0 ) { } elseif ( $total == 0 ) {
Error('disk_total_space indicates the following path has a filesystem size of zero bytes' . $path ); Error('disk_total_space indicates the following path has a filesystem size of zero bytes ' . $path );
return 100; return 100;
} }
$free = disk_free_space($path); $free = disk_free_space($path);
@ -1447,17 +1439,17 @@ function sidField() {
} }
function verNum( $version ) { function verNum( $version ) {
$vNum = ""; $vNum = '';
$maxFields = 3; $maxFields = 3;
$vFields = explode( ".", $version ); $vFields = explode( '.', $version );
array_splice( $vFields, $maxFields ); array_splice( $vFields, $maxFields );
while ( count($vFields) < $maxFields ) { while ( count($vFields) < $maxFields ) {
$vFields[] = 0; $vFields[] = 0;
} }
foreach ( $vFields as $vField ) { foreach ( $vFields as $vField ) {
$vField = sprintf( "%02d", $vField ); $vField = sprintf( '%02d', $vField );
while ( strlen($vField) < 2 ) { while ( strlen($vField) < 2 ) {
$vField = "0".$vField; $vField = '0'.$vField;
} }
$vNum .= $vField; $vNum .= $vField;
} }
@ -1466,7 +1458,7 @@ function verNum( $version ) {
function fixSequences() { function fixSequences() {
$sequence = 1; $sequence = 1;
$sql = "select * from Monitors order by Sequence asc, Id asc"; $sql = 'select * from Monitors order by Sequence asc, Id asc';
foreach( dbFetchAll( $sql ) as $monitor ) { foreach( dbFetchAll( $sql ) as $monitor ) {
if ( $monitor['Sequence'] != $sequence ) { if ( $monitor['Sequence'] != $sequence ) {
dbQuery( 'update Monitors set Sequence = ? WHERE Id=?', array( $sequence, $monitor['Id'] ) ); dbQuery( 'update Monitors set Sequence = ? WHERE Id=?', array( $sequence, $monitor['Id'] ) );
@ -1496,7 +1488,7 @@ function linesIntersect( $line1, $line2 ) {
// Checking if bounding boxes intersect // Checking if bounding boxes intersect
if ( $max_x1 < $min_x2 || $max_x2 < $min_x1 ||$max_y1 < $min_y2 || $max_y2 < $min_y1 ) { if ( $max_x1 < $min_x2 || $max_x2 < $min_x1 ||$max_y1 < $min_y2 || $max_y2 < $min_y1 ) {
if ( $debug ) echo "Not intersecting, out of bounds<br>"; if ( $debug ) echo 'Not intersecting, out of bounds<br>';
return( false ); return( false );
} }
@ -1531,11 +1523,11 @@ function linesIntersect( $line1, $line2 ) {
} }
} elseif ( $b1 == $b2 ) { } elseif ( $b1 == $b2 ) {
// Colinear, must overlap due to box check, intersect? // Colinear, must overlap due to box check, intersect?
if ( $debug ) echo "Intersecting, colinear<br>"; if ( $debug ) echo 'Intersecting, colinear<br>';
return( true ); return( true );
} else { } else {
// Parallel // Parallel
if ( $debug ) echo "Not intersecting, parallel<br>"; if ( $debug ) echo 'Not intersecting, parallel<br>';
return( false ); return( false );
} }
} elseif ( !$dx1 ) { // Line 1 is vertical } elseif ( !$dx1 ) { // Line 1 is vertical
@ -1559,15 +1551,15 @@ function linesIntersect( $line1, $line2 ) {
} else { // Both lines are vertical } else { // Both lines are vertical
if ( $line1[0]['x'] == $line2[0]['x'] ) { if ( $line1[0]['x'] == $line2[0]['x'] ) {
// Colinear, must overlap due to box check, intersect? // Colinear, must overlap due to box check, intersect?
if ( $debug ) echo "Intersecting, vertical, colinear<br>"; if ( $debug ) echo 'Intersecting, vertical, colinear<br>';
return( true ); return( true );
} else { } else {
// Parallel // Parallel
if ( $debug ) echo "Not intersecting, vertical, parallel<br>"; if ( $debug ) echo 'Not intersecting, vertical, parallel<br>';
return( false ); return( false );
} }
} }
if ( $debug ) echo "Whoops, unexpected scenario<br>"; if ( $debug ) echo 'Whoops, unexpected scenario<br>';
return( false ); return( false );
} }
@ -1638,18 +1630,18 @@ function getPolyArea( $points ) {
$dy = $y2 - $y1; $dy = $y2 - $y1;
$global_edges[] = array( $global_edges[] = array(
"min_y" => $y1<$y2?$y1:$y2, 'min_y' => $y1<$y2?$y1:$y2,
"max_y" => ($y1<$y2?$y2:$y1)+1, 'max_y' => ($y1<$y2?$y2:$y1)+1,
"min_x" => $y1<$y2?$x1:$x2, 'min_x' => $y1<$y2?$x1:$x2,
"_1_m" => $dx/$dy, '_1_m' => $dx/$dy,
); );
} }
usort( $global_edges, "_CompareXY" ); usort( $global_edges, '_CompareXY' );
if ( $debug ) { if ( $debug ) {
for ( $i = 0; $i < count($global_edges); $i++ ) { for ( $i = 0; $i < count($global_edges); $i++ ) {
printf( "%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>", $i, $global_edges[$i]['min_y'], $global_edges[$i]['max_y'], $global_edges[$i]['min_x'], $global_edges[$i]['_1_m'] ); printf( '%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>', $i, $global_edges[$i]['min_y'], $global_edges[$i]['max_y'], $global_edges[$i]['min_x'], $global_edges[$i]['_1_m'] );
} }
} }
@ -1659,7 +1651,7 @@ function getPolyArea( $points ) {
do { do {
for ( $i = 0; $i < count($global_edges); $i++ ) { for ( $i = 0; $i < count($global_edges); $i++ ) {
if ( $global_edges[$i]['min_y'] == $y ) { if ( $global_edges[$i]['min_y'] == $y ) {
if ( $debug ) printf( "Moving global edge<br>" ); if ( $debug ) printf( 'Moving global edge<br>' );
$active_edges[] = $global_edges[$i]; $active_edges[] = $global_edges[$i];
array_splice( $global_edges, $i, 1 ); array_splice( $global_edges, $i, 1 );
$i--; $i--;
@ -1667,10 +1659,10 @@ function getPolyArea( $points ) {
break; break;
} }
} }
usort( $active_edges, "_CompareX" ); usort( $active_edges, '_CompareX' );
if ( $debug ) { if ( $debug ) {
for ( $i = 0; $i < count($active_edges); $i++ ) { for ( $i = 0; $i < count($active_edges); $i++ ) {
printf( "%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>", $y, $i, $active_edges[$i]['min_y'], $active_edges[$i]['max_y'], $active_edges[$i]['min_x'], $active_edges[$i]['_1_m'] ); printf( '%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>', $y, $i, $active_edges[$i]['min_y'], $active_edges[$i]['max_y'], $active_edges[$i]['min_x'], $active_edges[$i]['_1_m'] );
} }
} }
$last_x = 0; $last_x = 0;
@ -1686,11 +1678,11 @@ function getPolyArea( $points ) {
$parity = !$parity; $parity = !$parity;
$last_x = $x; $last_x = $x;
} }
if ( $debug ) printf( "%d: Area:%d<br>", $y, $row_area ); if ( $debug ) printf( '%d: Area:%d<br>', $y, $row_area );
$y++; $y++;
for ( $i = 0; $i < count($active_edges); $i++ ) { for ( $i = 0; $i < count($active_edges); $i++ ) {
if ( $y >= $active_edges[$i]['max_y'] ) { // Or >= as per sheets if ( $y >= $active_edges[$i]['max_y'] ) { // Or >= as per sheets
if ( $debug ) printf( "Deleting active_edge<br>" ); if ( $debug ) printf( 'Deleting active_edge<br>' );
array_splice( $active_edges, $i, 1 ); array_splice( $active_edges, $i, 1 );
$i--; $i--;
} else { } else {
@ -1698,7 +1690,7 @@ function getPolyArea( $points ) {
} }
} }
} while ( count($global_edges) || count($active_edges) ); } while ( count($global_edges) || count($active_edges) );
if ( $debug ) printf( "Area:%d<br>", $area ); if ( $debug ) printf( 'Area:%d<br>', $area );
return( $area ); return( $area );
} }
@ -1727,7 +1719,7 @@ function mapCoords( $a ) {
} }
function pointsToCoords( $points ) { function pointsToCoords( $points ) {
return( join( " ", array_map( "mapCoords", $points ) ) ); return( join( ' ', array_map( 'mapCoords', $points ) ) );
} }
function coordsToPoints( $coords ) { function coordsToPoints( $coords ) {
@ -1776,7 +1768,7 @@ function scalePoints( &$points, $scale ) {
function getLanguages() { function getLanguages() {
$langs = array(); $langs = array();
foreach ( glob("lang/*_*.php") as $file ) { foreach ( glob('lang/*_*.php') as $file ) {
preg_match( '/([^\/]+_.+)\.php/', $file, $matches ); preg_match( '/([^\/]+_.+)\.php/', $file, $matches );
$langs[$matches[1]] = $matches[1]; $langs[$matches[1]] = $matches[1];
} }
@ -1790,7 +1782,7 @@ function trimString( $string, $length ) {
function monitorIdsToNames( $ids ) { function monitorIdsToNames( $ids ) {
global $mITN_monitors; global $mITN_monitors;
if ( !$mITN_monitors ) { if ( !$mITN_monitors ) {
$sql = "select Id, Name from Monitors"; $sql = 'select Id, Name from Monitors';
foreach( dbFetchAll( $sql ) as $monitor ) { foreach( dbFetchAll( $sql ) as $monitor ) {
$mITN_monitors[$monitor['Id']] = $monitor; $mITN_monitors[$monitor['Id']] = $monitor;
} }
@ -1813,16 +1805,16 @@ function initX10Status() {
if ( !isset($x10_status) ) { if ( !isset($x10_status) ) {
$socket = socket_create( AF_UNIX, SOCK_STREAM, 0 ); $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
if ( $socket < 0 ) { if ( $socket < 0 ) {
Fatal( "socket_create() failed: ".socket_strerror($socket) ); Fatal( 'socket_create() failed: '.socket_strerror($socket) );
} }
$sock_file = ZM_PATH_SOCKS.'/zmx10.sock'; $sock_file = ZM_PATH_SOCKS.'/zmx10.sock';
if ( @socket_connect( $socket, $sock_file ) ) { if ( @socket_connect( $socket, $sock_file ) ) {
$command = "status"; $command = 'status';
if ( !socket_write( $socket, $command ) ) { if ( !socket_write( $socket, $command ) ) {
Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) ); Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
} }
socket_shutdown( $socket, 1 ); socket_shutdown( $socket, 1 );
$x10Output = ""; $x10Output = '';
while ( $x10Response = socket_read( $socket, 256 ) ) { while ( $x10Response = socket_read( $socket, 256 ) ) {
$x10Output .= $x10Response; $x10Output .= $x10Response;
} }
@ -1848,14 +1840,14 @@ function getDeviceStatusX10( $key ) {
initX10Status(); initX10Status();
if ( empty($x10_status[$key]) || !($status = $x10_status[$key]) ) if ( empty($x10_status[$key]) || !($status = $x10_status[$key]) )
$status = "unknown"; $status = 'unknown';
return( $status ); return( $status );
} }
function setDeviceStatusX10( $key, $status ) { function setDeviceStatusX10( $key, $status ) {
$socket = socket_create( AF_UNIX, SOCK_STREAM, 0 ); $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
if ( $socket < 0 ) { if ( $socket < 0 ) {
Fatal( "socket_create() failed: ".socket_strerror($socket) ); Fatal( 'socket_create() failed: '.socket_strerror($socket) );
} }
$sock_file = ZM_PATH_SOCKS.'/zmx10.sock'; $sock_file = ZM_PATH_SOCKS.'/zmx10.sock';
if ( @socket_connect( $socket, $sock_file ) ) { if ( @socket_connect( $socket, $sock_file ) ) {
@ -1876,7 +1868,7 @@ function setDeviceStatusX10( $key, $status ) {
if ( preg_match( '/^'.$key.'\s+(.*)/', $x10Response, $matches ) ) if ( preg_match( '/^'.$key.'\s+(.*)/', $x10Response, $matches ) )
$status = $matches[1]; $status = $matches[1];
else else
$status = "unknown"; $status = 'unknown';
return( $status ); return( $status );
} }
@ -2026,7 +2018,7 @@ function ajaxError( $message, $code=HTTP_STATUS_OK ) {
ajaxCleanup(); ajaxCleanup();
if ( $code == HTTP_STATUS_OK ) { if ( $code == HTTP_STATUS_OK ) {
$response = array( 'result'=>'Error', 'message'=>$message ); $response = array( 'result'=>'Error', 'message'=>$message );
header( "Content-type: text/plain" ); header( 'Content-type: text/plain' );
exit( jsonEncode( $response ) ); exit( jsonEncode( $response ) );
} }
header( "HTTP/1.0 $code $message" ); header( "HTTP/1.0 $code $message" );
@ -2041,7 +2033,7 @@ function ajaxResponse( $result=false ) {
$response = array_merge( $response, $result ); $response = array_merge( $response, $result );
elseif ( !empty($result) ) elseif ( !empty($result) )
$response['message'] = $result; $response['message'] = $result;
header( "Content-type: text/plain" ); header( 'Content-type: text/plain' );
exit( jsonEncode( $response ) ); exit( jsonEncode( $response ) );
} }
@ -2091,7 +2083,7 @@ function getSkinIncludes( $file, $includeBase=false, $asOverride=false )
return( $includeFiles ); return( $includeFiles );
} }
function requestVar( $name, $default="" ) { function requestVar( $name, $default='' ) {
return( isset($_REQUEST[$name])?validHtmlStr($_REQUEST[$name]):$default ); return( isset($_REQUEST[$name])?validHtmlStr($_REQUEST[$name]):$default );
} }