881cb5327e
Adding and correcting Russian translation
2024-02-28 00:19:47 +03:00
f18f448a8c
Fix setting frames
2024-02-26 16:22:51 -05:00
58d8cf0adf
Makes the "Events" part of the ONVIF URL configurable
...
as required per some ONVIF version 21.06 cameras
by default sets the Events Path equals to "/Events"
to maintain functionality
2024-02-24 11:05:08 -06:00
989b3b7ba4
Merge pull request #3838 from IgorA100/patch-3
...
Fix: Logging levels coloring for languages other than English
2024-02-23 09:01:19 -05:00
ed64db315b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-23 08:56:32 -05:00
a738f1bc2e
Remove unused EventStartMode. Fixes #3839
2024-02-23 08:56:26 -05:00
78ab72a0d9
Remove EventStartMode stuff
2024-02-22 16:58:14 -05:00
f9a1b6b4f4
Only show cpuUsage if we have an Id
2024-02-22 12:55:35 -05:00
ebad97038e
Implement CpuLoad in Server object
2024-02-22 12:52:49 -05:00
799dcd5f51
Default thisServer to a default server object.
2024-02-22 12:52:39 -05:00
b5096677c7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-22 10:57:18 -05:00
1742c03b1a
Handle non-multi-server case. Fixes #3836
2024-02-22 10:57:01 -05:00
eeb8856157
Ad EventStartMode and EventCLoseMode to monitor
2024-02-22 10:46:36 -05:00
b079281900
Remove second data-click-to-select
2024-02-22 09:33:54 -05:00
0cbce2a8a4
Apply bootstrap table to servers list. Split the servers content into it's own file. Add overflow:auto to the container which for some reason fixes button visibility.
2024-02-22 09:33:32 -05:00
34815e02b9
Fix: Logging levels coloring
...
When getting the index, you cannot use text(), because there may be different meaning depending on the language!
If the value is different from 'Level', lvl_ndx will not be found and coloring will not work.
2024-02-22 11:16:30 +03:00
edcf09882f
Subsitute a 0 when ZM_SERVER_ID is not defined
2024-02-21 16:35:04 -05:00
9783c5a560
Adding an "All Events" Button from Live View
...
Ability to jump to viewing all events from live viewing.
2024-02-21 15:44:51 +03:00
d9cfcfbaa7
Clicking the "All Events" button from Live View
...
When you press the button, we go to view all events.
2024-02-21 15:17:15 +03:00
661d8620fd
Add Cpu Usage % to header
2024-02-20 13:15:38 -05:00
f54f10df72
Add server stats fields
2024-02-20 13:14:23 -05:00
def378fe12
Fix relative path to dms.js
2024-02-17 11:59:09 -05:00
16392fc1fb
removed unnecessary definition in lang file.
2024-02-16 18:09:34 -06:00
78676ac249
On Options -> System , show languages with names not codes/filenames
...
Possible implementation for issue #3694
2024-02-16 18:02:15 -06:00
2fd7c089e3
Update loading the download modal. Include the monitor and events filters, include auth_relay
2024-02-15 16:27:30 -05:00
7e98cf36d6
Remove requirement for id or eids. We can specify by filter now. Fix populating exportIds making sure it is an array.
2024-02-15 16:21:39 -05:00
f339ba5508
When listing option name, remove the ZM_ to be consistent with the options view
2024-02-15 12:54:39 -05:00
4424bab051
Add a resize handler
2024-02-15 09:38:17 -05:00
839f09dba1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-13 13:54:10 -05:00
013f6daaf6
Put back Accept-Ranges as it breaks seeking
2024-02-13 13:54:04 -05:00
0ff48f631e
Implements an option to disable soap_wsa code that doesn't work
...
with some chinese cameras, more common to Latam zone
2024-02-12 19:22:01 -06:00
8ffbc1d6f0
INclude monitor Name in monitors array, because it useful to show monitors by name instead of id
2024-02-11 19:13:48 -05:00
dc556c0f70
Handle user being undefined when not logged in
2024-02-11 19:12:37 -05:00
51020e92a4
Merge pull request #3822 from IgorA100/patch-1
...
Sorting an array of events when merging into a file
2024-02-09 10:35:05 -05:00
8bb368fe13
Fix children MonitorIds not being included due to the use of + instead of array_merge
2024-02-09 10:33:22 -05:00
a204a973f1
Code optimization
2024-02-09 18:09:51 +03:00
d0dc4bcbe1
Sorting an array of events when merging into a file
...
When merging events into a file, they must first be sorted by time and start date of the event.
2024-02-09 17:34:06 +03:00
31af9d905c
Still generate an auth if no password present.
2024-02-08 13:31:21 -05:00
ec20772f98
Use const on bottomLoc
2024-02-08 12:34:33 -05:00
f795fb3c19
fix unexpected this, although according to jquery docs it is totally valid
2024-02-08 12:33:32 -05:00
00f27ca8af
Add autocomplete=off to Montage Layout name
2024-02-08 10:27:39 -05:00
cc7b8fa9d0
Rename DMS2LL to dms2ll to satisfy eslint
2024-02-07 11:14:19 -05:00
b94b454bf9
Rename EventName to Name and Monitor Name to Monitor to take up less space
2024-02-07 11:08:15 -05:00
bd7bfcbdcd
Rename EventName to Name and Monitor Name to Monitor to take up less space
2024-02-07 11:08:11 -05:00
cc5bb8ecec
rename table=>eventStatTable. Apply width and height to map if it is to be displayed
2024-02-07 11:07:12 -05:00
79164993f9
Remove fixed width and height from map, they will be set in js if map is to be displayed
2024-02-07 11:06:47 -05:00
36b4d9a264
Add display: flex to content so that scroll bars work
2024-02-07 11:06:26 -05:00
fcac8ec2f2
Rename zmMap to ZMMap because eslint thinks constructors should always be capitalized.
2024-02-07 10:58:39 -05:00
5f6df6fad7
Make eventVideo div take up available space so that scaleToFit can do it's job
2024-02-07 10:38:17 -05:00
124bbc0295
pass #eventVIdeo as container to scaleToFit so that it fits within available width
2024-02-07 10:37:53 -05:00
3c91a2bcaf
Add px-3 to the flex container for stats and view to handle scroll bar
2024-02-07 10:37:31 -05:00
e6eff5903f
Add container to params for scaleToFit. The container we want to fit width into might not be #content.
2024-02-07 10:37:08 -05:00
57e9cc2b16
In the case where locale = System... properly set locale for the Date*FOrmatter classes
2024-02-05 19:06:16 -05:00
5a866aee0e
Add id's to selects to appease label for= attributes
2024-02-05 18:42:25 -05:00
4107058000
FIx units on warning about timeout
2024-02-05 18:42:05 -05:00
43c3937b87
Fix image proxy broken due to imagecreatefromstream=>imagecreatefromstring
2024-02-02 11:50:03 -05:00
48015e6efd
Remove extra / and urlencode password for Amcrest
2024-02-02 11:49:44 -05:00
aa67e5f6f3
Add range limits to lat&long and don't do anything if empty
2024-02-01 18:01:26 -05:00
314236dea8
Add inputs and code to display and convert to and from decimal degress and dhms for lat&long. Update marker on map when values change.
2024-02-01 17:58:20 -05:00
4987ea1b21
Define user before using for viewableMonitorIds
2024-02-01 11:39:09 -05:00
d47f78b354
Fix for use strict defining monitor_ids
2024-02-01 11:38:38 -05:00
da2744749d
fix vertical alignment and stretching of images on snapshot
2024-02-01 11:38:24 -05:00
9bb9f733a4
Reference the tab that the bad Path or Port is on
2024-01-31 18:24:22 -05:00
8e035f61ac
Use viewableMonitorsIds instead of canView(Monitors) when deciding to show the Console or Montage Links
2024-01-31 16:09:33 -05:00
05d605fe55
change Map to zmMap to prevent name collision with luxor. Add a haversine function to get distance between two lat&long. Start to rough in grouping locations into 1 pin.
2024-01-30 19:57:18 -05:00
18606e78ad
Remove width on p element on monitors view as it is too short for Recording and doesn't seem to be needed
2024-01-30 14:29:41 -05:00
0e88d764f0
Use object methods to load montiors
2024-01-28 16:53:30 -05:00
2c7c928fa6
Use object methods when loading monitors and zones and filter them by Deleted status
2024-01-28 16:53:06 -05:00
b7bc7cef7e
Only load non deleted Monitors
2024-01-28 16:52:36 -05:00
c84e7d4563
Include Monitor.php
2024-01-28 16:52:16 -05:00
512b1ec76d
Only list viewable monitors and zones
2024-01-28 16:51:49 -05:00
ac2cfa5ccb
Add children groups to MonitorIds
2024-01-28 16:32:31 -05:00
648bd77b21
Apply validCardinal to all eids. Remove dead delete code
2024-01-27 18:33:19 -05:00
a5916f01d1
Protect against XSS in server db values
2024-01-25 19:34:46 -05:00
39b2014c2d
Prevent XSS from COOKIE poisoning
2024-01-25 19:31:28 -05:00
b1aeb319f7
Prevent XSS from COOKIE poisoning
2024-01-25 19:27:18 -05:00
35396aad55
Prevent XSS from COOKIE poisoning
2024-01-25 19:25:15 -05:00
d8f36e4ef9
Prevent XSS from COOKIE poisoning
2024-01-25 19:23:28 -05:00
bf32bd6926
Prevent XSS throu mids
2024-01-25 19:12:37 -05:00
f1a26b90b6
Prevent against CSS in dupId
2024-01-25 19:05:59 -05:00
bc1fb8eef2
Protect against XSS from User field
2024-01-25 19:04:15 -05:00
9505910847
Prevent XSS via uid and prev
2024-01-25 19:01:44 -05:00
59b77df7f1
Prevent XSS through scale parameter
2024-01-25 18:57:01 -05:00
6f595385d7
Protect filter loading from injection
2024-01-25 18:56:42 -05:00
d45b05ec8a
XSS protect from server id and storage id
2024-01-25 18:50:35 -05:00
bac2705051
XSS protect from monitor id and name
2024-01-25 18:49:22 -05:00
c138984fc9
XSS prevent on sort_asc and eid. Still need to protect filter
2024-01-25 18:48:39 -05:00
b5757a2d05
Use validCardinal on Id's cuz we don't trust the db or Object
2024-01-25 18:38:44 -05:00
559d6edc70
Don't apply timezone when formatting datetimes
2024-01-25 11:57:29 -05:00
cfd8e3418e
Don't apply timezone when formatting datetimes
2024-01-25 11:57:19 -05:00
ee13034384
Use validInt on DefaultScale coming from Monitor object. Database shouldn't be trusted either.
2024-01-25 11:24:13 -05:00
5a498878b8
Protect mid with validCardinal. Return early if it is invalid or monitor is not found
2024-01-24 19:28:59 -05:00
914f7e0ae2
APply validCardinal to sid so that arrays don't get passed to new Server() which then prevents XSS
2024-01-24 19:25:15 -05:00
9669f1e3ef
Sanitize entity before outputting it preventing XSS
2024-01-24 19:22:47 -05:00
f62f1529f5
Try to prevent XSS by verifying valid image data
2024-01-24 19:18:22 -05:00
0fb71e35f2
Add luxor.js and use it to format datetimes
2024-01-24 16:10:20 -05:00
fb8b4af3f8
Revert "Remove unneeded bootstrap classes"
...
This reverts commit 00f52704a5
2024-01-24 13:17:52 -05:00
00f52704a5
Remove unneeded bootstrap classes
2024-01-24 13:00:31 -05:00
1255ae4bc7
Change Tags to be concated and add GROUP BY to fix SQL. Populate event object with db row instead of reloading by Id. Remove datetime formatting as it is screwing up and formatting should happen in js
2024-01-24 13:00:31 -05:00
8ca1436224
If img has a fix width set, clear it when we change scale
2024-01-24 12:54:13 -05:00
6ba09c6f0d
Finish switch to using Intervals instead of Timeouts
2024-01-24 09:28:12 -05:00
ceb81e13d6
Quiet warning about MonitorIds not exisitng in newGroup array when no MonitorIds are selected for that group
2024-01-23 16:14:21 -05:00
1ffc10ca83
Add recursive adding of monitors from children groups
2024-01-23 16:13:33 -05:00
3d2fa3172f
Fix im => i. Typo in variable name.
2024-01-22 15:41:00 -05:00
bd90711aa6
Use an interval instead of calling Timeout from callback
2024-01-22 14:25:57 -05:00
ad168ca23a
Allow monitor creation if Monitors()==Create
2024-01-22 14:25:57 -05:00
552069cd64
Makes zones view use getBodyTopHTML so that it display error messages. Rename deleteBtn to action.
2024-01-21 11:31:44 -05:00
4df4f5146a
Log error_message if set
2024-01-21 11:31:06 -05:00
580aefdfee
Handle the deleteBtn having an id instead of name == deleteBtn
2024-01-21 11:30:49 -05:00
da700a621a
Make EventStartCommand and EventEndCOmmand wider
2024-01-21 11:30:25 -05:00
e47fd8f661
Recamp zones actions, adding a redirect after finishing deletion and fixing CanEdit=>canEdit
2024-01-21 11:30:01 -05:00
0d6e7bc082
Add debugging to editableMonitor and handle when permission is set to Create.
2024-01-21 11:28:34 -05:00
4d1ffb258a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-01-18 14:17:02 -05:00
69383316aa
If the video file doesn't exist, don't try ffmpeg etc and log all those errors.
2024-01-18 13:16:22 -05:00
c26548d182
Alert any returned error messages when deleting events
2024-01-18 13:15:59 -05:00
ef926f4437
Return an array of string error messages instead of an array of arrays of arrays in deleting events.
2024-01-18 13:15:25 -05:00
04239c128c
Fix regular expression search of Source
2024-01-18 12:44:55 -05:00
adc784e767
Move maxfit2 to montage_common.js. Clean it up and apply strict
2024-01-17 17:04:49 -05:00
ceb60dd606
Remove unused compSize
2024-01-17 16:54:49 -05:00
422dda62dc
Remove important from navbar colour so that it is easier to override
2024-01-17 10:23:17 -05:00
839ef9ce67
Add a Component filter to logs
2024-01-16 16:35:52 -05:00
6812f2efe7
Fix eslint
2024-01-16 09:56:28 -05:00
1ab66b10b1
Don't assume findByEventidAndType actually returns a frame. If we are only recoridng, then there will be no alarm frames in the db
2024-01-16 09:50:19 -05:00
ebadc7a07b
GIve default user the create permission
2024-01-14 08:41:12 -05:00
a402217456
Correct state values so that Unknown starts at 0
2024-01-11 17:19:29 -05:00
36bdc3f8a9
Revert "Remove STATE_UNKNOWN"
...
This reverts commit 66e7179242
2024-01-11 17:16:58 -05:00
66e7179242
Remove STATE_UNKNOWN
2024-01-11 17:13:09 -05:00
63def6b82e
Add a function to_string that handles nulls, arrays, etc
2024-01-11 10:30:36 -05:00
6684f73694
Add export to users
2024-01-09 17:14:31 -05:00
7694d1aa86
Add End Date Time as an option for sorting in filters
2024-01-09 17:13:27 -05:00
c954214b03
If success when saving monitors, do a redirect so that a reload doesn't repeat the request and ask to resubmit data
2024-01-09 17:12:45 -05:00
db2691bf60
Only show PTZ button if camera has ptz enabled
2024-01-09 17:10:44 -05:00
0d3953bd9e
Fix collapsed version of navbar
2024-01-09 10:48:52 -05:00
c456960254
Add tags_opTypes and use it to limit operators for tags in a filter
2024-01-08 17:24:19 -05:00
ad54ad787a
Fix missing WHERE on monitor select.
2024-01-08 10:01:29 -05:00
da37e27431
Only do the console refresh if there is a value for REFRESH_MAIN
2024-01-04 15:17:09 -05:00
5887a1e853
State Unknown starts at -1
2024-01-03 16:52:44 -05:00
31036ae9dd
Users with Create permission should be able to view console
2024-01-03 16:41:56 -05:00
2747a97168
Disable range support to fix chrome playback.
2024-01-02 17:07:34 -05:00
2cc47557df
Remove bogus adding RTSP2WEB to CSP and CORS
2024-01-02 16:44:05 -05:00
ee9e03a7c1
Fix FPS values when getting status from web instead of ZMS.
2024-01-02 16:28:49 -05:00
e9362f1a10
Fix duplicated Capturing in monitor status elements. Add Recording. Fix MinEventId, MaxEventId, TotalEvents. Ad CaptureFPS, AnalysisFPS and CaptureBandwidth
2024-01-02 16:28:49 -05:00
f064887451
Add ZM_RTSP2WEB_PATH to CSP_Headers
2024-01-02 16:25:28 -05:00
85006269f7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-01-02 14:07:16 -05:00
3603aca21c
Put navbar brand separate from navbars, remove explicit padding. Increase text size of ZoneMinder in brand, hide Branding on portrait mobile
2024-01-02 14:06:52 -05:00
2d49e93405
Introduce a Create permission for Monitors, so that a given user may Edit existing monitors, but not create new ones.
2024-01-02 12:18:09 -05:00
2b10d02271
Don't include Deleted Monitor Names when checking for duplicates
2023-12-30 11:46:04 -05:00
deb880e99b
TRun off SSL verification when restarting remote filters.
2023-12-29 12:27:18 -05:00
7d5b91949c
Remove duplicate .cherry-picked commit wasn't needed.
2023-12-29 11:25:10 -05:00
d2a264b79f
define count. Fixes #3799
2023-12-29 11:06:46 -05:00
72e8ee0e5e
Move session inclusion down to where it is first used.
2023-12-29 11:06:46 -05:00
326a4ca201
Clean out old unused debugging code. The code further down is more useful
2023-12-29 11:06:46 -05:00
6e93e3df4c
Allow untrsuted ssl certs when sending commands to other servers
2023-12-24 12:17:08 -05:00
ac1c6203c2
Remove really old utility scripts for changing php tags
2023-12-20 09:20:11 -05:00
4e2dd31cdc
Use ZM_PATH_API instead of hard coded /zm/api
2023-12-15 09:18:04 -05:00
4193de1f00
Add functionality to undelete a Monitor
2023-12-14 13:55:16 -05:00
ea3d91b46f
Actually fix problem by not putting () on an integer has-post_sql_conditions
2023-12-14 09:32:32 -05:00
d910585ed9
Be a little more specific about what we are int'ing. https://forums.zoneminder.com/viewtopic.php?t=32942 has a weird error report that this might address
2023-12-13 19:39:11 -05:00
f9b82ca037
Always append username to zmu command line so that auth is more efficient
2023-12-12 11:14:29 -05:00
af3f380692
set defaults on properties of user object to fix neew user creation.
2023-12-09 18:01:04 -05:00
88db0e9854
Handle when ZM_RTSP2WEB_PATH hasn't been filled, but RTSP2Web has been turned on for a monitor.
2023-12-07 13:17:08 -05:00
2514b3533a
Fix spacing between monitor filters
2023-12-07 10:31:33 -05:00
ffc111f1e7
Need to a () so that ModelId is called as a function and so it doesn't complain about lack of property
2023-12-06 09:37:45 -05:00
ccfcd33855
modal requests require csrf-magic.
2023-12-05 09:47:35 -05:00
aafd4067e0
Dont' restart a monitor if it has been deleted
2023-12-04 14:50:37 -05:00
d51c99ce44
Fix groups not being shown when monitors not specifically selected.
2023-12-04 14:11:57 -05:00
03858ba1a2
Code style, using ->Id() instead of checking for property existence.
2023-12-04 14:06:49 -05:00
5e9f53b41a
Fixup issues with label for's
2023-12-03 17:57:22 -05:00
379028123e
add wrap to monitor filters
2023-12-03 10:25:30 -05:00
be61184faf
Add defaults to GenerateVideo, don't chdir, fix other code
2023-12-01 13:05:36 -05:00
70b1432c1f
Have to check for property_exists instead of empty. empty includes a valid value of 0
2023-12-01 12:46:49 -05:00
49af487746
port over generateVideo from perl side and stick into Event.
2023-12-01 12:46:26 -05:00
44a3a7a6a8
Fix loading event due to missing GROUP BY. Fixes event video generation.
2023-12-01 12:46:05 -05:00
99c9eb5e0e
Fix missing )
2023-11-30 14:23:17 -05:00
bb94d02019
Make sure groups is always defined else we get error from user.js.php
2023-11-30 10:00:40 -05:00
02f922d4b7
Don't include csrf on ajax requests. We only return json for ajax and the csrf kills the json parsing.
2023-11-28 10:16:58 -05:00
065bed894c
Use empty array instead of null for allowedMonitors
2023-11-24 08:57:35 -05:00
420a5a5ea5
Load events using post so that we can send a large request
2023-11-23 16:59:59 -05:00
39a0ee1230
Add loading speed from COOKIES
2023-11-23 14:27:04 -05:00
bde6870a21
Add support for Notes as a filter, setup for altering the terms later. Add CASE so that incomplete events have and EndTimeSecs
2023-11-23 14:25:52 -05:00
b0a6ef5624
Add Sorting monitors by user preference.
2023-11-23 14:10:29 -05:00
a7885a4c04
Make montagereview default to history mode
2023-11-23 14:00:19 -05:00
2fb0e40503
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-11-23 13:00:51 -05:00
164ec3667e
Fix eslint
2023-11-23 13:00:44 -05:00
b08c44172a
Add back a little padding to mfbpanel in montage
2023-11-23 13:00:30 -05:00
1fa3e18e5c
Remove extra padding in headers
2023-11-23 13:00:13 -05:00
27977acdd4
fix: php 8.3 deprecated get_class method call without argument
2023-11-22 10:48:04 +03:30
07d4fb2099
Set default delay, add starting statusCmdTimer when using rtsp2web
2023-11-21 11:35:04 -05:00
23a0e561eb
Remove depth of nested if's by returning early.
2023-11-21 10:49:09 -05:00
092f8df115
Handle scale=0 in getImageSrc
2023-11-20 17:23:51 -05:00
5be0ce5704
Fix eslint
2023-11-20 14:34:03 -05:00
e1b17590fa
Handle Config table not being updated for ZM_WEB_VIEWING_TIMEOUT
2023-11-20 14:29:25 -05:00
9a271e8960
Add are you still watching modal
2023-11-20 14:23:57 -05:00
5fd00ef7a5
Use a modal instead of confirm for are you still watching popup
2023-11-20 14:23:45 -05:00
1df3dc4c8c
Return the added modal
2023-11-20 14:23:24 -05:00
2c776523e9
Fix eslint
2023-11-20 14:04:03 -05:00
195a353bda
Add Viewing idle timeout code to watch.js and montage.js
2023-11-20 13:42:19 -05:00
d3cb7774b0
Add ZM_WEB_VIEWING_TIMEOUT, and remove quotes around config integer values so that they are integers instead of strings.
2023-11-20 13:38:22 -05:00
3ce96005af
Load Type when loading Config
2023-11-20 13:26:28 -05:00
c7bd2adb11
add ZM_WEB_VIEWING_TIMEOUT
2023-11-20 13:25:53 -05:00
IgorA100
Isaac Connor
Server
Isaac Connor
adhamiamirhossein