7b2dcc2ea8
user->MonitorIds no longer exists
2023-04-22 21:32:53 -04:00
6d88b3b90c
Add scanNetwork button
2023-04-22 16:59:59 -04:00
483b658622
Fix const curWidth. Fixes #3690
2023-04-22 16:45:30 -04:00
0bce4e190e
Fix eslint
2023-04-22 14:06:00 -04:00
35cc9fa4cb
Apparently Default for Deleted needs to be zero, not false
2023-04-22 14:04:18 -04:00
665628720f
Improved setting of Manufacturer and Model, add Status to monitor view status, new defaults for Label, EncoderParamters, don't save analysis jpegs by default and only analyze on 2fps and set a reasonable MaxImageBuffer
2023-04-22 13:58:33 -04:00
5f8c80698e
Improve Ubiquiti snapshot jpeg support
2023-04-22 13:32:42 -04:00
68370a1f88
Add Group to filters, add Notes to widgets, other fixes to widget structure. Add cookie support for widgets.
2023-04-22 10:56:34 -04:00
d9f5d3c357
Implement StartDateTimeSecs
2023-04-22 10:48:41 -04:00
312d0ba841
Use objdetect as thumbnail if it exists.
2023-04-22 10:47:33 -04:00
1638869982
If mp4 is not found, look for any other mp4s to use. Handles care where db has not been updated
2023-04-22 10:30:25 -04:00
c36be30e2a
Rough in an image proxy
2023-04-22 10:29:27 -04:00
d1543f7dd9
Fix missing )
2023-04-22 09:37:53 -04:00
4d8d4b6ee5
Update add_monitors to make it scan the network.
2023-04-21 17:52:14 -04:00
e4509a54ce
Move form control search box font fix to skin so it affects everywhere
2023-04-21 17:51:44 -04:00
0480a745d8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-21 17:37:44 -04:00
9102389394
Remove debugging from font loading
2023-04-21 17:33:14 -04:00
343dd7006c
Fix ESLint errors
...
GitHub web editor adds tabs when it autoformats code,
2023-04-20 00:44:04 -06:00
7a7c57f4d4
Update monitor.js
...
Fix indentation.
2023-04-20 00:39:42 -06:00
ad6f93d6d8
Update monitor.js
...
Hide Janus RTSP Timeout when use Janus is unchecked.
2023-04-20 00:36:04 -06:00
94ef0939ba
Add Deleted=false to sql loading monitors
2023-04-19 18:57:11 -04:00
02046b9c88
Use object methods to load monitor and delete it
2023-04-19 18:56:52 -04:00
73548dda73
Add Deleted member
2023-04-19 18:56:29 -04:00
6a2d28d92f
If Monitor is deleted, don't show event
2023-04-19 18:56:19 -04:00
daa47f4eac
views/monitor.php: Add back h264 NVMPI decoder
...
While moving decoder selection to be configuration based, the NVMPI based
H264 decoder was missed: add it back.
Fixes: 5027bf207
2023-04-18 18:02:48 +02:00
2c2b0a4c30
Add current setting for analysing and recording to Function column
2023-04-13 17:08:13 -04:00
2447f6e0db
Fix wrong number of parameters when using text search
2023-04-13 13:27:20 -04:00
ad89fe94ac
If holding ctrl when clicking zoomout button, zoom out all the way
2023-04-13 12:25:50 -04:00
8a434c95fc
Fix checkbox column still being on the right in the footer
2023-04-13 12:25:26 -04:00
1f11493266
Don't need to add auth_hash if we have auth_relay
2023-04-13 10:13:27 -04:00
50be9b6bf1
Allow table to have 200 rows instead of 100.
2023-04-13 10:13:06 -04:00
036091d7e1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-11 12:12:09 -04:00
1fcb29bbba
Fix the auto population of ControlAddress with user:port@ip
2023-04-11 12:12:04 -04:00
1f87eddd48
Cast event counts to int so that they say 0 instead of null
2023-04-11 08:22:18 -04:00
08e315c25d
Fix unmatched}
2023-04-11 07:55:23 -04:00
6fd46c54d5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-11 07:54:02 -04:00
240333381a
Handle val and cnj not being specified. Add Notes to attr that must be non empty
2023-04-11 07:53:55 -04:00
22bca46921
When viewing events with no startdate add a blak StartDate filter
2023-04-10 18:09:29 -04:00
74409daec4
Fix 5MP resolution
2023-04-10 14:20:53 -04:00
b85b7e462e
When testing ZM_ALARM_ON_SOUND, use string comparison as the config value is a string. Also add log if other config options are not set
2023-04-10 13:13:36 -04:00
aff74f0dab
Add text spans on buttons so we could hide text if we wanted to
2023-04-10 10:49:26 -04:00
e447137bf9
Define ZM_DIR_SOUNDS on montage
2023-04-09 08:58:28 -04:00
8dcc767af1
Split button bar into three sections, adding a right button bar and make it flex. Add right buttons to do sorting instead of using an image in each row. Move the Id column to the left for consistency and good UI.
2023-04-07 13:27:20 -04:00
75d9d9ad9b
Fix eslint
2023-04-07 12:09:01 -04:00
92f8adb654
Fix eslint
2023-04-07 12:08:18 -04:00
7b3a613474
Merge pull request #3685 from Simpler1/shift-delete-event
...
feat(event): Shift delete with no confirm
2023-04-07 12:03:55 -04:00
26d39dcde6
feat(event): Shift delete with no confirm
2023-04-07 12:00:53 -04:00
e0dd6ccca2
feat(event): Shift delete with no confirm
2023-04-07 11:26:32 -04:00
b2fe561608
Merge pull request #3682 from Simpler1/alarm-sound
...
fix(alarmSound): Use Audio.play() for alarm sound
2023-04-07 11:17:14 -04:00
977f392ffb
Merge pull request #3684 from Simpler1/shift-delete-watch
...
feat(watch): Shift delete with no confirm
2023-04-07 11:16:08 -04:00
0a84cd0327
fix(alarmSound): Use Audio.play() for alarm sound
2023-04-07 10:55:09 -04:00
d4b9982584
feat(events): Shift delete with no confirm
2023-04-07 10:54:15 -04:00
4b0a6e1cb0
feat(watch): Shift delete with no confirm
2023-04-07 10:53:11 -04:00
2343a42eea
Add Resolution to event stats
2023-04-06 19:03:40 -04:00
37c1b923bb
Update var=>const, and add detection of unapplied scale to image stream, and re-apply
2023-04-06 19:03:24 -04:00
1ada7d7504
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-06 15:16:12 -04:00
01b886ef49
Add scale to status and fix cast on elapsed
2023-04-06 15:15:36 -04:00
a256056d0a
All float values in various fields
2023-04-05 17:50:56 -04:00
ce0a83f904
Reduce minimum to .05% as that is what seems to be necessary these days
2023-04-05 17:47:03 -04:00
394cd6e0f8
AlarmRGB should be an actual hex value not a string
2023-04-05 17:46:29 -04:00
23fb13f660
Show streams even if not running, since they may be on a different server
2023-04-05 17:46:08 -04:00
21f6bdae35
Change minimum percent to 50% instead of 3%
2023-04-05 14:46:13 -04:00
d170112ef7
Change minimum percent to 50% instead of 3%
2023-04-05 14:45:30 -04:00
b1df318491
Use ORM Zone Object for Zone insertion on new monitor
2023-04-05 14:43:50 -04:00
231b0ab631
Sync up default values with what gets added in actions/monitor
2023-04-05 14:42:44 -04:00
48067542f9
Limit progressbar to 100%
2023-04-05 08:59:16 -04:00
9284ae2908
Add Name,Email,Phone to User object
2023-04-03 12:45:09 -04:00
edaec97895
Move buttons to header
2023-04-02 18:17:03 -04:00
df2828ecba
Make new header div flex and align contents
2023-04-02 18:16:51 -04:00
7616898579
Add class to side navbar to so can hide entries there too
2023-04-02 17:20:37 -04:00
6bc2d525d5
Add the config item name to the div so we can hide them if we want
2023-04-02 16:52:08 -04:00
44ebd80334
Parse and substitute events numbers with a link to the event.
2023-04-02 16:38:02 -04:00
e739cc2a34
Remove debug
2023-04-02 16:28:42 -04:00
7e00621e27
Make events column headers links too
2023-04-02 16:28:23 -04:00
c23469e3eb
limit height of filter inputs because chosen multi-select can get too tall
2023-04-02 16:28:05 -04:00
aaf5f4f207
Use val() on the select instead of trickery to get the array of selected values
2023-04-02 16:27:39 -04:00
3a20ab64c7
Turn dropdowns into chosen multiple-selects
2023-04-02 16:27:14 -04:00
d5baadca84
Comment out debug
2023-04-02 16:10:24 -04:00
86768d108a
Fix values not being used in log query causing errors when level filter isused
2023-04-01 09:41:37 -04:00
6b0fb7304a
Improve styling of monitors, making monitors list comma separated instead of br and make them links to monitor edit.
2023-03-29 11:58:55 -04:00
e0c1aeb823
Use jquery text() instead of DOM innerHTML to change icon
2023-03-28 18:09:04 -04:00
db58e9f7ef
Use alt and title tags on frame images
2023-03-28 16:35:20 -04:00
06cad49b80
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-03-28 16:34:05 -04:00
ca0f04f3a7
Fix assignment to const
2023-03-28 16:31:33 -04:00
aff04e3230
Remove width spec from objdetect image when viewing fullscreen
2023-03-26 10:50:11 -04:00
8f96f7de8b
fix lack of scroll in event view
2023-03-26 10:28:18 -04:00
593c7ac902
Handle HomeView not being set, and default it so that it is set
2023-03-24 12:53:49 -04:00
16b74fc474
Add title of monitor id and name like we had in 1.36
2023-03-23 20:03:40 -04:00
dd6cc74da7
Rough in UserPreference api
2023-03-22 13:22:08 -04:00
764d48d378
If the css in cookie is invalid, clear it so that the logs don't fill up with the warnings
2023-03-22 08:06:02 -04:00
6c8a2ad05a
add support for shortened user= pass= which is used in auth_relay=PLAIN
2023-03-22 08:06:02 -04:00
da87187f1d
Use explode instead of split
2023-03-22 08:06:02 -04:00
01ba5f59f9
Use dirname(__FILE__) instead of DOCUMENT_ROOT. Apparently many people have something wrong in DOCUMENT_ROOT. I don't understand it, but it seems like dirname(__FILE__) is a better solution anyways.
2023-03-21 18:22:53 -04:00
34e3e99c99
Rough in code for User_Preferences
2023-03-21 10:03:57 -04:00
cd167d8aec
Fix eslint
2023-03-21 10:02:53 -04:00
e60586feee
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-03-21 09:54:40 -04:00
128b3d884a
Spacing
2023-03-21 09:54:37 -04:00
e216b6b008
Add auth_relay to stream status request so that it works when AUTH_RELAY=PLAIN
2023-03-21 09:54:22 -04:00
a1c732abb8
Add special case, when the filter specifies a single event, modify the filter to be a Monitor filter so that next and prev buttons work
2023-03-21 09:53:52 -04:00
7a254b42f5
Fix use of auth_relay when PLAIN
2023-03-21 09:52:50 -04:00
a45fc576c9
Improve detection of codec playability. Basically just look for h264
2023-03-21 08:21:20 -04:00
766cdcde9e
Add auth_relay to cycle urls so that auth works on cycle view
2023-03-19 11:31:44 -04:00
8bef309a86
Values in terms are comma separated, so split the val for Monitor selection
2023-03-16 08:43:01 -04:00
97879eab49
Fix missing s causing problems when Group permission set to None
2023-03-08 10:59:33 -05:00
06f750c42b
add in is_isnot_opTypes and booleanValues and use them in simple_widget
2023-03-05 13:26:08 -05:00
ed9f02d4b0
show icons even if loading times out
2023-03-05 12:54:08 -05:00
3431a82f76
Add classes to option rows so we can style them individually
2023-03-05 10:57:35 -05:00
065464a7f8
Use new getHomeView function instead of view=console
2023-03-05 10:21:59 -05:00
4c586b67ba
Fix include from api to users for users tab
2023-03-05 10:21:39 -05:00
3e86454fc6
implement getHomeView function
2023-03-05 10:21:18 -05:00
aac9c644fb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-28 14:06:16 -05:00
6000ceaf2e
Add Name, Email, Phone to user edit
2023-02-28 14:06:00 -05:00
18403bf33e
Move users list from options into an include. Add Email, Phone, Name fields
2023-02-28 13:59:16 -05:00
94efc5ff73
Add fontfaceobserver.js
2023-02-28 13:58:17 -05:00
ecf91ff6a0
Unhide material icons once the font has loaded
2023-02-28 13:58:02 -05:00
ad4bc04bfb
Hide material icoins until font is loaded.
2023-02-28 13:57:46 -05:00
d75364ff53
Need to always include auth.php, as it has functions like canView
2023-02-27 17:02:23 -05:00
2e58ea1a42
return false if not logged in in canView. defaultUser is global, need to tell it so.
2023-02-27 17:01:58 -05:00
82491b3d81
Addd server_stats route
2023-02-27 10:59:14 -05:00
1e75ab7541
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-26 17:04:09 -05:00
8a6f0cbe1b
Add ServerStats to api
2023-02-26 17:04:05 -05:00
5027bf207e
add h264_mmal as a decoder option
2023-02-26 16:30:31 -05:00
72652cfb64
Add Decoder options to monitor view
2023-02-26 16:04:32 -05:00
af6e38caf0
Merge branch 'master' into patch-2
2023-02-26 10:14:35 -05:00
6505bba826
Add qsv codec options
2023-02-25 19:00:31 -05:00
1cdd1325bf
Fix eslint
2023-02-25 16:26:19 -05:00
79d19c21d1
Update validating access to Monitors, using canView due to Monitor and Groups permissions
2023-02-25 16:13:39 -05:00
9ceb22db8f
Fix auth for monitor_permissions...
2023-02-25 16:00:34 -05:00
9fe1e507c7
fix scroll bars on user edit when sticky headers
2023-02-25 15:54:42 -05:00
84383a0498
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-25 13:17:53 -05:00
3cda5ab235
Include map.js
2023-02-25 13:06:17 -05:00
afcf55608e
Move map generation into an Object so it can be reused.
2023-02-25 13:04:49 -05:00
155502ee32
Must include Storage.php
2023-02-25 13:02:29 -05:00
a7743dd0ed
Add DiskTotalSpace and DiskUsedSpace to returned Storage objects
2023-02-25 13:02:19 -05:00
a7af29c0c4
Add IN operator
2023-02-25 13:00:38 -05:00
0995a44561
Only show Location tab if geolocation is turned on
2023-02-25 12:46:48 -05:00
a2879fb66c
Add Map view to header
2023-02-25 12:46:34 -05:00
b0413f330e
Merge branch 'map'
2023-02-25 12:44:28 -05:00
4979d299a6
Cleanup code style
2023-02-25 12:40:54 -05:00
cbabf9d5ce
Add getFromApi
2023-02-25 12:40:41 -05:00
39de76e989
add a db_version and a feature check function to determine if we support skip locks in the query. Use it to disable the feature in filter view.
2023-02-25 11:44:50 -05:00
82a28b78d8
Use function style of member access to prevent errors on unsaved monitor
2023-02-23 13:22:50 -05:00
6867b0c841
Correct the syntax of the CSP
2023-02-23 09:47:49 -05:00
32afb13b39
Sanitise attr input in FilterTerm to prefent SQL Injection. Fixes GHSA-222j-wh8m-xjrx
2023-02-23 09:25:03 -05:00
7b36027066
add in files actions, with delete
2023-02-22 05:59:16 -05:00
4a19b4ec05
Scale the thumbnail, not the full view
2023-02-21 14:26:37 -05:00
d6dc1d3e30
Add object-src CSP directive
2023-02-20 18:15:16 -05:00
44c7582003
Don't shorten analysis
2023-02-20 17:30:48 -05:00
d073ba37ba
Default to Monitor->DefaultScale instead of 100% scale.
2023-02-20 15:42:30 -05:00
bfbe0d581b
uncomment out the mintime and maxtime validations. They were commented out for some quick testing.
2023-02-20 12:27:16 -05:00
119e4e6756
use detaintPath on modal to prevent including other files instead of real modals
2023-02-20 11:58:10 -05:00
4067151fd8
Check for valid date in minTime and maxTime to prevent SQL attack
2023-02-20 11:54:50 -05:00
8d36edb602
Be more specific about which form we are styling so as not to affect modals
2023-02-20 11:54:29 -05:00
4f66ab3503
Introduce check_datetime function to validate dates
2023-02-20 11:53:53 -05:00
00234fbb20
Attempt to sanitize daemon and arguments before executing commands to prevent executing other programs.
2023-02-20 11:53:32 -05:00
82a9d6d444
Use validCardinal on Id to prevent executing other commands
2023-02-20 11:41:41 -05:00
d6575cdec3
Adjust size of text inputs MonitorName and Source Path Filters to match chosen inputs
2023-02-20 10:36:13 -05:00
f4a2925177
Test for valid monitor id in snapshot creation.
2023-02-20 10:30:34 -05:00
bf810ec8c4
test for existence of username in session to prevent error outputs
2023-02-20 10:20:59 -05:00
80797e97d7
Move actions process to after the unauth check. In the past the action did the logging in but that is no longer the case. We can now assume in actions that the user is at least logged in.
2023-02-20 10:16:44 -05:00
3268f95282
Fix detaintPath not stripping sequences like ..././
2023-02-20 09:18:51 -05:00
2ec375d51c
Default to auto instead of 100% scale.
2023-02-19 17:29:32 -05:00
74a0790c56
Use const instead of var, code comment fix
2023-02-19 17:29:32 -05:00
3803a872fc
Replace some vars with const or let
2023-02-19 17:29:32 -05:00
5090000cdd
Remove ZM\s that shouldn't be there
2023-02-19 17:29:32 -05:00
74b8bf3a2a
decodeURI when taking password from uri. Always update username/password.
2023-02-18 18:02:15 -05:00
2412fefdf5
Bump firebase/php-jwt from 5.0.0 to 6.0.0 in /web
...
Bumps [firebase/php-jwt](https://github.com/firebase/php-jwt ) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/firebase/php-jwt/releases )
- [Changelog](https://github.com/firebase/php-jwt/blob/main/CHANGELOG.md )
- [Commits](https://github.com/firebase/php-jwt/compare/v5.0.0...v6.0.0 )
---
updated-dependencies:
- dependency-name: firebase/php-jwt
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-17 14:54:52 +00:00
a2e9cc23cb
Set a short expiry 1min and set the cookie name to include the filter so that each and every filter gets it;s own pagination saved. Fixes #3510
2023-02-16 14:10:41 -05:00
ee89169a7b
Use reload instead of restart on zone save
2023-02-16 14:10:30 -05:00
855ab6f141
Add reload to monitor zmcControl
2023-02-16 14:10:21 -05:00
f044d04271
Stop streams when clicking cancel/Save so that we don't log errors trying to access a dead zms. Fixes #3643
2023-02-16 14:10:12 -05:00
1a8a84da96
Remove debug when relay not hashed
2023-02-15 15:02:22 -05:00
8ec5946791
Add backtrace to value not in values warning
2023-02-15 15:02:11 -05:00
c009ef1bbe
Fix AlarmFrames validity test
2023-02-15 15:00:23 -05:00
71265a8271
Define serversr, stats for simple widget
2023-02-15 15:00:13 -05:00
113171e5ee
username in session can also be unset
2023-02-15 13:46:34 -05:00
ff528e578f
Show 0 instead of null in storage disk used column
2023-02-15 11:00:59 -05:00
1e77b58409
Don't set NextTimeStamp when we have a change of event.
2023-02-15 11:00:33 -05:00
30a75d81d2
Turn off debug, fix frame->frames typo
2023-02-15 10:24:45 -05:00
1a215dab3e
Handle no frames in data gracefully
2023-02-15 10:20:59 -05:00
e31fa4a4c3
Clear action when loading events.
2023-02-14 17:56:55 -05:00
40e7f8a517
Handle SESSION[password] not being set which happens when you switch AUTH_RELAY to plain.
2023-02-14 17:10:58 -05:00
29b688a2a5
Fix storageareas not being defined.
2023-02-14 17:05:20 -05:00
1fa0253fa5
When switching from hashed to plain relay, the session won't have password. So prevent errors.
2023-02-14 17:04:32 -05:00
dedff86511
Allow caching of images
2023-02-13 16:15:12 -05:00
50b462b3a0
Use scaled images when displaying alarm and objdetect images
2023-02-13 16:02:36 -05:00
ccc4588c99
Don't include Server column if there is only 1
2023-02-10 16:57:38 -05:00
14bfe38778
Fix eslint
2023-02-10 13:49:01 -05:00
91de85285c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-10 13:02:54 -05:00
86f63a9c01
remove extra p tag and reduce php tags
2023-02-10 13:00:46 -05:00
ce45783812
Fix infinite when page > 1 and there are no results.
2023-02-10 12:31:43 -05:00
30617fbadd
Refresh logs results after a date is chosen, not on each and every alteration to the hour/min/sec etc
2023-02-10 09:56:37 -05:00
d52d727256
Use const instead of var
2023-02-09 18:46:01 -05:00
ebb37ebc98
Don't output errors from remote commands as it breaks ui
2023-02-09 18:46:01 -05:00
357ce14c94
format endtime
2023-02-09 18:46:01 -05:00
8af3397f87
Fix errors when Path isn't parseable and add initial probeUbiquiti function
2023-02-08 13:19:18 -05:00
0589ec29c4
Add percentage used to storage listing
2023-02-07 11:52:54 -05:00
0462efdef0
Don't strip tags from log Message. It removes anything involving > OR <
2023-02-07 10:54:25 -05:00
a2ab907c92
Spacing, parenthesis and use Id() instead to avoid warning when called on a non-existent monitor
2023-02-07 09:11:29 -05:00
6281cbc623
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-07 09:00:49 -05:00
a592dfb8aa
Put alarm cues at the bottom of video area instead of overlapping progress bar.
2023-02-02 18:47:37 -05:00
b239109d72
Add navbars and password visibility to onvifprobe
2023-02-02 17:22:50 -05:00
2f06f67a95
Fix wrapping on cycle sidebar on watch
2023-02-01 18:40:21 -05:00
69c67bcc09
Fix eslint
2023-02-01 14:51:25 -05:00
55041043f2
Put back to 3.0
2023-02-01 14:34:05 -05:00
0d1e9c8d41
Try another way to prevent autofill
2023-01-31 13:30:59 -05:00
ce06badc80
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-31 11:38:11 -05:00
843805f852
Increase redness of alarm cues and make progress indicator yellow
2023-01-31 11:37:48 -05:00
9f75de73c8
Remove z-index: -1 which causes things to not be clickable
2023-01-31 11:37:48 -05:00
e411cf53a5
center events lists
2023-01-31 11:37:48 -05:00
9666244fa6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-31 09:04:51 -05:00
700c672cbd
update ZM_TARGET_DISTRO description
2023-01-29 14:49:54 -06:00
689ae56732
Sync up tags with collapsed header and remove the fixed-top class so that the stick header takes over.
2023-01-29 10:54:47 -05:00
b3029a3dad
Cleanup and remove the Capturing=None filter. Should still be able to view events for a monitor that is NOW disabled.
2023-01-27 16:58:01 -05:00
bbdfd0ddf0
Remove some cruft
2023-01-27 16:57:26 -05:00
5bf89b7178
Set width of UUID field and move labels to the left on mobile
2023-01-27 15:52:13 -05:00
3b5ceaddef
add version and telemetry tabs to options
2023-01-27 15:51:50 -05:00
d04b9891f1
Just do the symlink, there is a race between file_exists and symlink
2023-01-27 15:50:50 -05:00
bfe7b056b8
Add alarm,snapshot, objdetect thumbs to event view
2023-01-27 15:49:49 -05:00
49885c3b9c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-25 16:41:11 -05:00
047d1fb4e8
Fix missing / on close li tags
2023-01-25 16:39:05 -05:00
79d3d05060
Remove brackets and add and cnj for default filters. Use Event Loading SQL similar to other views, allowing filtering by monitor Name etc. Remove specific Archive filter.
2023-01-25 13:27:55 -05:00
4826b2edf4
Make monitor filters flex, and wrap when on mobile
2023-01-25 13:26:47 -05:00
c8e4dcbe51
Add valid case for Archived
2023-01-25 13:25:33 -05:00
ecf790b1d6
Diskspace(null) updates the db record so no need to call save as well
2023-01-25 12:27:59 -05:00
1658164ee1
explode the val in term for Monitor rule type. It will be a comma separated value, not an array
2023-01-25 11:50:16 -05:00
d6de278070
Only add filter terms if not in live mode. Use filter sql instead of manual rules
2023-01-25 11:50:16 -05:00
c48fc3ce6e
Define events even if sql fails
2023-01-25 11:50:16 -05:00
6f991d81ea
Go to history mode when viewing matches
2023-01-25 11:50:16 -05:00
031f5fe6f4
Don't output preg_match errors
2023-01-25 11:50:16 -05:00
874119c04d
Event->Diskspace(null) automatically updates the db. So don't do a second save
2023-01-25 11:50:16 -05:00
d5d5f33806
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-25 11:42:01 -05:00
774c963810
Merge branch 'master' of ../otherbranch
2023-01-25 11:41:52 -05:00
fe95e5b2bc
Add valid test case for AlarmFrames
2023-01-25 11:41:38 -05:00
fd327d9b91
Replace hr with borders. Make all content scrollable fixing buttons being off screen. Shrink labels on mobile
2023-01-24 21:33:42 -05:00
56dea17703
Fix issues with removing minTime and maxTime
2023-01-24 21:33:32 -05:00
caf6fc2528
Merge branch 'master' of ../otherbranch
2023-01-24 21:31:45 -05:00
4d543073ec
disable minTime and maxTime inputs, in favour of filter versions
2023-01-24 21:31:30 -05:00
b9c3be907c
Merge branch 'master' of ../otherbranch
2023-01-24 21:23:42 -05:00
86d1ac81e6
Use 'Y-m-d H:i:s' for formatting as datetimepicker doesn't want timezone. Use Filter object methods instead of arrays. Usse Monitor instead of MonitorId in filter so that widget looks better
2023-01-24 21:23:31 -05:00
d2a6c83056
Merge branch 'master' of ../otherbranch
2023-01-24 21:17:45 -05:00
1431eca868
Remove stripslashes when saving config values. The values in REQUEST have not been escaped, so stripslashes is not appropriate. Fixes #3655
2023-01-24 11:47:31 -05:00
9e46cc598e
Apply chosen styles to dropdowns in Options
2023-01-24 10:42:47 -05:00
5e71a8fb72
Add operator filtering to has_term
2023-01-21 18:41:11 -05:00
9789e02f2a
create archiveTypes static function. Use it. Add has_term function
2023-01-21 18:40:44 -05:00
77d27ceccc
Merge ../ZoneMinder.connortechnology
2023-01-21 18:39:53 -05:00
1bfd45ea34
Don't need to call chosen in monitor.js as it is called in body
2023-01-20 14:15:22 -05:00
38853e22d7
Remove uneeded classes and tags
2023-01-20 14:12:19 -05:00
39f2fa5fbb
When auto scaling, if we get a negative new height, just make it 100% width
2023-01-20 14:12:02 -05:00
9479ccae8f
Add scroll bar to watch content when sticky
2023-01-20 14:11:39 -05:00
90388e6483
Spacing
2023-01-20 14:11:19 -05:00
15f1930968
Remove style on chosen selects making them bigger than content
2023-01-20 14:10:02 -05:00
8c62f86797
Add styling for ul/li layout and fix mobile layout. Fixes #3654
2023-01-20 13:49:21 -05:00
df43de9496
replace use of tables for layout with ul/li/label
2023-01-20 13:12:37 -05:00
a0bbdfc140
Add flip to watch
2023-01-19 17:07:48 -05:00
d6e3a325aa
Remove dropdown class from menu items that aren't dropdowns
2023-01-19 17:07:48 -05:00
21bc35f4d2
Override portrait menu styles so that the menus look good on mobile
2023-01-19 17:07:48 -05:00
6fa39d25c1
Separate account status section.
2023-01-19 17:07:48 -05:00
4b7680bc43
Use & instead
2023-01-19 17:07:47 -05:00
382e9840ca
Make chosen work on mobile https://realize.be/blog/mobile-support-chosen
2023-01-19 17:07:47 -05:00
0fd9ca00d0
Make #header always 100% no matter responsive width
2023-01-19 17:07:47 -05:00
1469562927
Fix bulk frame adjustment doing string concat instead of integer addition
2023-01-18 10:08:33 -05:00
aa3bc1a28d
Add TimeStampSecs to fields returned for Frames.
2023-01-18 10:07:41 -05:00
1a4c349505
Need height: 100% to make logsTable div take up the space and show scrollbar
2023-01-17 20:05:10 -05:00
097c2bca83
fix lack of scrolling on events.
2023-01-16 19:18:20 -05:00
8fa1d98a7b
Merge branch 'master' of ../ZoneMinder.connortechnology
2023-01-16 17:23:52 -05:00
f942303e12
Set minimum width on sidebar to get rid of horizontal scroll
2023-01-16 17:17:38 -05:00
e6b897014c
Make controls scrollable when sticky navbar
2023-01-16 16:38:35 -05:00
06be7a6633
Pput buttons at top in options
2023-01-16 16:38:35 -05:00
76e3756ea6
Fixup structure and add styles for sticky header
2023-01-16 16:38:35 -05:00
378a9dc94f
Rework snapshots for stick headers
2023-01-16 16:38:35 -05:00
22b735b57c
Add overflow style for stick headers
2023-01-16 16:38:35 -05:00
dc40fe3049
Add content div and replace invisible flip code with the code we use in montage
2023-01-16 16:38:35 -05:00
75430dad9e
Remove flip code as we are using the code in skin.js now. Instead of setting height to auto, just clear it so that css rules apply.
2023-01-16 16:38:35 -05:00
b517af6d29
add styles to handle stick headers on montage
2023-01-16 16:38:35 -05:00
3b0843d8d0
Specify form on filter view is 100% so that scroll bars happen
2023-01-16 16:38:35 -05:00
992984b0cd
Add #content and #monitor divs so we can do stick navbar on monitor view
2023-01-16 16:38:35 -05:00
450007b860
Use getBodyTopHTML(); in watch view so that we pick up the sticky class
2023-01-16 16:38:35 -05:00
9089501bd8
Remove flexbox from #content because it is now on #page
2023-01-16 16:38:35 -05:00
5a990cb9cb
Add #page div for consistency also we are going to use it instead of #content for flexbox
2023-01-16 16:38:35 -05:00
3e1c816914
Merge divs and remove h-100 on sidebar ul that causes content to wrap sideways
2023-01-16 16:38:35 -05:00
26dfee496e
Use getBodyTopHTML(); in groups view so that we pick up the sticky class
2023-01-16 16:38:35 -05:00
2c6c7467f9
Add overflow styles to columns in options
2023-01-16 16:38:35 -05:00
9c15f794bf
Add overflow style to filter form so that it scrolls when using sticky headers
2023-01-16 16:38:35 -05:00
cb6d819c1e
Make #page flex as well when sticky.
2023-01-16 16:38:35 -05:00
b070749061
Split content div containing buttons from monitorlist so that we can position them separately
2023-01-16 16:38:35 -05:00
aa911f8968
Update logs view to make sticky headers work
2023-01-16 16:38:35 -05:00
ecf5089051
add flex styles to form and overflow to monitor list. These don't really have any effect normally so I havn't added a .sticky selector to them.
2023-01-16 16:38:35 -05:00
4f6a26dea9
Add styles so that when body has a .sticky class, we use flexbox to make content fill the browser, and we can then make sub content scrollable so that navbars are sticky
2023-01-16 16:38:35 -05:00
5dc658dd55
add sticky class to body when ZM_WEB_NAVBAR_STICKY is set. Remove it from navbar.
2023-01-16 16:38:35 -05:00
b82b8d2b67
Remove debug, add willReadFrequently: true to canvas ctx.
2023-01-16 16:38:35 -05:00
0af2a3eb10
Make header navbar sticky, make entire second navbar go away when minmised.
2023-01-16 16:38:35 -05:00
17e9a64f91
Remove frames loading code. We do it via api now.
2023-01-16 16:38:35 -05:00
ab2769ea48
Bulk load frames instead of by individual event
2023-01-16 16:38:35 -05:00
d059806573
fix UrlToApi => urlToApi
2023-01-13 13:50:05 -05:00
b9a1e1cb6c
use ajax() instead of getJSON so we can specify no timeout
2023-01-13 13:43:39 -05:00
cb87d04b3e
Move api page content from options.php to _options_api.php
2023-01-13 13:42:23 -05:00
292f3a0cc2
Remove reference to zm.connortechnology.com
2023-01-13 12:48:26 -05:00
1236b366a1
Need to index into servers array using 0 not ''
2023-01-13 12:48:02 -05:00
b1486783e3
Add a 5 second cycle option
2023-01-13 12:34:51 -05:00
cf0bc32fd4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-12 10:19:11 -05:00
a8c80fde27
Update monitor preset view: Use a submit button instead of input with javascript. Remove no longer needed js code. Sort presets by Name.
2023-01-12 10:01:40 -05:00
2e6f465055
eslint doesn't like function names that start with a capital
2023-01-12 09:38:13 -05:00
427201abd5
Fix eslint
2023-01-12 09:37:53 -05:00
4dbc198fd0
Only load events when not in live mode
2023-01-12 09:03:48 -05:00
8c3cd92801
Merge branch 'master' of ../ZoneMinder.connortechnology
2023-01-10 12:11:01 -05:00
1426e89aff
Remove debugging
2023-01-10 12:10:45 -05:00
1ee526444b
populate monitor_names array to we can output the dropdown
2023-01-10 12:07:35 -05:00
0befc7796a
Add code to populate dropdown input for attr type Monitor.
2023-01-10 12:07:35 -05:00
6e014949b4
Don't require zmc to be running to show a thumbnail. zms will say unable to connect, but at least later we can mouse over and get an updated image.
2023-01-10 12:07:35 -05:00
cc611129b6
Add RTSPServer help, Add Janus RTSP session timeout help.
...
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
2023-01-09 17:57:27 -07:00
aab62c5a7e
Add Janus RTSP session timeout to PHP (front end) ⚗️
...
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
2023-01-09 17:57:26 -07:00
eca1f5d2fd
Typo ✏️
...
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
2023-01-09 17:57:26 -07:00
09b621bb5e
Load Frames dynamically instead of in the initial page load. Use the api to do so.
2023-01-09 16:59:03 -05:00
662aa9f39d
Add getting frames by event id or other named filters to api
2023-01-09 16:53:27 -05:00
c9147be445
Add debug logging when date.getTime isn't a valid function I assume because EndDateTime was null
2023-01-09 14:45:31 -05:00
f06e11a097
Add SectionLengthWarn, use it to disable warnings in logs about section length being exceeded.
2023-01-07 12:33:42 -05:00
18b8080569
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-04 13:10:15 -05:00
ddf0996bd9
Fix eslint
2023-01-04 13:10:04 -05:00
3f527eb0d4
Test for existence of Janus elements
2023-01-04 11:48:16 -05:00
f1ea101bc3
Fix fatal when invalid mintime/maxtime is specified
2023-01-04 11:44:07 -05:00
25b4ee8d08
Add missing document when adding fullscreenchange listener
2023-01-04 11:43:38 -05:00
99d9d70a39
Update code, remove console.log debugging
2023-01-03 19:19:13 -05:00
569c4337eb
Hide timestamp caption from bottom of video.js event view. It serves no purpose. Fixes #3488
2023-01-03 19:19:13 -05:00
da934a6114
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-03 18:09:02 -05:00
9842c083f1
Fix click on control bar of video.js controls does zoom. Fixes #3650
2023-01-03 16:24:14 -05:00
0c316662e0
Remove php4 support
2023-01-03 15:50:18 -05:00
cda2191f3e
Spacing, quotes, remove dead code
2023-01-03 13:57:14 -05:00
51faa4f8dd
Use ajax() instead of getJSON with no timeout when deleting events.
2023-01-03 13:36:43 -05:00
5c9201cad3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-03 13:35:44 -05:00
2f3596d1ef
Use global Servers array instead of servers
2023-01-03 13:17:36 -05:00
d27769c0f9
Use global Servers array instead of loading from db
2023-01-03 13:17:22 -05:00
3c012bf4ba
Use global Servers array instead of loading from db
2023-01-03 13:17:13 -05:00
359c0c1b27
Don't know why we are turning off display errors in Server.php. Let's not.
2023-01-03 13:17:00 -05:00
e59687f437
Remove debug
2023-01-03 13:16:38 -05:00
f466e5b833
Use global Servers array instead of loading from db
2023-01-03 13:16:30 -05:00
8c35190b0a
Move loading of global Servers array into config.php.
2023-01-03 13:16:03 -05:00
df8bc464e3
Fix missing checkbox column on events table. See https://github.com/wenzhixin/bootstrap-table/issues/6522
2023-01-03 11:15:58 -05:00
5f01e275c9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-01-02 15:25:21 -05:00
046925797a
URL encode passwords embedded in Path. from Albert John FitzPatrick, III
2023-01-02 15:25:12 -05:00
4a1722df4f
Split line so that we get a space between the limit input and the text after it.
2023-01-02 15:20:45 -05:00
27980a8871
Make event button toolbar wrap-able
...
For small screens (i.e. phones), it's
useful to split the event button toolbar
on multiple rows, otherwise the video event
becomes useless (i.e. too small to be useful)
Signed-off-by: Alex Porosanu <dknight110@gmail.com>
2022-12-31 11:58:23 +02:00
6667c6449a
Improve title of Add Monitors view
2022-12-27 14:34:41 -05:00
63f1dbf8fd
Put the filter control commands into the POST data instead of get url. Also fixes auth relay
2022-12-27 14:34:20 -05:00
f6b64a9bf1
Merge branch 'master' into map
2022-12-21 14:56:25 -05:00
1c538a4bf0
Include Capturing, Analysing, Recording instead of Function
2022-12-14 08:28:21 -05:00
e4b4fae584
Merge branch 'master' of ../imouse
2022-12-13 16:44:21 -05:00
fd3640aca3
Fix op always being =
2022-12-13 16:44:02 -05:00
52dfca5a28
Hide WIP button
2022-12-13 12:42:24 -05:00
327f8c0f70
add missing semi colon
2022-12-12 13:12:40 -05:00
0a28a3e659
Add check for REQUEST['entity']. Add missing quotes around state word because it gets executed as code
2022-12-12 13:06:13 -05:00
1469178809
Work harder to select a monitor name that doesn't already exist
2022-12-12 13:05:25 -05:00
8c4a4cfe41
Don't output array entries for empty RTSPStreamName. Remove sorted_monitor_ids which is unused
2022-12-12 13:03:03 -05:00
24b8a9118d
Merge branch 'master' of ../cloudmule
2022-12-12 13:01:38 -05:00
656bc60944
Add groups to options
2022-12-12 13:00:54 -05:00
bc1e1aef45
Add date picker
2022-12-12 13:00:45 -05:00
7c7af4741c
Only default to start Date, not Date/Time
2022-12-12 13:00:36 -05:00
d7e95175b8
Fix html_input
2022-12-12 13:00:28 -05:00
e4d167b33e
Fix returning periods for sql when no attr
2022-12-12 13:00:19 -05:00
afbc495c45
Fixup filter hidden fields
2022-12-12 13:00:11 -05:00
08b06bd151
Include archiveTypes so that archive Status dropdown gets populated
2022-12-12 12:50:50 -05:00
de74497604
Merge branch 'master' of ../cloudmule
2022-12-07 15:54:39 -05:00
e30d151da7
prevent leading and when terms are invalid
2022-12-07 15:54:26 -05:00
62a9c2d8a5
Fix eslint
2022-12-07 15:52:47 -05:00
c1e2fab13b
Fix eslint
2022-12-07 15:46:48 -05:00
7fe10a4047
Fix the HABATM relationship in Snapshots
2022-12-07 15:01:08 -05:00
57d208efa9
Make view and listing of snapshots be recursive so they load the Events as well
2022-12-07 15:00:48 -05:00
b2c19e3db1
add the add view for snapshots
2022-12-07 14:15:39 -05:00
1c8083b0cb
Add Snapshot button to montagereview
2022-12-07 14:15:38 -05:00
23b94987e7
Use post() to go to create snapshot
2022-12-07 14:14:39 -05:00
a6b3b18a6e
Kill streams before posting to snapshot creation.
2022-12-07 14:14:00 -05:00
f6cf716ec6
Implement a post() function that submits via post as a navigation
2022-12-07 14:14:00 -05:00
50f87be9d9
Detach streams when killing the monitor stream to reduce console logging
2022-12-07 14:14:00 -05:00
b3cd07e9b8
Add snapshots route
2022-12-07 14:14:00 -05:00
031c573646
Rename Snapshot_Events to Snapshots_Events
2022-12-07 14:14:00 -05:00
fde0d652e5
Merge branch 'master' into update_snapshots
2022-12-07 14:09:46 -05:00
b53eed852c
Merge branch 'master' of ../cloudmule
2022-12-07 12:39:58 -05:00
0705bfa293
Check for term being null in FilterTerm constructor
2022-12-07 12:39:41 -05:00
fc7a6601f6
Check for validity of filterterm when building the parse tree
2022-12-07 12:39:26 -05:00
5d36739d0d
Add Monitor as an acceptable FilterTerm
2022-12-07 12:39:12 -05:00
eeb63db929
Default to all events
2022-12-07 12:39:00 -05:00
79fbd129ec
populate the events request with filter widget values.
2022-12-07 12:38:16 -05:00
b2fcb4d325
Move a ton of the filter widget code out of filter.php and into Filter.php
2022-12-07 12:37:56 -05:00
2efed0418c
Move a bunch more filter widget stuff into Filter
2022-12-07 12:37:38 -05:00
8b65e40883
If the filter is empty, add default filter options for StartDateTime, EndDateTime, Monitor. Add filter widget
2022-12-07 12:37:15 -05:00
623f5a5805
make .filterTable inline
2022-12-07 12:36:56 -05:00
6cd3e64bb8
Add NOW as a valid value for DateTime, rough in valid test function
2022-12-07 12:36:41 -05:00
07e188a25f
Add datetimepicker class to DateTime widgets and only include the sql if the term is valid
2022-12-07 12:36:23 -05:00
b7d5b53d67
Add handling of StartDateTime,EndDateTime,MonitorId as specific filters
2022-12-07 12:36:05 -05:00
6f45e6cd23
Use Monitor instead of MonitorId when loading event counts
2022-12-07 12:35:49 -05:00
ff756591c9
Rough in html_input
2022-12-07 12:34:59 -05:00
1134954166
Add Monitor as a Filter Term
2022-12-07 12:34:31 -05:00
638e6b0e3b
Move attrTypes and opTypes into Filter and rough in a widget and simple_width functions
2022-12-07 12:34:18 -05:00
df591a677e
Handle when there is no filtering in getNearEvents
2022-12-07 12:27:12 -05:00
753ba9e22b
Fix no results when showing all frames due to undefined limit
2022-12-04 10:44:03 -05:00
8ee5ca0679
add autocomplete=new-password to password fields. Apparently this is how browsers now prevent auto-completing them
2022-12-02 15:57:47 -05:00
a8f58b2fea
Spacing and fix the bogus setting shared_data->valid to false on disconnect. Other processes call disconnect. Only the capturing thread should set it to false.
2022-12-02 10:20:29 -05:00
c35b28a3d1
Rough in api support for snapshots
2022-11-30 15:11:04 -05:00
c3fda9be2a
Add takeSnapshot but it needs rewriting
2022-11-30 15:09:06 -05:00
0f2afdcff7
Fix eslint and use const on port
2022-11-30 13:42:17 -05:00
e915b2ece7
add icons and css
2022-11-30 13:35:55 -05:00
b68ebb495b
add map
2022-11-30 13:35:16 -05:00
3a6984c820
Move leaflet css loading code to monitor view
2022-11-30 13:23:42 -05:00
1e05ae01e0
Move leaflet css loading code to monitor view
2022-11-30 13:23:29 -05:00
d814fd27f7
Put Servers array in skin.js.php so that it is available to all views
2022-11-30 13:19:53 -05:00
cdfe38cc31
Add UrltoZMS and UrltoAPI methods to Server js class
2022-11-30 13:19:02 -05:00
e11b7d3406
Add CORS headers to API
2022-11-30 13:18:13 -05:00
b359f8f823
Get rid of 10px padding on bottom of main navbar
2022-11-29 13:58:49 -05:00
63e37e8744
Add styles to table headers to left align them to match the body
2022-11-29 12:47:10 -05:00
a5494a7c02
Use Y-m-d H:i:s instead of c for date formatting to match what datetimepicker expects. remove unused action input and put view in the get part of form action
2022-11-29 12:46:29 -05:00
fd3c8b21d6
Remove dead code from report_event_audit.js
2022-11-29 12:45:30 -05:00
38be2d9664
Rework fullscreen functionality a bit so that button gets updated even if you leave via escape key or other means
2022-11-26 11:01:53 -05:00
19832d24cd
Implement fullscreen button for event view
2022-11-26 10:52:28 -05:00
a0b759d91e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-11-21 17:04:33 -05:00
063eafe034
Fix link to monitor from Event Data
2022-11-21 17:01:17 -05:00
237a95a415
If no next bulk. Use Event data to estimate the delta.
2022-11-21 10:23:08 -06:00
68283c01eb
Added length and frames getters
2022-11-21 09:06:38 -06:00
047d109d59
Added potentially missing 404 header
2022-11-18 15:27:52 -06:00
e949a5554f
Must convert strings into integers before doing math as of php 8.2 Fixes Unsupported operand types: string - int
2022-11-17 14:54:05 -05:00
0515a1ba74
implode the output from zmu to fix php complaint abou array to string conversion
2022-11-17 14:53:56 -05:00
e4e8560722
Fix eslint. Fix use of fail instead of error in ajax requests
2022-11-16 10:50:48 -05:00
d63edde294
Make .form-group styles export page specific because they are affecting modals
2022-11-16 10:14:54 -05:00
9fe7ba8c8c
Cleanup the state modal. Fix form post
2022-11-16 10:14:24 -05:00
f9a3c5fc83
Don't log error when ignoring action if it is an ajax request
2022-11-16 09:28:33 -05:00
22df344880
Merge branch 'master' of ../imouse
2022-11-16 09:23:05 -05:00
57e70e1f1d
Switch to post methods for ajax actions on selected events. Can't use get because with a lot of selected events, the request URI gets too long.
2022-11-16 09:22:49 -05:00
0cee0561a4
Change form to post for delete
2022-11-16 09:01:30 -05:00
89c6e22052
Remove check for ZM_WEB_DIR is writable.
2022-11-15 14:44:45 -05:00
97e464b342
Comment out debugging
2022-11-15 14:17:30 -05:00
902f7d430f
Add error message when minTime >= maxTime
2022-11-15 12:48:33 -05:00
6d7a5cbcea
Fix infinite recursion in montagereview
2022-11-15 12:48:23 -05:00
a6856c4f94
Merge pull request #3630 from mispdev/fix_db_utf8_connection
...
Set web backend DB connection to UTF8
2022-11-12 15:34:03 -05:00
a712ad0605
Merge ../ZoneMinder.connortechnology
2022-11-10 18:10:08 -05:00
3e95134448
Remove Debug
2022-11-10 18:07:40 -05:00
69d835b5d2
Fix height of search text input to match buttons
2022-11-10 18:06:38 -05:00
37f4c1b454
Move title to Monitor div instead of container so that the title doesn't act on events list
2022-11-10 18:06:21 -05:00
7ac8a47f3e
Fix 500 on saving user due to incorrect scope of g. Fixes #3629
2022-11-10 17:15:39 -05:00
0d6b8d1de3
Set web backend db connection to utf8
2022-11-10 18:57:35 +01:00
4814eaa2df
Don't use old MonitorIds filter
2022-11-03 18:29:03 -04:00
d583c10fa6
Return events when limit is > the # of events returned
2022-11-03 17:48:39 -04:00
4d3dfd84f4
add includes/Monitor_Permission.php
2022-11-03 12:24:14 -04:00
59898b9a0c
Fix eslint
2022-11-02 17:47:12 -04:00
24ac383f97
spacing
2022-11-02 17:44:42 -04:00
160b61a9a0
Updates for added effecivePermission calculation
2022-11-02 17:44:34 -04:00
e3b1dd1dd0
rough in updateEffectivePermissions
2022-11-02 17:43:48 -04:00
6d31800419
Add monitors and groups info to javascript side
2022-11-02 17:43:34 -04:00
ea6d999654
Must use false === when using array_search because first element returns 0
2022-11-02 17:42:32 -04:00
7e82159f1a
Remove bootstrap calls=text-right crap. Replace with css
2022-11-02 15:53:55 -04:00
253011a453
Set styles for Name/th column of user edit table
2022-11-02 15:53:32 -04:00
135c52f3ec
Fix Group_Permissions()
2022-11-02 15:53:13 -04:00
ab3e1811d3
fix canEdit, rough in effectPermission
2022-11-02 15:52:37 -04:00
616734a041
Move API option to left column, replace MOnitorIds select with an entire section dedicated to specific monitor permissions
2022-11-02 13:26:37 -04:00
b1579d953d
Clear br.clear as well as div
2022-11-02 13:26:37 -04:00
b066e936c7
Apply styles to Monitor Permissions table
2022-11-02 13:26:34 -04:00
63769a2082
Fix missing )
2022-11-02 13:26:34 -04:00
3c36233dd8
Put in all the new logic for visibleMonitor and editableMonitor referencing Monitor_Permissions and Group_Permissions
2022-11-02 13:25:53 -04:00
68bf964eec
Add saving of Monitor_Permissions
2022-11-02 13:25:53 -04:00
b7490c754b
Rough in Group_Permission and Monitor Permissions loading functions.
2022-11-02 13:25:44 -04:00
24a83efa79
Improve Monitor canView and canEdit. If the user is not specified, use the cached auth routines in includs/auth.php. Otherwise replicate the logic for the specfied user.
2022-11-02 13:25:44 -04:00
16b5551a4a
Always return a Group_Permission in Permission()
2022-11-02 13:25:44 -04:00
121e864dde
Continue roughing in Group_Permission logic
2022-11-02 13:25:44 -04:00
a891b528d1
Use Monitor::canView in Event::canView
2022-11-02 13:25:44 -04:00
7a39433db7
update code to use Group_Permission::Permission
2022-11-02 12:37:47 -04:00
2ee142813e
start to rough in an editable monitor function
2022-11-02 12:37:47 -04:00
d8175126fd
I renamed the fields to user from newUser, so reflect that in the js validation
2022-11-02 12:37:47 -04:00
c6edb8d46a
Make Permission column wider to support the Inherit value
2022-11-02 12:37:47 -04:00
79f5d77fab
Add Permission saving to user view
2022-11-02 12:37:47 -04:00
3157510f23
Add Permission property
2022-11-02 12:37:47 -04:00
9df7283358
Rough in the boilerplate for retrieving Permissions on Groups
2022-11-02 12:37:46 -04:00
dd4869fb47
Add object for Group_Permission
2022-11-02 12:36:42 -04:00
a67f89ff9e
We renamed newUser to user in form elements
2022-11-02 12:36:42 -04:00
85bb66a3ea
Change from newUser[] to user[] in form elements. Add Group permissions
2022-11-02 12:36:42 -04:00
a840d65ac4
Add styles for groups listing table on user view
2022-11-02 12:36:42 -04:00
5734e38f52
Add group permission checking to visibleMonitor
2022-11-02 12:36:42 -04:00
bb9152d3f2
Update frame view js to use const etc instead of var. Put back EventId and FrameId in stats being links and fix FrameId not being populated. If no stats available disable the stats button and use the title to explain why.
2022-11-02 12:36:41 -04:00
d00536915e
Move getting time into the scope where it is used
2022-11-02 10:07:01 -04:00
0c0269b2cc
Fix eslint
2022-11-01 12:41:27 -04:00
52c865cfeb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-11-01 12:40:51 -04:00
2859634aaa
Set xhrFields: widthCredentials: true so that we send cookies with our streaming xhr requests so that we pick up new auth hashes
2022-11-01 08:22:53 -04:00
5bd50fe575
Add Access-Control-Allow-Credentials: true so that we can pass cookies along with xhr requests.
2022-11-01 08:21:59 -04:00
09ece9320e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-10-31 21:20:07 -04:00
a6b16510d0
Add Cuase, Notes and EndDateTime to columns in events list on watch view
2022-10-31 21:19:41 -04:00
cd4a9fbb98
Merge ../ZoneMinder.connortechnology
2022-10-31 18:01:04 -04:00
6199613c40
Merge branch 'add_event_data'
2022-10-31 18:00:32 -04:00
85e1f21ca7
Make button on Filter Debug modal be Close instead of Cancel
2022-10-31 17:59:52 -04:00
6edbee7c70
Handle empty but defined REQUEST[action]
2022-10-31 17:59:34 -04:00
6ee083a145
Update functions.php
2022-10-31 11:53:11 -06:00
25100cd592
Fix missed references to oldW and oldH
2022-10-31 09:27:53 -04:00
2fb631fa6e
Clean up debug. Clone the entire monitor object into oldMonitor instead of cherry-picking properties. Fixes use of new name when deleting old symlink. Always check for existence of monitor dir and symlink after done saving.
2022-10-31 09:27:53 -04:00
33455cbad2
Remove left over references to REQUEST['newMonitor']. Add error reporting to creating monitor directory and symlinking when adding a new monitor
2022-10-31 09:27:53 -04:00
6b3768fdf6
When saving monitor, only turn off error reporting for symlink. Don't delete old symlink unless the name has changed.
2022-10-31 09:27:53 -04:00
df421cbd4c
remove iiot which shouldn't be there
2022-10-28 08:45:08 -04:00
b0deed5376
Add EventData section to event view
2022-10-27 17:33:19 -04:00
f0a1a1b0ee
Merge branch 'master' into add_event_data
2022-10-27 17:08:12 -04:00
1ef87ab0b8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-10-27 17:05:24 -04:00
1540c3b41b
fetchImage now takes a documentElement not a jquery object
2022-10-27 17:01:56 -04:00
32951523b8
We no longer have outputHelper, so just output a warning if we don't have streaming support
2022-10-27 17:01:25 -04:00
b8a97b0fb9
Don't report errors from mkdir, it normally exists
2022-10-27 17:01:00 -04:00
c20a327eef
Fixups to EventData model
2022-10-27 17:00:24 -04:00
8a5e9d944d
Add authentication to FramesController
2022-10-27 16:59:34 -04:00
46fcd79881
Add authentication and fixups to EventDataController.php
2022-10-27 16:59:18 -04:00
70b0e53780
Add routing for EventData
2022-10-27 16:58:57 -04:00
6d073119cb
Rough in views for EventData
2022-10-27 16:57:05 -04:00
586d43798f
Rough in model and controller for Event_Data
2022-10-27 14:47:21 -04:00
7cec2d1dc3
Fix eslint, remove debug
2022-10-26 10:33:16 -04:00
2965ea2826
Fix eslint, remove debug
2022-10-26 10:33:02 -04:00
779d41f583
Add bootstrap-table-1.21.1 to eslint igore. Delete old versions
2022-10-26 10:23:16 -04:00
f96c90ffa7
Fix saving Server modal. Form was incomplete, action and view were duplicated. Don't need javascript just use the submit button Save.
2022-10-26 09:00:25 -04:00
ff08b0f871
Make search input the same size as other toolbar elements
2022-10-25 15:17:41 -04:00
bfc4b5aa67
Implement filtering by ServerId
2022-10-25 13:36:02 -04:00
8d8337135b
Give ServerId filter an id
2022-10-25 13:32:53 -04:00
0e88b5c7a3
Fix function name hash_frame_array_by_key => array_to_hash_by_key
2022-10-25 13:32:06 -04:00
91e728c0d3
Sort servers in global array
2022-10-25 13:31:40 -04:00
d1a7749ff4
fix eslint
2022-10-25 13:27:55 -04:00
f357327b9c
Merge branch 'master' into log_filters
2022-10-25 13:05:43 -04:00
418eeb9260
Add Server, Level, StartDateTime, EndDateTime filters to logs view
2022-10-25 13:05:25 -04:00
d11bb88f94
rough in array_to_hash_by_key function to generate hashes of Id => Object
2022-10-25 12:56:38 -04:00
0bc1f2792d
add specific filters for level, StartDateTime and EndDateTime.
2022-10-25 12:50:29 -04:00
189bf2f687
Update bootstrap-table to 1.21.1
2022-10-25 12:50:01 -04:00
4f0f2224b2
Restructure code around build where part of sql, add specific filters for level, StartDateTime and EndDateTime.
2022-10-25 12:49:08 -04:00
ee56f013d4
Add some filters to log view
2022-10-25 06:12:08 -04:00
a7277e357e
fix eslint
2022-10-21 18:16:53 -04:00
f0cd36989b
Spacing, use const and let instead of var
2022-10-21 18:11:46 -04:00
2e03d91ef7
Fix selecting 0 values in htmlSelect. Fixes not showing ZM_LOG_DATABASE_LEVEL==Info
2022-10-21 16:29:26 -04:00
3d68896625
Escape <> in log messages to prevent html shenanigans. Fixes #3596
2022-10-21 16:21:25 -04:00
42e8698318
Load logger.js before view js so that remote logging routines are available.
2022-10-21 16:20:51 -04:00
cbd763b455
Update code. Break early when figuring out if any events are checked. Use ajax instead of getJSON.
2022-10-21 10:19:06 -04:00
32dfbe60df
Include export.js because we need it for Download function in events list
2022-10-21 10:19:06 -04:00
4bb214f124
cleanup, use const instead of var
2022-10-21 10:19:06 -04:00
35f7e54bed
Remove exportStrings as they are in skin.js.php.
2022-10-21 10:19:06 -04:00
77b9c47296
Add export.js includes at bottom of montagereview since they are no longer in skin.js
2022-10-21 10:19:06 -04:00
89d112cfe8
Add video.js includes at bottom of video view since they are no longer handled in includes/function.php
2022-10-21 10:19:06 -04:00
23b0b9876d
Add leaflet.js includes at bottom of monitor view since they are no longer handled in includes/function.php
2022-10-21 10:19:06 -04:00
2cbae814c3
Add video.js includes at bottom of event view since they are no longer handled in includes/function.php
2022-10-21 10:19:06 -04:00
0fc91ec8cb
Remove export-related functions out of skin.js into export.js
2022-10-21 10:19:06 -04:00
beec8bb03a
Move view-specific includes out of includes/functions. It is far easier to just put those at the bottom of the actual view file.
2022-10-21 10:19:06 -04:00
262a2f0cb0
Don't add class=alarmCue to noneCue spans. Move calls to get frames data to after applying scale
2022-10-20 16:48:07 -04:00
8681b6d1b2
Add back setting width and height when scaling to image stream
2022-10-20 16:46:38 -04:00
bce8c6195a
Don't display errors in Server.php
2022-10-20 16:45:52 -04:00
f1843528d0
Put back width and height setting on img tag. Needed for event viewing
2022-10-20 16:45:37 -04:00
5cf47622d7
Clean up alarm cue styles a bit. Fix background color on noneCue
2022-10-20 16:41:21 -04:00
082ffdf76e
Fix SQL for when passing an empty array to find. Return false instead of trying weird sql.
2022-10-20 10:22:56 -04:00
76cd1b6b90
remove debug of monitors and Fix Warning when monitor is not visible
2022-10-20 10:22:56 -04:00
49b7f1e557
Make inputs on action table 100%
2022-10-20 10:22:56 -04:00
84fd4b42d5
Fix test for null in Object::find
2022-10-20 10:22:56 -04:00
ff01d4d394
IN () being false could still result in a true result of used in an OR, so instead of just returning, use an always false sql equivalent
2022-10-20 10:22:56 -04:00
837d0ece7f
return empty array when passing empty as SQLvalue
2022-10-20 10:22:56 -04:00
73c2415f83
Remove swp file
2022-10-20 10:20:58 -04:00
59bc1c3fc3
add IIOT styles
2022-10-20 10:20:26 -04:00
85a1b15e92
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-10-20 08:59:23 -04:00
23863c1853
Make inputs on action table 100%
2022-10-18 13:56:16 -04:00
c698027ac9
Fix test for null in Object::find
2022-10-18 13:29:12 -04:00
1be399026e
IN () being false could still result in a true result of used in an OR, so instead of just returning, use an always false sql equivalent
2022-10-18 13:28:54 -04:00
27757c1e59
return empty array when passing empty as SQLvalue
2022-10-18 13:28:43 -04:00
c40d251009
Add setting remoteAddr in session after regenerating
2022-10-17 19:09:24 -04:00
9adf5f662f
Use REQUEST instead of SESSION to store the post login redirect because we clear the session on login. Fixes #3517
2022-10-17 17:25:56 -04:00
22a059d3bc
Remove debug
2022-10-17 17:25:46 -04:00
ce62bb1297
Minor cleanup, remove dead code
2022-10-17 17:25:36 -04:00
155328b0d6
Put view in the form get part for visibility
2022-10-17 17:25:27 -04:00
9e257def8a
Add debug, add validateId function to session handler. Change it to be a a subclass of SessionHandlerInterface so that we don't have to provide createId. Fixes session breakage in php8.2
2022-10-17 17:24:52 -04:00
5c8343f737
remoteAddr is set when session is opened. So no need to do it in auth. session_clear closes the session so no need to close it first
2022-10-17 17:23:45 -04:00
520baefeae
Make font file location full width
2022-10-17 16:50:39 -04:00
9f4c9919e2
when a config value is overridden via *.conf files, put up a warning/explanation.
2022-10-17 16:50:23 -04:00
2b54f732a6
improve alarm cue and progress indicator styles
2022-10-14 17:39:23 -04:00
ae70b1255c
Fix styles after removal of dark styles from header
2022-10-14 17:32:58 -04:00
20ebbc3c58
Fix saving from the function modal. Put action in the post variables and change the action to save instead of function.
2022-10-14 14:10:46 -04:00
5ae47c8671
Fix form structure, use of get instead of post and duplicated action input
2022-10-14 14:09:43 -04:00
feecd5439d
left align option value column
2022-10-14 14:09:34 -04:00
2329dda323
Merge pull request #3609 from connortechnology/fix_non_post_auth
...
Move relevant code out of includes/actions/auth.php into includs/auth…
2022-10-14 14:09:09 -04:00
5a5a665cdf
Test for definition of ZM_LOG_INJECT. We don't include the config when not logged in. So it won't be defined
2022-10-12 19:34:05 -04:00
86e4d7f4d4
Don't show CaptureBandwidth as null/s if there is no value
2022-10-12 19:16:17 -04:00
e116c9ee48
Fix unable to unset LockRows on Filter
2022-10-12 16:57:53 -04:00
66a555250c
Handle the case where the specified monitor is not in display_monitors, which results in javascript breakage due to a lack of monitorData.
2022-10-12 11:18:13 -04:00
0c80425b71
Make Path link to the files view
2022-10-11 16:45:03 -04:00
d64868a44b
Fix downloads due to chunkSize not being defined
2022-10-11 16:45:03 -04:00
87627cac8e
add js for files view
2022-10-11 16:45:03 -04:00
673dff62c9
Handle empty path, give form an id and path.
2022-10-11 16:45:03 -04:00
c4a2d2fb51
Fix hide() not defined on AutoMoveTo and AutoCopyTo.
2022-10-11 16:45:03 -04:00
d35f8170e6
update code in updateformCheckboxesByName
2022-10-11 16:45:03 -04:00
31edfc26df
Rough in a files view
2022-10-11 16:45:03 -04:00
f8eef392d3
Add output_file to includes/functions.php
2022-10-11 16:45:03 -04:00
58657cc685
Remove swp file
2022-10-11 16:45:03 -04:00
7cf58df832
Add an id=content div for styling purposese
2022-10-11 16:45:03 -04:00
aadfb2e6f8
Add an id=content div for styling purposese
2022-10-11 16:45:02 -04:00
2a1d417511
Remove dark styles from navbar
2022-10-11 16:44:23 -04:00
16e8af0fe3
add IIOT styles
2022-10-11 16:44:23 -04:00
09b2b372ff
Test for matches[operator]. Fixes #3607
2022-10-11 15:52:46 -04:00
25a739c90e
Make the Save/Delete buttons always present, but disabled when not authorized. Allow anyone to create a filter, but only System:Edit or the owner of the filter can change or delete it.
2022-10-11 10:03:57 -04:00
371f1adbe7
update storage modal to fix buttons not being in form. Also remove duplicate view field and make button action be save instead of Save. Fixes #3605
2022-10-07 15:56:15 -04:00
eed60e7acb
Don't attach onclick to save button on stoage modal as it is a submit button
2022-10-07 15:55:43 -04:00
34ffd92bf1
Add permissions checking to API/Logs. Fixes unprivileged user being to add/edit/delete/view logs.
2022-10-06 16:22:56 -04:00
cb3fc5907d
Use canEdit['System'] and value of new ZM_LOG_INJECT to disable attempting to inject javascript errors into zm logs
2022-10-06 14:52:39 -04:00
de2866f957
Check value of System:Edit permission and ZM_LOG_INJECT to disable ajax log injection.
2022-10-06 14:51:29 -04:00
072e94385b
Make the ajaxError logging be debug level. If the error was actually critical, we will have to log that separately. Most of the errors reported by ajaxError are transient.
2022-10-05 09:31:39 -04:00
c7e40769cf
remove jquery-3.5.1
2022-10-04 10:55:55 -04:00
f3aabfd67c
Update jquery-ui to 1.13.2
2022-10-04 10:15:10 -04:00
4028c08831
Update jquery-ui to 1.13.2
2022-10-04 10:14:27 -04:00
54f821ac88
Upgrade jquery to 3.6.1
2022-10-04 10:06:40 -04:00
2139a0cf24
Make form on console use post
2022-10-03 16:15:17 -04:00
6d786e0690
save buttion is a submit button now, so doesn't need an onclick. Fix code setting action on delete.
2022-10-03 15:51:09 -04:00
Isaac Connor
baudneo
AngeloGioacchino Del Regno
Isaac Connor
Simpler1
dependabot[bot]
Andrew Bauer
Alex Porosanu
Martin Tiernan
Michael
ovargasp