mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-01-02 03:08:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
22,989 Commits 44 Branches 101 Tags
floorplan
Commit Graph

304 Commits

Author SHA1 Message Date
Isaac Connor
535194116b Merge branch 'floorplan' of github.com:ZoneMinder/zoneminder into floorplan 2023-11-23 13:01:55 -05:00
adhamiamirhossein
27977acdd4 fix: php 8.3 deprecated get_class method call without argument 2023-11-22 10:48:04 +03:30
Jonathan Bennett
67aea9dc9c Add Floorplan entries to Monitor DB 2023-11-12 16:54:15 -06: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
3cd6b78b85 OutputCodec cannot be null 2023-10-17 12:33:27 -04: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
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
Jonathan Bennett
5c9588c012 Adds RTSP2Web support for live view 2023-07-29 23:46:31 -05:00
Isaac Connor
febf424259 Fix returning link_to 2023-05-30 20:47:05 -04:00
Isaac Connor
30495578c2 Add link_to function 2023-05-30 20:47:05 -04:00
Isaac Connor
485af42a0b Fix more typos 2023-05-16 14:18:26 -04:00
Isaac Connor
030d6b9696 Fix undefined mid 2023-05-16 14:14:34 -04:00
Isaac Connor
3daee34d4d Fix typo 2023-05-16 14:11:53 -04:00
Isaac Connor
6eb166c938 Handle matches2 not being defined 2023-05-16 11:53:48 -04:00
Isaac Connor
a8365d40b4 Fix array uses of user object. Include data-id in monitor div. 2023-05-10 11:03:10 -04:00
Isaac Connor
969baa3891 Convert user from an array to a User object 2023-04-23 12:57:29 -04:00
Isaac Connor
35cc9fa4cb Apparently Default for Deleted needs to be zero, not false 2023-04-22 14:04:18 -04:00
Isaac Connor
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
Isaac Connor
73548dda73 Add Deleted member 2023-04-19 18:56:29 -04:00
Isaac Connor
16b74fc474 Add title of monitor id and name like we had in 1.36 2023-03-23 20:03:40 -04:00
Isaac Connor
72652cfb64 Add Decoder options to monitor view 2023-02-26 16:04:32 -05:00
Isaac Connor
82a28b78d8 Use function style of member access to prevent errors on unsaved monitor 2023-02-23 13:22:50 -05:00
Isaac Connor
82a9d6d444 Use validCardinal on Id to prevent executing other commands 2023-02-20 11:41:41 -05:00
Isaac Connor
5090000cdd Remove ZM\s that shouldn't be there 2023-02-19 17:29:32 -05:00
Isaac Connor
855ab6f141 Add reload to monitor zmcControl 2023-02-16 14:10:21 -05:00
Isaac Connor
113171e5ee username in session can also be unset 2023-02-15 13:46:34 -05:00
Isaac Connor
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
Isaac Connor
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
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
ea6d999654 Must use false === when using array_search because first element returns 0 2022-11-02 17:42:32 -04:00
Isaac Connor
ab3e1811d3 fix canEdit, rough in effectPermission 2022-11-02 15:52:37 -04:00
Isaac Connor
63769a2082 Fix missing ) 2022-11-02 13:26:34 -04:00
Isaac Connor
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
Isaac Connor
2f295a2f55 Make Monitor::Server always return a Server object so we don't have to test for null 2022-09-30 09:57:21 -04:00
Isaac Connor
8d56949800 Deal with structure of json response from API when getting Janus_Pin 2022-09-28 18:36:47 -04:00
Isaac Connor
f5bdbcf0bd Use new Server::SendToApi to reduce duplicated code. If Janus Not enabled, then don't both with Janus_Pin. If Server is remote, use API to get Janus_Pin. Implementing the API side is left as an exercise. 2022-09-28 17:41:46 -04:00
Isaac Connor
d32fe1cf55 Add Janus_RTSP_User and related UI code 2022-09-12 10:34:26 -04:00
Isaac Connor
8ba1bbc63c Set new defaults: Only analysis jpegs, and passthrough on. Label Size => Default. Fix warnings when creating a new MOnitor because Path, User, Pass are unset. 2022-09-09 11:29:32 -04:00
Isaac Connor
9276ae7d67 calling trim on null is deprecated 2022-09-08 15:11:53 -04:00
Jonathan Bennett
c35bbc8c30 Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it 2022-09-07 15:49:47 -05:00
Isaac Connor
d76c425057 Fix saving monitor due to MQTT being empty 2022-09-06 11:22:04 -04:00
Isaac Connor
29750a56e7 Merge branch 'master' into add_mqtt 2022-08-25 18:37:54 -04:00
Isaac Connor
6ae05d7009 Rework to not use strlen and strlen now complains if you pass it null 2022-08-22 11:46:57 -04:00
Isaac Connor
d51a2eb8a5 Merge pull request #3537 from parvit/issue-695 
Added configuring of authentication for rstp cameras
 2022-08-21 18:08:00 -04:00
parvit (Vittorio Parrella)
442d7b1c89 integrated dynamic client and server update of path, user and password values 2022-08-18 05:05:18 -04:00
Isaac Connor
4bd7fc8fcf Clear out width=auto and height=auto to prevent warnings in logs 2022-08-17 15:34:39 -04:00
Isaac Connor
0078a6f639 Log entire backtrace when invalid value for width 2022-08-10 09:18:39 -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