Commit Graph

10051 Commits (revert-3817-database-certificate-verification)

Author SHA1 Message Date
Isaac Connor d06264624a Refresh events list when filters at top change or close in the case of datetimepicker 2023-11-17 12:06:03 -05:00
Isaac Connor 936cefb41a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-11-17 09:33:22 -05:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor ee0ef4b6e4 Handle when there are no cueFrames populated 2023-11-16 10:34:43 -05:00
Isaac Connor d9ae4f8e04 Do not need to make servers global in this context. They are by default.| 2023-11-16 10:34:43 -05:00
Isaac Connor 40975184e0 Return the found term instead of true in has_term. 2023-11-16 10:34:43 -05:00
Isaac Connor 8e0793f5e7 Do not format StartDateTime and EndDateTime in ajax events results. Do the formatting in js. 2023-11-16 10:34:43 -05:00
Isaac Connor c23ee28fe6 Take expires setting off setCookie so it defaults to 2038 like everywhere else. 2023-11-15 11:34:05 -05:00
efranzwa cf906e86c8 Added missing table tags 2023-11-15 04:55:18 -08:00
efranzwa 83af15329a Fixed Monitor->WebSite Source Refresh html 2023-11-14 04:13:04 -08:00
Isaac Connor c1b32b79a2 Code style clceanup in server action 2023-11-13 11:38:03 -05:00
Isaac Connor abb4230f86 Use ajax error when specified storage not found. 2023-11-13 11:37:47 -05:00
Isaac Connor aaebd725bb Set default values on members, fixing bad defaults on nwe storage. 2023-11-13 11:37:31 -05:00
Isaac Connor 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
Isaac Connor aaaa321464 fix eslint 2023-11-09 11:55:17 -05:00
Isaac Connor 542803848d Prevent non-number inputs when filter attr is DiskPercent 2023-11-09 10:33:25 -05:00
Isaac Connor 6a68e5577a If view does not exist, redirect to console instead of just dying 2023-11-09 09:57:27 -05:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 46b27d9f78 Add Tags support to API 2023-11-03 13:33:28 -04:00
Isaac Connor 46fcb27a3b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-11-02 12:21:59 -04:00
Isaac Connor 9537492f1c Handle invalid codec and fix video_tag boolean assignment causing video tag to be false 2023-11-02 12:21:30 -04:00
Isaac Connor e6632ade43 Use echo instead of print which is apparently faster. 2023-11-01 17:27:56 -04:00
Isaac Connor f26617af71 Fix not allowing html5 video tag when h265. 2023-11-01 17:27:56 -04:00
Isaac Connor 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
Isaac Connor 13ec02d5f1 Fix Auto Unarchive not deselecting 2023-10-31 10:02:58 -04:00
Isaac Connor 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
Isaac Connor e2f8553b48 Fix lack of scroll on groups view. 2023-10-30 15:51:39 -04:00
Isaac Connor 36936001a4 Remove trailing spaces. Remove extra comma causing SQL-ERR 2023-10-30 10:22:04 -04:00
Isaac Connor 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
Isaac Connor db252ce191 Dont' log warning when no user preference set. Inlcude more info in log message. 2023-10-30 09:40:03 -04:00
Isaac Connor 29be822e99 Add required GROUP BY Id to fix SQL queries 2023-10-27 10:43:27 -04:00
Isaac Connor 1545210b12 Add php8.1+ members support for multiple and chosen flags for filter terms 2023-10-26 18:43:05 -04:00
Isaac Connor d54171c21c Be a little more verbose and robust when things like permission errors break config loading 2023-10-26 18:37:15 -04:00
Isaac Connor e8a866e504 Add named parameters support to ServerStatsController. 2023-10-26 18:26:51 -04:00
Isaac Connor d7bb9674e3 Add newline to fix SQL err due to Tags 2023-10-26 11:11:50 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor ab979c8f42 Fix typo in getHomeView 2023-10-23 16:49:34 -04:00
Isaac Connor 717f644087 Define ->savedErrorReporting to prevent php errors in logs 2023-10-23 16:39:43 -04:00
Isaac Connor 1411c47c99 Correct case of value in User_Perference 2023-10-20 14:51:18 -04:00
Isaac Connor 84ca405749 Rename a variable due to cutnpsating 2023-10-20 14:51:07 -04:00
Isaac Connor 0ab7a755ba Event::Tags returns an array of Tags objects, so turn them into a string. 2023-10-20 14:02:48 -04:00
Isaac Connor c287b7f645 Add Tags() and Event_Tags() functions to Event 2023-10-20 14:02:25 -04:00
Isaac Connor d303927ad0 Rough in ORM for Tags 2023-10-20 14:02:10 -04:00
Isaac Connor 7824613e53 Allow Objects with no Id, they can't be cached but can be used. 2023-10-20 14:01:55 -04:00
Isaac Connor f650d300d4 BUmp jquery to 3.7.1 2023-10-20 10:53:24 -04:00
Isaac Connor f5107b5743 Default to showing PTZ if it is enabled 2023-10-20 09:05:03 -04:00
Isaac Connor 7c2ec7f404 Improve replayMode loading, adding support for User Preference default value 2023-10-19 13:02:39 -04:00
Isaac Connor 876d76ef1d Only do thumbnail animations if not on mobile. 2023-10-18 12:03:56 -04:00
Isaac Connor 48b5960fac Can't copy by ref, the limit will affect unfiltered as well 2023-10-17 14:57:57 -04:00
Isaac Connor 41c156918e aviableTags must be defined 2023-10-17 14:13:44 -04:00
Isaac Connor 3cd6b78b85 OutputCodec cannot be null 2023-10-17 12:33:27 -04:00
Isaac Connor eaf43daa5c Fix missing date init 2023-10-16 14:13:07 -04:00
Isaac Connor 621e9e68d0 Must use floats when calculating width of progress bar segments. 2023-10-16 14:07:21 -04:00
Isaac Connor e9d51731e8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-10-16 12:23:37 -04:00
Isaac Connor db7a25ab3b Remove event rename button functionality, as that exists in eventdetail/event edit. 2023-10-16 12:23:29 -04:00
Isaac Connor c6d9c7731d Add aborting in transit events loading before sending another. 2023-10-16 12:15:55 -04:00
Isaac Connor 1658943097 Use playClicked instead of vjsPlay as it has additional functionality 2023-10-16 12:15:28 -04:00
Isaac Connor 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
Isaac Connor ea76a03043 Rename startRTSPtoWebRTSPPaly to startRTSPtoWebPlay 2023-10-15 17:55:44 -04:00
Isaac Connor 93f5378f4e Fix undefined reference to startPlay 2023-10-15 17:55:44 -04:00
Isaac Connor 8fd33b7f77 Handle case when Alarm frame or MaxScore frame don't exist. 2023-10-15 17:55:44 -04:00
Isaac Connor 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
Isaac Connor 4fe61d60ca Add Email as a column in user list 2023-10-13 09:01:56 -04:00
Isaac Connor fdc500304b Add test to see if php-curl is installed instead of crashing. 2023-10-12 11:04:55 -04:00
Isaac Connor 0ba0e6d27b Control form elements were renamed from newControl to just Control. Update validateForm to match. 2023-10-11 14:58:54 -04:00
Isaac Connor 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
Isaac Connor 7762e882b1 Remove debug 2023-10-11 13:34:09 -04:00
Isaac Connor 69e601d286 Fix failure to save new user due to Snapshots not getting a default value. 2023-10-11 13:34:00 -04:00
Isaac Connor bdc6bb58d6 Add a redirect after user delete so that we don't have form resubmission 2023-10-11 13:33:31 -04:00
Isaac Connor 0fe6dc2997 Fix the second Offline test. Fixes #3766 2023-10-11 11:34:27 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 16db44193f Test for data.response being defined and do some logging if not 2023-10-06 14:32:55 -04:00
Isaac Connor 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
Isaac Connor 38be4feeb8 Servers is a global, don't need to hit the db again 2023-10-05 11:51:33 -04:00
Isaac Connor 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
Isaac Connor c78063abd1 If we can edit we should still be able to do view actions 2023-10-04 15:11:14 -04:00
Isaac Connor 44c5c3c70c Introduce new download mode that concats event videos into 1 file per monitor 2023-10-04 12:04:11 -04:00
Isaac Connor f864a29eac Always return an array in getCredentialsDeprecated 2023-10-04 11:12:37 -04:00
Isaac Connor 9b1e98997c fix eslint 2023-10-01 10:28:36 -04:00
Simpler1 2547376c27 fix(php8): AllowDynamicProperties 2023-09-30 19:56:57 -04:00
Isaac Connor db390a4861 Merge branch 'fix_hardcoded' 2023-09-29 12:18:23 -04:00
Isaac Connor 10cf26fa7b Take FPSReportInterval into account when determining if a monitor is dead. Fixes #3766 2023-09-29 12:09:23 -04:00
Isaac Connor 2d46fc350a Spacing, test for setting of ZM_PATH_IP 2023-09-29 12:07:50 -04:00
Isaac Connor 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
Isaac Connor 5a7bd74521 Remove commented out code 2023-09-28 12:59:51 -04:00
Isaac Connor 91c44a4f9a Fix semi colon 2023-09-26 15:17:26 -04:00
Isaac Connor 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
Isaac Connor 51500d494f Add group by when doing advnaced search 2023-09-26 15:15:47 -04:00
Isaac Connor 82aeac076d Fix incorrect var name frameid=>fid in find_virtual_frame 2023-09-26 12:10:36 -04:00
Isaac Connor 709d08c6c5 Only call jsonDecode when Query_json is non-empty 2023-09-25 16:56:06 -04:00
Isaac Connor 45bcb13045 Add backtrace to errors in json 2023-09-25 16:32:20 -04:00
Isaac Connor 1fdf7f2b31 Remove debug 2023-09-25 16:32:01 -04:00
Isaac Connor e1ef40de17 Only load the delConfirm modal if we click delete 2023-09-25 16:27:01 -04:00
Isaac Connor a619634988 Add tab to available js vars on options 2023-09-21 12:52:30 -04:00
Isaac Connor fc3a1bfc4b use const instead of var 2023-09-21 12:52:02 -04:00
Isaac Connor 24d6649e98 Log useful output when failure to write dnsmasq.conf and fail to restart dnsmasq 2023-09-21 12:51:37 -04:00
Isaac Connor 2e10169cde Deprecate cURL monitor type 2023-09-21 12:08:27 -04:00
Isaac Connor 057159cde6 Make properties public so that they can be access in Storage object 2023-09-21 10:10:57 -04:00
Isaac Connor 2e17d2e8a4 Add Notes filter 2023-09-20 13:35:30 -04:00
Isaac Connor 4410757037 Fix use of RETURNING Id which isn't supported in all mysql. Use dbInsertId instead. 2023-09-15 11:26:15 -04:00
Isaac Connor ee379cb4e4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-09-15 10:15:58 -04:00
Isaac Connor f8c89a0405
Merge branch 'master' into tags 2023-09-14 16:42:06 -04:00
Isaac Connor 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
Charlie Root 41dc7c8f4e Fixes to not log errors when there are no monitors to display in watch. 2023-09-13 11:19:16 -07:00
Charlie Root e11b700fbd Add Id as a protected member, only lookup monitor status if Id has a value 2023-09-13 11:18:50 -07:00
Charlie Root 6754fcb208 Make Filter properties protected 2023-09-13 11:18:28 -07:00
Charlie Root 1c3206b781 Merge branch 'master' into openbsd 2023-09-13 10:15:06 -07:00
Charlie Root fccebee056 Add -a to arp, add ZM_PATH_OUI for path to ieee-oui.txt 2023-09-13 10:14:49 -07:00
Charlie Root c4302c27ac Add code to test for existence of ip and support ifconfig 2023-09-13 10:14:21 -07:00
Isaac Connor a58949ab32 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-09-13 13:10:37 -04:00
Isaac Connor d9bf168066 Merge ../ZoneMinder.connortechnology 2023-09-13 13:10:14 -04:00
Isaac Connor c6a7fe949a Use different syntax for property access 2023-09-13 13:10:01 -04:00
Isaac Connor d7090ce84a Define properties 2023-09-13 13:08:12 -04:00
Isaac Connor 3767d815a5 Use different syntax for assigning object properties 2023-09-13 13:05:57 -04:00
Isaac Connor ef402e7b99 Define tablename member 2023-09-13 13:05:39 -04:00
Isaac Connor 46ac2dba2f Define tablename member 2023-09-13 13:05:25 -04:00
Isaac Connor 6a87f56ac2 Never display errors 2023-09-13 13:04:16 -04:00
Isaac Connor de8f387207 Restrict mid to a cardinal value. Fixes GHSA-9cmr-7437-v9fj 2023-09-13 10:12:04 -04:00
Isaac Connor e353523073 Fix int()=>(int) causing events to not load 2023-09-12 09:07:46 -04:00
Charlie Root da213d8532 Merge branch 'master' into openbsd 2023-09-11 13:42:43 -07:00
Charlie Root 50059e5842 Only show ram info if proc exists. 2023-09-11 13:42:22 -07:00
Isaac Connor b7ed7a4bd8 in detaintPath also strip :// because php:// is a way to inject code 2023-09-11 12:34:31 -04:00
Isaac Connor 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
Isaac Connor a13c9c06f2 Handle when filter limit is '0' 2023-09-09 12:38:47 -04:00
Isaac Connor b1cdf9905c Make notes clickable to bring up objdetect image like in events list 2023-09-09 12:37:27 -04:00
Isaac Connor e53974119b Ensure that group_id is defined 2023-09-09 12:08:44 -04:00
Isaac Connor b44216d3da Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-09-08 14:19:09 -04:00
Isaac Connor a9997b943a Use new event::find_virtual_frame when loading frames 2023-09-08 14:19:01 -04:00
Isaac Connor cb5442d5b8 Add 704x576 aspect ratio to timeline css 2023-09-08 14:18:34 -04:00
Isaac Connor 82e972943e Add frame loading including virtual frames 2023-09-08 14:18:11 -04:00
Isaac Connor 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
Isaac Connor 2b2c43e630
Merge pull request #3748 from Simpler1/patch-6
Refresh table on show
2023-09-05 13:05:36 -04:00
Simpler1 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
Isaac Connor e5d125c4ef Handle when no linefeed found 2023-08-31 12:46:12 -04:00
Isaac Connor 56999da3eb Check for existence of path before scanning it generating a lot of erros 2023-08-30 14:38:43 -04:00
Isaac Connor 6331d79a73 Add visibility toggle for password inputs on user edit 2023-08-28 16:39:23 -04:00
Alejandro Criado-Pérez 6fd119157a
Text corrections 2023-08-27 02:00:59 +02:00
Isaac Connor cf713b59d7 Add 500 and 1000 as pagination options 2023-08-25 19:02:17 -04:00
Isaac Connor 9132f8947d If scale is 0 or negative, then start with scale=100 2023-08-23 16:32:39 -04:00
Isaac Connor 76d5646cbf Fix scaling being constantly set to 0 and hence logging a bogus value for scale 2023-08-23 16:32:13 -04:00
Isaac Connor 1dba6115b1 Fix eslint 2023-08-23 11:44:16 -04:00
Isaac Connor 1e423c151d Stop infinite recursion when fail to load logout modal. 2023-08-22 12:20:11 -04:00
Isaac Connor 67e2c80851 Check for existence of modal before including it. 2023-08-22 12:19:48 -04:00
Isaac Connor 491b48f9f9 Only allow execute if you have EditEvents permission 2023-08-18 16:58:29 -04:00
Isaac Connor 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
Isaac Connor 94ea51489b Add canDelete and canEdit functions to Filter 2023-08-18 16:57:08 -04:00
Isaac Connor ea581e521f Add default value for order 2023-08-18 16:56:50 -04:00
Isaac Connor 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
Isaac Connor 8748d6a1cc Handle unset _SESSION['remoteAddr'] 2023-08-16 15:23:34 -04:00
Isaac Connor 91b4e299b9 Demote failed login to Warn instead of Error 2023-08-16 10:37:06 -04:00
Isaac Connor bdc8452891 Add a button to toggle ptz controls. Put ptz controls into a right hand sidebar. 2023-08-15 17:58:55 -04:00
Isaac Connor 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
Isaac Connor 9a229a78a5 Fix missing mac key on cameras array 2023-08-14 13:30:24 -04:00
Joe 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
Alejandro Criado-Pérez a93b67c9d8
Fixed eslint checks 2023-08-13 16:47:04 +02:00
Isaac Connor c5eec8fa12 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-08-10 11:03:30 -04:00
Isaac Connor 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
Isaac Connor 9d5a1ec9d5 If scale is invalid, reset to auto so we don't constantly log the error. 2023-08-10 10:58:19 -04:00
Isaac Connor b2993c3ec0 Use some const instead of var in changeScale 2023-08-09 19:29:19 -04:00
Isaac Connor 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
Isaac Connor 10d70022fe Handle when controls is not defined, like in WebSite monitors 2023-08-09 19:01:55 -04:00
Isaac Connor 7aa229658b Slight cleanup of changeScale, converting it to float instead of string. 2023-08-09 19:01:30 -04:00
Isaac Connor 889c809e0b Add RTSP2WebEnabled to defaults 2023-08-09 18:55:36 -04:00
Isaac Connor 7750eef533 Handle non-existing elements when monitor type is Website or Local. 2023-08-09 16:00:08 -04:00
baudneo 95655c9043
Allow RTSPtoWeb streams for zone editing (#3750)
* Allow RTSPtoWeb streams for zone editing

* Fix quoting
2023-08-08 22:03:13 -05:00
Isaac Connor 97bb130cd1 Limit effect of styling on label elements 2023-08-08 19:18:25 -04:00
Isaac Connor 00bd2259a3 Midly improve dlink support. Fix for probing an undefined array 2023-08-08 18:34:44 -04:00
Isaac Connor 0afa383c38 Info to Debug for login. 2023-08-08 14:24:36 -04:00
Isaac Connor 1e200abf16 Remove support for browsers not supporting TextDecoder to fix eslint 2023-08-08 13:01:42 -04:00
Isaac Connor fd391a4b68 Merge whoosinn:ZoneMinder 2023-08-08 10:11:08 -04:00
Isaac Connor 11f84fcb4e Fix user->Controls to user->Control. Fixes broken js on monitor view 2023-08-08 10:10:49 -04:00
Isaac Connor 042edd25e5 Add classes to tr so they can be styled 2023-08-08 09:54:47 -04:00
Isaac Connor 2f552bdcce User monitor->canView instead of user->unviewableMonitorIds for performance 2023-08-02 18:08:32 -04:00
Isaac Connor 8f9a4dc825 Use User object to get Monitor_Permission and Group_Permissions hoping it will be cached there. 2023-08-02 18:07:35 -04:00
Isaac Connor 5233c402d3 Use User object to get Monitor_Permission and Group_Permissions hoping it will be cached there. 2023-08-02 18:07:28 -04:00
Isaac Connor 672ba114f4 Fix reversed defaults for RTSP2Web options 2023-08-02 13:48:15 -04:00
Isaac Connor 206be0ea96 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-08-02 13:36:33 -04:00
Isaac Connor b48702c96c Fix lack of ZM on Warning 2023-08-02 13:36:26 -04:00
Jonathan Bennett 80c145dca4 Add support for HTTPS connections to RTSP2Web 2023-07-31 00:16:51 -05:00
Jonathan Bennett af42398070 Fix ESLint issues in RTSP2Web work 2023-07-30 16:54:22 -05:00
Jonathan Bennett 5c9588c012 Adds RTSP2Web support for live view 2023-07-29 23:46:31 -05:00
Isaac Connor d56beead81 Remove duplicated and old styles from dark montage that are in base. Removes width 99% from montage content which is no longer needed 2023-07-28 14:03:20 -04:00
Isaac Connor 20bbd9f3a6 If controls are on but not permitted the controls will not be defined 2023-07-28 12:56:51 -04:00
Isaac Connor 3301d3042b Only show map if the event has lat&long 2023-07-27 10:30:37 -04:00
Isaac Connor 03155da5b6 Use the full integer value instead of the first char of mi. Fixes failure to get status on janus viewing pages 2023-07-25 15:18:35 -04:00
Isaac Connor 30c8052e60 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-07-25 12:32:40 -04:00
Isaac Connor bd3aac1cf6 Fixup curl() and Axis probing 2023-07-25 12:32:35 -04:00
Isaac Connor bb625ab237 nonce can contain =, so parse that properly. Use a betr nonce. 2023-07-25 12:32:13 -04:00
Simpler1 a6c403a4ac
Refresh table on show
After opening an event from the events table and editing some properties, returning back to the events table would show the cached version of the table without the new values.  

This change will refresh the events table each time it's shown. 

It is a bit of a performance hit, but it's more important to show accurate information after a quick delay than to show bad/inaccurate information fast.
2023-07-24 15:13:53 -04:00
Simpler1 8c49d911a0
Event table data should be aligned with column headers
This is more noticeable when some columns of the events table are toggled off, but the column headers were centered and the data in columns were left justified.  This made it difficult to read which column went to which data.

This change centers both the column headers and the data in the columns so that they line up.
2023-07-24 15:01:12 -04:00