c1a0afef95
make group view into a modal
2020-09-27 12:12:01 -05:00
0c4fcbbe97
convert controlcaps view to bstable
2020-09-26 12:09:41 -05:00
5b1d6331e4
make the delconfirm modal generic
2020-09-26 07:53:22 -05:00
e4a1bacbbf
get adv search working in newlog view
2020-09-24 11:05:34 -05:00
3f2f7359f0
rough in new log view - very rough
2020-09-23 13:09:19 -05:00
a43cbc05af
Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output
2020-09-21 13:03:03 -04:00
b6541aa1ff
Move log export to a generic modal
2020-09-21 13:01:58 -04:00
96474a7d94
Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output
2020-09-21 13:00:03 -04:00
a3c0e160a2
convert state modal to ajax request
2020-09-19 12:36:04 -05:00
7c1ec4f957
convert logout modal to ajax request
2020-09-19 10:44:05 -05:00
ec20fdf3ad
convert function modal to ajax request
2020-09-19 10:18:59 -05:00
d2963fe28f
convert donate modal to ajax request
2020-09-19 08:55:08 -05:00
467e75a11c
convert eventdetail function to php file
2020-09-18 11:03:20 -05:00
2757b74957
convert servermodal function to php file
2020-09-18 10:34:33 -05:00
a058d077bb
fix typo
2020-09-18 10:11:58 -05:00
10119dc609
convert storage function to php file
2020-09-18 10:02:02 -05:00
1b2f0514b9
convert delconfirm function to php file
2020-09-18 09:43:29 -05:00
6e6b9a464b
convert enoperm function to php file
2020-09-18 09:24:23 -05:00
416de4a068
fix git screwup
2020-09-18 08:56:17 -05:00
bc7cadcc73
convert optionhelp function to php file
2020-09-18 08:35:21 -05:00
f61a21fec4
Add modals dir with filterdebug modal
2020-09-17 15:17:53 -04:00
1caaf01502
Add code to the default case to include a file in ajax/modals/.php so that the modals template can be kept out of functions.php. We don't need the auth stuff. Also turn off error reporting as we should only return json.
2020-09-17 15:14:09 -04:00
afdd4702a2
add server modal
2020-09-16 08:30:45 -05:00
508967ffe9
fix typo on modal.php
2020-09-14 13:51:24 -05:00
fb85d6f79c
rough in eventdetail modal
2020-09-14 13:47:09 -05:00
d2bc39f65f
replace storage popup with modal
2020-09-14 09:50:04 -05:00
096f4a446f
Use Ajax to load delete confirm modal
2020-09-13 10:39:51 -05:00
1599bc4c14
load stats on deman via ajax
2020-09-13 07:32:49 -05:00
547e1d6cc4
rough in error no permisson modal
2020-09-12 08:36:19 -05:00
0557d847f0
fix ajax archive/unarchive
2020-09-11 17:01:56 -05:00
aa6bf31cbd
pass OLANG as a function parm
2020-09-11 07:51:00 -05:00
cd09ec8fef
rough in Modal Ajax framework
2020-09-10 16:56:58 -05:00
98874cb6d1
provide error message when trying to delete Archived events.
2020-09-03 17:04:52 -04:00
73cdb510b2
Rough in an events ajax request for deleting events
2020-08-31 10:37:22 -04:00
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
3242ce6ec9
Handle backticks in matches sort fields. Fixes regression in 1.34.17
2020-08-06 10:37:56 -04:00
2b29a7983a
clean up navbar background refresh
2020-08-02 13:01:20 -05:00
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -04:00
d7680e1a44
Spacing
2020-05-23 10:15:48 -04:00
3f50277e1c
Revert effort to escape column names. Not smart enough.
2020-05-12 09:21:05 -04:00
eadff23465
Fix missing )
2020-05-12 09:16:37 -04:00
c5f082e7ac
fix escaping column names
2020-05-12 09:06:57 -04:00
582102c2c6
Fix use of backticks for newer mysql
2020-05-11 09:19:16 -04:00
81cd338545
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-05-11 08:34:19 -04:00
d23258cb23
Allow for backticks in sort column
2020-05-11 08:34:07 -04:00
f1d794c11b
spacing and escape sql fields
2020-05-07 13:57:37 -04:00
c3a80e7e40
Add MonitorId to event data returned for status request
2020-04-23 11:07:07 -04:00
59f9f37fff
cleanup. Don't output errors that break json response
2020-04-23 11:06:41 -04:00
a25c3dfb5c
Add MonitorId to event data returned for status request
2020-04-10 11:11:24 -04:00
45c13176dc
cleanup. Don't output errors that break json response
2020-04-10 11:10:57 -04:00
4e58a38317
use ini_set(display_errors,0) instead of turning off errors entirely so that we still log errors, just not output them instead of json.
2020-04-03 15:21:31 -04:00
7c21f065bd
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
2020-03-02 12:07:11 -05:00
1cbc75813c
improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:21:57 -05:00
dd0ce50c17
quotes and improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:21:30 -05:00
e8a0ed9208
quotes and improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:20:35 -05:00
1865df3fe0
remove some debug, add some parenthesis to ensure logic works as intended
2020-01-07 17:08:07 -05:00
fc017893bc
Sort the log filtering options. Fixes #2756
2019-12-20 16:09:34 -05:00
e123e689ca
fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in
2019-12-06 14:32:59 -05:00
c7f5673b47
Make filterFIelds global and give more info in error message
2019-10-09 10:30:40 -04:00
4126554092
Move sendControlCommand out of includes/control_functions.php into Monitor.php. Make it smarted about talking to zmcontrol.pl. Fix sending the quit command
2019-10-08 18:07:33 -04:00
e4b5052fb4
Add delete from logs ajax capability. Make the clear button use it. Fixes #2620
2019-10-02 15:39:04 -04:00
ae7644370f
quotes
2019-09-28 14:14:27 -04:00
afd10e49d6
spaces, quotes extra braces
2019-09-25 10:13:32 -04:00
481f5b7eac
Update control ajax
2019-09-20 10:36:38 -04:00
ed9175b4ad
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2019-08-13 15:34:11 -04:00
547e80b1a9
Fix download and export button from events list. Fixes #2668 ( #2670 )
2019-07-24 12:31:43 -04:00
cfca67f663
spacing and quotes
2019-06-07 14:07:23 -04:00
c02eb2cd46
spacing
2019-05-24 10:00:51 -04:00
4e51379087
spacing
2019-05-24 10:00:15 -04:00
df348c3513
lets go with reporting actual errors
2019-04-10 11:48:17 -04:00
f7dfe2982b
Fix deleting single events
2019-04-10 11:46:12 -04:00
c3324ada18
Put back mkdir ZM_PATH_SOCKS
2019-03-20 14:26:03 -04:00
84a200395e
spacing and turn off errors because ajax should only return json
2019-03-20 14:25:34 -04:00
6b6e787e4e
fix ajax stream code
2019-03-19 12:05:45 -04:00
418276ff1c
cleanup/debug
2019-03-19 12:02:42 -04:00
e9a6eee2bb
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-01 17:47:50 -05:00
190142b24c
Merge branch 'master' into storageareas
2019-03-01 17:47:07 -05:00
520bd4e7a7
Add ZM namespace to Logger
2019-03-01 14:42:05 -05:00
95567e07a4
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-26 11:43:07 -05:00
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
3d6efe2253
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-13 11:10:07 -05:00
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
c8e41bfee7
log.php: Ensure 'line' is an integer. Helps with #2466
2019-02-10 00:10:39 -08:00
02f09aad7f
view=export: Remove inline event handlers and fix arbitrary URL/XSS usage. Fixes #2443
2019-02-09 02:01:26 -08:00
0b38e72f88
view=download: Remove inline event handlers and fix arbitrary URL/XSS usage. Fixes #2441
2019-02-09 01:16:32 -08:00
533d021dea
Merge branch 'master' into storageareas
2019-01-30 15:17:27 -05:00
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
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
7260f823cb
Merge branch 'master' into storageareas
2019-01-21 13:52:38 -05:00
326ac60ae4
add missing braces to fix logic
2019-01-21 11:20:56 -05:00
f0b33145f5
Log CSP violations in ZM logs in supported browsers ( #2431 )
2019-01-21 11:12:17 -05:00
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
5060358870
Merge branch 'master' into storageareas
2018-12-29 09:56:53 -05:00
3258d8e590
remove ZM_DIR_IMAGES ( #2374 )
2018-12-29 09:52:58 -05:00
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
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
015890a509
Merge branch 'master' into storageareas
2018-10-02 15:27:12 -04:00
613d885930
!= E.id is not sufficient. Since we are enforcing chronological ordering, > and < work better than !=
2018-09-30 10:15:04 -04:00
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
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
9c437b0303
Merge branch 'add_export_to_filter' into storageareas
2018-09-25 14:35:19 -04:00
978e332e3a
Merge branch 'master' into storageareas
2018-09-09 16:36:31 -04:00
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
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
40292f3dad
Add Compression flag
2018-09-07 09:08:33 -04:00
d5cab088d6
Merge branch 'master' into add_export_to_filter
2018-09-05 10:33:10 -04:00
14b5fc3660
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-31 18:43:29 -04:00
4be2a0501c
Merge branch 'master' into storageareas
2018-08-22 17:22:54 -04:00
24f8d63b69
comment out a debug line
2018-08-20 11:13:38 -04:00
871e3807e6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-17 12:57:27 -04:00
94401b6765
create ZM_PATH_SOCKS if it doesn't exist
2018-08-11 13:35:57 -04:00
e05604e4b3
Alter code style, spacing
2018-07-12 14:05:23 -04:00
639f916156
spacing
2018-07-09 09:59:03 -04:00
6bbd4f1083
google code style
2018-06-25 14:51:46 -04:00
798d046d81
Remove some debugging lines
2018-06-06 11:39:41 -04:00
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
07e7ab1547
fix spacing
2018-04-20 14:21:41 -04:00
12d46e2377
change event_id in status_msg to 64bit when unpacking
2018-04-18 09:52:57 -04:00
0b0fbae1c5
Add output of paused image when paused
2018-04-12 18:43:57 -04:00
22f86da372
Have to use the .sock file instead of w.lock
2018-04-11 10:38:13 -04:00
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
2774fded57
add debugging and put NavBarHTML back in message
2018-02-14 11:57:45 -05:00
4df8cdc685
add auth_hash updating to the navbar reload.
2018-02-14 10:44:48 -05:00
a610d564d1
tweak timeouts
2018-01-31 15:51:12 -05:00
a76fcb331c
Remove debugging. Treat can't get semaphore as a non-error
2018-01-29 08:25:46 -08:00
b1b8b42f2b
Fix getting stream status updates when # of files open is > 1024.
2018-01-29 07:21:31 -08:00
2dcb0d183f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-28 18:07:33 -08:00
51d5fd38aa
scan the board for the names of the camera inputs
2018-01-28 18:06:13 -08:00
0d734a880c
add hack to ensure that next and previous operate on time
2018-01-28 17:30:49 -05:00
5d4fde88d9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-27 12:17:13 -08:00
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
320f5c2083
Turn off error reporting in output
2018-01-25 09:13:44 -08:00
1b23f7b564
turn off debug
2018-01-23 17:34:49 +01:00
0f3cf33565
Move unparse_url from add_monitors to functions to make it generally available
2018-01-19 08:16:52 -08:00
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
c509b6fbf4
fix a quotes problem
2017-12-12 15:46:50 -05:00
7930e1881f
Fix quotes
2017-12-07 11:18:10 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
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
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
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
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
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
866c875312
Merge branch 'storageareas' into tesla
2017-11-01 12:01:51 -07:00
9473fbecd8
more debug
2017-10-31 13:32:42 -07:00
c16e101120
rough in add monitors import wizard
2017-10-27 20:52:08 -07:00
Andrew Bauer
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Matthew Noorenberghe
Isaac Connor
Isaac
digital-gnome