0b4c35c58e
Merge pull request #3241 from connortechnology/fix_3239
...
Fix 3239
2021-05-19 20:39:42 -04:00
007dce45fb
Add disable alarms as an alarm command
2021-04-12 15:59:31 -04:00
1b876f24f9
Must have Id as well in order to know which monitor to control
2021-03-17 17:15:04 -04:00
28a004c324
Must load ServerId so that we can tell if it is local or remote
2021-01-27 11:48:32 -05:00
3132820a71
Move daemonControl logic into the model. daemonControl needs to be called on the previous monitor data so that it knows which daemons to stop.
2020-12-23 13:48:12 -05:00
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
3e55795cad
Handle different command line syntax for zmcontrol.pl
2020-03-26 13:57:43 -04:00
8b375de455
Avoid duplicate Monitors in API
2020-01-15 20:31:05 +01:00
76b54a468f
use left join instead of inner join when listing monitors
2019-12-22 18:43:53 -05:00
bcda92058e
proper way to make cakephp filter by group. Make Group containable, always add the join
2019-12-20 14:56:01 -05:00
eee3729b85
dirty fix filtering Monitors by GroupId. Change occurrences of GroupId to ' ' as that is what the key is in conditions. Please note that other operators like != won't work.
2019-12-04 22:23:55 -05:00
0b2853095e
cleanup auth in monitors alarm method
2019-12-01 12:30:27 -05:00
16a6938710
add model validation so that we don't create empty monitors
2019-11-02 08:30:25 -04:00
a9d01ba3d2
Alarm api ( #2665 )
...
* fixed alarm api to use tokens if present
* clearer debug logs for tokens
* space
2019-07-17 20:38:58 -04:00
110e5075f4
fix namespace fixes #3566
2019-04-01 17:21:01 -04:00
520c41da23
Merge ../ZoneMinder.connortechnology.bad into storageareas
2019-03-18 14:40:03 -04:00
056b96f7fc
API: Monitor and Event 'index' SQLi. Fixes #2099
2019-03-11 00:21:51 -07:00
f5328265ef
fix missing daemons definition
2018-11-28 09:12:22 -05:00
51d8c0ea73
add back daemon parameter, but make it actually work
2018-11-14 12:59:44 -05:00
d671761a35
simplify params to daemonControl since they really aren't being used anyways. Return the status text
2018-11-14 12:54:10 -05:00
9a2d58adce
We don't store all the permissions in the session anymore. We just use the global user object
2018-10-29 11:03:03 -04:00
23ddc83ad4
fix_2167 ( #2168 )
...
* Populate a global from the session on every request. Use the object instead of using allowedMonitors in session.
* fix when gets loaded.
* use for auth, and add Monitor Edit checks to Zone add/delete/edit
* add back the ZM_OPT_USE_AUTH test for being logged in in AppController
* Update permissions code to use
* change quotes
* Update permission code to use
* Use instal of session for systemPermission
* deprecate montiorPermision in session
* use instead of session streamPermission
* move login code back into AppController. Has to be done for every request
* deprecate eventPermission, controlPermission and systemPermission in session.
* handle auth params in query string as well as post
* exit on HUP to free up memory.
* add missing global user
* system should be System
2018-08-08 09:59:46 -04:00
dc57a3c91c
fix spacing/quotes/google code style
2018-07-24 16:41:09 -04:00
cd64619743
Fix controlling daemon when the monitor is Local
2018-06-06 12:56:33 -04:00
475c465b0d
define
2018-01-26 10:39:12 -05:00
1503c586d2
When there is an error saving, add the invalidFields() info to the error message. Only restart the daemon on success.
2018-01-26 10:30:29 -05:00
933259f9a5
fix bracket
2018-01-23 13:16:21 -08:00
bd2da456f4
handle non-multi-server case when restarting monitors via API
2018-01-19 21:09:33 -05:00
d586faf7fb
Fix restarting Monitor
2018-01-19 08:16:28 -08:00
1b1b93f811
use CakePHP-Enum-Behavior to add support for ENUMs to the Monitor model. This should fix #48
2018-01-01 14:43:02 -05:00
bb8e326392
Fix not restarting a monitor if it has moved to a different server
2017-12-22 09:16:56 -08:00
ef1af9cc15
disable FilterComponent as it doesn't actually do anything. Add Groups join when needed
2017-12-09 14:03:42 -05:00
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
f093cfbcef
add Filtering to monitors index
2017-11-13 10:27:24 -08:00
a8fc832481
fix for monitor API edit perm ( #1995 )
2017-10-07 09:55:13 -04:00
55f5db55dd
implement suggested code to stop the monitor when Function is set to None
2016-09-01 11:43:20 -04:00
4018cab743
don't pass partial data to daemoncontrol
2016-05-19 14:53:16 -04:00
b513bcef82
icon's gonna kill me
2016-05-10 20:09:41 -04:00
af3cae578e
fixed verbose handling bug for status command on zmu
2016-05-10 20:07:28 -04:00
8d5f2a8e5d
added iconnor's change back
2016-05-10 19:17:09 -04:00
2888142e68
added status command to retrieve alarmed status of monitor in addition to on/of
2016-05-10 16:55:43 -04:00
6e606aa74b
removed issue #
2015-12-19 19:04:27 -05:00
38b4785557
PP - Gone,flitted away, Taken the starts from the night and sun, From the day! Gone, and a cloud in my heart. - Tennyson
2015-12-19 18:36:38 -05:00
b4fdaa9b4d
initial user role support
2015-12-19 17:44:46 -05:00
ee78ae5c49
restart monitor when edited via APIs
2015-09-28 09:31:57 -04:00
dd9603f70f
Merged Angular UI branch API to master
2015-06-11 02:58:58 +00:00
de631075d3
Return possible source types ni DB via API
2014-11-15 18:59:24 +00:00
f1f3de6d7d
Moved the api to underneath the web directory
2014-04-29 20:41:04 +00:00
Isaac Connor
Isaac Connor
Javier Gonzalez
Pliable Pixels
Pliable Pixels
Matthew Noorenberghe
Isaac Connor
APHW2 MFGENG
Isaac Connor
Ubuntu
Kyle Johnson