dac76e0328
add language subs for FilterEmailTo, FilterEmailSubject, FilterEmailBody
2020-01-22 13:59:12 -05:00
9d41334e8f
Merge branch 'master' into add_alarmed_zone_to_filters
2020-01-22 13:45:37 -05:00
dbdb13efd7
Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811
2020-01-20 11:02:43 -05:00
ead52f30b1
Bug fix: Allows for inital/base install without the option MultiPort config value assigned
2020-01-20 00:44:20 -08:00
75fa1d693d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-18 16:09:44 -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
6c7f003198
revert bogus change not including skin.js
2020-01-18 16:08:55 -05:00
de5bf21d8a
fix eslint
2020-01-17 15:06:46 -06:00
5b8e5eb349
don't output duplicated js when css=base
2020-01-17 14:51:02 -05:00
d0003215b1
Merge branch 'master' into rate_dropdown
2020-01-17 12:30:35 -05:00
86a2523498
break up a long line, add some parenthesis to clarify logic
2020-01-17 12:30:26 -05:00
a398f33e68
fix delTerm button not being enabled because it is a button now, not an input
2020-01-17 09:17:29 -05:00
4f2df830a8
fix inline js
2020-01-17 09:17:05 -05:00
74b3ad6dd9
add options help for HWACCEL options
2020-01-16 14:33:37 -05:00
6a43c2deb5
fix zoom_range to zoomout_range
2020-01-16 14:17:40 -05:00
028e7e8dde
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-15 19:03:11 -05:00
09f2298838
return empty array instead of nothing in probeNetwork
2020-01-15 19:02:40 -05:00
8b375de455
Avoid duplicate Monitors in API
2020-01-15 20:31:05 +01: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
91acb775eb
Fix Eventount to EventCount
2020-01-13 13:43:14 -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
fabb7180d6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-10 20:13:28 -05:00
0c478c7962
fix Monitor->Server
2020-01-10 20:13:09 -05:00
6a4b66a792
add 3840x2160 4k UHD to monitor dropdown
...
I think this is fairly common in consumer IP cams now...
2020-01-10 19:44:06 -05:00
2f5caf2bb5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-10 17:21:10 -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
28a4bef6ba
fix tar invocation for *BSD platforms
...
"--xform" switch is not supported by tar on BSD platforms i.e. *BSD,
MacOS, etc. As such, use "-s" switch on these platforms, with a
similar regexp.
2020-01-09 22:03:02 +02:00
f13a7199e1
fix eslint
2020-01-07 21:53:55 -06:00
c64de372a7
when auth_hash changes, update various CmdParms
2020-01-07 17:08:57 -05:00
0571909d05
add remote_IP to log entries on php side
2020-01-07 17:08:29 -05:00
1865df3fe0
remove some debug, add some parenthesis to ensure logic works as intended
2020-01-07 17:08:07 -05:00
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -05:00
61bc0ddd0a
add missing t and merge some lines
2020-01-07 11:01:53 -05:00
2f1b725ee4
quote SQL for mysql8
2020-01-07 11:01:02 -05:00
7535769e4b
controlcap needs to be larger
2020-01-05 17:34:40 -05:00
71581831b5
fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons
2020-01-05 17:34:27 -05:00
6ac26ec1aa
quotes
2020-01-05 17:33:53 -05:00
c3641df531
spaces
2020-01-05 17:30:06 -05:00
00f8a450de
spaces and quotes
2020-01-05 14:59:25 -05:00
7fdf6165d5
Fix case in var name
2020-01-03 17:08:11 -05:00
c8e39e2418
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-03 16:35:15 -05:00
e951b0af1c
add code to set default value for checkboxes
2020-01-03 16:35:04 -05:00
0a495395b0
Restore Gain tab
2020-01-03 16:34:46 -05:00
f572c4092a
add checks for Zoom, Focus, White, Iris movement types
2020-01-03 15:58:57 -05:00
158e26bb25
split long lines
2020-01-03 15:58:02 -05:00
c4aaa33bea
add widths for number inputs on controlcap view
2020-01-03 15:57:51 -05:00
0b3776dbf0
change text inputs to number inputs, cleanups
2020-01-03 15:57:29 -05:00
89844f72f4
Merge pull request #2790 from pliablepixels/jwt-token-duration
...
fix JWT access token always being 1 hr
2020-01-02 17:22:37 -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
3cfc1a0a6d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-02 16:45:39 -05:00
399508b211
fix JWT access token always being 1 hr
2020-01-02 10:25:48 -05:00
60d45d967f
test for existence of selected checkboxes in post data because if none are selected, the array won't exist
2020-01-02 10:17:07 -05:00
98f7fb63b9
fix eslint errors
2019-12-31 19:24:51 -06:00
6a39893c1d
include i elements in data-on-click
2019-12-31 19:11:14 -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
2c76c12664
Fix export to include files when using DEEP scheme. Also make it more efficient
2019-12-30 22:18:55 -05:00
2301103da5
use small, non-zero values, for image buffer & pre & post buffers
2019-12-28 09:49:42 -06:00
845f35fe00
Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name()
2019-12-26 15:57:25 -05:00
66ec110b02
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-26 15:21:33 -05:00
1977e48ddd
DefaultScale is a member of the Monitor, not the event
2019-12-26 15:21:27 -05: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
76b54a468f
use left join instead of inner join when listing monitors
2019-12-22 18:43:53 -05:00
42a724891b
spacing
2019-12-20 16:11:38 -05:00
63d20a1514
Move hidden inputs to top of form
2019-12-20 16:11:24 -05:00
5a45835006
break up long lines
2019-12-20 16:11:10 -05:00
23dde04725
remove timeout on changing runstate.
2019-12-20 16:10:30 -05:00
fc017893bc
Sort the log filtering options. Fixes #2756
2019-12-20 16:09:34 -05:00
d25a91ad13
Make Group containable
2019-12-20 14:56:14 -05:00
bcda92058e
proper way to make cakephp filter by group. Make Group containable, always add the join
2019-12-20 14:56:01 -05:00
0142c71c85
Merge branch 'master' into fix_2772
2019-12-20 11:02:27 -05:00
d87bf5a156
replace the rate display with a dropdown
2019-12-20 11:02:12 -05:00
3c59be9616
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-19 09:24:44 -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
67cc9faa8c
remove contentForm id from form in state view which isn't used and conflicts if it is used anywhere else.
2019-12-18 19:05:06 -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
3b12b67b4a
fix eslint
2019-12-18 10:40:51 -05:00
5f006421cc
fix #2771 . Correct relationship from hasMany to hasAndBelongsToMany for Monitors in Group Modelel. Use save Assiociated in Controller, and add code to handle backwards compatibility by turning MonitorIds into the appropriate Monitor array
2019-12-15 15:31:40 -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
5b7efb2b33
fix mouseover streaming in chrome when adblocker disabled
2019-12-13 17:48:22 -05:00
18ed90d147
remove second hit to db to load storage areas with no serverid
2019-12-13 17:47:51 -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
0dbc1ef15c
Use multiport when talking monitor stream on montage
2019-12-13 11:51:55 -05:00
0bbbbb302e
add default for Units in new zone
2019-12-13 11:51:07 -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
ed417a49b4
increase logspopup width to eliminate scrollbars
2019-12-08 11:21:38 -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
e123e689ca
fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in
2019-12-06 14:32:59 -05:00
4b786eaad5
fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in
2019-12-06 14:31:06 -05:00
eee3729b85
dirty fix filtering Monitors by GroupId. Change occurrences of GroupId to ' ' as that is what the key is in conditions. Please note that other operators like != won't work.
2019-12-04 22:23:55 -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
3af6358314
fix & to &
2019-12-02 15:49:49 -05:00
72cb5bd1bb
add missing </select>
2019-12-02 15:49:42 -05:00
09faa0a731
fix & to &
2019-12-02 15:49:32 -05:00
b686649589
fix & instead of &.
2019-12-02 15:34:31 -05:00
8bf74d2f35
fix & instead of &.
2019-12-02 15:34:23 -05:00
24022d157d
use & instead of &. Put inputs out of table where they belong
2019-12-02 15:33:58 -05:00
9f49e4f367
make Mark column text-align left so that checkboxes line up
2019-12-02 15:07:35 -05:00
f7e01aa999
switch to material icon for dot
2019-12-02 14:31:05 -05:00
cf35db120d
change to material icons, fix missing div
2019-12-02 14:21:51 -05:00
8e645e45e1
fix selecting Monitors by passing MonitorId as MonitorId[]
2019-12-02 14:21:25 -05:00
b70b75421b
quotes and spacing
2019-12-02 14:18:27 -05:00
16698b8a82
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-02 13:42:07 -05:00
9d0a416311
remove debugging code
2019-12-02 13:41:42 -05:00
c9a324b7b3
improve the configureExportButton to look at specific inputs instead of just counting checkboxes
2019-12-02 13:40:02 -05:00
09a6e06132
change layout from a table to something more bootstrappy. Use the new html_radio function generate the radio buttons for Format and Compression. Remove the data-on-click from the export button because we added setting up the click event in the javascript already
2019-12-02 13:38:23 -05:00
2713565c84
using bootstrap layout instead of a table, so text-align: right
2019-12-02 13:34:53 -05:00
80d0d037b5
add a style for inline form not supported by bootstrap 3
2019-12-02 13:34:11 -05:00
d39193cb6b
convert flip to material icons
2019-12-02 12:33:13 -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
caefcc2f7a
increase size of export popup
2019-12-02 12:17:33 -05:00
03d7bcdd11
better debug logging when on-click-this function isn't defined
2019-12-02 12:17:18 -05:00
c19632e114
Merge pull request #2769 from connortechnology/fix_api_alarm_auth
...
Fix api alarm auth
2019-12-02 07:53:50 -05:00
76d795f413
add rendering of enums for Events Controller
2019-12-01 12:32:14 -05:00
0b2853095e
cleanup auth in monitors alarm method
2019-12-01 12:30:27 -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
393c25b4f2
fix array keys
2019-11-29 14:26:03 -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
7e92900542
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:50:02 -05:00
4817efe17c
Add enum support for Orientation and Scheme to Events
2019-11-29 13:48:20 -05:00
d02e30ceca
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:48:02 -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
ab9f99bdbb
Fix Width & Height rotation when scaling. Fixes #2760
2019-11-22 12:18:30 -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
9d4c802b48
netEmpty is deprecated. Use notBlank instead
2019-11-20 09:32:19 -05:00
5feeedf7f4
Mostly spacing, but Event doesn't have DefaultScale, that comes from Monitor
2019-11-20 09:31:58 -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
ac96a19371
Fix filtering monitors by user's MonitorId restriction
2019-11-19 17:21:01 -05:00
207e5918c8
fix lint, remove debug
2019-11-19 11:37:45 -05:00
59b9220ddd
if doing multiport still call Url(), as it requires a hostname
2019-11-11 13:33:54 -05:00
56618aac32
Handle buttons not existing
2019-11-10 15:49:39 -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
5603fd70f8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-11-04 12:04:37 -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
4e16e9052a
Merge pull request #2749 from pliablepixels/monitor_add_validation
...
add model validation so that we don't create empty monitors
2019-11-02 10:16:41 -04:00
9d8a230252
Prevent deletion of entire events directory when monitor has empty name
2019-11-02 10:12:43 -04:00
16a6938710
add model validation so that we don't create empty monitors
2019-11-02 08:30:25 -04:00
54c11bc0d1
define monitor_options as an empty array instead of php implicitly dealing with it
2019-11-01 13:42:01 -04:00
a20517a6db
spacing
2019-11-01 13:41:37 -04:00
18c13c4bad
Make chosen dropdowns 100% width on monitor edit
2019-11-01 13:40:55 -04:00
eea4cf0924
add ParentGroup to language
2019-11-01 13:40:20 -04:00
968c28395d
close group popup when saving
2019-11-01 13:39:40 -04:00
9a3bee28d2
add logging and handling of oninput and oninput-this
2019-11-01 13:38:09 -04:00
3653ad5ce3
update group editing, solving inline javascript problems and removing cruft
2019-11-01 13:37:52 -04:00
e0d085d187
CHeck for existence of snapshot.jpg or alarm.jpg instead of hitting the database.
2019-10-30 16:57:45 -04:00
6ae220f756
improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript
2019-10-29 18:06:32 -04:00
daf71aa492
improvements to layout on zones and zone
2019-10-29 18:06:03 -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
417123019c
fix crumbs
2019-10-23 09:52:36 -04:00
77118d55b2
add 4CIF aspect ratio padding. Fixes #2738
2019-10-23 09:50:49 -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
12dfcae81f
remove debug
2019-10-21 13:19:20 -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
a6a61b75b9
update ptz css in classic
2019-10-18 13:52:34 -04:00
524a39a224
changeCodec no longer needs to be passed this
2019-10-18 13:40:29 -04:00
1abdf25ad3
Merge pull request #2727 from externo6/align_filter_options
...
align with other filter options
2019-10-17 10:22:01 -04:00
9068cb1a19
align with other filter options
2019-10-17 10:17:22 +01: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
f25a823bc8
Fix event => zm_event
2019-10-16 08:53:40 -04:00
4b71bc75ea
Change language to Contains / Not Contains and update perl filter.
2019-10-16 00:35:49 +01:00
8ee567442e
UPdate replay, scale, codec dropdown onchanges
2019-10-15 15:04:14 -04: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
c7f5673b47
Make filterFIelds global and give more info in error message
2019-10-09 10:30:40 -04:00
b15f7ad47d
handle ipv6 in Server->Hostname. Fixes #2713
2019-10-09 10:00:13 -04:00
1cf034ec5f
fix inline js on the back/close button
2019-10-08 18:49:29 -04:00
d1b086ddc6
fix cases of monitor->CanZoom to control->CanZoom
2019-10-08 18:49:11 -04:00
c15e8eebb2
Make PTZ presets fill the entire window width and fix other visual problems with the buttons
2019-10-08 18:48:37 -04:00
f3f972359b
increase width of Zoom, White, Iris controls to fit wider button
2019-10-08 18:28:02 -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
5040d5b075
remove extra (
2019-10-05 16:56:05 -04:00
b1496643eb
fix js error in onvif probe
2019-10-03 17:31:10 -04:00
5384b9345a
fix errors on centos 7 with the functions view
2019-10-03 17:30:52 -04:00
11fe748154
Sort control capabilities by Name instead of Id
2019-10-03 17:30:31 -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
17611f2e4b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-10-02 19:38:21 -04:00
769717b571
Merge pull request #2715 from connortechnology/fix_2620
...
Add delete from logs ajax capability. Make the clear button use it. …
2019-10-02 16:43:08 -04:00
95615fee35
fix eslint
2019-10-02 16:42:50 -04:00
6b65e9a60c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-10-02 16:41:20 -04:00
7b93a445b8
Finish updating the linked Monitors dropdown
2019-10-02 15:42:56 -04:00
e4b5052fb4
Add delete from logs ajax capability. Make the clear button use it. Fixes #2620
2019-10-02 15:39:04 -04:00
d02aee64e4
Add setting of timezone to Options/Config instead of php.ini
2019-10-02 09:07:18 -04:00
b4d5d92d86
Add some non standard resolutions available on some vivotek cameras
2019-09-30 15:06:32 -04:00
09efbfb4f1
Sort groups
2019-09-30 15:02:05 -04:00
e37870d983
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-09-30 14:43:02 -04:00
85b16e89b7
Fix groups dropdown
2019-09-30 14:42:10 -04:00
90b02beb94
fix eslint
2019-09-30 09:52:41 -05:00
3d6cab8360
Must force hash regeneration on login. Old hash may be from different user
2019-09-28 17:57:45 -04:00
7271151eb0
add some more aspect ratios
2019-09-28 15:16:25 -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
a2861c1361
remove errant (
2019-09-28 14:22:40 -04:00
ae7644370f
quotes
2019-09-28 14:14:27 -04:00
c24fc6c21f
Set Delta to 0 to avoid errors
2019-09-28 14:10:11 -04:00
deef948964
Allow anyone to change their skin
2019-09-28 12:58:17 -04:00
ec9e94b99d
Don't add checkboxes if can't edit groups
2019-09-28 12:58:01 -04:00
80e3922165
add backWindow function to handle back buttons
2019-09-28 12:57:43 -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
ebcacaa660
Use material icons for buttons
2019-09-26 16:26:37 -04:00
b1bcfe8a9b
fix backtrace
2019-09-26 16:26:28 -04:00
fdaee75310
Use material icons for buttons. Hide the stop button because it does nothing.
2019-09-26 16:26:18 -04:00
e4265bd075
spaces
2019-09-26 16:13:49 -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
2b017f782b
Fix missing eid= from View All/View Pages links
2019-09-25 10:35:41 -04:00
bcb8389923
spaces
2019-09-25 10:16:27 -04:00
b936fbac6a
Don't import Monitor.php unless we need to
2019-09-25 10:16:16 -04:00
fe893a4a01
Add report-uri to out Content-Security-Policy-Report-Only header
2019-09-25 10:16:02 -04:00
ca40e760f7
get global cspNonce
2019-09-25 10:15:32 -04:00
54dec069cd
correct quotes and use a button on loging page
2019-09-25 10:15:12 -04:00
1b653e7e79
Add warnings for when SaveJPEGs and VideoWriter are both set to disabled
2019-09-25 10:14:41 -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
afd10e49d6
spaces, quotes extra braces
2019-09-25 10:13:32 -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
c7d7d45380
Remove :'s, they can be added using css if desired
2019-09-23 11:49:39 -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
9a94ce6e41
remove debug
2019-09-23 10:22:25 -04:00
23b3ae5783
Remove debug
2019-09-22 21:06:54 -04:00
8d95b2f5f8
Don't select Layout when changing size in montage
2019-09-22 14:22:24 -04:00
4c3ea7125d
Add defaults to Frame
2019-09-22 14:21:59 -04:00
7b9eaf42b8
Fix selecting group from groups listing under monitor name. Fixes #2711
2019-09-22 12:03:34 -04:00
8226e3c233
Update hebrew language
2019-09-22 12:02:31 -04:00
6d16363f07
Restore monitor defaults
2019-09-21 10:40:24 -04:00
d7810bf9b3
fix eslint
2019-09-20 14:16:37 -04:00
6c39fd133d
fix eslint
2019-09-20 10:44:38 -04:00
5d0b4942d6
remove debug
2019-09-20 10:37:48 -04:00
0d19b0dc85
Use a subselect instead of inner join because the inner join won't return monitors that don't have a group
2019-09-20 10:37:19 -04:00
a8cbe7d10d
Turn off debug
2019-09-20 10:36:50 -04:00
481f5b7eac
Update control ajax
2019-09-20 10:36:38 -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
d4435368bc
fix spacing between presets and home/set
2019-09-19 14:57:48 -04:00
1539e34204
spacing
2019-09-19 14:57:28 -04:00
b05ecd881e
add onchange to scale
2019-09-19 14:57:21 -04:00
2da9edf0ff
add onchange to scale
2019-09-19 14:57:17 -04:00
14e625b775
Set width of dimensions
2019-09-19 14:56:55 -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
d5ee73a9ee
use CaptureResolution instead of CaptureDimensions because it is already in language
2019-09-19 10:50:20 -04:00
1bd70319a9
Add a dimensions dropdown to ease entering monitor dimensions
2019-09-19 10:48:25 -04:00
2caca5f3ad
Merge branch 'master' into update_monitor_saving
2019-09-18 11:41:16 -04:00
9889311b03
Handle username=&password= as well in HostController::login
2019-09-18 11:40:55 -04:00
458268d866
Merge branch 'master' into update_monitor_saving
2019-09-18 11:40:09 -04:00
b3b7ec660b
Add a test for the built-in layouts. Can't edit them.
2019-09-18 11:19:28 -04:00
9e8c17dfaf
Merge branch 'master' into tolland-remove-extra-px
2019-09-18 11:17:50 -04:00
0eb1fff5b5
remove unused view=image-ffmpeg
2019-09-18 11:16:49 -04:00
f509b4c9d1
spacing
2019-09-18 11:10:40 -04:00
1407d849e8
deprecate getStreamSrc in functions.php.
2019-09-18 11:10:25 -04:00
ce1823bd29
spacing and fix saving
2019-09-17 12:46:11 -04:00
bcaabf4cf2
update buttons
2019-09-17 12:09:36 -04:00
e0074692d1
Remove debug
2019-09-17 12:07:30 -04:00
ad84736cb4
spacing
2019-09-17 12:07:24 -04:00
ff8e9fa072
Don't glob skins dir and css dirs unless our skin or css is invalid.
2019-09-17 12:07:10 -04:00
f0cfd674c1
Cleanup options skins tab. Setting the values happens in index.php. Use global and
2019-09-17 12:06:54 -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
d141632256
general clean of onvif probe view. Use buttons instead of inputs and use data-on-change-this instead of inline js. Also rename username and password to Username and Password to not conflict with authentication to ZM ui.
2019-09-11 09:18:03 -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
bce1a48b66
Fix another Monitorid. Fixes #2699
2019-09-05 10:31:22 -04:00
25198e0eb0
move session_close to after auth so that whatever we do with the session in auth gets saved
2019-09-04 17:53:59 -04:00
2993e52652
Fix auth timing out due to cookie timing out and getting deleted.
2019-09-04 12:14:32 -04:00
f568e0da30
Fix event->id() to event->Id()
2019-09-04 10:11:16 -04:00
a57c5196f3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-09-04 10:07:31 -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
be99f6a4d6
In production mode, debug should be 0
2019-09-04 08:47:09 -04:00
f46662a062
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-09-03 12:55:51 -04:00
16f0ad4f59
Fix Monitorid => MonitorId
2019-09-03 12:55:45 -04:00
92bc1791f5
fix accidentally removed code
2019-09-03 11:33:13 -04:00
50aa0108e5
Add authhash to session
2019-09-03 11:33:02 -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
99a2ddba63
Add listing of Secondary Storage area in events list
2019-08-29 11:27:06 -04:00
6b9e8bec69
Add logging of delete events
2019-08-29 11:26:32 -04:00
ef5497cba8
If we have an ajax request, don't do actions.
2019-08-29 11:26:14 -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
c6dd3ffbec
tabs to spaces
2019-08-28 09:19:09 -04:00
320bf823c5
Don't report errors when creating monitor symlink when it already exists
2019-08-28 09:18:33 -04:00
91ef4f5932
x264 encode works on arm now, so let people choose it
2019-08-28 08:51:42 -04:00
8043ba8092
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-27 16:49:12 -04:00
9b3fecd7a0
Fix iOS autocapitalizing username field on login ( #2687 )
...
I propose removing the auto-capitalization from the username field for Safari under iOS by adding autocapitalize="none" to the username form field. Usernames rarely start with a capital letter, so I think this would be a usability improvement for users logging in through iPhones or iPads.
Having to login to ZM under iOS, I've been frustrated at the need to always press on the Caps Lock key on the virtual keyboard to disable the capitalization of the first letter. This is because iOS auto capitalized non-password and non-email HTML form fields. ZM is also case sensitive, so "Admin" will not work if the main user is "admin".
2019-08-27 16:49:03 -04:00
dfb65d23bf
Fix eslint warnings
2019-08-27 16:48:42 -04:00
41fb11d776
Fix Arched lacking () so not working
2019-08-27 15:19:38 -04:00
d7d2c140a0
Use index to server hosting storage where event is saved to talk to zms
2019-08-27 15:19:18 -04:00
c482fa7d5d
Fix executing filter
2019-08-26 20:45:38 -04:00
cd883e23b8
Extend inputs to full width on storage popup
2019-08-26 20:45:20 -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
5527685162
Merge branch 'storageareas'
2019-08-26 16:22:10 -04:00
292b530f99
Allow montage review maxdatetime to be less than minDateTime. This allows us to set it first so that the reload does kill us
2019-08-26 16:20:23 -04:00
7768d39eb9
Add auth to streamParms so that multi-server event viewing works
2019-08-26 16:19:44 -04:00
82e8bde406
Fix SaveAs
2019-08-26 16:19:19 -04:00
7cab22b450
Use Event->SaveJPEGs instead of Monitor->SaveJPEGs
2019-08-26 15:04:59 -04:00
c4c6935c6e
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-08-23 18:17:50 -04:00
73ba699dc4
Sort filter fields dropdown
2019-08-23 18:17:45 -04:00
e707bd8e72
correct getting frame_id so we get images instead of nodata
2019-08-23 17:59:29 -04:00
7598654740
add auth hash to ajax streams, and use monitorUrl instead of thisUrl to talk to zms
2019-08-23 17:58:40 -04:00
7ef26275bc
use isset to get rid of warnings when eid is not in REQUEST
2019-08-20 10:28:19 -04:00
a064f6c23f
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-20 10:03:55 -04:00
61926d3b85
Only parse the filter if it is valid. Remove unused filterQuery var
2019-08-20 10:03:44 -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
bf34d8901e
Merge branch 'master' into fix_token_auth_sessions
2019-08-19 11:13:24 -04:00
ca0b583007
Use material icons for sort because they look nicer
2019-08-19 08:59:15 -04:00
239c68dd7f
add .. to fix #2686
2019-08-19 08:58:52 -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
cfeedd39a4
Use zm_session_start instead of session_start
2019-08-16 15:07:20 -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
1d0ee227d7
fix mUser to username, etc.
2019-08-16 14:12:37 -04:00
4108495a7d
Add session storage if stateful query param is on, but only for LEGACY_API_AUTH
2019-08-16 14:12:14 -04:00
376b8af889
Make links in donate text actual links
2019-08-16 11:40:38 -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
1103928ed7
only call check_timezone on console for efficiency in all other requests
2019-08-15 15:16:20 -04:00
f09941ed48
timezone errors shouldn't be fatal
2019-08-15 15:16:02 -04:00
7c54ac85a0
remove debugging
2019-08-15 15:05:37 -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
ed9175b4ad
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2019-08-13 15:34:11 -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
9da10abca9
Move APIEnabled check to the api from auth.php
2019-08-13 11:29:32 -04:00
a63b6486b9
Remove Session from App Components list.
2019-08-12 15:36:40 -04:00
c2e1293472
spacing
2019-08-12 15:10:58 -04:00
0bf036fc55
Remove Session from the components list
2019-08-12 15:06:46 -04:00
2320ab4d66
update HostController. Use config constants, don't use sessions
2019-08-12 15:01:40 -04:00
4922861d1d
Merge branch 'master' into fix_token_auth_sessions
2019-08-12 13:59:11 -04:00
38a09bbd18
Don't auto-add default storage area to header. If someone wants to see it's space in the header they can add it to storage areas
2019-08-08 15:34:07 -04:00
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
45b970fb09
fix spacing
2019-08-08 13:34:28 -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
fb414b3f19
remove debug statements
2019-08-07 15:34:45 -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
8167ff2143
fix eslint
2019-07-26 12:28:02 -04:00
547e80b1a9
Fix download and export button from events list. Fixes #2668 ( #2670 )
2019-07-24 12:31:43 -04:00
a6a2239e5b
Fixes #2579 by putting the event Id into an attribute of the delete button. Also uses a button instead of a link. Also only does parent refresh if parent exists ( #2662 )
2019-07-24 11:39:21 -04:00
39262d55f5
Also show secondary storage area when viewing event
2019-07-24 11:26:07 -04:00
2d46f2adab
add Secondary Storage Area options.
2019-07-24 11:25:51 -04:00
1a0beab703
add Secondary Storage Area options. Storage array is now an array of Objects so use the Name key
2019-07-24 11:25:38 -04:00
1254e8ab67
Add AttrSecondaryStorageArea to lang
2019-07-24 11:24:50 -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
a4a144d2fa
Merge branch 'master' into filter_add_copy
2019-07-23 10:04:23 -04:00
88beb46c3e
Add FilterCopyEvents
2019-07-23 10:04:15 -04:00
df0aef89af
gracefully handle when window[fnName] doesn't exist
2019-07-23 10:03:28 -04:00
0e040fc2fc
Add click_autocopy function
2019-07-23 10:00:05 -04:00
346933126d
Update filter view to use Filter::find
2019-07-23 09:59:49 -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
a9d01ba3d2
Alarm api ( #2665 )
...
* fixed alarm api to use tokens if present
* clearer debug logs for tokens
* space
2019-07-17 20:38:58 -04:00
d244aadee6
Fix #2655
2019-07-08 14:27:49 -04:00
df8c46f0f0
Fix #2657
2019-07-08 14:22:46 -04:00
da5e8d19b8
Fix #2656
2019-07-07 17:54:45 -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
4b41655dc5
fix
2019-07-07 16:10:53 -04:00
3c1cd1e750
rename var from nevents to nFrames because that's what they are. Fix an error when page=0
2019-07-07 16:03:54 -04:00
256a0aa679
google code style
2019-07-04 09:04:43 -04:00
2470c09b20
Honour thumbnail width when bringing up frames popup for frames and alarm frames
2019-07-03 17:19:10 -04:00
268bc2264b
Merge branch 'storageareas'
2019-07-02 10:19:03 -04:00
1161c251fc
Add a warning when the monitor is not capturing in live view
2019-06-28 10:28:53 -04:00
d972ab6006
add min_section_length test to alarmed events that go unalarmed
2019-06-27 21:50:12 -04:00
305a954ee2
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2019-06-25 22:20:19 -04:00
0dbe48fb31
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2019-06-25 22:19:53 -04:00
46f3aabc25
Merge branch 'hwdecode' into storageareas
2019-06-25 15:35:56 -04:00
a28f17653f
Add DecoderHWAccel fields to Monitor
2019-06-25 15:34:45 -04:00
46c19c7efb
fix for zone overlay scaling issues in montage ( #2643 )
...
* remove extra px in svg tag
* add js method to track liveStream img size for zones
* switch to using SVG scaling to deal with zone polygons
* update jsdoc for eslint
* fix blank lines eslint issue
2019-06-24 11:45:40 -04:00
44e4d93445
Merge branch 'master' into storageareas
2019-06-24 11:35:36 -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
46032385fe
fix viewport on mobile. Fix duplicated css when selected css is base
2019-06-22 14:10:55 -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
85b9b045cc
Copy Profile Token to ControlDevice for use with Netcat PTZ script
2019-06-21 12:42:26 -04:00
60618d5998
Fix hour subtraction in getAuthUser to actually subtract an hour
2019-06-21 11:45:33 -04:00
db7362dbcb
Merge branch 'master' into storageareas
2019-06-20 14:18:47 -04:00
d026c61077
Don't allow saving to built in layouts
2019-06-20 13:48:14 -04:00
71eadfc40e
Merge branch 'remove-extra-px' of https://github.com/tolland/zoneminder into tolland-remove-extra-px
2019-06-20 13:28:24 -04:00
3bae7a5432
spaces and parenthesis
2019-06-20 13:28:12 -04:00
ffaad88bf0
switch to using SVG scaling to deal with zone polygons
2019-06-20 17:11:22 +00:00
edd52e7fbf
add js method to track liveStream img size for zones
2019-06-20 12:46:04 +00:00
4da5c52cd2
remove extra px in svg tag
2019-06-19 20:18:38 +00:00
77eb15ff17
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
2019-06-19 09:22:21 -04:00
70a91c7069
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-19 09:22:21 -04:00
a6e42e4317
remove a password log, corrected PHP version in log ( #2627 )
...
* remove a password log, corrected PHP version in log
* PHP version correction
2019-06-19 09:22:21 -04:00
2d5f84cd22
add event file system path to API ( #2639 )
2019-06-19 09:22:21 -04:00
199e8182be
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-19 08:36:48 -04:00
dc7707bbc1
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
2019-06-18 10:03:14 -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
c4dc5f34e4
add event file system path to API ( #2639 )
2019-06-16 11:59:23 -04:00
d87f5e3276
Merge branch 'master' into storageareas
2019-06-11 14:39:08 -04:00
ec7b373913
fix structure of events_by_monitor_id
2019-06-11 14:38:51 -04:00
1e7cf8c7cf
fix eslint, Fix video not resuming after setting speed to 0.
2019-06-11 14:38:28 -04:00
1241761683
Add a title popup telling people about the zoomin/out/pan functions. Add ctrl-click to zoomout
2019-06-11 10:58:54 -04:00
3a91880e2e
Merge branch 'storageareas'
2019-06-10 16:01:03 -04:00
1eadb814e2
Fix use of onclick and onchange. Fix bulk frame lookup. Make scanning events more efficient
2019-06-10 15:59:19 -04:00
265e49fe45
Add a newline after each filter group to make the code easier to read
2019-06-10 15:58:17 -04:00
1749a7a4f9
fix extra closing button tag in shutdown button. Add a newline after each Storage group to make the code easier to read
2019-06-10 15:57:53 -04:00
b9ea9ce0ae
Merge branch 'master' into storageareas
2019-06-07 14:40:43 -04:00
cfca67f663
spacing and quotes
2019-06-07 14:07:23 -04:00
9b507734b2
spacing
2019-06-06 13:49:24 -04:00
41714c676d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-06 13:40:09 -04:00
dfc60baf85
fix eslint spacing
2019-06-06 13:40:00 -04:00
b254e1e392
For column name title field should be taken instead of array name ( #2635 )
2019-06-06 12:58:33 -04:00
4879249d77
V4LMultiBuffer has a string value so testing against an integer fails.
2019-06-06 12:53:25 -04:00
43d24cda8e
Completed Polish translation ( #2634 )
...
* Completed Polish translation
* Changing translation to be simillar with other lines
2019-06-05 17:07:32 -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
83b00c2cd1
Merge branch 'master' into storageareas
2019-06-04 16:43:43 -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
86ad96b788
increase height of donate popup to hold all content
2019-06-04 12:08:08 -04:00
7649f5d6b9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-04 10:33:14 -04:00
9d6091e271
better fix for #2453 . Pushing an element causes td's within td's. Weird formatting, etc. We use an html escaping function to prevent XSS
2019-06-04 10:32:54 -04:00
a6f3303859
add options help to linked monitors option ( #2633 )
...
* add options help to linked monitors option
* fix typo and clarify instructions for new widget
2019-06-04 10:05:08 -04:00
7445f5588f
show storage when there are 4 areas. Used to only do it for < 4
2019-05-31 11:01:09 -04:00
aefd735abb
quotes
2019-05-31 11:00:30 -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
8e0f828aa1
Add APIEnabled to translations
2019-05-29 10:28:42 -04:00
ee0c21d587
Add API Enabled to User edit
2019-05-29 10:28:25 -04:00
722411475d
Fix +/- buttons on new line in filter not having onclick events bound
2019-05-29 09:23:56 -04:00
21761a35ad
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-05-29 08:40:52 -04:00
07d4310466
Can't cache-bust jquery-ui-theme.css as it loads sprites by relative path
2019-05-29 08:40:48 -04:00
bc0565858b
check for API disabled only when auth is on ( #2624 )
2019-05-28 13:44:06 -04:00
c4d76f03c9
Introduce ZM_PATH_SHUTDOWN to cmake config
2019-05-27 12:09:32 -04:00
ac8197f2e5
fix eslint errors in monitor.js
2019-05-27 11:25:49 -04:00
3c5d20a2e1
when an event view is scaled, adjust the frame popup window size accordingly
2019-05-24 15:06:37 -04:00
fad919adec
Fix incorrect fix for dealing with bulk frames. prev and next fid should just be +/- 1, so that we show the actual capture frame as opposed to the non-existent db frame record. Fix is by specifying the EventId as well
2019-05-24 14:59:33 -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
d5b29923a4
add a.disabled css style
2019-05-24 14:51:39 -04:00
0c00752ab4
fix nextFid and prevFid when using bulk frames. Disable buttons instead of removing them entirely.
2019-05-24 14:51:08 -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
e2d56597bf
Don't use an onlick inline js to show the caution text
2019-05-24 12:40:02 -04:00
2eebdb094c
move chosen setup to initPage
2019-05-24 11:54:14 -04:00
b6747e9b1f
spacing
2019-05-24 11:49:59 -04:00
3dd5caebca
fix quotes and stop merging lines of options help. Change MaxFPS help to advise against setting a value
2019-05-24 11:49:27 -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
c02eb2cd46
spacing
2019-05-24 10:00:51 -04:00
4e51379087
spacing
2019-05-24 10:00: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
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
a4eff3e8e0
fixed html typo
2019-05-17 09:44:22 -04:00
923f798e69
css classess for text that disappear
2019-05-17 09:32:23 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
96f578f1bd
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup. ( #2604 )
2019-05-16 15:37:37 -04:00
1855ee441a
Fix #2609 invalid value horz instead of hori in orientations enumeration
2019-05-15 19:35:19 -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
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
7f704263d8
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup.
2019-05-13 10:30:41 -04:00
74d9f4f1aa
Spelling and grammar fixes in help ( #2603 )
...
* Edit Help array to make it match others below. This should not affect the results
* Misc. grammer and spelling fixes along with removing some duplicated words. This should not affect compilation.
* More grammer and spelling errors
* Replace Javascript with ZoneMinder because it did not make sense there.
* More spelling and grammar edits
2019-05-13 07:58:18 -04:00
41ae745b17
removed stale code
2019-05-12 18:53:51 -04:00
ec279ccc9a
make old API auth mechanism optional
2019-05-12 18:51:07 -04:00
881d531fe9
make old API auth optional, on by default
2019-05-12 18:19:19 -04:00
21710b6e49
demote logs
2019-05-12 15:45:39 -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
91dd6630b5
enable API options only if API enabled
2019-05-12 12:34:55 -04:00
9998c26101
comma
2019-05-12 12:21:49 -04:00
c1891e35b9
moved API enable back to system
2019-05-12 12:15:08 -04:00
a9d601e5ae
add ability to revoke tokens and enable/disable APIs per user
2019-05-12 10:56:17 -04:00
225893fcd6
add mintokenexpiry to DB seek
2019-05-12 05:50:19 -04:00
88d50ec9ca
added revoke all tokens code, removed test code
2019-05-11 15:47:57 -04:00
2ee466f5e4
display user table in api
2019-05-11 14:08:49 -04:00
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
e6b7af4583
initial baby step for api tab
2019-05-10 15:11:35 -04:00
95b448abdd
handle case when supplied password is hashed, fix wrong params in AppController
2019-05-10 11:25:55 -04:00
1770ebea23
make sure refresh token login doesn't generate another refresh token
2019-05-08 15:26:51 -04:00
0bc96dfe83
Error out if used did not create an AUTH_HASH_SECRET
2019-05-08 14:26:16 -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
27e6e46f84
remove allowing auth_hash_ip for token
2019-05-08 12:11:32 -04:00
b293592e4c
added token validation to zms/zmu/zmuser
2019-05-08 10:55:32 -04:00
e8f79f3254
JWT integration, validate JWT token via validateToken
2019-05-07 15:04:51 -04:00
d36c1f5d3c
Add JWT token creation, move old code to a different function for future deprecation, simplified code for ZM_XX parameter reading
2019-05-07 15:04:12 -04:00
0bbc582971
New token= query for JWT
2019-05-07 15:03:13 -04:00
5fe565b99d
spacing
2019-05-06 10:49:18 -04:00
1ca5eee53a
spacing
2019-05-06 10:45:40 -04:00
ca3f65deef
go back to jwt-cpp as PR merged
2019-05-05 14:32:09 -04:00
37040f33a8
add composer vendor directory
2019-05-05 12:49:33 -04:00
a55a11dad1
first attempt to fix cast error
2019-05-05 11:24:55 -04:00
8d62c61b7a
fixed module path
2019-05-05 07:50:52 -04:00
725c3c50ed
use php-jwt, use proper way to add PHP modules, via composer
2019-05-05 07:08:25 -04:00
887912e7ad
bcrypt auth migration in PHP land
2019-05-01 13:22:24 -04:00
91f7034642
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-01 08:57:40 -04:00
25614bb75e
Merge branch 'master' into storageareas
2019-05-01 08:57:20 -04:00
b3fb934fb5
add namespace to Logging calls
2019-04-29 14:16:55 -04:00
940338ea12
namespace escape Error calls
2019-04-29 12:51:02 -04:00
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
a0dbb70af6
filter the form submit on enter to only affect input elements, not textareas
2019-04-26 10:40:11 -04:00
735a996e41
dsiable form submit on enter on the monitor view
2019-04-26 10:26:16 -04:00
6a250d61e3
cache_bust logger.js and overlay.js
2019-04-26 10:25:32 -04:00
0d4651c2d6
Update url to donate page ( #2586 )
2019-04-23 10:58:28 -04:00
8195c4e395
Fixing video export view ( #2585 )
2019-04-20 11:19:27 -04:00
5b68ddcc9a
add a note deprecating getDiskPercent
2019-04-17 09:55:34 -04:00
14791ec19b
Merge branch 'master' into storageareas
2019-04-15 13:27:41 -04:00
164a2d4d70
Fix image path ( #2576 )
...
Change the path of the "center.png" image from skins/classic/graphics/graphics/center.png to skins/classic/graphics/center.png.
Note that the `graphics/` directory was previously duplicated.
2019-04-14 15:41:58 -04:00
8828e2fe61
Merge branch 'master' into storageareas
2019-04-14 13:50:31 -04:00
733bd66773
Merge pull request #2562 from santos995/master
...
Added and edited tranlations to ru_ru.php
2019-04-13 08:25:09 -04:00
f0af0619e4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-04-12 14:58:24 -04:00
3f3ae748f0
Merge branch 'add_shutdown_capability' into storageareas
2019-04-12 14:58:11 -04:00
160f5c7bd9
Merge branch 'master' into storageareas
2019-04-12 14:57:54 -04:00
d59f058956
basic update of optionhelp view
2019-04-12 14:57:11 -04:00
1a1c2db15f
add the shutdown view and actions
2019-04-12 14:55:56 -04:00
c9d45b143c
Merge branch 'master' into add_shutdown_capability
2019-04-12 13:09:45 -04:00
36336d67be
set width and height of shutdown window
2019-04-12 13:09:25 -04:00
7b98dcbb94
but the shutdown icon in a navbar-txt
2019-04-12 13:08:58 -04:00
d7747b3385
add a shutdown power button to the navbar
2019-04-12 09:37:14 -04:00
Isaac Connor
Garrett Scott
Andrew Bauer
Javier Gonzalez
PrplHaz4
Alex Porosanu
Isaac Connor
Pliable Pixels
Andrew Bauer
Isaac Connor
externo6
Pliable Pixels
Isaac Connor
Paulius Gedrikas
Isaac Connor
Tom Hodder
fri.K
fri.K
Jonathan Meredith
Steve Root
andornaut