Commit Graph

77 Commits

Author SHA1 Message Date
stan 7b43ac2645 Use JSON encoding for language independent serialisation (filters and control commands) rather than PHP serialisation. Removes dependency on rare PHP::Serialization perl module.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3357 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 16:18:18 +00:00
stan 87124001ba Added error checking to builtin JSON functions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3351 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 15:15:37 +00:00
stan 1d84fb8f7d Added jsonDecode function and stop encoding single quotes in JSON encoder
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3350 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 13:17:12 +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 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 3b149bf552 Fixed JSON encoding bug
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3292 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 14:48:03 +00:00
stan c19b71975c Fixed issue with deleteing current monitor grouyp - http://www.zoneminder.com/forums/viewtopic.php?t=15278
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3284 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:11:56 +00:00
stan dae7327e7e Fixed enable/disable monitor from monitor settings - http://www.zoneminder.com/forums/viewtopic.php?t=15273
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3283 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:08:16 +00:00
stan 98203e6c2f Improved stream handling for single image mode, for Chrome etc.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3281 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:04:11 +00:00
stan ee3c2f84a4 Removed debug
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3280 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:36:20 +00:00
stan 255cf27e49 Removed support for PHP 4.1.0
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3279 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:31:30 +00:00
stan 5985897a5c Modified and improved browser checking
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3278 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:29:06 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
stan dc9e2755b0 Added sample apache config file.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:27:58 +00:00
stan 6c547aba85 Fixed use of analysis images in getImageSrc function plus fixed implementation of overwrite flag in various functions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3207 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-28 21:20:02 +00:00
stan c7e4ebd85d Updated with new bandwidth based stream config
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3167 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:36:50 +00:00
stan 825eda95a6 Regenerated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3162 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:56:23 +00:00
stan 0cdc6e89ef Added utility function
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3065 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-05-27 12:18:06 +00:00
stan ac0e0c9ca6 Fixed typo in Quicktime video
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3033 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 10:41:04 +00:00
stan 9b31bf29e8 Added in image view to allow event root to be able web root
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:12:12 +00:00
stan a9c2044669 Changed split and ereg calls to explode and preg_match
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3029 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:00:31 +00:00
stan aeee1aff69 Changed calls of deprecated split function to use explode
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3019 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:09:07 +00:00
stan 6fc7acb378 Changed query separator to & and added CDATA wrapper.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2981 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:04:44 +00:00
stan 93b955813f Further PTZ preset tweaks
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2958 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 14:16:17 +00:00
stan 1e2ecf0947 Updated Makefiles
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2957 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 13:35:23 +00:00
stan c5a0f98309 Factored out action and request control functionality. Added presets to mobile view for PTZ cams.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2956 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 13:34:10 +00:00
stan 8cad0dbd6a Updated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-24 10:27:28 +00:00
stan 11a1cc2d41 Now supports custom perl install path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +00:00
stan 9116927ca2 Removed extranrous quote.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2860 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-06 09:48:01 +00:00
stan 545ca029e3 Added next auto inc function
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2825 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 10:53:51 +00:00
stan 2956b4bf14 Fixed issues with monitor creation/updating.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2821 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-30 08:56:15 +00:00
stan 7b4c0fa926 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2820 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-03-27 16:01:59 +00:00
stan 75c654e654 Downgraded to support autoconf 2.59
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:59:13 +00:00
stan 3069dc2402 Final timestamp update
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:45:32 +00:00
stan 429884741a Updated for timestamps
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:32:04 +00:00
stan f512cd91e7 Fixed issue with 'set' values.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2793 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-03 17:50:31 +00:00
stan 61089eeeb1 Added authentication hashed logins.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 14:06:39 +00:00
stan 66a19fe99b Fixed control preset issue.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2779 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 09:45:29 +00:00
stan 847606a200 Fixed further with editng control capabilities
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2737 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-30 17:43:29 +00:00
stan e14efbd493 Updated generated files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:24:01 +00:00
stan d43d2289ed Changes from updated build tools.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 14:54:50 +00:00
stan 69f6270171 Fixed issue with X10 web commands.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2712 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-05 14:37:26 +00:00
stan 549aa39cbb Updated autoconf/make files
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-06 00:05:56 +00:00
viseon 5d766dde92 Remove decorations from Cambozola applet and escape line endings in json values.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2707 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:44:43 +00:00