ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,310 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

1317 Commits

Author SHA1 Message Date
Kfir Itzhak 8f0ec42ba2 First work on adding built-in deinterlacing to ZM. 2012-07-13 20:11:16 +03:00
stan 4996dd0a51 Recreated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:46:18 +00:00
stan be97b244b4 Increased size of options window and changed to use debug functions instead of console ones. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3659 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 08:58:19 +00:00
Kfir Itzhak 2dfdc8129c Few small fixes: 
1) Added a workaround against SWS_CPU_CAPS_SSE2 not being defined.
2) Fixed enableDisableAlarms javascript error.
3) swscale unsupported format errors now include the unsupported format in the error.
4) Fixed a small error affecting local cameras with rotation enabled.
 2012-03-07 14:33:09 +02:00
Kfir Itzhak d5fbd351b3 Small corrections 2012-02-01 07:33:21 +02:00
Kfir Itzhak be8ef02a7c Small corrections 2012-02-01 07:33:21 +02:00
Kfir Itzhak b4921c4403 1) Made 24bit the default target colorspace. 
2) Changed crop info's layout.
 2012-02-01 07:33:21 +02:00
Kfir Itzhak 066fe89718 Added automatic capture palette selection. 2012-02-01 07:33:21 +02:00
Kfir Itzhak bdf0687550 1) Added support for JPEG and MJPEG capture palettes - needs to be tested 
2) Allow the blend percent to be zero, to disable blending
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 63122ab9bc Undo translations in es_es.php because its not available in the ZM 1.24.4 package. 2012-02-01 07:33:20 +02:00
Kfir Itzhak 8ac3dda54b 1) Removal of the ZM_LOCAL_BGR_INVERT option. 
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak eeaed7ccd3 Some small changes 
1) Fixed wrong size calculation in Image::AssignDirect.
2) Improved libjpeg subpixel order selection.
3) Finished adding support in the simple Overlay function.
4) Completed Flip and Rotate 32bit RGB support.
5) Allow ZM to compile on 32bit with omit frame pointer disabled by defining _DEBUG
   To use one less register in the SSE algorithms.
6) Removed the counter variable in some loops to reduce loop overhead.
7) Modified crop query error handling.
8) Most of the shared data now declared as volatile.
9) Small improvements to the AlarmedPixels motion detection.
10) Changed the default blend percent from 7% to 12%.
11) Fixed an earlier bug created by me: motion detection checking the wrong pixels.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 642a1bfdb2 1) RTSP support for direct capture and target colorspace. 
2) Hopefully fixed the mmap unexpected shared memory size completely this time.
3) Added 32bit RGB and grayscale support to the signal checking.
4) Fixed zms\nph-zms keeps running after changing capture options, eating CPU and has to be killed with -9.
5) Default monitor options changed again.
6) Fixed unrelated bug: Undefined constant ZM_V4L2 in monitor probe.
7) Fixed unrelated bug: Error in offset X in monitor probe.
8) Changed monitor probe's prefered capture settings.
9) Small other minor changes.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak b0bc227232 1) Made shared memory 16 byte aligned and identical size and layout for all platforms. 
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 33119c6dc5 1) Added image size requirements to ensure proper alignment 
2) Changed image class buffer related functions
3) Improved format selection for local cameras
4) Removed imagesize check for swscale
5) Fixed mmap unexpected memory size when changing capture options
6) Fixed unrelated bug in zmdc.pl: sockets directory doesn't exist
 2012-02-01 07:33:20 +02:00
Kfir Itzhak c3ecdd00e0 1) Relocated conversion functions and tables to zm_image.cpp 
2) SSE2 aligned memcpy now functional
3) Fixed fill functions bug from an earlier commit
4) Many changes to zm_local_camera.cpp format selection
5) Fixed memory leak in AssignDirect()
6) Fixed Target Colorspace webinterface issues
7) Small other changes
 2012-02-01 07:33:20 +02:00
