Commit Graph

71 Commits

Author SHA1 Message Date
Isaac Connor
d89f2e59db refactor: rename Janus_Use_RTSP_Restream to Restream
Rename Janus-specific restream fields to be more generic since they are
now used by Go2RTC and RTSP2Web as well:
- Janus_Use_RTSP_Restream → Restream
- Janus_RTSP_User → RTSP_User

Update visibility logic so the Restream checkbox appears when RTSPServer
is enabled AND any streaming service (Janus, Go2RTC, or RTSP2Web) is
selected, rather than only when Janus is enabled.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-31 18:47:37 -05:00
Steve Gilvarry
c4385768ad Fix default zone creation to account for monitor rotation
When creating a new monitor with Orientation set to ROTATE_90 or
ROTATE_270, the default "All" zone dimensions are now correctly swapped
to match the rotated image dimensions. This prevents zm_zone.cpp from
reporting that zones extend outside of image dimensions and having to
fix them at runtime.

Fixes issue where monitors created with Rotate Right or Rotate Left
would generate warnings like:
"Zone 1/All for monitor X extends outside of image dimensions,
(0,0), (3839,2159) != (2160,3840), fixing"

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2026-01-08 22:58:59 +11:00
Isaac Connor
203418d45e Only make symlink if name is different than id 2025-09-06 11:37:07 -04:00
Isaac Connor
e42d31fe3b Fix not being able to turn off Go2RTCEnabled 2025-06-26 16:28:16 -04:00
Isaac Connor
edb0836fe1 Fix not being able to undelete a monitor 2024-12-09 12:27:42 -05:00
Isaac Connor
caeb65233e Fix not being able to unset use WallClockTimestamps 2024-07-08 08:36:55 -04:00
Isaac Connor
c2b6f6ba17 Detect when a new monitor uses a specified Id and the record exists in a deleted monitor. Automatically Undelete it. 2024-03-28 12:48:48 -04:00
Isaac Connor
b4bbff6353 Use per-monitor permissions 2024-03-05 14:00:40 -05:00
Server
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
Isaac Connor
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
Isaac Connor
aafd4067e0 Dont' restart a monitor if it has been deleted 2023-12-04 14:50:37 -05:00
Isaac Connor
889c809e0b Add RTSP2WebEnabled to defaults 2023-08-09 18:55:36 -04:00
Isaac Connor
e13a42aa46 Fix not saving Manufacturer and Model. Have to unset the text input if the ddm is populated 2023-07-12 14:30:49 -04:00
Isaac Connor
969baa3891 Convert user from an array to a User object 2023-04-23 12:57:29 -04:00
Isaac Connor
ce0a83f904 Reduce minimum to .05% as that is what seems to be necessary these days 2023-04-05 17:47:03 -04:00
Isaac Connor
21f6bdae35 Change minimum percent to 50% instead of 3% 2023-04-05 14:46:13 -04:00
Isaac Connor
d170112ef7 Change minimum percent to 50% instead of 3% 2023-04-05 14:45:30 -04:00
Isaac Connor
b1df318491 Use ORM Zone Object for Zone insertion on new monitor 2023-04-05 14:43:50 -04:00
baudneo
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
Isaac Connor
f06e11a097 Add SectionLengthWarn, use it to disable warnings in logs about section length being exceeded. 2023-01-07 12:33:42 -05:00
Isaac Connor
25100cd592 Fix missed references to oldW and oldH 2022-10-31 09:27:53 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
1f20b18100 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-09-06 11:22:28 -04:00
Isaac Connor
d76c425057 Fix saving monitor due to MQTT being empty 2022-09-06 11:22:04 -04:00
Isaac Connor
683acbbc1d Clear Manufacturer and Model so that they don't list as changes 2022-08-31 10:05:52 -04:00
Jonathan Bennett
d41792ae00 Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues 2022-08-09 00:54:41 -05:00
Isaac Connor
cf3c194e21 Handle when there are no servers and hence no defined ServerId in newMonitor 2022-08-03 11:55:44 -04:00
Isaac Connor
10e39b3b13 :wqMerge branch 'master' into replace_function_concept 2022-02-02 17:08:01 -05:00
Jonathan Bennett
fb832e7d1b Adds janus_enable_audio, a switch to try to enable audio in live stream viewing. 2022-01-19 00:14:52 -06:00
Isaac Connor
d00aaa11e9 default JanusEnabled to 0 so that we can turn it off 2022-01-18 23:02:26 -05:00
Isaac Connor
3241fa59c5 Don't redirect if there was an error so that we display it 2022-01-18 23:02:26 -05:00
Isaac Connor
b1d881b118 Report more saving errors to ui 2021-11-17 18:57:36 -05:00
Isaac Connor
1fd99424bb Merge branch 'master' into add_manufacturer_model_to_monitors 2021-11-05 10:13:41 -04:00
Isaac Connor
1f04723f3a dbError is supposed to take the sql that caused the error. So pass something to satisfy php 2021-10-05 19:49:42 -04:00
Isaac Connor
2f12615f08 assign REQUEST['newMonitor'] to a variable to simplify code. Fixup ModelId and ManufacturerId saving. 2021-09-25 10:33:16 -04:00
Isaac Connor
c6209ce460 Store new Model and Manufacturer when saving Monitor 2021-07-07 09:47:00 -04:00
Isaac Connor
9254c99ab8 Add ModectDuringPTZ 2021-04-23 14:52:29 -04:00
Isaac Connor
5eae1c0a9f spacing, add code comment 2021-03-13 12:10:55 -05:00
Isaac Connor
b58ecca040 Allow RTSPServer to be unselected 2021-02-17 12:07:55 -05:00
Isaac Connor
105eff7a21 Remove references to zma 2021-02-01 17:29:16 -05:00
Isaac Connor
0dc6b60985 Use new insert function to allow re-use of monitor Ids 2021-02-01 16:44:41 -05:00
Isaac Connor
284b9f963f Merge branch 'master' into zma_to_thread 2020-12-29 12:18:26 -05:00
Isaac Connor
da8d96ddda Don't pass types to changes, it doesn't do anything. Add DecodingEnabled to request 2020-12-10 16:24:09 -05:00
Matt N
6e3eb922e0 Use relative symlinks for monitor event directories
This way the link continues to work from backups and after the user moves ZM data to a new directory.
2020-11-01 14:55:08 -08:00
Isaac Connor
10c0a6617c Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php. 2020-10-14 10:39:25 -04:00
Isaac Connor
ed6d5a55a5 put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button 2020-09-22 14:33:26 -04:00
Isaac Connor
0aa0452b7e Use a redirect instead of just changing the view on monitor save. This fixes the reload issue 2020-09-22 14:05:37 -04:00
Isaac Connor
d0f1a2af80 Since monitor edit is no longer a popup, we need to redirect to console instead of none. 2020-08-28 10:22:28 -04:00