91955b491d
Remove class "pt-2"
...
The ".contentButtons" style will be changed in the CSS
2024-03-14 11:50:51 +03:00
38ae631dbe
Fix space
2024-03-14 00:11:28 +03:00
37756fb5f9
Added DIV to offset vertical scrollbar to left
2024-03-13 20:59:31 +03:00
cf92914c60
Update options.css
2024-03-13 20:51:23 +03:00
b10511fb97
Adjusting the vertical scroll bar when using sticky
2024-03-13 20:50:25 +03:00
66364c7c32
Fis style in Options page
...
* Why extra padding at top?
padding-top: 2rem;
*/
I don't know the answer, because... I didn't add it :)
Before my edit, it was generally “4rem”; it seemed like a lot to me, so I halved it.
I didn’t clean it up completely because I was careful not to break something completely.
I understood why. If the <form> does not have buttons at the top, then there will be no padding between the form and the "id="optionsContainer" (for example the "Storage" section).
For now, so be it.
2024-03-13 19:13:52 +03:00
6b8fe26be6
empty line
2024-03-13 16:26:25 +03:00
510d60e931
Merge branch 'master' into patch-19
2024-03-13 16:24:45 +03:00
ef3245fe2b
Moved class "pt-2" in other DIV
...
Necessary for correct table scrolling
2024-03-13 16:11:21 +03:00
1d81af50b9
Fixing table header when using sticky
2024-03-13 16:07:22 +03:00
452576ad5e
Fix: change class "table-responsive-sm-2" to "table-responsive"
...
And always specify the object ID before its class
2024-03-13 15:57:44 +03:00
4d8a357bba
Rough in bootstrap-table for monitor list in console.
2024-03-13 08:47:31 -04:00
6a20a3a482
Fix scrool bar
...
You should not hardcode "overflow-y: scroll;" because if the table contains few rows, then we do not need a scroll bar.
Also, the scroll bar must be used only in case of stickiness, otherwise there will be duplication of scroll bars in the absence of stickiness.
2024-03-13 15:38:47 +03:00
83d64e8442
Fix style for sticky navbar & sticky table header
2024-03-13 13:49:47 +03:00
fc23cef16a
Code cleaned & added table header background
2024-03-13 13:33:15 +03:00
6ccf0c66a1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-12 21:45:07 -04:00
2ba7369ea8
hack to fix scroll bars in bootstrap table
2024-03-12 21:45:02 -04:00
be202719c3
Appease eslint
2024-03-12 21:22:50 -04:00
bc044f38d9
Only put scrollbar on console contents if needed. Fixes double scroll bar when not sticky navbar
2024-03-12 17:57:50 -04:00
95d2e0a27c
Fix form not scrolling entirely. Remove top padding. Remove right padding due to bootstrap row.
2024-03-12 17:53:27 -04:00
f926e98283
Temp fix to put scroll bars back
2024-03-12 09:12:53 -04:00
855da2cbc4
Put back scroll bars on console
2024-03-12 08:55:44 -04:00
657cda18ef
Put back style permitting scrolling to work
2024-03-12 08:44:12 -04:00
625e699e32
Fix: video scaling on console
...
Close #3861
2024-03-12 11:44:29 +03:00
65c2331394
Feat: added functions for controlling the visibility of blocks when clicking on the control button
2024-03-10 23:19:19 +03:00
20e1ae2090
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-10 11:04:10 -04:00
3f9bda4f80
FIx arrap_map => array_map. Fixes #3859
2024-03-10 11:03:03 -04:00
3939bcec22
Fix eslint
2024-03-10 11:02:28 -04:00
b647280766
FIx arrap_map to array_map. Don't assume _REQUEST[mids] exists. Fixes #3859
2024-03-10 10:59:56 -04:00
76db26cec1
Merge pull request #3852 from IgorA100/patch-12
...
Fix style in options pages
2024-03-09 11:54:43 -05:00
28fd799bf6
Removed erroneously added style for tag 'a'
2024-03-09 10:26:16 +03:00
4718bff514
Merge pull request #3856 from IgorA100/patch-14
...
Fix design when viewing list of events
2024-03-08 08:24:18 -05:00
e576e9b756
Fix "overflow-y" for "#monitorList" in console
...
For "#monitorList" there is no need to set "overflow-y: scroll;"
Otherwise, scrolling will always be displayed.
2024-03-07 21:39:33 +03:00
f27f9bdf95
Fix layout
2024-03-07 16:58:26 +03:00
ab556f3135
Update events.css
2024-03-07 16:16:02 +03:00
4df177208c
Fix design when viewing list of events
...
Layouts & space in code
2024-03-07 16:03:16 +03:00
7e4cd163f5
Fix: remove right padding as unnecessary
...
Slightly shifts the video at some screen and video aspect ratios
2024-03-07 13:49:50 +03:00
e90340dd2b
Fix: More correct scaling (with padding) during live viewing
2024-03-07 13:30:39 +03:00
f0088e49d7
Remove debug
2024-03-06 16:21:44 -05:00
6124678fb8
Add scaling to zms url
2024-03-06 16:21:19 -05:00
32dc9cff2f
Remove use strict to appease eslint for now. Use a zms url instead of view=image
2024-03-06 16:02:50 -05:00
ada974ef51
Fix eslint
2024-03-06 14:21:18 -05:00
1278613832
Merge fixes in findEventByTime and fineFrameByTime with better debugging. Turn on use strict. Update when datetimepickers close instead of onchange
2024-03-06 13:31:36 -05:00
57c993507c
Fix layout
2024-03-06 20:18:15 +03:00
7757eeae1a
Fix layout
2024-03-06 20:14:36 +03:00
151114f778
Fix space
2024-03-06 20:00:08 +03:00
008c864751
Fix style
2024-03-06 19:56:10 +03:00
714a0913e4
Merge branch 'ZoneMinder:master' into patch-12
2024-03-06 19:52:25 +03:00
f94d264407
Fix: Button block location
...
There is no need
2024-03-06 19:01:52 +03:00
c8c731519d
Fix Removing excess styles & specifying a minimum textarea height
2024-03-06 01:23:42 +03:00
c69f6e8908
Fix Removing excess styles & Aligning a form vertically
...
Additional modernization required
2024-03-06 01:14:59 +03:00
696837e22f
Fix Removing excess styles
2024-03-06 01:11:16 +03:00
21cb1c8c29
Fix layout
2024-03-06 01:06:45 +03:00
55df0fd8f7
Only save permissions if passed in POST. We might not be able to see all monitors, so might not exist in POST.
2024-03-05 16:33:41 -05:00
a4ed614763
Fix set chosen width for modal window
...
For the modal window, set the width chosen to 100%
2024-03-06 00:23:11 +03:00
c078cf7bba
Use per-monitor permission on save button
2024-03-05 14:02:20 -05:00
b5e1d5e611
Fix invalid canEditMonitor call, simplify login in canView and canEdit to prefer per-monitor permissions
2024-03-05 14:02:01 -05:00
b4bbff6353
Use per-monitor permissions
2024-03-05 14:00:40 -05:00
5120baa9ee
Implement object permissions vs entity permissions so that we can handle the new group based permissions on Monitors. This fixes status updates when MOnitors=None but there is a per-monitor group based view permission.
2024-03-05 14:00:23 -05:00
302f3ad96d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-05 11:48:16 -05:00
beda6cd66d
Remove unused linked monitor array population. All is done in javascript now
2024-03-05 11:47:39 -05:00
5de9e7800c
Use monitor->canEdit when making source link clickable because it is per-monitor instead of User['Monitors']
2024-03-05 11:47:15 -05:00
4ab1aaa1d0
Fix Linked monitor expression not updating
2024-03-05 11:46:42 -05:00
ed14fc7449
Don't allow linking to ourselves
2024-03-05 11:14:58 -05:00
5c360c2a91
Add mid to available globals
2024-03-05 10:35:07 -05:00
9eee9fcb1e
Lint fixes
2024-03-05 08:14:28 -05:00
634bffea80
Adaptation of Chosen to Bootstrap (Height alignment)
2024-03-05 15:43:01 +03:00
74a43745d3
Fix: Order of loading css files
...
Initially, you need to load third-party styles and only then load your own styles.
This way we will get rid of the confusion of styles and the need to use "!important"
2024-03-05 15:20:02 +03:00
8f521a7221
Fix Entrust management of enabling search in select to the Chosen plugin
2024-03-05 14:06:13 +03:00
610109d569
Feat Entrust management of enabling search in select to the Chosen plugin
...
On Options page it is necessary to use Chosen plugin for all “selects”, otherwise the design will not be beautiful.
Search disabling is managed by Chosen plugin.
2024-03-05 12:07:45 +03:00
bc16f526ac
Merge pull request #3850 from IgorA100/patch-10
...
Added button for editing the monitor during live viewing.
2024-03-04 17:09:22 -05:00
8902f902ea
Update skin.css
2024-03-05 00:58:05 +03:00
1f6279a00f
Update skin.css
2024-03-05 00:56:59 +03:00
b07ae01e89
Fix cursor for <a>
2024-03-05 00:53:47 +03:00
7482d28af8
Fix Handling a button click
...
For some reason, an old, faulty code was sent..
2024-03-04 23:15:10 +03:00
7920f17c8a
Handling button click
2024-03-04 23:03:42 +03:00
38acd931e4
Added monitor edit button
2024-03-04 21:22:10 +03:00
a370ce19ea
Fix style
2024-03-04 17:28:30 +03:00
f173974f2b
Fix: Scaling
2024-03-04 17:22:32 +03:00
ea17631de9
Fix Control panel
...
At least temporarily.
In general, a lot of work.
2024-03-04 17:07:55 +03:00
074751e068
Fix style
...
Managed by bootstrap
2024-03-04 17:00:20 +03:00
a18167377e
Fix: scaleToFit function
...
It is required to pass an object in parameters
2024-03-04 16:52:04 +03:00
66ff90c8c1
Update watch.js
2024-03-04 16:47:46 +03:00
a05540bd3d
Fix: Responsive design with use bootstrap
2024-03-04 16:30:09 +03:00
89de8b7765
Merge pull request #3845 from IgorA100/patch-8
...
Added a link to live viewing from monitor event viewer
2024-03-03 14:29:57 -05:00
55244441c3
Add processing for clicking on the button to view all events
2024-03-03 18:50:02 +03:00
1793e7813c
Added value "Edit" to "translate" array for translation
2024-03-03 18:20:40 +03:00
45bf972fea
Ref: style
...
Bootstrap is now used more
2024-03-03 18:14:29 +03:00
99779681fb
Fix: style
...
Not required, because now using Bootstrap
2024-03-03 17:27:14 +03:00
21abe20234
Fix: style
...
Not required, because now using Bootstrap
2024-03-03 17:26:09 +03:00
373fa15440
Fix: rem style
...
Not required, because now using Bootstrap
2024-03-03 17:21:30 +03:00
9aa8919fb8
Fix: Button layout
2024-03-03 17:04:59 +03:00
6ea195b8b1
Fix: Button layout
2024-03-03 17:01:50 +03:00
0d5d495bbf
FixL Recalculation of height and width if "padding" is specified for "wrapperEventVideo"
2024-03-03 16:56:50 +03:00
84d8aa9e52
Ref: Responsive design
2024-03-03 16:49:54 +03:00
852dd772ab
Merge branch 'ZoneMinder:master' into patch-6
2024-03-03 00:38:02 +03:00
ccaaf6aaf5
Consistency
2024-03-02 14:12:59 -05:00
d7eca5bb23
fix(event): Keep progressBar from overlapping videojs control.
2024-03-02 14:10:25 -05:00
3d008263e4
fix(tags): Tags were not populated on watch view
2024-03-02 11:30:35 -05:00
d0d47a81d3
Merge pull request #3846 from Simpler1/patch-1
...
Placeholder text for monitor date time format.
2024-03-02 11:12:11 -05:00
19e6e9baf2
Merge pull request #3707 from Simpler1/default_sound
...
feat(sound): Include default alarm sound (again)
2024-03-02 11:11:03 -05:00
7fdc204082
feat(): Custom snapp.ogg sound for ZoneMinder
2024-03-02 10:15:44 -05:00
e1e255393d
typo
2024-03-02 09:55:08 -05:00
6ff4c3f7ec
Added additional parameters
2024-03-02 09:52:55 -05:00
ea0c79d976
Placeholder text for monitor date time format.
...
After spending an hour trying to figure out which date time format to enter here, I thought it would be best to just spell it out for users trying to customize this.
2024-03-01 16:59:17 -05:00
ecab601c21
Use array_values to discard the keys in the array of monitorIds
2024-03-01 16:13:52 -05:00
8a42594009
Upgrade bootstrap-table to 1.22.3
2024-03-01 11:44:06 -05:00
02785fb81d
Merge pull request #3844 from IgorA100/patch-7
...
Adding and correcting Russian translation
2024-02-29 15:22:17 -05:00
9cd048d97b
Only try to set monitor_permissions for non-deleted Monitors
2024-02-29 09:19:19 -05:00
c33ec9833a
Only show non deleted monitors in linked monitors
2024-02-29 08:59:14 -05:00
43cd675d96
Added value "Live" to "translate" array for translation
2024-02-29 15:12:33 +03:00
a6b9ba5a1d
Added a link to live viewing from monitor event viewer
2024-02-29 15:07:41 +03:00
a28df623f2
Fix canEdit is a hash, not a function
2024-02-27 19:18:09 -05:00
0128873ca7
Spacing, some better debug
2024-02-27 18:41:31 -05:00
c48ccd3ce2
Add autocomplete to onvif_username and fix case when local inputs aren't there after switching from non-local to local because Method is now wrong.
2024-02-27 17:39:34 -05:00
ad53ebb8a8
Handle when inputs don't exist.
2024-02-27 17:38:48 -05:00
c1b65185b5
Handle when inputs don't exist.
2024-02-27 17:38:45 -05:00
c51c53c47a
FIx use of inline javascript for the method dropdown on remote type monitors
2024-02-27 16:50:52 -05:00
742a821170
Add 'Decoder' => 'Декодер'
2024-02-28 00:30:43 +03:00
ebe8a26188
Add 'OnMotion' => 'При движении',
2024-02-28 00:26:30 +03:00
881cb5327e
Adding and correcting Russian translation
2024-02-28 00:19:47 +03:00
f89b7461b1
Temp solution: If server ID is "1" we assume that it is NULL in DB
...
To display Stats in Options->Server
2024-02-27 22:06:24 +03:00
5a5a25e6a9
Add ReadStats()
2024-02-27 21:53:25 +03:00
59e4bdd69e
Fix: Losing icons during Ajax update
2024-02-27 19:57:23 +03:00
72674fd0d4
Add function ReadStats()
...
Reading Stats from DB
2024-02-27 18:14:02 +03:00
4529b32a5d
Fix getSysLoadHTML() getCpuUsageHTM()
2024-02-27 18:03:39 +03:00
cd8ffa08dc
Add getCpuUsageHTML()
2024-02-27 16:49:29 +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
d06264624a
Refresh events list when filters at top change or close in the case of datetimepicker
2023-11-17 12:06:03 -05:00
936cefb41a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-11-17 09:33:22 -05:00
56095bec9d
Must use MIN_STREAMING_PORT in monitor Url because 80/443 might not go to the same host as MIN_STREAMING_PORT (think reverse proxy)
2023-11-17 09:33:17 -05:00
6232cfb8b1
Remove 100 limit on response to events index. Handle there not being a next or prev neighbour.
2023-11-16 18:00:30 -05:00
0d6df970d3
Enforce max length of 64k for log entries. Use HTTP_X_FORWARDED_FOR in logging so we log actual remote addr
2023-11-16 10:34:44 -05:00
afb594aa19
Don't load Servers, they are loaded globally in config. Enforce int instead of string for range because fseek can't handle strings
2023-11-16 10:34:44 -05:00
a1693c34b9
Add HTTP_FRONT_END_HTTPS as a signal to use https in urls. Mainly for when using a reverse proxy
2023-11-16 10:34:44 -05:00
ee0ef4b6e4
Handle when there are no cueFrames populated
2023-11-16 10:34:43 -05:00
d9ae4f8e04
Do not need to make servers global in this context. They are by default.|
2023-11-16 10:34:43 -05:00
40975184e0
Return the found term instead of true in has_term.
2023-11-16 10:34:43 -05:00
8e0793f5e7
Do not format StartDateTime and EndDateTime in ajax events results. Do the formatting in js.
2023-11-16 10:34:43 -05:00
c23ee28fe6
Take expires setting off setCookie so it defaults to 2038 like everywhere else.
2023-11-15 11:34:05 -05:00
cf906e86c8
Added missing table tags
2023-11-15 04:55:18 -08:00
83af15329a
Fixed Monitor->WebSite Source Refresh html
2023-11-14 04:13:04 -08:00
c1b32b79a2
Code style clceanup in server action
2023-11-13 11:38:03 -05:00
abb4230f86
Use ajax error when specified storage not found.
2023-11-13 11:37:47 -05:00
aaebd725bb
Set default values on members, fixing bad defaults on nwe storage.
2023-11-13 11:37:31 -05:00
9f04d90a27
When ZM_AUTH_HASH_IPS is off, don't use remote ip in storing auth hash in session. If ips are constantly changing it breaks.
2023-11-13 11:31:45 -05:00
aaaa321464
fix eslint
2023-11-09 11:55:17 -05:00
542803848d
Prevent non-number inputs when filter attr is DiskPercent
2023-11-09 10:33:25 -05:00
6a68e5577a
If view does not exist, redirect to console instead of just dying
2023-11-09 09:57:27 -05:00
7bc126abe1
Use User->Id() instead of Request['uid'] because when adding a new user Request['uid'] isn't populated so a warning is generated.
2023-11-08 14:23:49 -05:00
5486fc6327
Include username in url when using auth_hash so that the authenting sql can be more efficient
2023-11-08 10:55:39 -05:00
46b27d9f78
Add Tags support to API
2023-11-03 13:33:28 -04:00
46fcb27a3b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-11-02 12:21:59 -04:00
9537492f1c
Handle invalid codec and fix video_tag boolean assignment causing video tag to be false
2023-11-02 12:21:30 -04:00
e6632ade43
Use echo instead of print which is apparently faster.
2023-11-01 17:27:56 -04:00
f26617af71
Fix not allowing html5 video tag when h265.
2023-11-01 17:27:56 -04:00
859baf6f8f
Remove padding from navbars to condense them a bit. Fix 1 pixel extra padding on state button
2023-11-01 11:31:18 -04:00
13ec02d5f1
Fix Auto Unarchive not deselecting
2023-10-31 10:02:58 -04:00
f76046af3f
Always stop a filter. Otherwise we won't stop it when switching from background to not background.
2023-10-30 17:16:06 -04:00
e2f8553b48
Fix lack of scroll on groups view.
2023-10-30 15:51:39 -04:00
36936001a4
Remove trailing spaces. Remove extra comma causing SQL-ERR
2023-10-30 10:22:04 -04:00
6aa7901066
Use same logic as in LogHTML to apply success class, and hence make the word Log green when there are no errors.
2023-10-30 10:03:17 -04:00
db252ce191
Dont' log warning when no user preference set. Inlcude more info in log message.
2023-10-30 09:40:03 -04:00
29be822e99
Add required GROUP BY Id to fix SQL queries
2023-10-27 10:43:27 -04:00
1545210b12
Add php8.1+ members support for multiple and chosen flags for filter terms
2023-10-26 18:43:05 -04:00
d54171c21c
Be a little more verbose and robust when things like permission errors break config loading
2023-10-26 18:37:15 -04:00
e8a866e504
Add named parameters support to ServerStatsController.
2023-10-26 18:26:51 -04:00
d7bb9674e3
Add newline to fix SQL err due to Tags
2023-10-26 11:11:50 -04:00
ecfc39aa87
Set new defaults for ENabled, API Enabled and HomeView in user Object. php's new need to declare every property breaks the old default system. Only load Group Permissions and Monitor Permissions if we have an Id.
2023-10-26 09:39:26 -04:00
f1f553dd98
Don't give a default value to Username it is not useful. Replace it with a placeholder.
2023-10-26 09:26:35 -04:00
50ece0ae57
Turn off debugging of status ajax results. Can be a lot of info and can be gotten from browser dev tools
2023-10-26 09:25:45 -04:00
f4d69d524a
Undo the extreme splitting up of the SQL so that it is a little less multiple-liney. Hopefully may fix the lack of white space issue reported in forums.
2023-10-25 09:40:14 -04:00
b01908e93c
Don't include the third nav element for nav banner when there is no banner set so as to take up less space
2023-10-23 17:06:28 -04:00
ab979c8f42
Fix typo in getHomeView
2023-10-23 16:49:34 -04:00
717f644087
Define ->savedErrorReporting to prevent php errors in logs
2023-10-23 16:39:43 -04:00
1411c47c99
Correct case of value in User_Perference
2023-10-20 14:51:18 -04:00
84ca405749
Rename a variable due to cutnpsating
2023-10-20 14:51:07 -04:00
0ab7a755ba
Event::Tags returns an array of Tags objects, so turn them into a string.
2023-10-20 14:02:48 -04:00
c287b7f645
Add Tags() and Event_Tags() functions to Event
2023-10-20 14:02:25 -04:00
d303927ad0
Rough in ORM for Tags
2023-10-20 14:02:10 -04:00
7824613e53
Allow Objects with no Id, they can't be cached but can be used.
2023-10-20 14:01:55 -04:00
f650d300d4
BUmp jquery to 3.7.1
2023-10-20 10:53:24 -04:00
f5107b5743
Default to showing PTZ if it is enabled
2023-10-20 09:05:03 -04:00
7c2ec7f404
Improve replayMode loading, adding support for User Preference default value
2023-10-19 13:02:39 -04:00
876d76ef1d
Only do thumbnail animations if not on mobile.
2023-10-18 12:03:56 -04:00
48b5960fac
Can't copy by ref, the limit will affect unfiltered as well
2023-10-17 14:57:57 -04:00
41c156918e
aviableTags must be defined
2023-10-17 14:13:44 -04:00
3cd6b78b85
OutputCodec cannot be null
2023-10-17 12:33:27 -04:00
eaf43daa5c
Fix missing date init
2023-10-16 14:13:07 -04:00
621e9e68d0
Must use floats when calculating width of progress bar segments.
2023-10-16 14:07:21 -04:00
e9d51731e8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-10-16 12:23:37 -04:00
db7a25ab3b
Remove event rename button functionality, as that exists in eventdetail/event edit.
2023-10-16 12:23:29 -04:00
c6d9c7731d
Add aborting in transit events loading before sending another.
2023-10-16 12:15:55 -04:00
1658943097
Use playClicked instead of vjsPlay as it has additional functionality
2023-10-16 12:15:28 -04:00
c06f32fd67
Only load event OBject and test post_sql_conditions if the filter has any. Save a little processing. Copy unfiltered rows by reference.
2023-10-16 12:04:14 -04:00
ea76a03043
Rename startRTSPtoWebRTSPPaly to startRTSPtoWebPlay
2023-10-15 17:55:44 -04:00
93f5378f4e
Fix undefined reference to startPlay
2023-10-15 17:55:44 -04:00
8fd33b7f77
Handle case when Alarm frame or MaxScore frame don't exist.
2023-10-15 17:55:44 -04:00
71ff61b05f
Use parseInt around quoted number values so that we can trust that they are integers. Fixes an issue with StreamReplayBuffer
2023-10-15 17:55:44 -04:00
4fe61d60ca
Add Email as a column in user list
2023-10-13 09:01:56 -04:00
fdc500304b
Add test to see if php-curl is installed instead of crashing.
2023-10-12 11:04:55 -04:00
0ba0e6d27b
Control form elements were renamed from newControl to just Control. Update validateForm to match.
2023-10-11 14:58:54 -04:00
ad35eba013
Use bootstrap table for user list, giving us sortable columns and we can use mobile table/card
2023-10-11 13:34:38 -04:00
7762e882b1
Remove debug
2023-10-11 13:34:09 -04:00
69e601d286
Fix failure to save new user due to Snapshots not getting a default value.
2023-10-11 13:34:00 -04:00
bdc6bb58d6
Add a redirect after user delete so that we don't have form resubmission
2023-10-11 13:33:31 -04:00
0fe6dc2997
Fix the second Offline test. Fixes #3766
2023-10-11 11:34:27 -04:00
feb3d91e8b
Remove Tags from Event Data defaults. I don't think it is meant to be there
2023-10-06 14:54:17 -04:00
72d021dae9
Remove Tags from Event Data defaults. I don't think it is meant to be there
2023-10-06 14:49:57 -04:00
16db44193f
Test for data.response being defined and do some logging if not
2023-10-06 14:32:55 -04:00
9ff31ab4f5
Only print logged in user name if we are actually logged in, in order to avoid errors in logs
2023-10-05 17:03:42 -04:00
38be4feeb8
Servers is a global, don't need to hit the db again
2023-10-05 11:51:33 -04:00
58ef8fe509
IF operator is LIKE and there is no %, automatically add them to front and back so that we get a match.
2023-10-05 11:50:29 -04:00
c78063abd1
If we can edit we should still be able to do view actions
2023-10-04 15:11:14 -04:00
44c5c3c70c
Introduce new download mode that concats event videos into 1 file per monitor
2023-10-04 12:04:11 -04:00
f864a29eac
Always return an array in getCredentialsDeprecated
2023-10-04 11:12:37 -04:00
9b1e98997c
fix eslint
2023-10-01 10:28:36 -04:00
2547376c27
fix(php8): AllowDynamicProperties
2023-09-30 19:56:57 -04:00
db390a4861
Merge branch 'fix_hardcoded'
2023-09-29 12:18:23 -04:00
10cf26fa7b
Take FPSReportInterval into account when determining if a monitor is dead. Fixes #3766
2023-09-29 12:09:23 -04:00
2d46fc350a
Spacing, test for setting of ZM_PATH_IP
2023-09-29 12:07:50 -04:00
7060945e97
Use new ZM_PATH_IP and ZM_PATH_IFCONFIG instead of hard coded paths. Fixes #3670
2023-09-28 13:32:42 -04:00
5a7bd74521
Remove commented out code
2023-09-28 12:59:51 -04:00
91c44a4f9a
Fix semi colon
2023-09-26 15:17:26 -04:00
23b58a2709
Move delteclick and download click into separate functions. Only load delconfirm modal when delete is clicked.
2023-09-26 15:17:01 -04:00
51500d494f
Add group by when doing advnaced search
2023-09-26 15:15:47 -04:00
82aeac076d
Fix incorrect var name frameid=>fid in find_virtual_frame
2023-09-26 12:10:36 -04:00
709d08c6c5
Only call jsonDecode when Query_json is non-empty
2023-09-25 16:56:06 -04:00
45bcb13045
Add backtrace to errors in json
2023-09-25 16:32:20 -04:00
1fdf7f2b31
Remove debug
2023-09-25 16:32:01 -04:00
e1ef40de17
Only load the delConfirm modal if we click delete
2023-09-25 16:27:01 -04:00
a619634988
Add tab to available js vars on options
2023-09-21 12:52:30 -04:00
fc3a1bfc4b
use const instead of var
2023-09-21 12:52:02 -04:00
24d6649e98
Log useful output when failure to write dnsmasq.conf and fail to restart dnsmasq
2023-09-21 12:51:37 -04:00
2e10169cde
Deprecate cURL monitor type
2023-09-21 12:08:27 -04:00
057159cde6
Make properties public so that they can be access in Storage object
2023-09-21 10:10:57 -04:00
2e17d2e8a4
Add Notes filter
2023-09-20 13:35:30 -04:00
4410757037
Fix use of RETURNING Id which isn't supported in all mysql. Use dbInsertId instead.
2023-09-15 11:26:15 -04:00
ee379cb4e4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-15 10:15:58 -04:00
f8c89a0405
Merge branch 'master' into tags
2023-09-14 16:42:06 -04:00
b68ed6c135
Use UpdatedOn field of Monitor_Status to determine if info there is stale. Show offline if Monitor_Status hasn't been updated in over a minute.
2023-09-14 10:25:36 -04:00
41dc7c8f4e
Fixes to not log errors when there are no monitors to display in watch.
2023-09-13 11:19:16 -07:00
e11b700fbd
Add Id as a protected member, only lookup monitor status if Id has a value
2023-09-13 11:18:50 -07:00
6754fcb208
Make Filter properties protected
2023-09-13 11:18:28 -07:00
1c3206b781
Merge branch 'master' into openbsd
2023-09-13 10:15:06 -07:00
fccebee056
Add -a to arp, add ZM_PATH_OUI for path to ieee-oui.txt
2023-09-13 10:14:49 -07:00
c4302c27ac
Add code to test for existence of ip and support ifconfig
2023-09-13 10:14:21 -07:00
a58949ab32
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-13 13:10:37 -04:00
d9bf168066
Merge ../ZoneMinder.connortechnology
2023-09-13 13:10:14 -04:00
c6a7fe949a
Use different syntax for property access
2023-09-13 13:10:01 -04:00
d7090ce84a
Define properties
2023-09-13 13:08:12 -04:00
3767d815a5
Use different syntax for assigning object properties
2023-09-13 13:05:57 -04:00
ef402e7b99
Define tablename member
2023-09-13 13:05:39 -04:00
46ac2dba2f
Define tablename member
2023-09-13 13:05:25 -04:00
6a87f56ac2
Never display errors
2023-09-13 13:04:16 -04:00
de8f387207
Restrict mid to a cardinal value. Fixes GHSA-9cmr-7437-v9fj
2023-09-13 10:12:04 -04:00
e353523073
Fix int()=>(int) causing events to not load
2023-09-12 09:07:46 -04:00
da213d8532
Merge branch 'master' into openbsd
2023-09-11 13:42:43 -07:00
50059e5842
Only show ram info if proc exists.
2023-09-11 13:42:22 -07:00
b7ed7a4bd8
in detaintPath also strip :// because php:// is a way to inject code
2023-09-11 12:34:31 -04:00
a194fe81d3
Only allow Events Columns for sort. Fixes GHSA-2qp3-fwpv-mc96. Fixes GHSA-9cmr-7437-v9fj
2023-09-11 11:29:54 -04:00
a13c9c06f2
Handle when filter limit is '0'
2023-09-09 12:38:47 -04:00
b1cdf9905c
Make notes clickable to bring up objdetect image like in events list
2023-09-09 12:37:27 -04:00
e53974119b
Ensure that group_id is defined
2023-09-09 12:08:44 -04:00
b44216d3da
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-08 14:19:09 -04:00
a9997b943a
Use new event::find_virtual_frame when loading frames
2023-09-08 14:19:01 -04:00
cb5442d5b8
Add 704x576 aspect ratio to timeline css
2023-09-08 14:18:34 -04:00
82e972943e
Add frame loading including virtual frames
2023-09-08 14:18:11 -04:00
473d34e220
Update events frameimage status code to use Event object. Make not finding the frame a debug because of bulk frames.
2023-09-08 14:17:36 -04:00
2b2c43e630
Merge pull request #3748 from Simpler1/patch-6
...
Refresh table on show
2023-09-05 13:05:36 -04:00
18d74ed7ac
(feat): Tags
...
fix(tag): Create tags on mobile
chore(tags): Change TagName to Name
chore(tags): eslint
chore(tags): dbFetchAll to dbQuery for removetag
chore(events): eslint (attempt 2)
feat(tags): Better handling of keyboard
fix(tags): Enter key for creating new tag
fix(tags): Don't allow space as a tag name
feat(tags): Delete tag if last assignment removed
fix(tags): Increase height of dropdown
in progress
fix(Tags): Use T.Id on the events page dropdown
fix(Tags): Remove $availableTags from events.php
chore(sql): Formatting sql statements
feat(Tags): Working OR on filters and events pages
fix(filter): Populate availableTags
chore(Tags): code formatting
fix(tag): Add tag on create tag
Fix(tags): Remove tag from available if last
feat(tags): Add zm_update.sql
fix(chosen): Undo css width
fix(chosen): tags dropdown width
fix(tags): dropdown over timeline
fix(tags): Full width input
fix(events): Refresh table on page show
chore(filter): Clean up availableTags
chore(event): Clean up available & selected Tags
fix(event): Update available tags on remove
fix(event): Remove hack for selected tags
feat(tags): Blur input after adding tag
doc(tags): Initial tags documentation
fix(tags): Dark theme dropdown
fix(tags): Dark theme for tags on input
fix(tags): Dark theme for highlight in dropdown
fix(tags): Populate filter tags droplist
chore(): Bump zm_update to 1.37.42
chore(tags): Move mobile check to skin.js
chore(tags): Comment debug statements
fix(tags): Enter key to create tag on mobile Chome
chore(tags): Space in 'All Tags' for translation
Temporary commit to handle cookie expiration times
chore(tags): Remove unnecessary Tag(s) from en_gb
chore(): Cleanup unnecessary Error and Debug
chore(): Resolve merge conflicts
chore(): Address merge conflicts with master
2023-08-31 15:50:08 -04:00
e5d125c4ef
Handle when no linefeed found
2023-08-31 12:46:12 -04:00
56999da3eb
Check for existence of path before scanning it generating a lot of erros
2023-08-30 14:38:43 -04:00
6331d79a73
Add visibility toggle for password inputs on user edit
2023-08-28 16:39:23 -04:00
6fd119157a
Text corrections
2023-08-27 02:00:59 +02:00
cf713b59d7
Add 500 and 1000 as pagination options
2023-08-25 19:02:17 -04:00
9132f8947d
If scale is 0 or negative, then start with scale=100
2023-08-23 16:32:39 -04:00
76d5646cbf
Fix scaling being constantly set to 0 and hence logging a bogus value for scale
2023-08-23 16:32:13 -04:00
1dba6115b1
Fix eslint
2023-08-23 11:44:16 -04:00
1e423c151d
Stop infinite recursion when fail to load logout modal.
2023-08-22 12:20:11 -04:00
67e2c80851
Check for existence of modal before including it.
2023-08-22 12:19:48 -04:00
491b48f9f9
Only allow execute if you have EditEvents permission
2023-08-18 16:58:29 -04:00
9371c2775d
Use canEdit and canDelete to allow users without canEditEvents to create filters that don't act on events, only list them.
2023-08-18 16:57:51 -04:00
94ea51489b
Add canDelete and canEdit functions to Filter
2023-08-18 16:57:08 -04:00
ea581e521f
Add default value for order
2023-08-18 16:56:50 -04:00
084fc8b651
Put users table in an options div, which has overflow-y: auto applied to it. Move buttons to top so they don't scroll
2023-08-18 12:12:30 -04:00
8748d6a1cc
Handle unset _SESSION['remoteAddr']
2023-08-16 15:23:34 -04:00
91b4e299b9
Demote failed login to Warn instead of Error
2023-08-16 10:37:06 -04:00
bdc8452891
Add a button to toggle ptz controls. Put ptz controls into a right hand sidebar.
2023-08-15 17:58:55 -04:00
d31f918abc
Change the api for frameimage status request to split id into eid and fid instead of having id as an array.
2023-08-15 09:15:24 -04:00
9a229a78a5
Fix missing mac key on cameras array
2023-08-14 13:30:24 -04:00
87f09d3b7e
Fix usage of unset variable
...
If daemon or args are unset the preg_replace is never called which can
result in count not having a value when referenced in the if statement.
This generates a warning in error.log.
2023-08-13 17:56:55 -07:00
a93b67c9d8
Fixed eslint checks
2023-08-13 16:47:04 +02:00
c5eec8fa12
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-08-10 11:03:30 -04:00
8672e6d64e
Fix missing dropdown-item class on warning or danger storage areas. Increase warning to 95% instead of 90%
2023-08-10 11:03:22 -04:00
9d5a1ec9d5
If scale is invalid, reset to auto so we don't constantly log the error.
2023-08-10 10:58:19 -04:00
b2993c3ec0
Use some const instead of var in changeScale
2023-08-09 19:29:19 -04:00
b8982dce53
When hiding/unhiding the monitor filter bar, when done call changeScale to readjust the size of teh video
2023-08-09 19:28:59 -04:00
10d70022fe
Handle when controls is not defined, like in WebSite monitors
2023-08-09 19:01:55 -04:00
7aa229658b
Slight cleanup of changeScale, converting it to float instead of string.
2023-08-09 19:01:30 -04:00
889c809e0b
Add RTSP2WebEnabled to defaults
2023-08-09 18:55:36 -04:00
7750eef533
Handle non-existing elements when monitor type is Website or Local.
2023-08-09 16:00:08 -04:00
IgorA100
Isaac Connor
Isaac Connor
Simpler1
Simpler1
Server
adhamiamirhossein
efranzwa
Charlie Root
Alejandro Criado-Pérez
Joe