stan 2c47a15f9b Use event dimensions instead of monitor ones as they may have changed. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3520 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-11-10 22:53:29 +00:00
stan 8b86c9af58 Removed permissions check when creating new log entries. Instead check that request is 'post'ed and moved some other requests to be 'post' only. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3509 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-26 10:50:50 +00:00
stan e695dfd4dd Allow for level as a minimum when selecting availability criteria for other fields. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3501 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-24 13:15:58 +00:00
stan b64c506659 Added SFTP upload option. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-23 14:10:20 +00:00
stan 194d8350b4 Fixed distribution and install lists 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3497 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-05 11:24:24 +00:00
stan 62df1ba8de Tidier detainting. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3494 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-03 17:33:58 +00:00
stan aa0ee13afa Detaint further dodgy path varieties. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3488 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-03 11:08:40 +00:00
stan 63589ddee7 Don't include postprocessed config.php 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3487 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-28 21:26:20 +00:00
stan 3a399378b2 Fixed problem with link to overlay css file 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3485 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-27 16:09:09 +00:00
stan 6035ed211a Detaint some user inputs to avoid malicious file inclusion 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3483 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-22 08:37:01 +00:00
stan a3ef933f2d Check for json_last_error function existence before invoking. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3482 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-22 08:34:35 +00:00
stan b40669dc75 Updated Spanish translation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3476 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-07 08:30:12 +00:00
stan 07fca2ad9a Fixed environment fetching when in cli mode and logfile error message. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3471 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-27 16:15:59 +00:00
stan 7e55373b87 Fixed incorrect scaling of timeout on select call 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3470 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-27 16:15:16 +00:00
stan bf90ab8158 Added error trapping to log file exports. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3463 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-23 22:33:07 +00:00
stan 1ce54fb0db Enabled alternate selections when a filter has been chosen. Improved 
styles for debug entries in log.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3462 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-23 21:53:45 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
jaidhar 96249db582 eyeZm Plugin: Patched functions.php to check for ffmpeg codec support via -formats as well as -codecs 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3399 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-08 22:37:19 +00:00
stan b3d8279dfc Fixed problem with transparency 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3373 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-27 10:41:43 +00:00
stan a6011b4f93 Fixed down/right PTZ image 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3372 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-27 08:39:22 +00:00
stan d2f5e9623c Added checks for mismatches between system and database versions 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3364 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-25 09:15:14 +00:00
stan a20180aded Updated to process other sections on top of SLANG 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3362 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-25 09:13:47 +00:00
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 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 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
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 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 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 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 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 49daed8658 Changed name of event variable as Chrome objects. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3289 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-08 14:30:59 +00:00
stan f92752b358 Added more content headers for video download. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3288 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:52:10 +00:00
stan 240027dd98 Fixed javascript error due to archive button permissions - http://www.zoneminder.com/forums/viewtopic.php?t=15387 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3286 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:17:42 +00:00
stan 45f1ee9c36 Fixed restricted user not being able to select a monitor in console - http://www.zoneminder.com/forums/viewtopic.php?t=15347 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3285 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:14:16 +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 48d287f9de Fixed bug where unarchiving multiple events would not work - http://www.zoneminder.com/forums/viewtopic.php?t=15272 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3282 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 16:06:44 +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 1027b1c75b Prevented memory exhaustion in timeline view for very long events 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3277 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:28:49 +00:00
stan 173de6debf Replaced deprecated split function call 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3276 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:28:25 +00:00
stan ccfdd30988 Fixed typo in error message 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3275 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:28:01 +00:00
stan e1a9514262 Added Estonian language 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3274 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:27:32 +00:00
stan 4cbe2fbad9 Updated mootools version number to 1.2.5 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3270 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-31 08:54:39 +00:00
stan f6bcc70b0d Updated for new tokens 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3268 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-30 21:17:50 +00:00
stan 5203205680 Improved formatting of options and help. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3229 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-20 18:38:24 +00:00
stan 828e316885 Updated SVN header 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3226 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-17 18:20:54 +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 04dbf0f016 Renamed zmHttpd conf file to zmApache 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3219 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-03 23:30:20 +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
jaidhar 1a8d7c46fc XML Plugin: Bugfix where EVENT_IMAGE_DIGITS other than 3 would not work. Now uses define 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3215 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-12-30 12:35:14 +00:00
stan 14376ac519 Updated to mootools 1.2.5 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3214 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-12-13 22:37:57 +00:00
jaidhar 192b1310b8 Adding Display language item to hungarian file. Other languages need this 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3212 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-12-03 17:47:00 +00:00
jaidhar 4dc1fac544 XML Plugin: Added commenting for config.php defines 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3211 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-30 04:32:43 +00:00
stan 00478b3ff2 Fixed id parsing. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3209 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-28 21:27:08 +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
stagecoach 79e24aef44 updated /web/skins/classic/views/options.php: 
added tab for skin selection
updated /web/lang/en_gb.php:
added Display entry and SkinDescription entry

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3206 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-24 01:35:12 +00:00
stagecoach f65edd0cc1 updated /web/skins/classic/views/options.php: 
added tab for skin selection
updated /web/lang/en_gb.php:
added Display entry and SkinDescription entry

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3205 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-24 01:33:21 +00:00
jaidhar 635d8e1dad Grab FFMPEG from ZM_PATH_FFMPEG (if available), more robust error checking against codecs and paths 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3203 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:09:51 +00:00
jaidhar bd31f9ec4b IP Address printout in XML Loggin 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3202 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:09:33 +00:00
jaidhar 069136fe53 Added vlog function to view log output, ability to redirect XML logging to it's own file 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:09:18 +00:00
jaidhar 18bcfcff7f Added support for deep-event storage 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3200 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:08:48 +00:00
jaidhar c7b3d04eed Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:08:33 +00:00
jaidhar d3fa2b2df3 Changed default H264 bitrate for events to 128kbit 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3198 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:08:07 +00:00
jaidhar f0165bab78 Prettied-up the splash screen for H264, modified FFMPEG encoding parameters for H264 slightly 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3197 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:07:52 +00:00
jaidhar 5ed6fccd20 - Incremented to p2fs2 
- H264, MPEG-4 and MJPEG support for encoding of events through parameters now
- Display overlay of still-capture when streaming H264 (transparency)
- Introduced logXmlErr macro

Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3196 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:07:37 +00:00
jaidhar 7ab4d4efbe XML Plugin: Modified H264 behavior to utilize internal MPMoviePlayercontroller in eyeZm. Works more reliably now. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3195 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-15 21:35:29 +00:00
jaidhar 56018fc9b3 XML Plugin: Another bugfix in getEventPathSafe() to account for more variations in ZM installations 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3194 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-15 02:48:12 +00:00
jaidhar f85c060ba6 XML Plugin: Check for ZM_DIR_EVENTS being defined in getEventPathSafe() 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3193 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-14 18:33:55 +00:00
jaidhar e57c1b0331 XML Plugin: More config options added, stability fixes to H264 streaming 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-12 23:04:09 +00:00
jaidhar 78caa0adb0 XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-12 04:26:31 +00:00
jaidhar 461374dc2a XML Plugin: Minor commit to impove h264 web-page appearance 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3187 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 07:57:46 +00:00
jaidhar 2d7979ac93 XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 05:25:43 +00:00
jaidhar 97a99993d7 XML Plugin: Added preliminary H264 feed stream support 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3185 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-10 22:20:29 +00:00
jaidhar f4b75d4f14 XML Plugin: Speed improvement where using inner join on Frames table was causing large delays for huge tables 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3184 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-10 01:32:14 +00:00
jaidhar 6307ecbb0c XML Plugin: Checked for define of ZM_WEB_x_CAN_STREAM since 1.24.1 and .2 don't have this 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3182 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-08 17:23:13 +00:00
jaidhar 2a09efdfd4 XML Plugin: Looks like getEventPath is broken between 1.24.2 and 1.24.3, implement getEventPathSafe to workaround 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3181 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-07 04:05:16 +00:00
jaidhar 039358e00c XML Plugin: Removing README 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3180 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-07 02:00:50 +00:00
jaidhar 2fc3936ec5 XML Plugin: vframe action checks if file exists and outputs image if not 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3179 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-07 01:23:08 +00:00
jaidhar dd337affdc XML Plugin: vframe action can now display alarm, regular and analyze frames based on input parameters, console can be sped-up by using 'nostatus' tag to skip daemon-check 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3178 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-06 01:37:32 +00:00
jaidhar 41405e1115 XML Plugin: Added vframe action, some more defines, condensed vevent parameter requirements 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3177 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-05 23:41:09 +00:00
jaidhar 1c7086dc39 XML Plugin: Modified event query to return frame scoring information along with the frame ID of the max. scoring frame 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3176 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-05 17:50:39 +00:00
jaidhar d6575d90e1 XML Plugin: Split off actions from console.php into it's own file, actions.php 
- Fixed bug where authentication wasn't being handled properly



