Isaac Connor
3d6efe2253
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-13 11:10:07 -05:00
Isaac Connor
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
Matthew Noorenberghe
c8e41bfee7
log.php: Ensure 'line' is an integer. Helps with #2466
2019-02-10 00:10:39 -08:00
Matthew Noorenberghe
02f09aad7f
view=export: Remove inline event handlers and fix arbitrary URL/XSS usage. Fixes #2443
2019-02-09 02:01:26 -08:00
Matthew Noorenberghe
0b38e72f88
view=download: Remove inline event handlers and fix arbitrary URL/XSS usage. Fixes #2441
2019-02-09 01:16:32 -08:00
Isaac Connor
533d021dea
Merge branch 'master' into storageareas
2019-01-30 15:17:27 -05:00
Isaac Connor
e53678f869
Can't use a normal subsitution on the Order by field. So parse the sort param instead
2019-01-23 12:22:00 -05:00
Isaac Connor
7026ebafac
Make ajax/stream wait longer for zms. On pi can take up to 3 seconds. Also for php < 5.6, we need to fake 64bit unpack support
2019-01-22 16:45:38 -05:00
Isaac Connor
7260f823cb
Merge branch 'master' into storageareas
2019-01-21 13:52:38 -05:00
Isaac Connor
326ac60ae4
add missing braces to fix logic
2019-01-21 11:20:56 -05:00
Matt N
f0b33145f5
Log CSP violations in ZM logs in supported browsers ( #2431 )
2019-01-21 11:12:17 -05:00
Matt N
02fd1e79b3
Fix ajax/status.php orderby sql injection ( #2421 )
...
https://github.com/LoRexxar/CVE_Request/tree/master/zoneminder%20vul%20before%20v1.32.3#ajaxstatusphp-line-276-orderby-sql-injection
2019-01-19 09:46:08 -05:00
Isaac Connor
5060358870
Merge branch 'master' into storageareas
2018-12-29 09:56:53 -05:00
Andrew Bauer
3258d8e590
remove ZM_DIR_IMAGES ( #2374 )
2018-12-29 09:52:58 -05:00
Isaac Connor
b16cd7ec84
Merge branch 'h265' into zma_to_thread
2018-11-20 12:38:17 -05:00
Isaac Connor
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
Isaac Connor
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
Isaac Connor
abeafe9ba6
fix log export. minTime and maxTime were being cleared by the regexp to detect sub second time. Also use ZM_DIR_EXPORTS instead of ZM_PATH_SWAP
2018-11-12 15:43:03 -05:00
Isaac Connor
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
Isaac Connor
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
Isaac Connor
015890a509
Merge branch 'master' into storageareas
2018-10-02 15:27:12 -04:00
Isaac Connor
613d885930
!= E.id is not sufficient. Since we are enforcing chronological ordering, > and < work better than !=
2018-09-30 10:15:04 -04:00
Isaac Connor
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
Isaac Connor
c88dc690a6
Make getNearEvents smarter. When Sorting by something other than Id, include Id in the sort so that events with identical starttime for example maintain the correct chronological order.
2018-09-28 13:24:50 -04:00
Isaac Connor
9c437b0303
Merge branch 'add_export_to_filter' into storageareas
2018-09-25 14:35:19 -04:00
Isaac Connor
978e332e3a
Merge branch 'master' into storageareas
2018-09-09 16:36:31 -04:00
Isaac Connor
534aebb21f
When loading previous and subsequent log lines, merge the fields in the filters instead of replacing
2018-09-09 16:36:09 -04:00
Isaac Connor
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
Isaac Connor
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
Isaac Connor
40292f3dad
Add Compression flag
2018-09-07 09:08:33 -04:00
Isaac Connor
d5cab088d6
Merge branch 'master' into add_export_to_filter
2018-09-05 10:33:10 -04:00
Isaac Connor
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
Isaac Connor
14b5fc3660
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-31 18:43:29 -04:00
Isaac Connor
4be2a0501c
Merge branch 'master' into storageareas
2018-08-22 17:22:54 -04:00
Isaac Connor
24f8d63b69
comment out a debug line
2018-08-20 11:13:38 -04:00
Isaac Connor
871e3807e6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-17 12:57:27 -04:00
Isaac Connor
94401b6765
create ZM_PATH_SOCKS if it doesn't exist
2018-08-11 13:35:57 -04:00
Isaac Connor
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
Isaac Connor
e05604e4b3
Alter code style, spacing
2018-07-12 14:05:23 -04:00
Isaac Connor
639f916156
spacing
2018-07-09 09:59:03 -04:00
Isaac Connor
6bbd4f1083
google code style
2018-06-25 14:51:46 -04:00
Isaac Connor
798d046d81
Remove some debugging lines
2018-06-06 11:39:41 -04:00
Isaac Connor
4454ca0072
Merge branch 'storageareas' into zma_to_thread
2018-05-20 10:39:14 -04:00
Isaac Connor
25703fb2d4
Speed up log query response by generating the options out of the log rows instead of hitting the db again.
2018-05-18 09:05:25 -04:00
Isaac Connor
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
Isaac Connor
07e7ab1547
fix spacing
2018-04-20 14:21:41 -04:00
Isaac Connor
12d46e2377
change event_id in status_msg to 64bit when unpacking
2018-04-18 09:52:57 -04:00
Isaac Connor
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
Isaac Connor
0b0fbae1c5
Add output of paused image when paused
2018-04-12 18:43:57 -04:00
Isaac Connor
22f86da372
Have to use the .sock file instead of w.lock
2018-04-11 10:38:13 -04:00
Isaac Connor
ebb0c9eec6
Merge branch 'storageareas' into zma_to_thread
2018-02-14 13:56:30 -05:00
Isaac Connor
002f22f685
generateAuthHash is already called earlier in index.php, so it will always be up to date. Just include it in the response.
2018-02-14 13:15:22 -05:00
Isaac Connor
2774fded57
add debugging and put NavBarHTML back in message
2018-02-14 11:57:45 -05:00
Isaac Connor
4df8cdc685
add auth_hash updating to the navbar reload.
2018-02-14 10:44:48 -05:00
Isaac Connor
a1392bf613
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_mpeg.cpp
src/zmc.cpp
2018-02-02 14:23:26 -05:00
Isaac Connor
a610d564d1
tweak timeouts
2018-01-31 15:51:12 -05:00
Isaac Connor
67b365948e
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
2018-01-29 15:53:26 -05:00
Isaac Connor
a76fcb331c
Remove debugging. Treat can't get semaphore as a non-error
2018-01-29 08:25:46 -08:00
Isaac Connor
b1b8b42f2b
Fix getting stream status updates when # of files open is > 1024.
2018-01-29 07:21:31 -08:00
Isaac Connor
2dcb0d183f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-28 18:07:33 -08:00
Isaac Connor
51d5fd38aa
scan the board for the names of the camera inputs
2018-01-28 18:06:13 -08:00
Isaac Connor
0d734a880c
add hack to ensure that next and previous operate on time
2018-01-28 17:30:49 -05:00
Isaac Connor
5d4fde88d9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-27 12:17:13 -08:00
Isaac Connor
bc6d8623a6
add a semaphore around the socket creation and retention. I think concurrent processes are messing with the sockets.
2018-01-27 15:03:22 -05:00
Isaac Connor
320f5c2083
Turn off error reporting in output
2018-01-25 09:13:44 -08:00
Isaac Connor
215660a817
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_packetqueue.cpp
src/zm_videostore.cpp
src/zm_videostore.h
web/includes/Event.php
web/skins/classic/views/events.php
2018-01-24 11:06:19 -05:00
Isaac
1b23f7b564
turn off debug
2018-01-23 17:34:49 +01:00
Isaac Connor
f0d4cab24a
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
web/ajax/add_monitors.php
2018-01-21 11:13:06 -05:00
Isaac Connor
0f3cf33565
Move unparse_url from add_monitors to functions to make it generally available
2018-01-19 08:16:52 -08:00
Isaac Connor
e16852ee8e
fix compile, impose minimum 10 second event length
2017-12-18 13:39:08 -05:00
Isaac Connor
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
Isaac Connor
ecf5cfc767
Merge branch 'storageareas' into zma_to_thread
2017-12-14 13:41:41 -05:00
Isaac Connor
c509b6fbf4
fix a quotes problem
2017-12-12 15:46:50 -05:00
Isaac Connor
6b9007c6a7
Merge branch 'storageareas' into zma_to_thread
2017-12-08 13:46:16 -05:00
digital-gnome
7930e1881f
Fix quotes
2017-12-07 11:18:10 -05:00
Isaac Connor
90820ab92a
Merge branch 'storageareas' into zma_to_thread
2017-12-07 10:37:04 -05:00
Isaac Connor
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
digital-gnome
f8d3c07586
Add h264 event view functionality and new feature alarmCues ( #2012 )
...
* Fix nearEventsQuery
Removed dbEscape from getNearEvents previous event because it only returns 0. Now matches next. Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch. Also added start times to allow for videoJS replaymode.
* Unescape filters
Filters need to be unescaped
* Add initial values to page load
* Add replay modes to videojs
* rough in figuring out a frame in between bulk frames
* Add alarmCues
Add a graphical indication of where alarm frames happened in an event. Similar to what zmNinja shows.
* Add remaining buttons to videojs
Functionality for all buttons on videojs streams. FF/RW buttons show as active when they are active.
* Whitespace and fix Bulkframe calcs
* Fix zms events trying to generate with mp4 code
ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed
* ZMS scrub bar
Move zms scrub bar to bottom of image feed. Make it simpler and more like videojs style.
* Wrap event feeds properly
* Fix dvrControls on watch view
* Add scaleToFit
Add a scaleToFit option to event view
* Add navigation for videoJS streams
Disables nav buttons at beginning and end of events. Handles switching from zms to videojs. If zms crashes changes next event function to reload page instead of ajax.
* Add scaleToFit to watch and frame view
Adds scaleToFit to watch view. Since frame view uses the watch cookie this required changes to frame view
* Add transition to zoom
* Change stills view to match stream
Move stills slider bar to match scrub bar on streams. Allow it to resize, make it larger. Add alarmcues.
* Add Stills for every event
Add stills for every event. Match size to stream size
* Progressbox transitions
2017-12-04 21:26:59 -05:00
Isaac Connor
588f63b053
Merge branch 'storageareas' into zma_to_thread
2017-12-04 17:07:16 -05:00
digital-gnome
3e7c573da5
Add download video option to events view
...
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
Isaac Connor
bab308ffa8
Merge branch 'storageareas' into zma_to_thread
2017-12-03 12:43:31 -05:00
digital-gnome
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
Isaac Connor
f2efc80f22
works?
2017-11-30 14:37:36 -05:00
Isaac Connor
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
Isaac Connor
8e494ef431
Merge branch 'storageareas' into zma_to_thread
2017-11-23 08:40:49 -05:00
Isaac Connor
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
digital-gnome
64346a031d
alarmCues to status.php
...
Switched alarm cues from API to ajax/status.php. Less overhead due to only requesting the information it needs and avoids a weird problem with authentication after sitting logged in for hours.
2017-11-16 21:03:03 -05:00
Isaac Connor
778942b928
improve add_monitors
2017-11-16 17:39:48 -08:00
APHW2 MFGENG
d15d36f389
rework, compiles, won't open h264
2017-11-09 11:50:20 -08:00
Isaac Connor
8432ab5938
change quotes, and limit the # of results to 2 when getting next and previous frames. 2 is because one of them could be the currently selected Event,
2017-11-03 15:09:19 -04:00
Isaac Connor
866c875312
Merge branch 'storageareas' into tesla
2017-11-01 12:01:51 -07:00
Isaac Connor
9473fbecd8
more debug
2017-10-31 13:32:42 -07:00
Isaac Connor
c16e101120
rough in add monitors import wizard
2017-10-27 20:52:08 -07:00
Isaac Connor
eb48759ff8
wip
2017-10-27 13:37:51 -07:00
Isaac Connor
0fbb473dd4
refactoring
2017-10-25 13:06:15 -07:00
Isaac Connor
b58c9d87c3
wip
2017-10-23 09:51:41 -04:00
digital-gnome
1eb2edd95c
Converge initial eventData with ajax
...
The initial eventData object on page load didn't have most of the information that the ajax call gave it.
2017-10-21 22:14:46 -04:00
digital-gnome
e23b4a0d5d
Fix event path
2017-10-07 12:42:16 -04:00
Isaac Connor
224ca30c86
Merge branch 'storageareas' into zma_to_thread
2017-10-06 17:10:28 -04:00
Isaac Connor
8f8d66189c
Google code style
2017-10-04 10:48:24 -04:00