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
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
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
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -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
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -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
077ad75516
Merge branch 'storageareas' into origin/zma_to_thread
2019-04-25 12:41:48 -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
279e0d8bcf
Merge branch 'storageareas' into zma_to_thread
2019-02-22 11:39:58 -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
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -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
b16cd7ec84
Merge branch 'h265' into zma_to_thread
2018-11-20 12:38:17 -05:00
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -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
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04: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
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -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
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -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
4454ca0072
Merge branch 'storageareas' into zma_to_thread
2018-05-20 10:39:14 -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
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -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
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -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
ebb0c9eec6
Merge branch 'storageareas' into zma_to_thread
2018-02-14 13:56:30 -05: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
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
a610d564d1
tweak timeouts
2018-01-31 15:51:12 -05:00
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
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
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Matthew Noorenberghe
Andrew Bauer
Isaac Connor
Isaac Connor