Isaac Connor
|
ecac5e051a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-28 09:34:14 -04:00 |
|
Isaac Connor
|
0a4a144bbc
|
Merge branch 'location'
|
2020-09-28 09:33:28 -04:00 |
Andrew Bauer
|
3b46ebacae
|
remove warning used for testing
|
2020-09-27 12:20:09 -05:00 |
|
Andrew Bauer
|
c1a0afef95
|
make group view into a modal
|
2020-09-27 12:12:01 -05:00 |
|
Andrew Bauer
|
2d8349073d
|
redirect to controlcaps after saving a control
|
2020-09-26 14:31:59 -05:00 |
|
Andrew Bauer
|
ae9139b00c
|
unpopup zone view
|
2020-09-25 10:52:13 -05:00 |
|
Isaac Connor
|
386f991364
|
Merge branch 'master' into location
|
2020-09-24 19:28:57 -04:00 |
|
Isaac Connor
|
8bd958e91c
|
pass querySep to querystring
|
2020-09-24 12:12:06 -04:00 |
|
Isaac Connor
|
e47fa48a8e
|
move parseFilterToTree from timeline_functions to Filter->tree(). Fix passing separator in querystring
|
2020-09-24 12:11:45 -04:00 |
|
Isaac Connor
|
624bcdcde0
|
Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them
|
2020-09-24 09:01:30 -04:00 |
|
Isaac Connor
|
ed6d5a55a5
|
put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button
|
2020-09-22 14:33:26 -04:00 |
|
Isaac Connor
|
0aa0452b7e
|
Use a redirect instead of just changing the view on monitor save. This fixes the reload issue
|
2020-09-22 14:05:37 -04:00 |
|
Isaac Connor
|
3e3af0bca5
|
Fix zmcontrol.pl command line to not use = to match with usage elsewhere
|
2020-09-21 11:24:17 -04:00 |
|
Isaac Connor
|
861ebedcae
|
Implement a crude view for a failed db connection with a 30 second reload interval.
|
2020-09-21 11:15:34 -04:00 |
|
Andrew Bauer
|
ec20fdf3ad
|
convert function modal to ajax request
|
2020-09-19 10:18:59 -05:00 |
|
Andrew Bauer
|
d2963fe28f
|
convert donate modal to ajax request
|
2020-09-19 08:55:08 -05:00 |
|
Andrew Bauer
|
2757b74957
|
convert servermodal function to php file
|
2020-09-18 10:34:33 -05:00 |
|
Isaac Connor
|
29880cdab3
|
handle width options['width'] and options['height'] aren't set
|
2020-09-17 20:57:14 -04:00 |
|
Isaac Connor
|
006cc079c4
|
Rework action to use Zone class and just take a list of Zid's so that technically we can delete zones from multiple monitors at once.
|
2020-09-17 20:56:56 -04:00 |
|
Isaac Connor
|
1701089211
|
Add MonitorId to Zone fields and add Monitor() method
|
2020-09-17 20:56:21 -04:00 |
|
Isaac Connor
|
42dc4e46b1
|
add canEdit method to Monitor object
|
2020-09-17 20:56:04 -04:00 |
|
Isaac Connor
|
4a6743be3f
|
turn off debug
|
2020-09-17 15:15:13 -04:00 |
|
Isaac Connor
|
123b2a4747
|
Change Event Diskspace case to not interfere with Filesystem DiskSpace
|
2020-09-17 15:14:54 -04:00 |
|
Isaac Connor
|
d39beb5714
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-15 10:22:36 -04:00 |
|
Andrew Bauer
|
accfd1191f
|
update eventdetail modal
|
2020-09-15 09:20:38 -05:00 |
|
Isaac Connor
|
fa1ade6b7b
|
Fix obr getting cbr value
|
2020-09-15 10:11:07 -04:00 |
|
Isaac Connor
|
ad0f8d674d
|
sort_asc is a boolean. ZM_WEB_EVENT_SORT_ORDER is asc|desc
|
2020-09-14 15:13:41 -04:00 |
|
Isaac Connor
|
ab8e2d2e6c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-14 14:05:02 -04:00 |
|
Isaac Connor
|
77fb533e48
|
Fix default value for AutoExecuteCmd
|
2020-09-14 14:04:36 -04:00 |
|
Andrew Bauer
|
d2bc39f65f
|
replace storage popup with modal
|
2020-09-14 09:50:04 -05:00 |
|
Andrew Bauer
|
aa6bf31cbd
|
pass OLANG as a function parm
|
2020-09-11 07:51:00 -05:00 |
Isaac Connor
|
3b7bde755e
|
Merge pull request #3041 from mnoorenberghe/unsafe_inline_backcompat
Drop support for CSP 1 browsers (with no nonce-* support)
|
2020-09-10 18:09:44 -04:00 |
|
Andrew Bauer
|
46d4f55b80
|
add makeHelpLink helper function
|
2020-09-10 17:06:27 -05:00 |
Matthew Noorenberghe
|
f031ce9934
|
Drop support for CSP 1 browsers (with no nonce-* support)
This gets rid of console spew in modern browsers.
|
2020-09-10 16:25:43 -04:00 |
|
Isaac Connor
|
c5e4a964cd
|
quotes, spacing fix some functions that clearly no one uses
|
2020-09-05 12:49:14 -04:00 |
|
Isaac Connor
|
240f4ceabd
|
Fix code warning if no value is selected in htmlSelect
|
2020-09-03 18:21:38 -04:00 |
|
Isaac Connor
|
47971bb8f5
|
Update function action to use Monitor object
|
2020-09-03 18:21:08 -04:00 |
|
Isaac Connor
|
6f5acece66
|
FIx Record Entry
|
2020-09-03 18:20:51 -04:00 |
|
Isaac Connor
|
c934dee233
|
Do not allow the deleting of Archived Events
|
2020-09-03 17:02:48 -04:00 |
|
Isaac Connor
|
94c7708df5
|
Warn when the specified selected value isn't in the passed options. Don't default to adding id in htmlSelect. Shouldbe passed in behaviours
|
2020-09-03 10:42:33 -04:00 |
|
Isaac Connor
|
fb9129a4d3
|
Add missing Mocord option
|
2020-09-03 10:40:10 -04:00 |
|
Isaac Connor
|
b1d4115df8
|
Handle case where IN operator is used with 1 value
|
2020-09-02 17:55:06 -04:00 |
|
Isaac Connor
|
31e8270470
|
Do not set width and height of stream based on monitor size
|
2020-09-02 14:37:28 -04:00 |
|
Isaac Connor
|
c0b54ee790
|
introduce connKey method. Use it to generate a connKey if one hasn't been assigned yet.
|
2020-09-02 13:56:55 -04:00 |
|
Isaac Connor
|
762bea0761
|
Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot.
|
2020-08-31 18:30:05 -04:00 |
|
Isaac Connor
|
9b36b68ccc
|
Introduce a Group_Monitor class to ease loading this relationship
|
2020-08-31 18:28:53 -04:00 |
|
Isaac Connor
|
cce0ab1464
|
pass params when loading Objects_Indexed_By_Id
|
2020-08-31 10:16:35 -04:00 |
|
Isaac Connor
|
4fcece6b69
|
Fixes to generating SQL for postSQL conditions. Now we will add the AND with a value of TRUE and a comment with the attr
|
2020-08-31 10:16:10 -04:00 |
|
Isaac Connor
|
d0f1a2af80
|
Since monitor edit is no longer a popup, we need to redirect to console instead of none.
|
2020-08-28 10:22:28 -04:00 |
|
Isaac Connor
|
079d1be3b3
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-28 09:52:34 -04:00 |
|
Isaac Connor
|
b458a7c893
|
Redirect after save so that a reload doesn't redo the post
|
2020-08-27 17:20:24 -04:00 |
|
Isaac Connor
|
10d0ccf0ce
|
fix use of ->value instead of ->val. Return 1 for the sql for a post-condition term
|
2020-08-27 17:15:33 -04:00 |
|
Isaac Connor
|
d0f6f8755c
|
Implement a remove_from_cache function so we can free mem for objects we are not interested in
|
2020-08-27 17:14:47 -04:00 |
|
Isaac Connor
|
a5cef3e6d1
|
Need to put a 1 in the sql for post-sql conditions due to the cnj term
|
2020-08-27 17:14:16 -04:00 |
|
Isaac Connor
|
9fef228636
|
remove debug Warning
|
2020-08-27 13:38:13 -04:00 |
|
Isaac Connor
|
11f165a99f
|
remove width and height from zms url. zms doesn't support them and having them in the url is confusing
|
2020-08-27 10:29:50 -04:00 |
|
Isaac Connor
|
b451c323e9
|
remove debug code at Warning level
|
2020-08-26 18:40:31 -04:00 |
|
Andrew Bauer
|
8ba91db1fb
|
make logout view a modal
|
2020-08-26 16:28:11 -05:00 |
|
Isaac Connor
|
ab68bef39a
|
Merge branch 'master' into filter_pre_post
|
2020-08-26 15:28:48 -04:00 |
|
Isaac Connor
|
06942746d6
|
Merge branch 'release-1.34'
|
2020-08-25 12:41:33 -04:00 |
|
Isaac Connor
|
98dce06d6b
|
Introduce get_auth_relay to return an auth string to use in urls.
|
2020-08-25 12:38:31 -04:00 |
|
Isaac Connor
|
3d3dde22c4
|
Use zm_session_start
|
2020-08-25 11:31:06 -04:00 |
|
Isaac Connor
|
3c29228df5
|
Use zm_session_start
|
2020-08-25 11:30:22 -04:00 |
|
Isaac Connor
|
2d05fbda8d
|
simplify debug line
|
2020-08-24 14:36:36 -04:00 |
|
Isaac Connor
|
3c1651d98f
|
in getStreamSrc if scale isn't set figure it out from width and height if passed
|
2020-08-24 14:35:59 -04:00 |
|
Isaac Connor
|
0f27243007
|
Merge branch 'master' into filter_pre_post
|
2020-08-24 09:23:24 -04:00 |
|
Isaac Connor
|
fe425302ad
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-21 10:46:13 -04:00 |
|
Isaac Connor
|
63ef15d247
|
spacing and quotes
|
2020-08-21 10:46:10 -04:00 |
|
Isaac Connor
|
80a6608733
|
Make values in conf.d files override values in db. Also handle the fact that they would already be defined in this case.
|
2020-08-21 10:36:49 -04:00 |
|
Isaac Connor
|
0a3ad719cd
|
Merge branch 'master' into filter_pre_post
|
2020-08-17 18:30:44 -04:00 |
|
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
|
c0ab8bf90d
|
Merge branch 'master' into zma_to_thread
|
2020-08-07 17:53:32 -04:00 |
|
Isaac Connor
|
5fb56c9f57
|
Merge branch 'master' into zma_to_thread
|
2020-08-07 17:52:43 -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
|
3641797500
|
Merge branch 'master' into zma_to_thread
|
2020-07-22 13:14:40 -04:00 |
|
Isaac Connor
|
869860bb26
|
Merge branch 'master' into zma_to_thread
|
2020-07-21 17:49:39 -04:00 |
|
Isaac Connor
|
7575afc8d5
|
Merge branch 'master' into zma_to_thread
|
2020-07-21 17:38:32 -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 |
|
Isaac Connor
|
13130a844e
|
handle array args in daemonStatus
|
2020-06-25 16:07:16 -04:00 |
|
Isaac Connor
|
93b0552ed7
|
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
|
2020-06-23 22:18:45 -04:00 |
|
Isaac Connor
|
f73cb3bebe
|
Don't start filter if the command was execute
|
2020-06-17 13:36:28 -04:00 |
|
Isaac Connor
|
8efe00157d
|
add a User object
|
2020-06-17 12:50:22 -04:00 |
|
Isaac Connor
|
a719565bf3
|
Merge branch 'master' into add_user_to_filters
|
2020-06-05 19:03:23 -04:00 |
|
Isaac Connor
|
198790796d
|
Merge branch 'release-1.34'
plus cleanups in dbConnect
|
2020-06-05 19:02:43 -04:00 |
|
Isaac Connor
|
0905655377
|
Merge branch 'master' into add_user_to_filters
|
2020-06-05 17:08:14 -04:00 |
|
Isaac Connor
|
f71926c736
|
Merge branch 'release-1.34'
|
2020-06-05 10:09:07 -04:00 |
|
Isaac Connor
|
910d4b51c9
|
Escape table names for mysql-8
|
2020-06-04 11:44:59 -04:00 |
|
Isaac Connor
|
8802447b10
|
Handle no DB_HOST specifed so default to localhost
|
2020-06-04 11:36:10 -04:00 |
|
Isaac Connor
|
ef3fc758cb
|
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
|
2020-06-04 11:34:48 -04:00 |
|
Isaac Connor
|
c4b2aa4a85
|
Handle no DB_HOST specifed so default to localhost
|
2020-06-04 11:34:16 -04:00 |
|
Isaac Connor
|
0644358d0a
|
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
|
2020-06-03 17:41:03 -04:00 |
|
Isaac Connor
|
88a910793c
|
Spacing
|
2020-05-13 08:06:55 -04:00 |
|
Isaac Connor
|
69e5feb28b
|
Add ONVIF* to Monitor object
|
2020-05-12 15:47:00 -04:00 |
|
Isaac Connor
|
92ba017328
|
Spacing
|
2020-05-11 09:19:33 -04:00 |
|
Isaac Connor
|
24c09a8207
|
Accept 0 as a value for scale meaning scale to fit
|
2020-05-08 17:55:12 -04:00 |
|
Isaac Connor
|
a9a490126a
|
Add UserId to Filter object
|
2020-05-07 10:59:32 -04:00 |
|
Isaac Connor
|
5a15701873
|
remove annoying ()
|
2020-05-05 18:07:28 -04:00 |
|
Isaac Connor
|
4ff341a0f5
|
Merge branch 'master' into zma_to_thread
|
2020-05-02 18:03:42 -04:00 |
|
Isaac Connor
|
28a3691b9c
|
Merge branch 'release-1.34'
|
2020-05-01 19:46:38 -04:00 |
|
Isaac Connor
|
683bf3f982
|
Handle no default set for array defaults. Fixes Warning when saving WebSite type Monitors
|
2020-05-01 15:32:54 -04:00 |
|
Isaac Connor
|
9dbeaa2c7b
|
Add default for Orientation. Fixes saving WebSite type monitors
|
2020-05-01 15:32:26 -04:00 |
|
Isaac Connor
|
82188c266e
|
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
|
2020-05-01 13:23:39 -04:00 |
|
Isaac Connor
|
ad373a5549
|
add Zone.php from master
|
2020-05-01 13:20:42 -04:00 |
|
Isaac Connor
|
cb44f2c5de
|
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
|
2020-04-29 16:30:59 -04:00 |
|
Isaac Connor
|
9d42d0e2f0
|
silence warning when no language is set
|
2020-04-23 17:38:15 -04:00 |
|
Isaac Connor
|
b3a8ac0b2a
|
tidy up, be more efficient and warn when language files are not found.
|
2020-04-23 17:37:46 -04:00 |
|
Isaac Connor
|
ced36a5333
|
remove debug and spacing
|
2020-04-23 15:40:35 -04:00 |
|
Isaac Connor
|
54995ab0d1
|
handle sort_asc not being set. Handle term['val'] not being set.
|
2020-04-23 15:18:05 -04:00 |
|
Isaac Connor
|
f06dc3f171
|
Update group save action, using Group object methods. Fixes errors on new MariaDB
|
2020-04-23 15:16:22 -04:00 |
|
Isaac Connor
|
b05916fc50
|
Use === when testing for empty value and setting defaults
|
2020-04-23 15:08:01 -04:00 |
|
Isaac Connor
|
eb26c5f798
|
Fix use of array_key_exists instead of property_exists
|
2020-04-23 15:07:28 -04:00 |
|
Isaac Connor
|
f5bf474ba6
|
filter bad characters out of Monitor Name
|
2020-04-23 14:59:21 -04:00 |
|
Isaac Connor
|
6f08322f7f
|
add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving
|
2020-04-23 11:12:47 -04:00 |
|
Isaac Connor
|
e770be2e13
|
Merge branch 'release-1.34'
|
2020-04-23 10:26:16 -04:00 |
|
Isaac Connor
|
d0e83fcfcb
|
handle case where g-recaptcha-response is not in the request, due to failure to render the recaptcha
|
2020-04-21 09:19:29 -04:00 |
|
Isaac Connor
|
bdfdc2a20c
|
add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving
|
2020-04-10 12:17:09 -04:00 |
|
Isaac Connor
|
81ed022d5a
|
Add a filter_regexp to Monitor Name
|
2020-04-10 12:16:32 -04:00 |
|
Isaac Connor
|
2d748091a2
|
handle sort_asc not being set. Handle term['val'] not being set.
|
2020-04-10 11:13:30 -04:00 |
|
Isaac Connor
|
d0fe1b60df
|
Merge branch 'release-1.34'
|
2020-04-04 16:58:53 -04:00 |
|
Isaac Connor
|
210d380029
|
CSP must include all Servers.
|
2020-04-04 16:57:52 -04:00 |
|
Isaac Connor
|
571ff260cc
|
Merge branch 'release-1.34'
|
2020-04-04 16:35:09 -04:00 |
Isaac Connor
|
f81cfc0513
|
add 1 month as an option to the version popup dropdown
|
2020-04-04 11:46:31 -04:00 |
|
Isaac Connor
|
3bfcd8eb33
|
Check for definition of ZM_TIMEZONE before using it. Fixes #2895
|
2020-04-02 14:00:36 -04:00 |
|
Isaac Connor
|
eec634c1b0
|
Add Source() support for VNC type
|
2020-03-30 10:10:06 -04:00 |
|
Isaac Connor
|
599960ef05
|
Update group save action, using Group object methods. Fixes errors on new MariaDB
|
2020-03-28 10:09:13 -04:00 |
|
Isaac Connor
|
c3bcdcff64
|
Use zm_session_start instead of session_start
|
2020-03-27 14:30:42 -04:00 |
|
Isaac Connor
|
50700031b1
|
Use zm_session_start instead of session_start
|
2020-03-27 13:05:12 -04:00 |
|
Isaac Connor
|
4ce944da23
|
Merge branch 'release-1.34'
|
2020-03-26 15:38:35 -04:00 |
|
Isaac Connor
|
af36cc3e52
|
Fix starting and stopping zmcontrol processes across servers.
|
2020-03-26 13:57:00 -04:00 |
|
Isaac Connor
|
b611e2616b
|
handle scale=auto
|
2020-03-24 16:15:24 -04:00 |
|
Isaac Connor
|
e06912a995
|
Merge branch 'release-1.34'
|
2020-03-21 15:28:27 -04:00 |
|
Isaac Connor
|
d3df0defc9
|
Support missing openssl_random_pseudo_bytes by using alternate functions
|
2020-03-21 15:28:18 -04:00 |
|
Isaac Connor
|
a0bd602339
|
Use === when testing for empty value and setting defaults
|
2020-03-09 14:39:22 -04:00 |
|
Isaac Connor
|
f0791c8118
|
silence warning when no language is set
|
2020-03-05 22:13:32 -05:00 |
|
Isaac Connor
|
f003daa791
|
Merge branch 'add_enabled_to_storage'
|
2020-03-05 15:48:43 -05:00 |
|
Isaac Connor
|
53f262a4cb
|
Merge pull request #2870 from pliablepixels/dev
#2866 - fixes incorrect token type comparison
|
2020-03-04 11:31:16 -05:00 |
|
Isaac Connor
|
4dae0c4609
|
Merge pull request #2870 from pliablepixels/dev
#2866 - fixes incorrect token type comparison
|
2020-03-04 11:21:48 -05:00 |
|
Isaac Connor
|
d24069e3d0
|
Look for global array so we don't load all Servers multiple times. Add all servers to allowed script-src in CSPHeaders
|
2020-03-04 11:03:07 -05:00 |
Pliable Pixels
|
1381cb194e
|
#2866 - fixes incorrect token type comparison
|
2020-03-04 10:50:59 -05:00 |
|
Isaac Connor
|
0b267fbdee
|
Add Enabled to Storage
|
2020-03-04 10:46:16 -05:00 |
|
Isaac Connor
|
fa6ac399be
|
Fix code in makePopupLink. Return content-type application/json for json response
|
2020-03-02 17:21:58 -05:00 |
|
Isaac Connor
|
85e5ade07a
|
fix makePopupLink when condition is false
|
2020-03-02 16:10:56 -05:00 |
|
Isaac Connor
|
bd59ae8856
|
Move the Basic Auth login code from skin.php to includes/auth.php
|
2020-03-02 15:00:31 -05:00 |
|
Isaac Connor
|
c1e13221f7
|
Move the Basic Auth login code from skin.php to includes/auth.php
|
2020-03-02 14:59:36 -05:00 |
|
Isaac Connor
|
d0e70fc501
|
Merge branch 'fix_auth_timeouts' of github.com:connortechnology/ZoneMinder into fix_auth_timeouts
|
2020-03-02 12:04:45 -05:00 |
|
Isaac Connor
|
f0e7b84001
|
Only load user from session if other auth mechanisms aren't present.
|
2020-03-02 11:51:07 -05:00 |
|
Isaac Connor
|
6456d52b97
|
Merge branch 'fix_user_lang'
|
2020-02-27 17:43:51 -05:00 |
|
Isaac Connor
|
e19332f36a
|
tidy up, be more efficient and warn when language files are not found.
|
2020-02-27 17:40:31 -05:00 |
|
Isaac Connor
|
bab0b2e830
|
handle a scale value of auto
|
2020-02-27 11:35:40 -05:00 |
|
Isaac Connor
|
0c70c5c2a4
|
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
|
2020-02-25 18:14:27 -05:00 |
|
Isaac Connor
|
a34af39ca7
|
Fix logging line in generate video function
|
2020-02-25 18:14:14 -05:00 |
|
Isaac Connor
|
e82ed3a098
|
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
|
2020-02-25 18:13:42 -05:00 |
|
Isaac Connor
|
4d044a1f14
|
Fix logging line in generate video function
|
2020-02-25 18:11:07 -05:00 |