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 |