1534934b20
move login code back into AppController. Has to be done for every request
2018-08-01 10:01:35 -04:00
c095b9cd33
Merge branch 'master' into fix_2167
2018-07-24 16:48:29 -04:00
c6aae346b9
use instead of session streamPermission
2018-07-24 16:43:07 -04:00
3a676cd569
deprecate montiorPermision in session
2018-07-24 16:42:36 -04:00
8098051268
Use instal of session for systemPermission
2018-07-24 16:42:16 -04:00
dc57a3c91c
fix spacing/quotes/google code style
2018-07-24 16:41:09 -04:00
98f279addb
Update permission code to use
2018-07-24 12:02:35 -04:00
ba0ab50545
change quotes
2018-07-24 12:02:18 -04:00
00cfb100db
Update permissions code to use
2018-07-24 12:02:03 -04:00
3255a2829f
add back the ZM_OPT_USE_AUTH test for being logged in in AppController
2018-07-24 12:01:40 -04:00
08d3f98e5e
use for auth, and add Monitor Edit checks to Zone add/delete/edit
2018-07-24 11:49:40 -04:00
caa8adae5e
fix when gets loaded.
2018-07-24 10:40:18 -04:00
8c35d4d1b0
Populate a global from the session on every request. Use the object instead of using allowedMonitors in session.
2018-07-24 10:32:37 -04:00
997aa6aa55
fixed getCredentials not working if called directly
2018-07-17 13:57:20 -04:00
0ff9002adf
2156 api login ( #2157 )
...
* error can be due to bad user or password
* added login/logout and related private functions
* handle case when userLogin fails, current code returns PHP error for and API throw is not called
* formatting
* converted login params to POST, removed user=&pass= for other APIs
* formatting
* add auth check back but leave out login/out
* fixes to make it work across zmN, postman and curl
* added back enabled check
2018-07-15 21:17:35 -04:00
fe5ebe094d
More work just using auth.php instead of cake code. Don't reload the User object
2018-07-11 11:45:49 -04:00
4f80ca6871
Use userLogin function from auth.php instead of cake code.
2018-07-11 10:33:49 -04:00
983e3c45be
Fix spacing and quotes
2018-07-11 09:54:25 -04:00
f10509690b
add username and passwordHash to Session so that generateAuthHash works
2018-07-11 09:54:15 -04:00
21438d17ac
Fix authenticating User
2018-07-10 13:19:51 -04:00
930d929427
Merge branch 'storageareas' into api_auth
2018-07-10 12:46:30 -04:00
e04eac57ae
Include values in /etc/zm files in viewByName
2018-06-25 15:43:01 -04:00
24ceb75936
Merge branch 'master' into include_fs_config_in_api_config
2018-06-21 21:41:54 -04:00
cd64619743
Fix controlling daemon when the monitor is Local
2018-06-06 12:56:33 -04:00
2a5f05499e
Munge the config in the global configvals into the configs array before returning it.
2018-05-10 13:44:46 -04:00
62edca6dcb
add fileSize to the api, and use it to add remote fileSize reporting in includes/Event
2018-05-08 13:33:56 -07:00
1a012c62ff
Add fileExists to event view
2018-05-07 14:07:03 -07:00
e953a04f61
naming consistency of attribute ( #2096 )
2018-05-03 14:03:49 -04:00
a3158fcc97
auth_key api for different situations ( #2090 )
...
* auth_key api for different situations
* added new flag to indicate if password needs to be appended
* pure json view
2018-05-02 12:26:28 -04:00
c3b6cd4bab
include auth.php if auth is on, and return '' for auth_hash is auth is disabled
2018-04-30 11:24:53 -04:00
513708b11c
don't need to define the config, it will have already been done. Include auth.php instead of functions.php as the code has been moved
2018-04-06 14:42:10 -04:00
a789fc88aa
implement getAuthHash
2018-04-06 14:41:39 -04:00
632ab143fe
error when can't set session in cake
2018-04-05 14:21:56 -04:00
a4fee5c91c
further merges from cakephp 2.10.8
2018-03-21 13:09:55 -04:00
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
0654c7e3b2
Adding group handling in API
2018-03-04 23:01:52 -08: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
85b7baa131
Fix event Groups associations
2017-12-19 18:09:41 -05:00
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
dd69bc3d7b
Merge branch 'master' into storageareas
2017-12-11 11:39:42 -05:00
ef1af9cc15
disable FilterComponent as it doesn't actually do anything. Add Groups join when needed
2017-12-09 14:03:42 -05:00
08b5c26a15
2019 maxscoreframeid ( #2020 )
...
* added MaxScoreFrameId to address #2019
* consistent quotes
2017-12-07 14:11:06 -05:00
f7a2db4e49
remove MaxScore from the sorting because it really doesn't make sense to sort by time then maxscore... time is going to be pretty much unique
2017-12-04 21:50:29 -05:00
97c9ae02c2
cleanup
2017-12-04 17:02:38 -05:00
Isaac Connor
Pliable Pixels
Pliable Pixels
Isaac Connor
Isaac Connor
tim
Isaac Connor