git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3175 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-05 16:48:57 +00:00
jaidhar b60e60b062 XML Plugin: testing with eyeZm v1.1 and 1.24.3, bugfixes accordingly 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3174 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-04 19:25:34 +00:00
jaidhar e86444cbc3 Importing initial XML Plugin files to build structure. Updated autoconf files to include Makefiles 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3173 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-04 07:07:40 +00:00
stan 51a03d84ee Updated with new bandwidth based stream config. Changed streaming to be more flexible. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3171 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:42:10 +00:00
stan 32578e3fbf Updated with new bandwidth based stream config. Fixed inadvertent triple equals comparison. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3170 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:41:00 +00:00
stan eda9757415 Updated with new bandwidth based stream config. Fixed inadvertent triple equals comparison. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3169 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:40:33 +00:00
stan 9559ea297b Updated with new bandwidth based stream config 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3168 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:39:47 +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 7e1979760e Updated with new bandwidth based stream config 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3166 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:36:03 +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 70aee2ad56 Regenerated 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3160 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:50:41 +00:00
stan 88a6371d46 Preserve replay mode in cookie 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3159 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:49:46 +00:00
stan 9052dc1313 Corrected syntax error. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3158 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:46:57 +00:00
stan 77a2d16493 Cosmetic/whitespace change 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3157 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:45:44 +00:00
stagecoach 1d77e03622 Updated skins/classic/includes/export_functions.php: 
- time and date stamp in file name of master .html file modified: removed chars (i.e. :) that could trip up some browsers

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3150 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-10-20 18:13:29 +00:00
stagecoach b5146a067c Updated skins/classic/includes/export_functions.php: 
- human-readable time and date stamp in file name of master .html file
- after download to client, master .html file is being removed from server

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3149 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-10-19 21:14:08 +00:00
stagecoach b7d8f58929 Changed from 
div.makeDraggable( { 'container': $('imageFrame'), 'onStart': setActivePoint.pass( i
), 'onSuccess': fixActivePoint.pass( i ), 'onDrag': updateActivePoint.pass( i ) } );

