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
Isaac Connor
Isaac Connor
Isaac Connor
Pliable Pixels
externo6
Andrew Bauer
Pliable Pixels
Isaac Connor
Paulius Gedrikas
Isaac Connor