Isaac Connor
|
e4fad02b43
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-09-28 18:37:20 -04:00 |
|
Isaac Connor
|
8d56949800
|
Deal with structure of json response from API when getting Janus_Pin
|
2022-09-28 18:36:47 -04:00 |
|
Isaac Connor
|
9fc0d26d32
|
If we don't have session, we can still generate an auth hash. We kinda need this for zmu calls from API
|
2022-09-28 18:35:59 -04:00 |
|
Isaac Connor
|
460695202f
|
Add Janus_Pin to monitor API
|
2022-09-28 18:35:30 -04:00 |
|
Isaac Connor
|
59db9c2d90
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-09-28 17:42:16 -04:00 |
|
Isaac Connor
|
f5bdbcf0bd
|
Use new Server::SendToApi to reduce duplicated code. If Janus Not enabled, then don't both with Janus_Pin. If Server is remote, use API to get Janus_Pin. Implementing the API side is left as an exercise.
|
2022-09-28 17:41:46 -04:00 |
|
Isaac Connor
|
2a9576371b
|
Introduce Server::SendToApi to reduce duplicated code.
|
2022-09-28 17:40:08 -04:00 |
|
Isaac Connor
|
1e43f55479
|
Fix spelling
|
2022-09-28 15:58:59 -04:00 |
|
Isaac Connor
|
9db64b860c
|
Don't try to close the event if we have no Frame information
|
2022-09-28 15:58:28 -04:00 |
|
Isaac Connor
|
79026b77a1
|
Use monitor::Substitute on Event Prefix
|
2022-09-28 15:53:43 -04:00 |
|
Isaac Connor
|
80f7f43f7c
|
Introduce Monitor::Substitute from code doing timestamping.
|
2022-09-28 15:53:29 -04:00 |
|
Isaac Connor
|
fe0e4fcb8f
|
handle lack of sysvsem support in php better. Turn errors back on, just don't display them. Proceed regardless of semaphore success but log an error.
|
2022-09-28 14:48:13 -04:00 |
|
Isaac Connor
|
7c9cb36027
|
Don't wait for decode in Analyze.
|
2022-09-28 13:41:23 -04:00 |
|
Isaac Connor
|
0b11418c6a
|
Update Execute function: Only add the path if there are no substitutions. Include status in debug output. Reload the Event from DB before updating the Executed flag because the executed command may have changed it.
|
2022-09-28 12:38:21 -04:00 |
|
Isaac Connor
|
812ce283ab
|
Use zmDbFetchOne instead of incorrect dbFetchOne
|
2022-09-28 12:37:01 -04:00 |
|
Isaac Connor
|
44fd2f99e0
|
Add zmSQLExecute and zmDbFetchOne to Exports. Add a debug to zmDbFetchOne
|
2022-09-28 12:35:48 -04:00 |
|
Isaac Connor
|
3e43a1159a
|
Add EPATH to substitutions and don't add path to execute unless no substitutions are being done
|
2022-09-28 11:08:06 -04:00 |
|
Isaac Connor
|
ae07db6104
|
Implement the close command in zmeventtool.pl
|
2022-09-28 11:07:31 -04:00 |
|
Isaac Connor
|
3a75f147ec
|
Implement Event::Close() which fixes up a crashed event.
|
2022-09-28 11:07:11 -04:00 |
|
Isaac Connor
|
c7ded07794
|
Only look for action if there is a view
|
2022-09-27 10:49:50 -04:00 |
|
Isaac Connor
|
64cae53a52
|
Include monitor Id in logs, for consistency as well as utility
|
2022-09-26 09:28:10 -04:00 |
Isaac Connor
|
3ddf00ed98
|
Merge pull request #3603 from pliablepixels/fix-outputcodec-api
whoops fixed errant enum values I forgot to delete
|
2022-09-26 07:22:59 -04:00 |
Pliable Pixels
|
23ae004724
|
whoops fixed errant enum values I forgot to delete
|
2022-09-25 17:46:53 -04:00 |
|
Isaac Connor
|
75e40b4b37
|
Merge pull request #3601 from pliablepixels/fix-outputcodec-api
make OutputCodec work in API layer
|
2022-09-25 12:54:20 -04:00 |
|
Pliable Pixels
|
6218d065a5
|
make OutputCodec work in API
|
2022-09-25 12:41:07 -04:00 |
Jonathan Bennett
|
9cb21dce22
|
Uses the master Janus secret as the mountpoint secret, detects and restarts mounts if PIN is stale
|
2022-09-24 16:05:52 -05:00 |
|
Isaac Connor
|
e91b11d1db
|
Add IDLE to the states where we will close the event at section length end time.
|
2022-09-23 14:17:28 -04:00 |
|
Isaac Connor
|
0b37df3782
|
Fix scroll to top on option help modals by not having an href=#. Fix css so that the ? still is blue.
|
2022-09-23 09:34:29 -04:00 |
|
Isaac Connor
|
63e4c81d9c
|
Try out just using connkey as the semaphore key instead of ftok
|
2022-09-22 16:22:36 -04:00 |
|
Isaac Connor
|
8a6db4a5e7
|
convert event->Id() explicitly to a string for strpos.
|
2022-09-22 16:21:25 -04:00 |
|
Isaac Connor
|
faa6b8c9e7
|
Add connkey and semaphore key to logging about failure to get semaphore. Add sem_release before every ajaxError call because ajaxError exits and so we never release the semaphore.
|
2022-09-22 11:30:59 -04:00 |
|
Isaac Connor
|
a16e7aad62
|
Switch to utf8mb4 to support 4 byte unicode which is available since mysql 5.5
|
2022-09-22 10:15:57 -04:00 |
|
Isaac Connor
|
ef0ad5a17b
|
Merge ../ZoneMinder.connortechnology
|
2022-09-21 16:16:27 -04:00 |
|
Isaac Connor
|
cb6dd816d8
|
streamSrc is no longer used and is making php complain
|
2022-09-21 15:46:42 -04:00 |
|
Isaac Connor
|
5fef98ce6f
|
Add types to buttons. Make save a submit button, and remove the javascript onclick event.
|
2022-09-21 15:37:47 -04:00 |
|
Isaac Connor
|
9338732bd3
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-09-21 14:36:05 -04:00 |
|
Isaac Connor
|
363c589975
|
More properly fix the alarm status api changing. The previous hack broken doing alarm on/off.
|
2022-09-21 14:35:27 -04:00 |
|
Isaac Connor
|
97a791656e
|
Fix log causing idle events to not be closed when close_mode=ALARM.
|
2022-09-21 13:41:09 -04:00 |
|
Isaac Connor
|
f68c64ea30
|
Last and next buttons don't get disabled if the event record thinks it has more frames than are actually in the db.
|
2022-09-21 13:24:18 -04:00 |
|
Isaac Connor
|
6d1b341141
|
Add a.btn-primary.disabled to disabled buttons style so that frame view buttons look right
|
2022-09-21 13:23:49 -04:00 |
|
Isaac Connor
|
1072a8aa69
|
When scaling frame images, apparently a float value for height is no good. So use intval to fix.
|
2022-09-21 13:23:16 -04:00 |
|
Isaac Connor
|
895adcb4c4
|
put back code to close an event when idle, at section_length when using CLOSE_MODE==idle
|
2022-09-21 12:32:15 -04:00 |
|
Isaac Connor
|
9d6d5a242f
|
fix monitorIds => MonitorIds
|
2022-09-21 12:32:15 -04:00 |
|
Isaac Connor
|
78ab6583e7
|
Fix typo causing broken link to monitor in event stats
|
2022-09-21 12:32:15 -04:00 |
|
Isaac Connor
|
c3c897cd76
|
In failure state populate imageData array to reduce output php errors
|
2022-09-21 12:32:14 -04:00 |
|
Isaac Connor
|
86f27d2ac5
|
Update frame view js to use const etc instead of var. Put back EventId and FrameId in stats being links and fix FrameId not being populated. If no stats available disable the stats button and use the title to explain why.
|
2022-09-21 12:32:14 -04:00 |
|
Isaac Connor
|
291c43ec0f
|
Add spans and titles over the title h2 parts so that on mouseover it tells you what they are
|
2022-09-21 12:32:14 -04:00 |
|
Isaac Connor
|
6e55ae4f7d
|
Merge pull request #3598 from megasaturnv/3516-CaseInsensitiveLogin
Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516
|
2022-09-21 11:51:34 -04:00 |
megasaturnv
|
8fb6477820
|
Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516
|
2022-09-21 16:47:16 +01:00 |
|
Isaac Connor
|
4138aa950b
|
Merge pull request #3597 from sashashura/patch-1
GitHub Workflows security hardening
|
2022-09-20 10:05:07 -04:00 |