Commit Graph

2660 Commits

Author SHA1 Message Date
stan d26f3a7e8c Fixed problem with blank boolean values
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3347 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-20 08:54:36 +00:00
stan ee5d8db0cd Moved the runCommand function into the library plus shell detection. Should have been there anyway.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3343 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-16 22:54:37 +00:00
stan 154880ac15 Now detects camera restarts and disconnections properly.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3342 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-16 22:53:31 +00:00
stan 327ae02e9a Regenerated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3340 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-16 14:48:52 +00:00
stan 24c3c068dd Removed original apache config and merged with new one in misc
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3339 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-15 21:16:36 +00:00
stan b3b715e022 Fixes to work with latest ffmpeg
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3338 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-15 20:38:51 +00:00
stan 70505b5f6a Added -d option to allow specification of path to update files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3337 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-04 14:11:23 +00:00
stan 36291aebf4 Comment
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3336 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-04 14:10:56 +00:00
stan 68200320de Restructured to fix scoping errors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3335 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-28 14:22:44 +00:00
stan eabe1d057c Added disclaimer text
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3334 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-28 14:10:40 +00:00
stan e59ed8d9dc Added Apache config file
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3333 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-27 14:32:41 +00:00
stan 2b1b818e2e Reformatted slightly
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3332 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-27 14:31:29 +00:00
stan aadb1e0e94 Added syslog sample config
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3331 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-27 11:28:36 +00:00
stan 011777c1c6 Added misc directory and sample logrotate config file
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3330 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-27 11:04:06 +00:00
stan e0633998f9 Changed extra debug log location to the temporary directory.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3329 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-26 15:50:02 +00:00
stan a90ae4f19f Added additional info to exceptional polygon message
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3328 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-26 15:48:21 +00:00
stan 4121d5f5de Restructured slightly to workmore efficiently and require fewer passes for full cleanups. Also added tests for hanging monitor symbolic links and events left behind when monitors are removed.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3327 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 13:01:45 +00:00
stan 47e8d6112a Do not ignore return status of unlink
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3326 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 11:47:25 +00:00
stan 249b53ec7e When creating a monitor add it to the current group if any
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3325 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 11:46:55 +00:00
stan 27fedec37b Reordered monitor deletion to do primary activities first in case of deletions timing out
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3324 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 10:56:39 +00:00
stan bf101660b4 Added deletePath function and changed deleteEvent to use it.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3323 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 10:54:41 +00:00
stan e46acf74b0 Fixed broken previous commit.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3322 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 09:53:33 +00:00
stan 40dfb5abde Fixed potential issues with monitor deletion
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3321 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 09:50:28 +00:00
stan 6a5f649092 Improved process control options, guesses less.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3320 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 09:35:39 +00:00
stan f5186813f7 Changed to use standard shell execution method
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3319 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 09:32:50 +00:00
stan f15ef08d90 Do database freshening unconditionally on startup
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3318 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 09:27:55 +00:00
jaidhar d0f8e7e1aa eyeZm Plugin: Changed text on H264 splash page
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3317 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:10:17 +00:00
jaidhar 7c430cd7a5 eyeZm Plugin: Changed loading text for H264 splash screen
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3316 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:10:03 +00:00
jaidhar 6645cd0a8f eyeZm Plugin: Removed -s tag from ffmpeg to allow it to automatically pick size, and added viewport meta-tag to h264 splash page
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3315 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:09:50 +00:00
jaidhar f2caca6f2f added single-shot when fps=0 for vcodec=mjpeg
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3314 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:09:34 +00:00
jaidhar 923fd832e5 Incremented to p2fs3, added rescaling support for 'vframe' action, added viewport tag to vfeed for mjpeg mode
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3313 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:09:20 +00:00
stan 755bd93a09 Un-hardcode /tmp in zmupdate
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3312 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-05 20:54:41 +00:00
stan fe12ae4ee2 Handle empty strings better.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3311 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-05 20:54:10 +00:00
stan a1ccff276f Auto-updated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3310 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:35:17 +00:00
stan 0327f0f751 Added Spanish translation
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3309 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:34:58 +00:00
stan 0ff4e53832 Allow FPS reporting to be disabled by setting valure to zero
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3308 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:23:10 +00:00
stan f0a012ebfd Fixed bug to do with V4L versions and monitor settings
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3307 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:04:52 +00:00
jaidhar e3f8bdb6cd XML (eyeZm) plugin: Now renamed plugin to eyeZm, along with all database variables. Note that this must still reside in the skins/xml path until iPhone apps can be moved over at a later point in time
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3306 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-19 20:25:54 +00:00
jaidhar 15de28e665 XML Plugin: Securing code by escaping SQL strings, and validating input parameters
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3305 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-19 20:25:22 +00:00
stan 278b78f012 Added missing V4L1 conditional
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3304 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-17 09:31:33 +00:00
stan 00881cae63 Regenerated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3303 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-17 09:17:58 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 21:59:06 +00:00
stan beffdab035 Improved fast image blending somewhat and changed image class to use generic typedefs rather than libjpeg ones.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3301 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 11:18:41 +00:00
stan 88e5abaa6e Amended comment on FAST_IMAGE_BLENDS config
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3300 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 11:18:10 +00:00
stan efa583aed0 Fixed JSON request queueing issue.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3299 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 11:17:44 +00:00
stan f4ee181a1b Removed redundant overloaded code, now implmented directly in MooTools
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3298 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 11:17:30 +00:00
stan 39b5400046 Tidied up memory freeing a bit.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3297 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 17:54:45 +00:00
stan 1ef02ac35a Tidied up disposal of ffmpeg structures.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3296 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 17:51:08 +00:00
stan e91795a619 Removed netpbm options
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3295 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 14:50:04 +00:00
stan 05a3ff2707 Regenerated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3294 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 14:49:56 +00:00