204086a56d
spacing and quotes
2020-07-30 17:12:00 -04:00
c4d4a73c2a
json decoding errors shouldnt' be fatal
2020-07-29 16:41:37 -04:00
4c5a88a822
json decoding errors shouldnt' be fatal
2020-07-29 16:40:31 -04:00
31cbfc35b1
fix use of is_callable so that we fix filter saving
2020-07-26 22:32:55 -04:00
c81e4a3bca
fix
2020-07-25 14:32:30 -04:00
99d7aa0da0
fix
2020-07-25 14:31:57 -04:00
e90efa7a7e
spacing
2020-07-25 14:28:08 -04:00
4c8f96b786
Update saving action to use our ORM methods
2020-07-25 14:28:01 -04:00
dda630f522
fix filter_regexp to remove trailing /
2020-07-25 14:27:09 -04:00
522dfecebe
Fix setting values by checking is_callable. Remove debug. Fix filter_regexp
2020-07-25 14:26:49 -04:00
fe9db4cfa2
add filtering to Storage->Path()
2020-07-25 13:51:13 -04:00
a819b73e18
allow filter_regexp to be an array
2020-07-25 13:50:59 -04:00
1416bc547e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-22 17:37:52 -04:00
7fd038d99b
spacing and quotes
2020-07-22 17:28:12 -04:00
3641797500
Merge branch 'master' into zma_to_thread
2020-07-22 13:14:40 -04:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
a70b329ce3
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-07-20 18:40:59 -04:00
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
4e2633d22b
Update code to make calls to api on remote servers
2020-07-20 16:25:29 -04:00
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
dcd67a1acf
Remove args with non-sensical values from cgi params as a micro-opt
2020-07-13 14:50:21 -04:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
c47a348fea
Handle empty string version of scale
2020-06-30 19:18:45 -04:00
b060e0835c
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-06-25 16:07:22 -04:00
13130a844e
handle array args in daemonStatus
2020-06-25 16:07:16 -04:00
93b0552ed7
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:18:45 -04:00
f73cb3bebe
Don't start filter if the command was execute
2020-06-17 13:36:28 -04:00
8efe00157d
add a User object
2020-06-17 12:50:22 -04:00
a719565bf3
Merge branch 'master' into add_user_to_filters
2020-06-05 19:03:23 -04:00
198790796d
Merge branch 'release-1.34'
...
plus cleanups in dbConnect
2020-06-05 19:02:43 -04:00
0905655377
Merge branch 'master' into add_user_to_filters
2020-06-05 17:08:14 -04:00
f71926c736
Merge branch 'release-1.34'
2020-06-05 10:09:07 -04:00
910d4b51c9
Escape table names for mysql-8
2020-06-04 11:44:59 -04:00
8802447b10
Handle no DB_HOST specifed so default to localhost
2020-06-04 11:36:10 -04:00
ef3fc758cb
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
2020-06-04 11:34:48 -04:00
c4b2aa4a85
Handle no DB_HOST specifed so default to localhost
2020-06-04 11:34:16 -04:00
0644358d0a
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
2020-06-03 17:41:03 -04:00
88a910793c
Spacing
2020-05-13 08:06:55 -04:00
69e5feb28b
Add ONVIF* to Monitor object
2020-05-12 15:47:00 -04:00
92ba017328
Spacing
2020-05-11 09:19:33 -04:00
24c09a8207
Accept 0 as a value for scale meaning scale to fit
2020-05-08 17:55:12 -04:00
a9a490126a
Add UserId to Filter object
2020-05-07 10:59:32 -04:00
5a15701873
remove annoying ()
2020-05-05 18:07:28 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
28a3691b9c
Merge branch 'release-1.34'
2020-05-01 19:46:38 -04:00
683bf3f982
Handle no default set for array defaults. Fixes Warning when saving WebSite type Monitors
2020-05-01 15:32:54 -04:00
9dbeaa2c7b
Add default for Orientation. Fixes saving WebSite type monitors
2020-05-01 15:32:26 -04:00
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
ad373a5549
add Zone.php from master
2020-05-01 13:20:42 -04:00
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
9d42d0e2f0
silence warning when no language is set
2020-04-23 17:38:15 -04:00
b3a8ac0b2a
tidy up, be more efficient and warn when language files are not found.
2020-04-23 17:37:46 -04:00
ced36a5333
remove debug and spacing
2020-04-23 15:40:35 -04:00
54995ab0d1
handle sort_asc not being set. Handle term['val'] not being set.
2020-04-23 15:18:05 -04:00
f06dc3f171
Update group save action, using Group object methods. Fixes errors on new MariaDB
2020-04-23 15:16:22 -04:00
b05916fc50
Use === when testing for empty value and setting defaults
2020-04-23 15:08:01 -04:00
eb26c5f798
Fix use of array_key_exists instead of property_exists
2020-04-23 15:07:28 -04:00
f5bf474ba6
filter bad characters out of Monitor Name
2020-04-23 14:59:21 -04:00
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
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
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
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
81ed022d5a
Add a filter_regexp to Monitor Name
2020-04-10 12:16:32 -04:00
2d748091a2
handle sort_asc not being set. Handle term['val'] not being set.
2020-04-10 11:13:30 -04:00
d0fe1b60df
Merge branch 'release-1.34'
2020-04-04 16:58:53 -04:00
210d380029
CSP must include all Servers.
2020-04-04 16:57:52 -04:00
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
f81cfc0513
add 1 month as an option to the version popup dropdown
2020-04-04 11:46:31 -04:00
3bfcd8eb33
Check for definition of ZM_TIMEZONE before using it. Fixes #2895
2020-04-02 14:00:36 -04:00
eec634c1b0
Add Source() support for VNC type
2020-03-30 10:10:06 -04:00
599960ef05
Update group save action, using Group object methods. Fixes errors on new MariaDB
2020-03-28 10:09:13 -04:00
c3bcdcff64
Use zm_session_start instead of session_start
2020-03-27 14:30:42 -04:00
50700031b1
Use zm_session_start instead of session_start
2020-03-27 13:05:12 -04:00
4ce944da23
Merge branch 'release-1.34'
2020-03-26 15:38:35 -04:00
af36cc3e52
Fix starting and stopping zmcontrol processes across servers.
2020-03-26 13:57:00 -04:00
b611e2616b
handle scale=auto
2020-03-24 16:15:24 -04:00
e06912a995
Merge branch 'release-1.34'
2020-03-21 15:28:27 -04:00
d3df0defc9
Support missing openssl_random_pseudo_bytes by using alternate functions
2020-03-21 15:28:18 -04:00
a0bd602339
Use === when testing for empty value and setting defaults
2020-03-09 14:39:22 -04:00
f0791c8118
silence warning when no language is set
2020-03-05 22:13:32 -05:00
f003daa791
Merge branch 'add_enabled_to_storage'
2020-03-05 15:48:43 -05:00
53f262a4cb
Merge pull request #2870 from pliablepixels/dev
...
#2866 - fixes incorrect token type comparison
2020-03-04 11:31:16 -05:00
4dae0c4609
Merge pull request #2870 from pliablepixels/dev
...
#2866 - fixes incorrect token type comparison
2020-03-04 11:21:48 -05:00
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
1381cb194e
#2866 - fixes incorrect token type comparison
2020-03-04 10:50:59 -05:00
0b267fbdee
Add Enabled to Storage
2020-03-04 10:46:16 -05:00
fa6ac399be
Fix code in makePopupLink. Return content-type application/json for json response
2020-03-02 17:21:58 -05:00
85e5ade07a
fix makePopupLink when condition is false
2020-03-02 16:10:56 -05:00
bd59ae8856
Move the Basic Auth login code from skin.php to includes/auth.php
2020-03-02 15:00:31 -05:00
c1e13221f7
Move the Basic Auth login code from skin.php to includes/auth.php
2020-03-02 14:59:36 -05:00
d0e70fc501
Merge branch 'fix_auth_timeouts' of github.com:connortechnology/ZoneMinder into fix_auth_timeouts
2020-03-02 12:04:45 -05:00
f0e7b84001
Only load user from session if other auth mechanisms aren't present.
2020-03-02 11:51:07 -05:00
6456d52b97
Merge branch 'fix_user_lang'
2020-02-27 17:43:51 -05:00
e19332f36a
tidy up, be more efficient and warn when language files are not found.
2020-02-27 17:40:31 -05:00
bab0b2e830
handle a scale value of auto
2020-02-27 11:35:40 -05:00
0c70c5c2a4
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
2020-02-25 18:14:27 -05:00
a34af39ca7
Fix logging line in generate video function
2020-02-25 18:14:14 -05:00
e82ed3a098
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
2020-02-25 18:13:42 -05:00
4d044a1f14
Fix logging line in generate video function
2020-02-25 18:11:07 -05:00
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
7787ba1040
Fix adding auth string screwing up url to remote api in zmaControl and zmcControl
2020-02-25 17:15:45 -05:00
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
bd097bf8ce
Fix adding auth string screwing up url to remote api in zmaControl and zmcControl
2020-02-25 17:00:16 -05:00
f719514998
remove debug
2020-02-25 13:39:33 -05:00
a2c5e4943a
Merge branch 'fix_scale'
2020-02-25 12:18:27 -05:00
4dda37a6ee
remove extra }
2020-02-25 12:13:12 -05:00
d68d115581
Handle scale==0 to do width=100%.
2020-02-25 11:12:49 -05:00
583350ef06
Fix use of array_key_exists instead of property_exists
2020-02-25 11:09:12 -05:00
6cf448c74e
remove debug and spacing
2020-02-25 11:08:23 -05:00
b389f9660d
Merge branch 'fix_class_PTZ_presets_almost_invisible'
2020-02-24 13:17:09 -05:00
1a87eb40bd
Fixes #2841 and maintains login through password change
2020-02-19 16:55:38 -05:00
dab5c520fe
Merge branch 'master' into add_alarmed_zone_to_filters
2020-02-19 14:20:08 -05:00
821355c117
Only set date.timezone if we have a configured value in the Config
2020-02-11 13:21:28 -05:00
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
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
29a04dc1b9
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
2020-01-24 09:50:53 -05:00
adf376e4a6
add Zone.php
2020-01-24 09:45:02 -05:00
8aa0fe665f
Add EmailTo,EmailSubjecet,EmailBody fields to Filter object
2020-01-22 14:04:42 -05:00
9d41334e8f
Merge branch 'master' into add_alarmed_zone_to_filters
2020-01-22 13:45:37 -05:00
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
86a2523498
break up a long line, add some parenthesis to clarify logic
2020-01-17 12:30:26 -05:00
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
e4ba1fd432
fix restarting zmcontrol on remote servers by passing object=filter as well
2020-01-13 17:16:15 -05:00
d7dc7cdc47
Add ServerId to database log entries in php
2020-01-13 16:18:01 -05:00
9036b6db77
fix typo
2020-01-13 16:17:39 -05:00
f3a9e608db
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-13 16:11:19 -05:00
b11815cfa9
Introduce Storage->EventCount to get the # of events per storage without actually loading all events.
2020-01-13 12:53:50 -05:00
6cd76ee2ff
Clear cache after loading Events so as to free ram.
2020-01-13 12:53:05 -05:00
f7e2359818
Implement a clear_cache function so that we can free up cached objects
2020-01-13 10:57:56 -05:00
398688550b
fixtypo
2020-01-10 20:15:52 -05:00
0c478c7962
fix Monitor->Server
2020-01-10 20:13:09 -05:00
5ee0158735
Set defaults for vars == ''
2020-01-10 16:42:41 -05:00
f61f6eaf7d
remove line cutnpasted erroneously
2020-01-10 12:45:47 -05:00
d433590f74
use find_one in stead of new to use Cached Server
2020-01-10 12:45:30 -05:00
ef4ecd40fb
Set defaults before saving Objects
2020-01-10 12:44:59 -05:00
0571909d05
add remote_IP to log entries on php side
2020-01-07 17:08:29 -05:00
c3641df531
spaces
2020-01-05 17:30:06 -05:00
e951b0af1c
add code to set default value for checkboxes
2020-01-03 16:35:04 -05:00
d42e9beddc
Add warnings when the type of movement is not selected
2020-01-02 17:03:52 -05:00
e9815bf9c7
add ZM Namespace to Error calls
2020-01-02 16:54:50 -05:00
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
77cfb7c190
fix spacing
2019-12-31 12:42:49 -05:00
2301103da5
use small, non-zero values, for image buffer & pre & post buffers
2019-12-28 09:49:42 -06:00
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
958a6b8218
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-18 19:06:19 -05:00
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
d21fa5c48a
Do not set defaults in Object->set(). This allows us to set an empty timestamp.
2019-12-18 19:03:37 -05:00
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
2a4d06f93b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-15 10:35:56 -05:00
4d9d4ba957
Do not allow deletion of archived events.
2019-12-15 10:35:43 -05:00
689956bba7
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-13 17:49:00 -05:00
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
d2a23e4822
add possing port to Monitor->UrlToIndex
2019-12-13 11:50:11 -05:00
bedc61a347
handle dbFetchNext on null result more gracefully
2019-12-13 11:49:55 -05:00
ea89ebf150
more mysql8 fixes
2019-12-08 21:33:29 -05:00
3bd0525e64
escape column names for mysql8
2019-12-08 14:27:07 -05:00
0de6396a5b
Test for null in user before testing for access in CanEdit et all
2019-12-07 12:39:28 -05:00
4632bbd124
Apply relevant changes to deal with php7,4 deprecations
2019-12-07 11:45:32 -05:00
cc6d40d67e
Missing ->
2019-12-07 10:38:51 -05:00
df9f6103e4
fix syntax error
2019-12-04 09:00:20 -05:00
78912584e1
re-arrange code to hopefully get rid of syntax error reported by some people
2019-12-04 07:10:33 -05:00
576dd23907
test for existence of filter in query
2019-12-02 12:30:15 -05:00
355fceccb4
test for existence of default
2019-12-02 12:30:03 -05:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
eedb31730e
fix saving Monitor values that don't get passed when empty, like Enabled
2019-11-29 14:49:43 -05:00
cab1056328
improve debugging in recursive_array_diff
2019-11-29 14:49:10 -05:00
d6a414a1a4
Merge pull request #2767 from connortechnology/fix_2692
...
Fix 2692
2019-11-29 14:24:00 -05:00
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
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
7b99c89541
its not necessary the token is a refresh. Can also be empty
2019-11-26 20:57:25 -05:00
54a15573ad
Make 32bit the default for COlours
2019-11-26 15:06:24 -05:00
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
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
606c89962f
eliminate an extra db call
2019-11-20 16:30:26 -05:00
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
59b9220ddd
if doing multiport still call Url(), as it requires a hostname
2019-11-11 13:33:54 -05:00
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
014ce0afe8
improve error message regarding timezone differences
2019-11-05 12:40:11 -05:00
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
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
9d8a230252
Prevent deletion of entire events directory when monitor has empty name
2019-11-02 10:12:43 -04:00
968c28395d
close group popup when saving
2019-11-01 13:39:40 -04:00
988b2183c3
use new ViewWIdth and ViewHeight functions to generate video stream.
2019-10-29 17:42:48 -04:00
eb2269ea52
improve zone saving testing for value before doing math
2019-10-29 17:42:23 -04:00
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
d036613776
Fix Server() not returning a ServerObject if not found when ServerId is null or 0
2019-10-21 13:45:27 -04:00
91651652c7
Only report an error for not finding the server if ServerId had a value
2019-10-21 13:41:32 -04:00
3244c8ab5b
spacing, quotes, remove debug
2019-10-21 13:18:09 -04:00
6a3fe1ef1f
actually set date.timezone from ZM_TIMEZONE
2019-10-18 14:37:09 -04:00
1a417952c3
AutoStopTimeOut is part of Monitor, not Control
2019-10-18 14:19:25 -04:00
13b02284fe
Merge branch 'master' into timezone_as_config
2019-10-18 13:58:22 -04:00
fdf48c4123
Merge pull request #2726 from externo6/more-filter-options
...
More filter options
2019-10-16 10:15:58 -04:00
ebebcad10d
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-10-16 10:13:31 -04:00
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
d145adf9c6
set default for V4LCapturePerFrame to 1 instead of null.
2019-10-16 10:07:50 -04:00
4b71bc75ea
Change language to Contains / Not Contains and update perl filter.
2019-10-16 00:35:49 +01:00
ee1e12b938
Be more robust about returning a Server object when instantiating the default Storage area.
2019-10-11 17:29:47 -04:00
70396c5897
Don't warn about the spaces in the command
2019-10-09 13:10:43 -04:00
b15f7ad47d
handle ipv6 in Server->Hostname. Fixes #2713
2019-10-09 10:00:13 -04:00
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
7328eb1979
be more robust when sending commands to zmcontrol. Of no commands given don't bother.
2019-10-03 17:30:10 -04:00
d02aee64e4
Add setting of timezone to Options/Config instead of php.ini
2019-10-02 09:07:18 -04:00
09efbfb4f1
Sort groups
2019-09-30 15:02:05 -04:00
85b16e89b7
Fix groups dropdown
2019-09-30 14:42:10 -04:00
3d6cab8360
Must force hash regeneration on login. Old hash may be from different user
2019-09-28 17:57:45 -04:00
0c1635b3b8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-09-28 14:23:33 -04:00
393f0a369c
Revamp timeline. Make it handle being full browser width. remove onclicks.
2019-09-28 14:23:23 -04:00
c24fc6c21f
Set Delta to 0 to avoid errors
2019-09-28 14:10:11 -04:00
7a3134ae5e
Fix restart login in functions. Only start zmc if function is not None and start zma if it isn't None or NoDect. Even if disabled, we still run zma so that we can send it a signal to enable motion detection.
2019-09-28 10:26:50 -04:00
7479d3f1f1
Add LIKE and NOT LIKE to filter options
...
This is useful for filtering notes.
EG filtering detected objects from zmeventnofification;
WHERE notes LIKE %detect%
WHERE notes NOT LIKE %car%
2019-09-28 13:03:16 +01:00
b1bcfe8a9b
fix backtrace
2019-09-26 16:26:28 -04:00
555f3e9c0d
Fix missing semi colon in Content-Security-Policy-Report-Only
2019-09-26 13:52:27 -04:00
4deea4c6ab
code doc
2019-09-25 10:35:57 -04:00
fe893a4a01
Add report-uri to out Content-Security-Policy-Report-Only header
2019-09-25 10:16:02 -04:00
5c80e098c5
Only save Group changes if there were changes
2019-09-25 10:14:12 -04:00
475432449f
Add default values for Status record
2019-09-25 10:13:56 -04:00
d16d77d6b3
quotes and spacing
2019-09-23 12:39:24 -04:00
a05c513643
Revert change breaking multiport when servers not defined.
2019-09-23 12:03:19 -04:00
538478ff1c
Need to -1 on the dimensions when comparing to points as they are 0-based
2019-09-23 11:48:58 -04:00
1dd09923eb
Add special case for just rotating the monitor dimensions and add out of bounds check for zone points
2019-09-23 11:42:49 -04:00
23b3ae5783
Remove debug
2019-09-22 21:06:54 -04:00
4c3ea7125d
Add defaults to Frame
2019-09-22 14:21:59 -04:00
6d16363f07
Restore monitor defaults
2019-09-21 10:40:24 -04:00
308236b4ad
Fix sending ptz controls
2019-09-20 10:35:39 -04:00
0a0bb1b326
Update Frame and Server Objects to use common methods
2019-09-19 16:24:05 -04:00
1539e34204
spacing
2019-09-19 14:57:28 -04:00
daa9f646fb
fix error printing
2019-09-19 14:56:34 -04:00
b9b52c964e
Upgrade monitor saving and viewing
2019-09-19 14:56:16 -04:00
73a5a8c8c5
Improve changes/set/etc to handle more complex defaults
2019-09-19 14:55:45 -04:00
b41e998a3a
Remove Control stuff from Monitor
2019-09-19 14:55:27 -04:00
4c206c2e9a
Upgrade Control Object to extend ZM\Object. Add commands function from skin specific control functions
2019-09-19 14:55:17 -04:00
458268d866
Merge branch 'master' into update_monitor_saving
2019-09-18 11:40:09 -04:00
1407d849e8
deprecate getStreamSrc in functions.php.
2019-09-18 11:10:25 -04:00
e0074692d1
Remove debug
2019-09-17 12:07:30 -04:00
ad84736cb4
spacing
2019-09-17 12:07:24 -04:00
deefa0754d
Backtick the fields when updating Monitors
2019-09-16 10:53:06 -04:00
63db128edf
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-09-15 17:54:29 -04:00
60cf4586da
Don't return a hostname when not in multi-server. Should prevent problems with reverse proxies
2019-09-15 17:54:23 -04:00
32a1ab58b5
remove use of userLogin which was removed recently
2019-09-15 12:19:35 -04:00
d5aa95e45f
cpplint fixes
2019-09-09 16:13:32 -04:00
8103156436
when deleting multiple events, each event has to be it's own transaction due to locking
2019-09-09 09:16:52 -04:00
056449590a
Update Monitor object, using Object methods for saving monitors
2019-09-08 12:26:11 -04:00
2993e52652
Fix auth timing out due to cookie timing out and getting deleted.
2019-09-04 12:14:32 -04:00
dde655950f
Use locking when deleting an event
2019-09-04 10:07:17 -04:00
26670c2df2
Add lock function to write lock an object
2019-09-04 10:07:08 -04:00
92bc1791f5
fix accidentally removed code
2019-09-03 11:33:13 -04:00
a384e978c8
don't load user from session if we have already gotten it from elsewhere
2019-09-03 11:19:42 -04:00
b84d005d8f
Load use from session when it exists
2019-09-03 10:54:34 -04:00
6b9e8bec69
Add logging of delete events
2019-08-29 11:26:32 -04:00
a4b057fa2b
Upgrade Event object to use the common Object methods. Add deleting files from Secondary storage
2019-08-29 11:25:37 -04:00
c80ef0e0ab
spacing
2019-08-28 12:20:03 -04:00
320bf823c5
Don't report errors when creating monitor symlink when it already exists
2019-08-28 09:18:33 -04:00
c482fa7d5d
Fix executing filter
2019-08-26 20:45:38 -04:00
f01bedb33e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-26 18:49:12 -04:00
231c9c3902
move executeFilter to Filter->execute. If no changes have been made, don't make a tempfilter.
2019-08-26 18:48:34 -04:00
82e8bde406
Fix SaveAs
2019-08-26 16:19:19 -04:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
7ef26275bc
use isset to get rid of warnings when eid is not in REQUEST
2019-08-20 10:28:19 -04:00
84492f29b1
Fix token auth sessions ( #2676 )
...
* If token is present do token based auth and do not do anything with session
* update HostController. Use config constants, don't use sessions
* Remove Session from the components list
* spacing
* Remove Session from App Components list.
* Move APIEnabled check to the api from auth.php
* 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.
* remove debugging
* Add session storage if stateful query param is on, but only for LEGACY_API_AUTH
* fix mUser to username, etc.
* shuffle lines
* use instead of session when generating auth hash.
* Add docs regarding the use of cookies and stateful query param
* Only open/close session if we are clearing a session var
* Use zm_session_start instead of session_start
* Should use zm_session_start instead of session_start
* document that zm_session_start should be called previously to session_regenerate_id
* Don't actually write out the session when generating auth hashes. Means they should never actually persist.
* More backticking of SQL
* add .. to fix #2686
* Use material icons for sort because they look nicer
* fix typo
* have to add authhash to session on login
* restore username&password login for all urls
* fix
* fixes
2019-08-20 09:46:53 -04:00
b344701dea
fixes
2019-08-19 12:15:58 -04:00
3b58da860f
fix
2019-08-19 12:08:41 -04:00
b1132087b8
restore username&password login for all urls
2019-08-19 12:07:38 -04:00
87e7ba0e50
have to add authhash to session on login
2019-08-19 11:38:56 -04:00
d39da61b66
Don't actually write out the session when generating auth hashes. Means they should never actually persist.
2019-08-16 15:27:24 -04:00
070b8066f2
document that zm_session_start should be called previously to session_regenerate_id
2019-08-16 15:08:35 -04:00
28155ebd90
Should use zm_session_start instead of session_start
2019-08-16 15:08:10 -04:00
660eddc69d
Only open/close session if we are clearing a session var
2019-08-16 15:06:56 -04:00
3475a11e15
use instead of session when generating auth hash.
2019-08-16 14:13:13 -04:00
51c7f0b73f
shuffle lines
2019-08-16 14:12:52 -04:00
fdb66aaa72
Merge branch 'master' into fix_token_auth_sessions
2019-08-15 16:22:09 -04:00
336f45219b
fix object caching
2019-08-15 16:04:56 -04:00
68052368f7
use backticks on table and column names. Use data-on-change-this in group dropdown
2019-08-15 16:04:37 -04:00
f09941ed48
timezone errors shouldn't be fatal
2019-08-15 15:16:02 -04:00
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
0ec6e8d635
Merge branch 'master' into fix_token_auth_sessions
2019-08-15 12:05:07 -04:00
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
4922861d1d
Merge branch 'master' into fix_token_auth_sessions
2019-08-12 13:59:11 -04:00
5f77634aca
Update Group object to use shared code in Object.php. Should fix #2659
2019-08-08 13:51:56 -04:00
702cb65d2a
Merge branch 'storageareas'
2019-08-08 13:38:36 -04:00
df285006d2
change sortHeader to include eid if it is in the request
2019-08-08 13:34:10 -04:00
a9de537e01
Merge branch 'master' into storageareas
2019-08-08 09:27:27 -04:00
1892528679
quotes
2019-08-08 09:26:15 -04:00
5b0509e000
When invalid operator terms, use print_r on the term instead of just the operator
2019-08-08 09:26:00 -04:00
3a142df14f
Only send zmdc.pl commands for filters to running servers
2019-08-07 15:51:01 -04:00
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
d4b59211cd
Merge branch 'master' into storageareas
2019-08-07 11:21:19 -04:00
962049fa31
Merge branch 'master' into filter_add_copy
2019-08-06 20:17:21 -04:00
7e6b0058d2
Update Zone buttons. Fix double submit. Fixes #2671
2019-08-02 08:04:38 -04:00
6a425b6988
If token is present do token based auth and do not do anything with session
2019-08-01 10:02:31 -04:00
7f19831e0c
Use isset when testing for existence of authash in session
2019-07-29 14:54:55 -04:00
45afc2a534
introduce array_recursive_diff which we use to compare two arrays in Object::changes
2019-07-24 11:24:37 -04:00
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
341f4adbdf
Functions that change the Query must reset Query_json as well
2019-07-24 11:23:38 -04:00
58851d23d2
Add Secondary Storage support to the Event object
2019-07-24 11:22:55 -04:00
9b6dedb35d
Update Filter saving action to use object set/save etc
2019-07-23 09:58:28 -04:00
35ec60ca03
Change Storage object to extend ZM_Object
2019-07-23 09:58:05 -04:00
7c52f8a4ae
Fixes and add Objects_Indexed_By_Id
2019-07-23 09:57:44 -04:00
b05aff1d5d
Update Filter Object to extend ZM_Object. Rename Query to Query_json and implement a Query function to parse Query_json
2019-07-23 09:57:16 -04:00
fe71a9abaa
php_errormsg is deprecated
2019-07-19 16:32:40 -04:00
d244aadee6
Fix #2655
2019-07-08 14:27:49 -04:00
b84e3499f4
Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message
2019-07-07 17:25:49 -04:00
a28f17653f
Add DecoderHWAccel fields to Monitor
2019-06-25 15:34:45 -04:00
6ed0074077
End continuous events on alarm ( #2644 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* add update script to add MinSectionLength
* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
38bcdbbffe
ONly close session if we opened it in generateAuthHash, only try to validate auth hash if it is set in the session
2019-06-21 18:04:39 -04:00
60618d5998
Fix hour subtraction in getAuthUser to actually subtract an hour
2019-06-21 11:45:33 -04:00
3bae7a5432
spaces and parenthesis
2019-06-20 13:28:12 -04:00
1336c03f97
WIP: Add pagination to frames.php in classic ( #2618 )
...
* add pagination to the frames.php results
* remove commented code, fix view all paging
* removing debugging logging statements
* default frames paging to on
2019-06-16 12:02:00 -04:00
98bf7800b0
remove a password log, corrected PHP version in log ( #2627 )
...
* remove a password log, corrected PHP version in log
* PHP version correction
2019-06-16 11:59:48 -04:00
08cc4e0383
add null value to set() function
2019-06-05 10:22:20 -04:00
5346f82de9
Fix unable to login when ZM_AUTH_RELAY != hashed and fix setting the password in session when ZM_AUTH_RELAY==plain
2019-06-05 09:23:34 -04:00
4b9b2015cb
write a note why regnerateAuthHash doesn't work when saving config
2019-06-04 16:30:57 -04:00
cc269378cf
regenerate auth_hash in session because we might have changed an auth hash setting
2019-06-04 16:27:25 -04:00
168aa35461
force regeneration of auth_hash on login. Fix failed auth_hash verification not logging you out by returning null instead of false. Update session with new auth_hash when forcing regeneration
2019-06-04 16:26:29 -04:00
eaa1939f6b
comment out debug lines
2019-05-31 10:35:54 -04:00
274737d1b1
Fix moocord to mocord.
2019-05-31 10:35:18 -04:00
b0869a0b13
spaces and quotes
2019-05-31 10:34:53 -04:00
75ec4818a6
WHen saving a monitor, only start zmc and zma if appropriate
2019-05-31 10:15:02 -04:00
ba96f0709c
fix saving user using password_hash
2019-05-30 09:58:54 -04:00
628760d5b9
Spacing and braces cleanup from asker's code
2019-05-29 10:29:03 -04:00
c4d76f03c9
Introduce ZM_PATH_SHUTDOWN to cmake config
2019-05-27 12:09:32 -04:00
4765b9d936
Don't generate php errors when returned row doesn't have the specified column
2019-05-24 14:52:04 -04:00
1ddd5b1f74
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-05-24 13:56:30 -04:00
34400419e8
Add shutdown capability ( #2575 )
...
* Add Config for showing a system shutdown/restart option
* Add a translation for Shutdown
* add a shutdown power button to the navbar
* but the shutdown icon in a navbar-txt
* set width and height of shutdown window
* Add instructions for enabling the web user to run shutdown
* add the shutdown view and actions
2019-05-24 13:53:24 -04:00
fc27393a96
Replace MySQL Password() with bcrypt, allow for alternate JWT tokens ( #2598 )
...
* added sha1 and bcrypt submodules
* added bcrypt and sha to src build process
* added test sha1 and bcrypt code to validate working
* bcrypt auth migration in PHP land
* added include path
* add sha source
* added bcrypt to others
* put link_dir ahead of add_executable
* fixed typo
* try add_library instead
* absolute path
* absolute path
* build bcrypt as static
* move to wrapper
* move to fork
* logs tweak
* added lib-ssl/dev for JWT signing
* Moved to openSSL SHA1, initial JWT plugin
* removed vog
* fixed SHA1 algo
* typo
* use php-jwt, use proper way to add PHP modules, via composer
* fixed module path
* first attempt to fix cast error
* own fork
* own fork
* add composer vendor directory
* go back to jwt-cpp as PR merged
* moved to jwt-cpp after PR merge
* New token= query for JWT
* Add JWT token creation, move old code to a different function for future deprecation, simplified code for ZM_XX parameter reading
* JWT integration, validate JWT token via validateToken
* added token validation to zms/zmu/zmuser
* add token to command line for zmu
* move decode inside try/catch
* exception handling for try/catch
* fix db read, forgot to exec query
* remove allowing auth_hash_ip for token
* support refresh tokens as well for increased security
* remove auth_hash_ip
* Error out if used did not create an AUTH_HASH_SECRET
* fixed type conversion
* make sure refresh token login doesn't generate another refresh token
* fix absolute path
* move JWT/Bcrypt inside zm_crypt
* move sha headers out
* move out sha header
* handle case when supplied password is hashed, fix wrong params in AppController
* initial baby step for api tab
* initial plumbing to introduce token expiry and API bans per user
* remove M typo
* display user table in api
* added revoke all tokens code, removed test code
* use strtoul for conversion
* use strtoul for conversion
* use strtoul for conversion
* more fixes
* more fixes
* add mintokenexpiry to DB seek
* typo
* add ability to revoke tokens and enable/disable APIs per user
* moved API enable back to system
* comma
* enable API options only if API enabled
* move user creation to bcrypt
* added password_compat for PHP >=5.3 <5.5
* add Password back so User object indexes don't change
* move token index after adding password
* demote logs
* make old API auth optional, on by default
* make old API auth mechanism optional
* removed stale code
* forgot to checkin update file
* bulk overlay hash mysql encoded passwords
* add back ssl_dev, got deleted
* fix update script
* added token support to index.php
* reworked API document for new changes in 2.0
* Migrate from libdigest to crypt-eks-blowfish due to notice
* merge typo
* css classess for text that disappear
* fixed html typo
* added deps to ubuntu control files
* spaces
* removed extra line
* when regenerating using refresh tokens, username needs to be derived from the refresh token, as no session would exist
* add libssl1.0.0 for ubuntu 16/12
* small API fixes
* clean up of API, remove redundant sections
* moved to ZM fork for bcrypt
* whitespace and google code style
* regenerate auth hash if doing password migration
* dont need AUTH HASH LOGIN to be on
* Add auth hash verification to the user logged in already case
* fix missing ]
* reject requests if per user API disabled
2019-05-24 13:48:40 -04:00
729dee5dda
Merge branch 'master' into storageareas
2019-05-24 10:06:14 -04:00
db9ba7eeab
Add StartDateTime and EndDateTime as Sort options. Fixes #2614
2019-05-24 10:02:15 -04:00
f9004443cf
Merge branch 'master' into storageareas
2019-05-24 09:37:03 -04:00
843a9a6630
Merge branch 'pliablepixels-crypt-replacement3' into storageareas
2019-05-24 09:36:54 -04:00
2fc7b3cf4d
Don't allow deleting of in-progress recording
2019-05-24 09:31:48 -04:00
aa1264f4d2
fix missing ]
2019-05-23 16:26:40 -04:00
4466ef13fd
Merge branch 'pliablepixels-crypt-replacement3' into storageareas
2019-05-23 15:21:58 -04:00
7559c975e3
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement3
2019-05-23 15:15:52 -04:00
883688a72d
Add auth hash verification to the user logged in already case
2019-05-23 15:15:37 -04:00
57708c016c
dont need AUTH HASH LOGIN to be on
2019-05-23 14:59:21 -04:00
d5120f7506
regenerate auth hash if doing password migration
2019-05-23 14:30:45 -04:00
bc9116dd94
whitespace and google code style
2019-05-23 14:27:17 -04:00
2ce2381269
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-19 08:45:42 -04:00
8e1037458a
when regenerating using refresh tokens, username needs to be derived from the refresh token, as no session would exist
2019-05-18 11:23:16 -04:00
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
95460a945a
added token support to index.php
2019-05-14 19:22:49 -04:00
e9f843f297
bulk overlay hash mysql encoded passwords
2019-05-13 14:29:24 -04:00
adb01c4d0e
added password_compat for PHP >=5.3 <5.5
2019-05-12 13:57:25 -04:00
d7dbaf52d4
move user creation to bcrypt
2019-05-12 13:01:29 -04:00
a9d601e5ae
add ability to revoke tokens and enable/disable APIs per user
2019-05-12 10:56:17 -04:00
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
95b448abdd
handle case when supplied password is hashed, fix wrong params in AppController
2019-05-10 11:25:55 -04:00
f9730bb46b
remove auth_hash_ip
2019-05-08 14:07:48 -04:00
bc050fe330
support refresh tokens as well for increased security
2019-05-08 13:38:42 -04:00
b293592e4c
added token validation to zms/zmu/zmuser
2019-05-08 10:55:32 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Pliable Pixels
Andrew Bauer
externo6
Isaac Connor
Isaac Connor
Tom Hodder
Pliable Pixels