Isaac Connor
|
28155ebd90
|
Should use zm_session_start instead of session_start
|
2019-08-16 15:08:10 -04:00 |
|
Isaac Connor
|
cfeedd39a4
|
Use zm_session_start instead of session_start
|
2019-08-16 15:07:20 -04:00 |
|
Isaac Connor
|
660eddc69d
|
Only open/close session if we are clearing a session var
|
2019-08-16 15:06:56 -04:00 |
|
Isaac Connor
|
3475a11e15
|
use instead of session when generating auth hash.
|
2019-08-16 14:13:13 -04:00 |
|
Isaac Connor
|
51c7f0b73f
|
shuffle lines
|
2019-08-16 14:12:52 -04:00 |
|
Isaac Connor
|
1d0ee227d7
|
fix mUser to username, etc.
|
2019-08-16 14:12:37 -04:00 |
|
Isaac Connor
|
4108495a7d
|
Add session storage if stateful query param is on, but only for LEGACY_API_AUTH
|
2019-08-16 14:12:14 -04:00 |
|
Isaac Connor
|
fdb66aaa72
|
Merge branch 'master' into fix_token_auth_sessions
|
2019-08-15 16:22:09 -04:00 |
|
Isaac Connor
|
336f45219b
|
fix object caching
|
2019-08-15 16:04:56 -04:00 |
|
Isaac Connor
|
68052368f7
|
use backticks on table and column names. Use data-on-change-this in group dropdown
|
2019-08-15 16:04:37 -04:00 |
|
Isaac Connor
|
1103928ed7
|
only call check_timezone on console for efficiency in all other requests
|
2019-08-15 15:16:20 -04:00 |
|
Isaac Connor
|
f09941ed48
|
timezone errors shouldn't be fatal
|
2019-08-15 15:16:02 -04:00 |
|
Isaac Connor
|
7c54ac85a0
|
remove debugging
|
2019-08-15 15:05:37 -04:00 |
|
Isaac Connor
|
618e6816ef
|
Rework auth. login using username and password only occurs on login action now. Including auth.php should not touch the session. auth_hash logins no longer touch the session. replace userLogin with a function called validateUser which matches the semantics of validateToken.
|
2019-08-15 14:59:15 -04:00 |
|
Isaac Connor
|
0ec6e8d635
|
Merge branch 'master' into fix_token_auth_sessions
|
2019-08-15 12:05:07 -04:00 |
Isaac Connor
|
ed9175b4ad
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2019-08-13 15:34:11 -04:00 |
|
Isaac Connor
|
4140d51e9f
|
database.php cleanup. remove dbFetchMonitor and dbFetchGroup. Their usage has been replaced with the Object::find_one usage. Also more quoting of table and colume names to fix #2659
|
2019-08-13 11:45:50 -04:00 |
|
Isaac Connor
|
9da10abca9
|
Move APIEnabled check to the api from auth.php
|
2019-08-13 11:29:32 -04:00 |
|
Isaac Connor
|
a63b6486b9
|
Remove Session from App Components list.
|
2019-08-12 15:36:40 -04:00 |
|
Isaac Connor
|
c2e1293472
|
spacing
|
2019-08-12 15:10:58 -04:00 |
|
Isaac Connor
|
0bf036fc55
|
Remove Session from the components list
|
2019-08-12 15:06:46 -04:00 |
|
Isaac Connor
|
2320ab4d66
|
update HostController. Use config constants, don't use sessions
|
2019-08-12 15:01:40 -04:00 |
|
Isaac Connor
|
4922861d1d
|
Merge branch 'master' into fix_token_auth_sessions
|
2019-08-12 13:59:11 -04:00 |
|
Isaac Connor
|
38a09bbd18
|
Don't auto-add default storage area to header. If someone wants to see it's space in the header they can add it to storage areas
|
2019-08-08 15:34:07 -04:00 |
|
Isaac Connor
|
5f77634aca
|
Update Group object to use shared code in Object.php. Should fix #2659
|
2019-08-08 13:51:56 -04:00 |
|
Isaac Connor
|
702cb65d2a
|
Merge branch 'storageareas'
|
2019-08-08 13:38:36 -04:00 |
|
Isaac Connor
|
45b970fb09
|
fix spacing
|
2019-08-08 13:34:28 -04:00 |
|
Isaac Connor
|
df285006d2
|
change sortHeader to include eid if it is in the request
|
2019-08-08 13:34:10 -04:00 |
|
Isaac Connor
|
a9de537e01
|
Merge branch 'master' into storageareas
|
2019-08-08 09:27:27 -04:00 |
|
Isaac Connor
|
1892528679
|
quotes
|
2019-08-08 09:26:15 -04:00 |
|
Isaac Connor
|
5b0509e000
|
When invalid operator terms, use print_r on the term instead of just the operator
|
2019-08-08 09:26:00 -04:00 |
|
Isaac Connor
|
3a142df14f
|
Only send zmdc.pl commands for filters to running servers
|
2019-08-07 15:51:01 -04:00 |
|
Isaac Connor
|
fb414b3f19
|
remove debug statements
|
2019-08-07 15:34:45 -04:00 |
|
Isaac Connor
|
fb7ab993b5
|
Have to include the --daemon param when telling zmdc.pl what to do with zmfilter.pl
|
2019-08-07 15:34:30 -04:00 |
|
Isaac Connor
|
d4b59211cd
|
Merge branch 'master' into storageareas
|
2019-08-07 11:21:19 -04:00 |
|
Isaac Connor
|
962049fa31
|
Merge branch 'master' into filter_add_copy
|
2019-08-06 20:17:21 -04:00 |
|
Isaac Connor
|
7e6b0058d2
|
Update Zone buttons. Fix double submit. Fixes #2671
|
2019-08-02 08:04:38 -04:00 |
|
Isaac Connor
|
6a425b6988
|
If token is present do token based auth and do not do anything with session
|
2019-08-01 10:02:31 -04:00 |
|
Isaac Connor
|
7f19831e0c
|
Use isset when testing for existence of authash in session
|
2019-07-29 14:54:55 -04:00 |
|
Isaac Connor
|
8167ff2143
|
fix eslint
|
2019-07-26 12:28:02 -04:00 |
Isaac Connor
|
547e80b1a9
|
Fix download and export button from events list. Fixes #2668 (#2670)
|
2019-07-24 12:31:43 -04:00 |
|
Isaac Connor
|
a6a2239e5b
|
Fixes #2579 by putting the event Id into an attribute of the delete button. Also uses a button instead of a link. Also only does parent refresh if parent exists (#2662)
|
2019-07-24 11:39:21 -04:00 |
|
Isaac Connor
|
39262d55f5
|
Also show secondary storage area when viewing event
|
2019-07-24 11:26:07 -04:00 |
|
Isaac Connor
|
2d46f2adab
|
add Secondary Storage Area options.
|
2019-07-24 11:25:51 -04:00 |
|
Isaac Connor
|
1a0beab703
|
add Secondary Storage Area options. Storage array is now an array of Objects so use the Name key
|
2019-07-24 11:25:38 -04:00 |
|
Isaac Connor
|
1254e8ab67
|
Add AttrSecondaryStorageArea to lang
|
2019-07-24 11:24:50 -04:00 |
|
Isaac Connor
|
45afc2a534
|
introduce array_recursive_diff which we use to compare two arrays in Object::changes
|
2019-07-24 11:24:37 -04:00 |
|
Isaac Connor
|
e3a9d5d488
|
Rewrite changes to run through the keys of the passed in new values array, and handle object methods as well as basic values
|
2019-07-24 11:24:14 -04:00 |
|
Isaac Connor
|
341f4adbdf
|
Functions that change the Query must reset Query_json as well
|
2019-07-24 11:23:38 -04:00 |
|
Isaac Connor
|
58851d23d2
|
Add Secondary Storage support to the Event object
|
2019-07-24 11:22:55 -04:00 |