Isaac Connor
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
Andrew Bauer
b5aa215e31
WIP events view server pagination
2020-10-20 12:59:30 -05:00
Andrew Bauer
6357c02ec9
WIP events view server pagination
2020-10-20 12:13:12 -05:00
Isaac Connor
41ed267b71
move view to the form action so that it is part of get request instead of post
2020-10-20 12:31:38 -04:00
Andrew Bauer
bfa45b0c43
continue work on event view server pagination
2020-10-20 08:10:43 -05:00
Andrew Bauer
4e391708f1
event view server pagination WIP
2020-10-19 14:18:21 -05:00
Andrew Bauer
89f298771f
server pagination backend improvements
2020-10-19 12:25:13 -05:00
Andrew Bauer
6f45de04f8
partial roughin ajax event view server side pagination
2020-10-19 07:50:11 -05:00
Andrew Bauer
97d05c2f88
move newlog ajax request to log
2020-10-18 07:20:59 -05:00
Andrew Bauer
e69b3800c7
set return status for cancel and restart commands
2020-10-14 12:22:21 -05:00
Andrew Bauer
bea95bca68
use ZM\Debug
2020-10-14 10:33:40 -05:00
Andrew Bauer
c3a98c1f44
replace shutdown form submit with ajax
2020-10-14 10:03:33 -05:00
Isaac Connor
10c0a6617c
Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php.
2020-10-14 10:39:25 -04:00
Isaac Connor
cd2e96eaec
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-13 08:42:28 -04:00
Andrew Bauer
89c76ec140
no need to clare $view as global
2020-10-12 14:52:57 -05:00
Andrew Bauer
c4ea27db8d
fix buttons in shutdown modal
2020-10-12 14:51:33 -05:00
Andrew Bauer
ed5f6b2625
convert shutdown popup to modal
2020-10-12 12:16:52 -05:00
Isaac Connor
66a8d3876d
add caching of users by username to improve performance
2020-10-12 11:25:20 -04:00
Isaac Connor
9e6db17e68
Fix getting next event due to case of asc
2020-10-10 11:09:39 -04:00
Isaac Connor
9cc7f0d360
Merge branch 'release-1.34'
2020-10-08 09:28:25 -04:00
Isaac Connor
c28ff1f2b4
Include loading EndTime when loading Events data so that we can determine if an event is in-progress
...
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
Isaac Connor
9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
Isaac Connor
d7429014b6
Convert progress to a double instead of int.
2020-10-06 16:36:56 -04:00
Isaac Connor
0e89d28c26
Send SEEK as two integers representing a float
2020-10-06 16:34:06 -04:00
Isaac Connor
2faedc6248
Sort sessions by access time so that we list active users first
2020-10-05 10:34:52 -04:00
Isaac Connor
1cf181372f
Only load users for logged in sessions
2020-10-05 10:30:57 -04:00
Isaac Connor
fa641a0345
Convert progress to a double instead of int.
2020-10-05 10:30:38 -04:00
Isaac Connor
6d1e5330e3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-05 09:30:49 -04:00
Isaac Connor
93021f5806
Update getNearEvents to handle when event doesn't exist
2020-10-05 09:30:33 -04:00
Andrew Bauer
b4d2fa5e75
replace inline onchange event
2020-10-03 21:14:24 -05:00
Andrew Bauer
1643fb686b
convert settings popup to modal
2020-10-03 16:51:25 -05:00
Andrew Bauer
a97e526298
fix save button in controlpreset modal
2020-10-02 16:10:32 -05:00
Andrew Bauer
802e439cb5
convert controlpreset view to a modal
2020-10-02 15:46:28 -05:00
Isaac Connor
311ba4ef69
use bootstrap styles on logged in user table. Include ip address
2020-10-02 16:04:56 -04:00
Isaac Connor
7261a7b1dd
Merge branch 'sessions_in_db'
2020-10-02 15:57:11 -04:00
Isaac Connor
d97f8af215
Finish showing logged in users
2020-10-02 15:56:39 -04:00
Isaac Connor
23f2c1468f
rough in a table of the logged in users
2020-10-02 15:21:58 -04:00
Andrew Bauer
6c0f61ebbd
rework devices view, remove inline onclick
2020-10-02 12:39:05 -05:00
Andrew Bauer
186b8ac947
convert x10 device view to a modal
2020-10-01 15:52:33 -05:00
Andrew Bauer
2d30d7aafa
convert download view to modal
2020-09-30 09:12:54 -05:00
Isaac Connor
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
Andrew Bauer
c1a0afef95
make group view into a modal
2020-09-27 12:12:01 -05:00
Andrew Bauer
0c4fcbbe97
convert controlcaps view to bstable
2020-09-26 12:09:41 -05:00
Andrew Bauer
5b1d6331e4
make the delconfirm modal generic
2020-09-26 07:53:22 -05:00
Andrew Bauer
e4a1bacbbf
get adv search working in newlog view
2020-09-24 11:05:34 -05:00
Andrew Bauer
3f2f7359f0
rough in new log view - very rough
2020-09-23 13:09:19 -05:00
Isaac Connor
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
Isaac Connor
b6541aa1ff
Move log export to a generic modal
2020-09-21 13:01:58 -04:00
Isaac Connor
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
Andrew Bauer
a3c0e160a2
convert state modal to ajax request
2020-09-19 12:36:04 -05:00
Andrew Bauer
7c1ec4f957
convert logout modal to ajax request
2020-09-19 10:44:05 -05:00
Andrew Bauer
ec20fdf3ad
convert function modal to ajax request
2020-09-19 10:18:59 -05:00
Andrew Bauer
d2963fe28f
convert donate modal to ajax request
2020-09-19 08:55:08 -05:00
Andrew Bauer
467e75a11c
convert eventdetail function to php file
2020-09-18 11:03:20 -05:00
Andrew Bauer
2757b74957
convert servermodal function to php file
2020-09-18 10:34:33 -05:00
Andrew Bauer
a058d077bb
fix typo
2020-09-18 10:11:58 -05:00
Andrew Bauer
10119dc609
convert storage function to php file
2020-09-18 10:02:02 -05:00
Andrew Bauer
1b2f0514b9
convert delconfirm function to php file
2020-09-18 09:43:29 -05:00
Andrew Bauer
6e6b9a464b
convert enoperm function to php file
2020-09-18 09:24:23 -05:00
Andrew Bauer
416de4a068
fix git screwup
2020-09-18 08:56:17 -05:00
Andrew Bauer
bc7cadcc73
convert optionhelp function to php file
2020-09-18 08:35:21 -05:00
Isaac Connor
f61a21fec4
Add modals dir with filterdebug modal
2020-09-17 15:17:53 -04:00
Isaac Connor
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
Andrew Bauer
afdd4702a2
add server modal
2020-09-16 08:30:45 -05:00
Andrew Bauer
508967ffe9
fix typo on modal.php
2020-09-14 13:51:24 -05:00
Andrew Bauer
fb85d6f79c
rough in eventdetail modal
2020-09-14 13:47:09 -05:00
Andrew Bauer
d2bc39f65f
replace storage popup with modal
2020-09-14 09:50:04 -05:00
Andrew Bauer
096f4a446f
Use Ajax to load delete confirm modal
2020-09-13 10:39:51 -05:00
Andrew Bauer
1599bc4c14
load stats on deman via ajax
2020-09-13 07:32:49 -05:00
Andrew Bauer
547e1d6cc4
rough in error no permisson modal
2020-09-12 08:36:19 -05:00
Andrew Bauer
0557d847f0
fix ajax archive/unarchive
2020-09-11 17:01:56 -05:00
Andrew Bauer
aa6bf31cbd
pass OLANG as a function parm
2020-09-11 07:51:00 -05:00
Andrew Bauer
cd09ec8fef
rough in Modal Ajax framework
2020-09-10 16:56:58 -05:00
Isaac Connor
98874cb6d1
provide error message when trying to delete Archived events.
2020-09-03 17:04:52 -04:00
Isaac Connor
73cdb510b2
Rough in an events ajax request for deleting events
2020-08-31 10:37:22 -04:00
Isaac Connor
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
Isaac Connor
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
Isaac Connor
3242ce6ec9
Handle backticks in matches sort fields. Fixes regression in 1.34.17
2020-08-06 10:37:56 -04:00
Andrew Bauer
2b29a7983a
clean up navbar background refresh
2020-08-02 13:01:20 -05:00
Isaac Connor
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -04:00
Isaac Connor
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
Isaac Connor
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
Isaac Connor
d7680e1a44
Spacing
2020-05-23 10:15:48 -04:00
Isaac Connor
3f50277e1c
Revert effort to escape column names. Not smart enough.
2020-05-12 09:21:05 -04:00
Isaac Connor
eadff23465
Fix missing )
2020-05-12 09:16:37 -04:00
Isaac Connor
c5f082e7ac
fix escaping column names
2020-05-12 09:06:57 -04:00
Isaac Connor
582102c2c6
Fix use of backticks for newer mysql
2020-05-11 09:19:16 -04:00
Isaac Connor
81cd338545
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-05-11 08:34:19 -04:00
Isaac Connor
d23258cb23
Allow for backticks in sort column
2020-05-11 08:34:07 -04:00
Isaac Connor
f1d794c11b
spacing and escape sql fields
2020-05-07 13:57:37 -04:00
Isaac Connor
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
Isaac Connor
c3a80e7e40
Add MonitorId to event data returned for status request
2020-04-23 11:07:07 -04:00
Isaac Connor
59f9f37fff
cleanup. Don't output errors that break json response
2020-04-23 11:06:41 -04:00
Isaac Connor
a25c3dfb5c
Add MonitorId to event data returned for status request
2020-04-10 11:11:24 -04:00
Isaac Connor
45c13176dc
cleanup. Don't output errors that break json response
2020-04-10 11:10:57 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
5f16c10e0a
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 11:50:40 -05:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
1865df3fe0
remove some debug, add some parenthesis to ensure logic works as intended
2020-01-07 17:08:07 -05:00
Isaac Connor
fc017893bc
Sort the log filtering options. Fixes #2756
2019-12-20 16:09:34 -05:00
Isaac Connor
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
Isaac Connor
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
Isaac Connor
c7f5673b47
Make filterFIelds global and give more info in error message
2019-10-09 10:30:40 -04:00
Isaac Connor
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
Isaac Connor
e4b5052fb4
Add delete from logs ajax capability. Make the clear button use it. Fixes #2620
2019-10-02 15:39:04 -04:00
Isaac Connor
ae7644370f
quotes
2019-09-28 14:14:27 -04:00
Isaac Connor
afd10e49d6
spaces, quotes extra braces
2019-09-25 10:13:32 -04:00
Isaac Connor
481f5b7eac
Update control ajax
2019-09-20 10:36:38 -04:00
Isaac Connor
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
Isaac Connor
ed9175b4ad
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2019-08-13 15:34:11 -04:00
Isaac Connor
547e80b1a9
Fix download and export button from events list. Fixes #2668 ( #2670 )
2019-07-24 12:31:43 -04:00
Isaac Connor
cfca67f663
spacing and quotes
2019-06-07 14:07:23 -04:00
Isaac Connor
c02eb2cd46
spacing
2019-05-24 10:00:51 -04:00
Isaac Connor
4e51379087
spacing
2019-05-24 10:00:15 -04:00
Isaac Connor
077ad75516
Merge branch 'storageareas' into origin/zma_to_thread
2019-04-25 12:41:48 -04:00
Isaac Connor
df348c3513
lets go with reporting actual errors
2019-04-10 11:48:17 -04:00
Isaac Connor
f7dfe2982b
Fix deleting single events
2019-04-10 11:46:12 -04:00
Isaac Connor
c3324ada18
Put back mkdir ZM_PATH_SOCKS
2019-03-20 14:26:03 -04:00
Isaac Connor
84a200395e
spacing and turn off errors because ajax should only return json
2019-03-20 14:25:34 -04:00
Isaac Connor
6b6e787e4e
fix ajax stream code
2019-03-19 12:05:45 -04:00
Isaac Connor
418276ff1c
cleanup/debug
2019-03-19 12:02:42 -04:00
Isaac Connor
e9a6eee2bb
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-01 17:47:50 -05:00
Isaac Connor
190142b24c
Merge branch 'master' into storageareas
2019-03-01 17:47:07 -05:00
Isaac Connor
520bd4e7a7
Add ZM namespace to Logger
2019-03-01 14:42:05 -05:00
Isaac Connor
95567e07a4
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-26 11:43:07 -05:00
Isaac Connor
279e0d8bcf
Merge branch 'storageareas' into zma_to_thread
2019-02-22 11:39:58 -05:00
Isaac Connor
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
Isaac Connor
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
Isaac Connor
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05:00
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