Isaac Connor
|
5078a69c81
|
move pre and post condition testing into the Filter class so we can use it everywhere
|
2020-08-17 17:40:58 -04:00 |
|
Isaac Connor
|
479768a2a4
|
implement disk_used_blocks in Storage. Also use Type() instead of ->{Type} to get default value.
|
2020-08-17 16:57:53 -04:00 |
|
Isaac Connor
|
72cad5f6d6
|
Move more code from parseFilter to Filter object.
|
2020-08-17 16:57:14 -04:00 |
|
Isaac Connor
|
e9b0c4fbf5
|
add ->filter to FilterTerm so that we can access other terms in testing pre and post conditions. rename hidden_fields_string to hidden_fields. Add in DiskPercent DiskBlocks, SystemLoad Pre and Post conditions
|
2020-08-17 16:56:54 -04:00 |
|
Isaac Connor
|
d2b7aa3e90
|
Populate Scheme of default Storage Area when event Storage is not valid
|
2020-08-17 16:55:29 -04:00 |
|
Isaac Connor
|
ae91e9c58f
|
add functions to Filter class to build up the sql, hidden_fields and query_string from the list of terms
|
2020-08-17 16:55:05 -04:00 |
|
Isaac Connor
|
e4425d7565
|
Merge branch 'master' into filter_pre_post
|
2020-08-17 12:56:20 -04:00 |
|
Isaac Connor
|
d1126b3007
|
Move term logic from parseFilter to FilterTerm class
|
2020-08-16 13:02:34 -04:00 |
|
Isaac Connor
|
82a1670d80
|
Rough in FilterTerm class, stealing code from functions.php and adapting it.
|
2020-08-15 17:49:59 -04:00 |
|
Isaac Connor
|
8a170f2841
|
Remove Debug
|
2020-08-15 17:49:26 -04:00 |
|
Isaac Connor
|
4fee59208d
|
Use str_replace and ltrim instead of preg_replace for efficiency
|
2020-08-13 12:14:18 -04:00 |
|
Isaac Connor
|
d42424d6d8
|
Merge branch 'release-1.34'
|
2020-08-11 11:41:11 -04:00 |
|
Isaac Connor
|
63da7f0074
|
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
|
2020-08-10 14:02:25 -04:00 |
|
Isaac Connor
|
81b55589db
|
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
|
2020-08-10 13:59:47 -04:00 |
|
Isaac Connor
|
e64e786c5b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-09 22:20:08 -04:00 |
|
Isaac Connor
|
25426d5fdd
|
Don't add 442 for https and 80 for http. Just cleaner
|
2020-08-09 22:18:35 -04:00 |
|
Isaac Connor
|
b4a3ccdfed
|
only put the hostname in the CSP headers so that we accept as source either http or https or any port. Useful for multiport.
|
2020-08-09 22:18:07 -04:00 |
|
Isaac Connor
|
6c831be61f
|
remove extra ,
|
2020-08-08 14:27:37 -04:00 |
|
Isaac Connor
|
bf7aa3f5c2
|
this version of set_cookie_params was introduced in 7.3. So put back code for previous versions of php which unfortunately do not support the samesite parameter. Fixes #3009
|
2020-08-08 09:58:18 -04:00 |
|
Isaac Connor
|
da757d075b
|
Only save the DiskSpace on completed events. Fixes #3007
|
2020-08-07 09:53:35 -04:00 |
|
Isaac Connor
|
eff96c5fa3
|
Only save the DiskSpace on completed events. Fixes #3007
|
2020-08-07 09:53:15 -04:00 |
|
Isaac Connor
|
e5513bc7a4
|
Add setting Name and Path
|
2020-08-04 17:35:16 -04:00 |
|
Isaac Connor
|
d7de4768d7
|
Fix use of is_callable
|
2020-08-04 16:36:04 -04:00 |
|
Isaac Connor
|
9acbd9d1b2
|
fix typos prevent array based regexp from working. Fixes saving Storage
|
2020-08-03 11:05:16 -04:00 |
|
Isaac Connor
|
56bf181dc4
|
set SameSite on session cookie.
|
2020-08-03 10:55:54 -04:00 |
|
Isaac Connor
|
cfa2d13948
|
set samesite=Strict in session cookie
|
2020-08-02 12:06:13 -04:00 |
|
Isaac Connor
|
3df58fc9db
|
handle array args in daemonStatus
|
2020-07-30 19:36:05 -04:00 |
|
Isaac Connor
|
0a782814a7
|
Don't start filter if the command was execute
|
2020-07-30 17:13:30 -04:00 |
|
Isaac Connor
|
204086a56d
|
spacing and quotes
|
2020-07-30 17:12:00 -04:00 |
|
Isaac Connor
|
c4d4a73c2a
|
json decoding errors shouldnt' be fatal
|
2020-07-29 16:41:37 -04:00 |
|
Isaac Connor
|
4c5a88a822
|
json decoding errors shouldnt' be fatal
|
2020-07-29 16:40:31 -04:00 |
|
Isaac Connor
|
31cbfc35b1
|
fix use of is_callable so that we fix filter saving
|
2020-07-26 22:32:55 -04:00 |
|
Isaac Connor
|
c81e4a3bca
|
fix
|
2020-07-25 14:32:30 -04:00 |
|
Isaac Connor
|
99d7aa0da0
|
fix
|
2020-07-25 14:31:57 -04:00 |
|
Isaac Connor
|
e90efa7a7e
|
spacing
|
2020-07-25 14:28:08 -04:00 |
|
Isaac Connor
|
4c8f96b786
|
Update saving action to use our ORM methods
|
2020-07-25 14:28:01 -04:00 |
|
Isaac Connor
|
dda630f522
|
fix filter_regexp to remove trailing /
|
2020-07-25 14:27:09 -04:00 |
|
Isaac Connor
|
522dfecebe
|
Fix setting values by checking is_callable. Remove debug. Fix filter_regexp
|
2020-07-25 14:26:49 -04:00 |
Isaac Connor
|
fe9db4cfa2
|
add filtering to Storage->Path()
|
2020-07-25 13:51:13 -04:00 |
|
Isaac Connor
|
a819b73e18
|
allow filter_regexp to be an array
|
2020-07-25 13:50:59 -04:00 |
|
Isaac Connor
|
1416bc547e
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-07-22 17:37:52 -04:00 |
|
Isaac Connor
|
7fd038d99b
|
spacing and quotes
|
2020-07-22 17:28:12 -04:00 |
|
Isaac Connor
|
a70b329ce3
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-07-20 18:40:59 -04:00 |
|
Isaac Connor
|
d716d1d686
|
Merge branch 'release-1.34'
|
2020-07-20 16:25:41 -04:00 |
|
Isaac Connor
|
4e2633d22b
|
Update code to make calls to api on remote servers
|
2020-07-20 16:25:29 -04:00 |
|
Isaac Connor
|
cb0e54d3be
|
consider Monitor->Controllable as well in stopping zmtrack. Don't complain about ControlCommand being told to start/stop
|
2020-07-20 10:23:26 -04:00 |
|
Isaac Connor
|
dcd67a1acf
|
Remove args with non-sensical values from cgi params as a micro-opt
|
2020-07-13 14:50:21 -04:00 |
|
Isaac Connor
|
2db65d3821
|
Merge branch 'release-1.34'
|
2020-07-04 09:09:24 -04:00 |
|
Isaac Connor
|
c47a348fea
|
Handle empty string version of scale
|
2020-06-30 19:18:45 -04:00 |
|
Isaac Connor
|
b060e0835c
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-06-25 16:07:22 -04:00 |