fcebe4bcdc
Fix ISE when auth is turned off.
2024-10-01 10:10:42 -04:00
7fdb318e49
Don't assume findByEventidAndType actually returns a frame. If we are only recoridng, then there will be no alarm frames in the db
2024-01-16 09:51:58 -05:00
ab898fa4a8
WHen AUTH turned off, return an empty array in login as the result.
2024-01-15 18:30:46 -05:00
e1d2e0981c
Don't try to do auth if auth is turned off
2024-01-15 18:30:46 -05:00
72162b6ea0
Always return an array in getCredentialsDeprecated
2024-01-15 18:30:46 -05:00
78c28a50ac
Fix usage of unset variable
...
If daemon or args are unset the preg_replace is never called which can
result in count not having a value when referenced in the if statement.
This generates a warning in error.log.
2024-01-15 18:30:46 -05:00
c1a8c75575
Info to Debug for login.
2024-01-15 18:30:46 -05:00
29197dbe1c
define count. Fixes #3799
2023-12-29 11:05:37 -05:00
45da63b624
put back to upstream
2023-06-30 17:25:11 -04:00
c194ab98f4
Load event using find_one which does caching.
2023-06-29 10:33:06 -04:00
387a9ebc8a
Load the ZM::Event using the Event Model data instead of loading by Id which goes back to db.
2023-06-29 10:31:51 -04:00
3bd58d8393
Attempt to sanitize daemon and arguments before executing commands to prevent executing other programs.
2023-02-20 12:23:19 -05:00
38b5ddd80a
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2022-11-17 13:28:52 -05:00
46ddbeba92
Must convert strings into integers before doing math as of php 8.2 Fixes Unsupported operand types: string - int
2022-11-17 13:28:31 -05:00
101aa82776
implode the output from zmu to fix php complaint abou array to string conversion
2022-11-16 16:16:27 -05:00
0eacb7d650
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2022-11-15 13:38:43 -05:00
55ee6fc727
replace php Memcached with Apc on Fedora
2022-11-03 09:29:10 -05:00
600894682e
Test for matches[operator]. Fixes #3607
2022-10-11 15:50:41 -04:00
5f8ca42d96
whoops fixed errant enum values I forgot to delete
2022-10-07 10:12:01 -04:00
38e45c6c3b
Add permissions checking to API/Logs. Fixes unprivileged user being to add/edit/delete/view logs.
2022-10-06 16:56:24 -04:00
121fab2f6a
make OutputCodec work in API
2022-09-25 13:29:36 -04:00
d09362c6c9
More properly fix the alarm status api changing. The previous hack broken doing alarm on/off.
2022-09-21 14:35:50 -04:00
d2176c83af
Restore status value to pre 1.36.16 value by substracting 1. So Unknown == -1, 0 = IDLE etc. Fixes #3584
2022-09-08 13:02:02 -04:00
a8c2653453
Prevent editing of system config entries through the api
2022-05-27 10:20:33 -04:00
906d6c62a1
remove cruft from ServersController.php
2022-03-29 18:50:38 -04:00
e6e31b0c94
Don't both running zmu if monitor Function is set to None
2022-03-29 18:49:57 -04:00
6e68a35861
Remove dead code, remove locking from CopyTo, put locking into MoveTo.
2021-10-28 11:59:23 -04:00
7517bdc6ec
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2021-10-25 16:44:01 -04:00
8c92fa5dc3
Fix version of Crud
2021-09-09 13:26:59 -04:00
55080da9dc
Don't use AUTH_HASH_IPS when talking to zmu as it doesn't support that at this time.
2021-09-03 22:29:16 -04:00
0b76892ddf
Merge pull request #3307 from pliablepixels/optimize-event-api
...
API: allow option to not load the frames DB table
2021-07-05 12:49:58 -04:00
a423f2620e
Allow cakephp cache engine to be set during build
2021-06-18 15:29:54 -05:00
bb67c27d3b
It is okay to call daemonControl with function==None for command == stop. All others give a warning. Fixes monitors on other servers not stopping when set to None.
2021-06-12 12:22:42 -04:00
9f6eec792c
Fix Crud fork
2021-06-08 13:01:09 -04:00
a4e4ebe3fd
Restore api behaviour. Add zmu output to response
2021-05-28 12:29:02 -04:00
cb0a421d25
use latest rtspserver commit
2021-05-21 15:10:42 -05:00
0b4c35c58e
Merge pull request #3241 from connortechnology/fix_3239
...
Fix 3239
2021-05-19 20:39:42 -04:00
1abbc187e9
Merge pull request #3242 from connortechnology/fix_3232_api_monitor_event_summaries
...
Add Event_Summary model so that it is included in monitor listing
2021-05-19 20:32:50 -04:00
b1ac0e61a9
put back upstream version 3.2.0 of Crud
2021-05-09 18:18:03 -04:00
2cf6ad8089
Switch ZMPacket * to a shared_ptr<ZMPacket>. This is so that in LockedPacket we can unlock and then notify and be confident that packet_ won't have been deleted. Change ZMPacket->timestamp to be a timeval instead of timeval *. This might not have been necessary but I like it. No longer cuse the ZMPacket object to wrap the shared image buffers and timestamps. Use a vector for image_buffers.
2021-05-08 21:14:20 -04:00
4385076e66
Fix encrypting password when saving User
2021-04-26 09:40:08 -04:00
02a1ecee6f
Remove dbeug
2021-04-26 09:40:08 -04:00
15a769bcd1
add hashing of passwords on user save
2021-04-23 09:07:50 -04:00
e01533af7f
Add users to routes
2021-04-23 08:52:55 -04:00
d07d85dd6c
Clean User add to match behaviour of Monitors. For some reason posting to index doesn't call add unlike Monitors. Clean out duplicated Views
2021-04-22 12:25:13 -04:00
007dce45fb
Add disable alarms as an alarm command
2021-04-12 15:59:31 -04:00
1ccc416224
Merge branch 'release-1.34'
2021-04-09 20:00:47 -04:00
99c28d1f9f
Change log level to debug when warning about ZM_OPT_AUTH being turned off. Fixes #3207
2021-04-07 09:47:48 -04:00
c3ce9913cf
Upgrade cakephp to 2.10.24
2021-03-31 12:11:12 -04:00
1b876f24f9
Must have Id as well in order to know which monitor to control
2021-03-17 17:15:04 -04:00
Isaac Connor
Joe
Isaac Connor
Andrew Bauer
Pliable Pixels
Isaac Connor