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 |
|
Isaac Connor
|
8fcd5b37ed
|
API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials
|
2020-02-25 17:15:59 -05:00 |
|
Isaac Connor
|
7787ba1040
|
Fix adding auth string screwing up url to remote api in zmaControl and zmcControl
|
2020-02-25 17:15:45 -05:00 |
|
Isaac Connor
|
54a6dfff66
|
API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials
|
2020-02-25 17:12:48 -05:00 |
|
Isaac Connor
|
bd097bf8ce
|
Fix adding auth string screwing up url to remote api in zmaControl and zmcControl
|
2020-02-25 17:00:16 -05:00 |
|
Isaac Connor
|
f719514998
|
remove debug
|
2020-02-25 13:39:33 -05:00 |
|
Isaac Connor
|
a2c5e4943a
|
Merge branch 'fix_scale'
|
2020-02-25 12:18:27 -05:00 |
|
Isaac Connor
|
4dda37a6ee
|
remove extra }
|
2020-02-25 12:13:12 -05:00 |
|
Isaac Connor
|
d68d115581
|
Handle scale==0 to do width=100%.
|
2020-02-25 11:12:49 -05:00 |
|
Isaac Connor
|
583350ef06
|
Fix use of array_key_exists instead of property_exists
|
2020-02-25 11:09:12 -05:00 |
|
Isaac Connor
|
6cf448c74e
|
remove debug and spacing
|
2020-02-25 11:08:23 -05:00 |
|
Isaac Connor
|
b389f9660d
|
Merge branch 'fix_class_PTZ_presets_almost_invisible'
|
2020-02-24 13:17:09 -05:00 |
|
Isaac Connor
|
1a87eb40bd
|
Fixes #2841 and maintains login through password change
|
2020-02-19 16:55:38 -05:00 |
|
Isaac Connor
|
dab5c520fe
|
Merge branch 'master' into add_alarmed_zone_to_filters
|
2020-02-19 14:20:08 -05:00 |
|
Isaac Connor
|
821355c117
|
Only set date.timezone if we have a configured value in the Config
|
2020-02-11 13:21:28 -05:00 |
|
Isaac Connor
|
1c2f2657d2
|
We don't do automatic login when recaptcha is enabled, so add the login calls on successful recaptcha
|
2020-02-04 16:41:19 -05:00 |
|
Isaac Connor
|
df5bf788d9
|
Filtering by Alarmed Zone now only supports a single value using EXISTS as the operator. We now also support CURDATE() and NOW() as values for Date/StartDate/EndDate
|
2020-01-24 11:09:27 -05:00 |
|
Isaac Connor
|
29a04dc1b9
|
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
|
2020-01-24 09:50:53 -05:00 |
|
Isaac Connor
|
adf376e4a6
|
add Zone.php
|
2020-01-24 09:45:02 -05:00 |
|
Isaac Connor
|
8aa0fe665f
|
Add EmailTo,EmailSubjecet,EmailBody fields to Filter object
|
2020-01-22 14:04:42 -05:00 |
|
Isaac Connor
|
9d41334e8f
|
Merge branch 'master' into add_alarmed_zone_to_filters
|
2020-01-22 13:45:37 -05:00 |
|
Isaac Connor
|
a3754709e4
|
allow filters to not have terms specified. We can't pass an empty array in a url, so we will just have to handle it.
|
2020-01-18 16:09:33 -05:00 |
|
Isaac Connor
|
86a2523498
|
break up a long line, add some parenthesis to clarify logic
|
2020-01-17 12:30:26 -05:00 |
|
Isaac Connor
|
02e9096d2b
|
When saving an existing Filter and we are unchecking Background, need to stop the filter before saving. Remove dead code
|
2020-01-13 17:32:57 -05:00 |
|
Isaac Connor
|
e4ba1fd432
|
fix restarting zmcontrol on remote servers by passing object=filter as well
|
2020-01-13 17:16:15 -05:00 |
|
Isaac Connor
|
d7dc7cdc47
|
Add ServerId to database log entries in php
|
2020-01-13 16:18:01 -05:00 |
|
Isaac Connor
|
9036b6db77
|
fix typo
|
2020-01-13 16:17:39 -05:00 |
|
Isaac Connor
|
f3a9e608db
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-13 16:11:19 -05:00 |
|
Isaac Connor
|
b11815cfa9
|
Introduce Storage->EventCount to get the # of events per storage without actually loading all events.
|
2020-01-13 12:53:50 -05:00 |
|
Isaac Connor
|
6cd76ee2ff
|
Clear cache after loading Events so as to free ram.
|
2020-01-13 12:53:05 -05:00 |
|
Isaac Connor
|
f7e2359818
|
Implement a clear_cache function so that we can free up cached objects
|
2020-01-13 10:57:56 -05:00 |
|
Isaac Connor
|
398688550b
|
fixtypo
|
2020-01-10 20:15:52 -05:00 |
|
Isaac Connor
|
0c478c7962
|
fix Monitor->Server
|
2020-01-10 20:13:09 -05:00 |
|
Isaac Connor
|
5ee0158735
|
Set defaults for vars == ''
|
2020-01-10 16:42:41 -05:00 |
|
Isaac Connor
|
f61f6eaf7d
|
remove line cutnpasted erroneously
|
2020-01-10 12:45:47 -05:00 |
|
Isaac Connor
|
d433590f74
|
use find_one in stead of new to use Cached Server
|
2020-01-10 12:45:30 -05:00 |
|
Isaac Connor
|
ef4ecd40fb
|
Set defaults before saving Objects
|
2020-01-10 12:44:59 -05:00 |
|
Isaac Connor
|
0571909d05
|
add remote_IP to log entries on php side
|
2020-01-07 17:08:29 -05:00 |
|
Isaac Connor
|
c3641df531
|
spaces
|
2020-01-05 17:30:06 -05:00 |
|
Isaac Connor
|
e951b0af1c
|
add code to set default value for checkboxes
|
2020-01-03 16:35:04 -05:00 |
|
Isaac Connor
|
d42e9beddc
|
Add warnings when the type of movement is not selected
|
2020-01-02 17:03:52 -05:00 |
|
Isaac Connor
|
e9815bf9c7
|
add ZM Namespace to Error calls
|
2020-01-02 16:54:50 -05:00 |
|
Isaac Connor
|
714d304528
|
Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation
|
2019-12-31 19:10:29 -05:00 |
|
Isaac Connor
|
77cfb7c190
|
fix spacing
|
2019-12-31 12:42:49 -05:00 |
Andrew Bauer
|
2301103da5
|
use small, non-zero values, for image buffer & pre & post buffers
|
2019-12-28 09:49:42 -06:00 |
|
Isaac Connor
|
9e43e06a55
|
Add empty array value for terms when there isn't any to get rid of warning when loading all events
|
2019-12-26 11:22:42 -05:00 |
|
Isaac Connor
|
958a6b8218
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-12-18 19:06:19 -05:00 |
|
Isaac Connor
|
e39a95d761
|
Add AlarmedZoned to filters, work on fixing filter behaviour in js. Enable viewing filter results in montagereview
|
2019-12-18 19:06:10 -05:00 |
|
Isaac Connor
|
d21fa5c48a
|
Do not set defaults in Object->set(). This allows us to set an empty timestamp.
|
2019-12-18 19:03:37 -05:00 |
|
Isaac Connor
|
34354f5871
|
Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab.
|
2019-12-18 12:13:00 -05:00 |
|
Isaac Connor
|
2a4d06f93b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-12-15 10:35:56 -05:00 |
|
Isaac Connor
|
4d9d4ba957
|
Do not allow deletion of archived events.
|
2019-12-15 10:35:43 -05:00 |
|
Isaac Connor
|
689956bba7
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-12-13 17:49:00 -05:00 |
|
Isaac Connor
|
b24e912050
|
Use ZM\Server::find_one for loading server so that it gets cached. Use a single regexp to determine config line validity instead of two for efficiency
|
2019-12-13 17:46:56 -05:00 |
|
Isaac Connor
|
d2a23e4822
|
add possing port to Monitor->UrlToIndex
|
2019-12-13 11:50:11 -05:00 |
|
Isaac Connor
|
bedc61a347
|
handle dbFetchNext on null result more gracefully
|
2019-12-13 11:49:55 -05:00 |
|
Isaac Connor
|
ea89ebf150
|
more mysql8 fixes
|
2019-12-08 21:33:29 -05:00 |
|
Isaac Connor
|
3bd0525e64
|
escape column names for mysql8
|
2019-12-08 14:27:07 -05:00 |
|
Isaac Connor
|
0de6396a5b
|
Test for null in user before testing for access in CanEdit et all
|
2019-12-07 12:39:28 -05:00 |
|
Isaac Connor
|
4632bbd124
|
Apply relevant changes to deal with php7,4 deprecations
|
2019-12-07 11:45:32 -05:00 |
|
Isaac Connor
|
cc6d40d67e
|
Missing ->
|
2019-12-07 10:38:51 -05:00 |
|
Isaac Connor
|
df9f6103e4
|
fix syntax error
|
2019-12-04 09:00:20 -05:00 |
|
Isaac Connor
|
78912584e1
|
re-arrange code to hopefully get rid of syntax error reported by some people
|
2019-12-04 07:10:33 -05:00 |
|
Isaac Connor
|
576dd23907
|
test for existence of filter in query
|
2019-12-02 12:30:15 -05:00 |
|
Isaac Connor
|
355fceccb4
|
test for existence of default
|
2019-12-02 12:30:03 -05:00 |
|
Isaac Connor
|
09fcbad666
|
Merge branch 'master' into zma_to_thread
|
2019-11-30 14:59:39 -05:00 |
|
Isaac Connor
|
eedb31730e
|
fix saving Monitor values that don't get passed when empty, like Enabled
|
2019-11-29 14:49:43 -05:00 |
|
Isaac Connor
|
cab1056328
|
improve debugging in recursive_array_diff
|
2019-11-29 14:49:10 -05:00 |
|
Isaac Connor
|
d6a414a1a4
|
Merge pull request #2767 from connortechnology/fix_2692
Fix 2692
|
2019-11-29 14:24:00 -05:00 |
|
Isaac Connor
|
29572abef2
|
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
|
2019-11-29 13:56:02 -05:00 |
|
Isaac Connor
|
a9d8e73f68
|
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
|
2019-11-29 13:53:46 -05:00 |
|
Pliable Pixels
|
7b99c89541
|
its not necessary the token is a refresh. Can also be empty
|
2019-11-26 20:57:25 -05:00 |
|
Isaac Connor
|
54a15573ad
|
Make 32bit the default for COlours
|
2019-11-26 15:06:24 -05:00 |
|
Isaac Connor
|
5ebf929598
|
Add Event counts, event disk usage to storage tab of options. Disable checkbox selection when there are events stored on the storage area.
|
2019-11-26 14:36:39 -05:00 |
|
Isaac Connor
|
1dc83700c0
|
Do a better job of handling the non-server, non-multiport case. Put the code in Url so that it works for other functions that call Url()
|
2019-11-21 13:32:27 -05:00 |
|
Isaac Connor
|
606c89962f
|
eliminate an extra db call
|
2019-11-20 16:30:26 -05:00 |
|
Isaac Connor
|
5494fdb087
|
When upgrading from a version that doesn't do DiskSpace storage, there can be a lot of events to update. Can't load them all or we run out of ram. Batch them in 1000's
|
2019-11-20 09:31:16 -05:00 |
|
Isaac Connor
|
59b9220ddd
|
if doing multiport still call Url(), as it requires a hostname
|
2019-11-11 13:33:54 -05:00 |
|
Isaac Connor
|
1c54f22627
|
Introduce CSP_REPORT_URI to config and use it when setting up CSP headers as to where to report unsafe inline js to.
|
2019-11-08 15:18:08 -05:00 |
|
Isaac Connor
|
014ce0afe8
|
improve error message regarding timezone differences
|
2019-11-05 12:40:11 -05:00 |
|
Isaac Connor
|
5b02bc76f4
|
Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly
|
2019-11-05 10:07:42 -05:00 |
|
Isaac Connor
|
d218d2ee9f
|
If the default server case, don't add the Url component. So this will return just the path, using whatever servername/port combo is currently in use. Fixes #2750
|
2019-11-04 12:04:23 -05:00 |
|
Isaac Connor
|
9d8a230252
|
Prevent deletion of entire events directory when monitor has empty name
|
2019-11-02 10:12:43 -04:00 |
|
Isaac Connor
|
968c28395d
|
close group popup when saving
|
2019-11-01 13:39:40 -04:00 |
|
Isaac Connor
|
988b2183c3
|
use new ViewWIdth and ViewHeight functions to generate video stream.
|
2019-10-29 17:42:48 -04:00 |
|
Isaac Connor
|
eb2269ea52
|
improve zone saving testing for value before doing math
|
2019-10-29 17:42:23 -04:00 |
|
Isaac Connor
|
f2300f2e8c
|
Add isPortrait and isLandscape functions. Rename Width and Height to ViewWidth and ViewHeight to return the rotated dimensions suitable for viewing
|
2019-10-29 17:39:12 -04:00 |
|
Isaac Connor
|
d036613776
|
Fix Server() not returning a ServerObject if not found when ServerId is null or 0
|
2019-10-21 13:45:27 -04:00 |
|
Isaac Connor
|
91651652c7
|
Only report an error for not finding the server if ServerId had a value
|
2019-10-21 13:41:32 -04:00 |
|
Isaac Connor
|
3244c8ab5b
|
spacing, quotes, remove debug
|
2019-10-21 13:18:09 -04:00 |
|
Isaac Connor
|
6a3fe1ef1f
|
actually set date.timezone from ZM_TIMEZONE
|
2019-10-18 14:37:09 -04:00 |
|
Isaac Connor
|
1a417952c3
|
AutoStopTimeOut is part of Monitor, not Control
|
2019-10-18 14:19:25 -04:00 |
|
Isaac Connor
|
13b02284fe
|
Merge branch 'master' into timezone_as_config
|
2019-10-18 13:58:22 -04:00 |
|
Isaac Connor
|
fdf48c4123
|
Merge pull request #2726 from externo6/more-filter-options
More filter options
|
2019-10-16 10:15:58 -04:00 |
|
Isaac Connor
|
ebebcad10d
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-10-16 10:13:31 -04:00 |
|
Isaac Connor
|
7146bdd59a
|
IN order to allow specifying a monitor Id that has been deleted, use monitor->Id instead of mid to test for monitor existence
|
2019-10-16 10:08:30 -04:00 |
|
Isaac Connor
|
d145adf9c6
|
set default for V4LCapturePerFrame to 1 instead of null.
|
2019-10-16 10:07:50 -04:00 |
externo6
|
4b71bc75ea
|
Change language to Contains / Not Contains and update perl filter.
|
2019-10-16 00:35:49 +01:00 |
|
Isaac Connor
|
ee1e12b938
|
Be more robust about returning a Server object when instantiating the default Storage area.
|
2019-10-11 17:29:47 -04:00 |
|
Isaac Connor
|
70396c5897
|
Don't warn about the spaces in the command
|
2019-10-09 13:10:43 -04:00 |
|
Isaac Connor
|
b15f7ad47d
|
handle ipv6 in Server->Hostname. Fixes #2713
|
2019-10-09 10:00:13 -04:00 |
|
Isaac Connor
|
4126554092
|
Move sendControlCommand out of includes/control_functions.php into Monitor.php. Make it smarted about talking to zmcontrol.pl. Fix sending the quit command
|
2019-10-08 18:07:33 -04:00 |
|
Isaac Connor
|
7328eb1979
|
be more robust when sending commands to zmcontrol. Of no commands given don't bother.
|
2019-10-03 17:30:10 -04:00 |
|
Isaac Connor
|
d02aee64e4
|
Add setting of timezone to Options/Config instead of php.ini
|
2019-10-02 09:07:18 -04:00 |
|
Isaac Connor
|
09efbfb4f1
|
Sort groups
|
2019-09-30 15:02:05 -04:00 |
|
Isaac Connor
|
85b16e89b7
|
Fix groups dropdown
|
2019-09-30 14:42:10 -04:00 |
|
Isaac Connor
|
3d6cab8360
|
Must force hash regeneration on login. Old hash may be from different user
|
2019-09-28 17:57:45 -04:00 |
|
Isaac Connor
|
0c1635b3b8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-09-28 14:23:33 -04:00 |
|
Isaac Connor
|
393f0a369c
|
Revamp timeline. Make it handle being full browser width. remove onclicks.
|
2019-09-28 14:23:23 -04:00 |
|
Isaac Connor
|
c24fc6c21f
|
Set Delta to 0 to avoid errors
|
2019-09-28 14:10:11 -04:00 |