66221e39ab
rough in a StorageController for api
2018-10-03 11:22:51 -04:00
bf9ff8461c
Add WebSite to the Monitor type enumeration
2018-09-24 13:20:19 -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
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
32d103c216
fix submodule again
2018-07-01 08:23:00 -05:00
5d0719f18d
fixes #2137
2018-07-01 08:16:06 -05: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
af3ce3660f
Only unlink if file exists, removing warning. Always return a Storage object in Monitor->Storage() fixes Monitor Delete.
2018-05-24 09:54:45 -04:00
be424f46f0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-18 12:07:22 -04:00
8276386a44
We always return an associative array now
2018-05-18 09:06:17 -04:00
93dd943fec
Fix some spacing
2018-05-16 20:17:57 +02:00
571b27a025
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-05-10 14:39:16 -04:00
c61deb422f
update to -zm versions
2018-05-10 14:38:49 -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
e7bd5900bc
rough in a Storage Model
2018-05-07 14:09:05 -07:00
1a012c62ff
Add fileExists to event view
2018-05-07 14:07:03 -07:00
9c44f56f37
Add Storage to belongsTo. Implement Relative_Path and fileExists functions
2018-05-07 14:06:48 -07:00
f2c099f1e4
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-05-04 16:01:25 -04:00
84c94efaa8
Move redunddant close methods into parent. Use Fatal instead of croak. Croak is not defined so it causes an infinite loop
2018-05-04 02:26:25 +02: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
a4da624f4c
break out of loops when zm-terminate is set
2018-04-27 13:20:38 -07:00
bbb10fa4b4
Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34
2018-04-24 12:40:15 -04:00
578df0c5cc
update submodules
2018-04-20 16:18:58 -04:00
c65255a067
Merge ../ZoneMinder.connortechnology
2018-04-20 15:56:42 -04:00
a868bb70ed
Better debug when fail to attach images
2018-04-20 15:56:14 -04:00
fac3cde1e7
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-20 15:23:23 -04:00
ed140426ab
rpm packaging changes and documentation
2018-04-19 15:36:43 -05:00
3c225c9f1c
Migrate Webcache out of webroot ( #2083 )
...
* migrate webcache folder out of webroot, migrate htaccess files
* rpm specfile - add missing reference to cache folder
* fix submodule mixup
2018-04-19 15:01:46 -04:00
fb44619a66
output the initial table head
2018-04-19 14:33:05 -04:00
2aa689a14a
Use a class instead of an id for consoleTable
2018-04-19 14:20:02 -04:00
a5cbc8abd1
buildsystem - update git submodules
2018-04-18 19:21:14 -05:00
f6540aeba1
point git submodules to our own forks
2018-04-18 14:00:00 -05:00
0b0fbae1c5
Add output of paused image when paused
2018-04-12 18:43:57 -04:00
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
989ed65f52
spacing and braces, remove a dead unused function
2018-04-11 10:50:28 -04:00
ae3ccf6ffe
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-06 12:32:07 -07:00
fdd8be5daf
brackets and spaces
2018-04-06 14:52:56 -04:00
Isaac Connor
Isaac Connor
Pliable Pixels
Pliable Pixels
Andrew Bauer
Isaac
Isaac Connor
Isaac
Andy Bauer
Andrew Bauer
Isaac Connor