to

div.makeDraggable( { 'container': $('imageFrame'), 'onStart': setActivePoint.pass( i
), 'onComplete': fixActivePoint.pass( i ), 'onDrag': updateActivePoint.pass( i ) } );

So that motion detection areas are properly re-computed and updated in Zone config pages and db.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3144 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-10-12 22:50:49 +00:00
stagecoach ee50a8c42e Playback functionality embedded into exported jpeg event. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3131 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-09-29 16:19:41 +00:00
stagecoach 2709b3eec6 Stagecoach Wireless Second Test Commit: 
commented string removed from file below to reverse first test commit

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3130 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-09-29 00:57:52 +00:00
stagecoach 80c5c3edb1 Stagecoach Wireless Test Commit: 
commented string, will be removed with second test

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3129 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-09-29 00:55:10 +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 60f0136ed3 Merged in image root changes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 19:16:40 +00:00
stan 255c311ef1 Updated by autoconf/automake 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3038 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 17:39:38 +00:00
stan 2b375ef264 Changes to querying and probing. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3037 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 17:38:30 +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 1432bbed60 Changed splitcalls to explode 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3030 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-23 09:10:36 +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 4f0c4cced0 Changed use of deprecated split function to explode 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3025 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-15 17:11:58 +00:00
stan 63988218a7 Changed use of deprecated split function to explode 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3024 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-15 17:11:37 +00:00
stan 6f464e7152 Changed use of deprecated split function to explode 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3023 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-15 17:11:17 +00:00