ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,739 Commits
32 Branches
93 Tags
162 MiB
Commit Graph

9153 Commits (1c538a4bf057635b781927179666854c8078558f)

Author SHA1 Message Date
Isaac Connor 73c2415f83 Remove swp file 2022-10-20 10:20:58 -04:00
Isaac Connor 59bc1c3fc3 add IIOT styles 2022-10-20 10:20:26 -04:00
Isaac Connor 85a1b15e92 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-10-20 08:59:23 -04:00
Isaac Connor 23863c1853 Make inputs on action table 100% 2022-10-18 13:56:16 -04:00
Isaac Connor c698027ac9 Fix test for null in Object::find 2022-10-18 13:29:12 -04:00
Isaac Connor 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
Isaac Connor 27757c1e59 return empty array when passing empty as SQLvalue 2022-10-18 13:28:43 -04:00
Isaac Connor c40d251009 Add setting remoteAddr in session after regenerating 2022-10-17 19:09:24 -04:00
Isaac Connor 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
Isaac Connor 22a059d3bc Remove debug 2022-10-17 17:25:46 -04:00
Isaac Connor ce62bb1297 Minor cleanup, remove dead code 2022-10-17 17:25:36 -04:00
Isaac Connor 155328b0d6 Put view in the form get part for visibility 2022-10-17 17:25:27 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 520baefeae Make font file location full width 2022-10-17 16:50:39 -04:00
Isaac Connor 9f4c9919e2 when a config value is overridden via *.conf files, put up a warning/explanation. 2022-10-17 16:50:23 -04:00
Isaac Connor 2b54f732a6 improve alarm cue and progress indicator styles 2022-10-14 17:39:23 -04:00
Isaac Connor ae70b1255c Fix styles after removal of dark styles from header 2022-10-14 17:32:58 -04:00
Isaac Connor 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
Isaac Connor 5ae47c8671 Fix form structure, use of get instead of post and duplicated action input 2022-10-14 14:09:43 -04:00
Isaac Connor feecd5439d left align option value column 2022-10-14 14:09:34 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 86e4d7f4d4 Don't show CaptureBandwidth as null/s if there is no value 2022-10-12 19:16:17 -04:00
Isaac Connor e116c9ee48 Fix unable to unset LockRows on Filter 2022-10-12 16:57:53 -04:00
Isaac Connor 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
Isaac Connor 0c80425b71 Make Path link to the files view 2022-10-11 16:45:03 -04:00
Isaac Connor d64868a44b Fix downloads due to chunkSize not being defined 2022-10-11 16:45:03 -04:00
Isaac Connor 87627cac8e add js for files view 2022-10-11 16:45:03 -04:00
Isaac Connor 673dff62c9 Handle empty path, give form an id and path. 2022-10-11 16:45:03 -04:00
Isaac Connor c4a2d2fb51 Fix hide() not defined on AutoMoveTo and AutoCopyTo. 2022-10-11 16:45:03 -04:00
Isaac Connor d35f8170e6 update code in updateformCheckboxesByName 2022-10-11 16:45:03 -04:00
Isaac Connor 31edfc26df Rough in a files view 2022-10-11 16:45:03 -04:00
Isaac Connor f8eef392d3 Add output_file to includes/functions.php 2022-10-11 16:45:03 -04:00
Isaac Connor 58657cc685 Remove swp file 2022-10-11 16:45:03 -04:00
Isaac Connor 7cf58df832 Add an id=content div for styling purposese 2022-10-11 16:45:03 -04:00
Isaac Connor aadfb2e6f8 Add an id=content div for styling purposese 2022-10-11 16:45:02 -04:00
Isaac Connor 2a1d417511 Remove dark styles from navbar 2022-10-11 16:44:23 -04:00
Isaac Connor 16e8af0fe3 add IIOT styles 2022-10-11 16:44:23 -04:00
Isaac Connor 09b2b372ff Test for matches[operator]. Fixes #3607 2022-10-11 15:52:46 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor de2866f957 Check value of System:Edit permission and ZM_LOG_INJECT to disable ajax log injection. 2022-10-06 14:51:29 -04:00
Isaac Connor 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
Isaac Connor c7e40769cf remove jquery-3.5.1 2022-10-04 10:55:55 -04:00
Isaac Connor f3aabfd67c Update jquery-ui to 1.13.2 2022-10-04 10:15:10 -04:00
Isaac Connor 4028c08831 Update jquery-ui to 1.13.2 2022-10-04 10:14:27 -04:00
Isaac Connor 54f821ac88 Upgrade jquery to 3.6.1 2022-10-04 10:06:40 -04:00
Isaac Connor 2139a0cf24 Make form on console use post 2022-10-03 16:15:17 -04:00
Isaac Connor 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 9b8e48e480 Switch to post instead of get in the groups form because we only do actions on post now. 2022-10-03 15:50:16 -04:00
Isaac Connor c0a4c05e84 Only perform actions on post. Doing them on GET allows doing actions from things like img tags which is not good. 2022-10-03 15:49:48 -04:00
Isaac Connor 96b428edb5 Fix group modal. Use post instead of get, properly populate the save submit button 2022-10-03 15:48:05 -04:00
Isaac Connor 0ab074eb88 Change colour of indicator to yellow to be more prominent. Add last 24hour events button. 2022-09-30 09:58:24 -04:00
Isaac Connor d289eb4860 File must be escaped as well to prevent XSS 2022-09-30 09:57:35 -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 caedd94f69 add 24hour button 
put archive status filter on same line as buttons
 2022-09-29 17:16:57 -04:00
Isaac Connor 3b47f2fc9c Fix export not working for filter due to limit set to 0. 2022-09-29 14:36:36 -04:00
Isaac Connor 340ed19c71 Handle filter[query] not being defined 2022-09-29 14:29:36 -04:00
Isaac Connor e4fad02b43 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-09-28 18:37:20 -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 9fc0d26d32 If we don't have session, we can still generate an auth hash. We kinda need this for zmu calls from API 2022-09-28 18:35:59 -04:00
Isaac Connor 460695202f Add Janus_Pin to monitor API 2022-09-28 18:35:30 -04:00
Isaac Connor 59db9c2d90 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-09-28 17:42:16 -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 2a9576371b Introduce Server::SendToApi to reduce duplicated code. 2022-09-28 17:40:08 -04:00
Isaac Connor fe0e4fcb8f handle lack of sysvsem support in php better. Turn errors back on, just don't display them. Proceed regardless of semaphore success but log an error. 2022-09-28 14:48:13 -04:00
Isaac Connor c7ded07794 Only look for action if there is a view 2022-09-27 10:49:50 -04:00
Pliable Pixels 23ae004724 whoops fixed errant enum values I forgot to delete 2022-09-25 17:46:53 -04:00
Pliable Pixels 6218d065a5 make OutputCodec work in API 2022-09-25 12:41:07 -04:00
Isaac Connor 0b37df3782 Fix scroll to top on option help modals by not having an href=#. Fix css so that the ? still is blue. 2022-09-23 09:34:29 -04:00
Isaac Connor 63e4c81d9c Try out just using connkey as the semaphore key instead of ftok 2022-09-22 16:22:36 -04:00
Isaac Connor 8a6db4a5e7 convert event->Id() explicitly to a string for strpos. 2022-09-22 16:21:25 -04:00
Isaac Connor faa6b8c9e7 Add connkey and semaphore key to logging about failure to get semaphore. Add sem_release before every ajaxError call because ajaxError exits and so we never release the semaphore. 2022-09-22 11:30:59 -04:00
Isaac Connor cb6dd816d8 streamSrc is no longer used and is making php complain 2022-09-21 15:46:42 -04:00
Isaac Connor 5fef98ce6f Add types to buttons. Make save a submit button, and remove the javascript onclick event. 2022-09-21 15:37:47 -04:00
Isaac Connor 9338732bd3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-09-21 14:36:05 -04:00
Isaac Connor 363c589975 More properly fix the alarm status api changing. The previous hack broken doing alarm on/off. 2022-09-21 14:35:27 -04:00
Isaac Connor f68c64ea30 Last and next buttons don't get disabled if the event record thinks it has more frames than are actually in the db. 2022-09-21 13:24:18 -04:00
Isaac Connor 6d1b341141 Add a.btn-primary.disabled to disabled buttons style so that frame view buttons look right 2022-09-21 13:23:49 -04:00
Isaac Connor 1072a8aa69 When scaling frame images, apparently a float value for height is no good. So use intval to fix. 2022-09-21 13:23:16 -04:00
Isaac Connor 9d6d5a242f fix monitorIds => MonitorIds 2022-09-21 12:32:15 -04:00
Isaac Connor 78ab6583e7 Fix typo causing broken link to monitor in event stats 2022-09-21 12:32:15 -04:00
Isaac Connor c3c897cd76 In failure state populate imageData array to reduce output php errors 2022-09-21 12:32:14 -04:00
Isaac Connor 86f27d2ac5 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-09-21 12:32:14 -04:00
Isaac Connor 291c43ec0f Add spans and titles over the title h2 parts so that on mouseover it tells you what they are 2022-09-21 12:32:14 -04:00
megasaturnv 8fb6477820
Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516 2022-09-21 16:47:16 +01:00
Isaac Connor abc5ea26d8 Merge branch 'master' into add_janus_rtsp_user 2022-09-18 12:44:25 -04:00
Isaac Connor a36a28d4b5
Merge pull request #3591 from VikingGer/patch-4 
Update MonitorLinkExpression.js
 2022-09-17 14:53:31 -04:00
Isaac Connor ec16937939
Merge pull request #3592 from VikingGer/patch-5 
Update event.js
 2022-09-17 10:23:24 -04:00
Isaac Connor 3843b9e14f
Merge pull request #3593 from VikingGer/patch-6 
Update report.php
 2022-09-17 10:22:33 -04:00
VikingGer ac55a9e0f2
Update reports.js 
Function name missing? Assumed to be correct according to the rest.
 2022-09-17 10:28:10 +02:00
VikingGer a099a4e3ae
Update report.php 
Again Eslint errors
 2022-09-17 10:19:42 +02:00
VikingGer 851ddb7f06
Update event.js 
Again Eslint errors
 2022-09-17 10:14:00 +02:00
VikingGer 11a4735082
Update MonitorLinkExpression.js 
Trailing spaces lead to eslint error. Removed them
 2022-09-17 10:08:07 +02:00
Isaac Connor 7d9771e41c Merge branch 'master' into add_janus_rtsp_user 2022-09-16 18:33:52 -04:00
VikingGer c43b3d1aef
Update control_functions.php 
The Reboot button was not shown without activating another one. Probably not intended  so  I did this micro adjustment
 2022-09-16 14:21:15 +02:00
Isaac Connor c197644b96 Fix contents of values on LOCALE_DEFAULT. 2022-09-15 14:05:33 -04:00
Isaac Connor 62b6171934 Only try to set TIMEZONE when loading dateTimeFormatter if it is set. Handle the exception when any of TIMEZONE or LOCALE are invalid. 2022-09-15 14:04:31 -04:00
Isaac Connor bf2b6ca145 Specify that only main page content tables should have the first colunm be min-width: 300px. This was affecting the logout dialog table content. 2022-09-15 14:03:22 -04:00
Isaac Connor d1cd7d3f91 Merge branch 'master' into add_janus_rtsp_user 2022-09-14 18:34:07 -04:00
Isaac Connor a944a1fac7 Fix no video due to height:auto on videojs 2022-09-14 13:31:25 -04:00
Isaac Connor bc566ccfdf Remove debugging 2022-09-14 13:15:02 -04:00
Isaac Connor 46de7afb0f Add fade to the logout modal which for some reason fixes it not showing after a hide 2022-09-14 13:09:51 -04:00
Isaac Connor 715122e93a Spacing, ignore auth_relay, clean up clickLogout a bit 2022-09-14 13:09:38 -04:00
Isaac Connor 419a44f8ed Merge branch 'iiot' 2022-09-13 18:23:44 -04:00
Isaac Connor b4fc5abe95 Failure to auth by hash is common, the end result is a redirect to login page. Change the log level to INF 2022-09-13 17:59:53 -04:00
Isaac Connor 4624a53a90 Show time segments in progress bar. Fix alarm cues. 2022-09-13 17:58:30 -04:00
Isaac Connor ea1970418e don't let position go negative in onclick progressbar 2022-09-12 16:05:53 -04:00
Isaac Connor f3e04ca212 shorten and move up the indicator 2022-09-12 16:05:30 -04:00
Isaac Connor fd52e73268 Add time ticks to progressbar with a mouseover highlight 2022-09-12 13:44:18 -04:00
Isaac Connor e2bd72b6a0 Fix eslint 2022-09-12 13:44:18 -04:00
megasaturnv 8fc60fef12 Moved case-insensitive username checks to SQL 2022-09-12 13:44:18 -04:00
megasaturnv 143a00cccc Fix typo 2022-09-12 13:44:18 -04:00
megasaturnv c90e2f7898 Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516 2022-09-12 13:44:18 -04:00
megasaturnv e9ab7f2f26 Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516 2022-09-12 13:44:18 -04:00
Isaac Connor c22007e8ee Allow viewing a specific video file instead of DefaultVideo 2022-09-12 13:44:18 -04:00
Isaac Connor 60d01376c5 clean up, give generation options even if viewing. Fix viewing. Add transform option. 2022-09-12 13:44:18 -04:00
Isaac Connor d3e3807263 setup video.js on the video tag if it exists 2022-09-12 13:44:18 -04:00
Isaac Connor fdbe950640 include video.js for video view as well as event 2022-09-12 13:44:18 -04:00
Isaac Connor 8676609425 Center video obj 2022-09-12 13:44:18 -04:00
Isaac Connor dbcf320808 For mp4, use video tag, with videojs instead of embed 2022-09-12 13:44:18 -04:00
Isaac Connor 37dac7d3a6 Add transform support and use Event::createVideo 2022-09-12 13:44:18 -04:00
Isaac Connor 4d2f956827 Move createVideo from functions to Event 2022-09-12 13:44:18 -04:00
Isaac Connor f9fddcb6ee format filesize into human_readable in generate video view 2022-09-12 13:44:18 -04:00
Isaac Connor 6452f8127a Convert password fields to hidden fields on submit so that browser doesn't offer to remember passwords 2022-09-12 13:44:18 -04:00
Isaac Connor eb9ac11d21 fix updating donation reminder. I would always be a month or more 2022-09-12 13:44:18 -04:00
Isaac Connor 1fe3d52c96 remove extra spacing, move dropdown option own to where they are used 2022-09-12 13:44:18 -04:00
Isaac Connor 813434e0f4 Fix saving monitor due to MQTT being empty 2022-09-12 13:44:18 -04:00
Isaac Connor e088e88e13 Make monitor rows in event stats a link if user can view monitors. Include path to event. 2022-09-12 13:44:18 -04:00
Isaac Connor ce4dd065ff Use y instead of Y for path generation when using Deep scheme. Fixes #3583 2022-09-12 13:44:18 -04:00
Isaac Connor d079439005 Merge branch 'reports' of http://github.com/ConnorTechnology/zoneminder into reports 2022-09-12 19:40:27 +02:00
Isaac Connor 363c424117 fix every monitor getting the same Janus_Pin 2022-09-12 12:56:46 -04:00
Isaac Connor d32fe1cf55 Add Janus_RTSP_User and related UI code 2022-09-12 10:34:26 -04:00
Isaac Connor d9c0e1dd8f Move RTSPServer options to under Viewing 2022-09-09 11:37:19 -04:00
Isaac Connor c306722a4e Adjust styles on ONVIF tab so that Username and Password are shorter and there is room for the reveal password icon 2022-09-09 11:35:50 -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 11c2cc1829 Change first entry of Storage Areas to say Unspecified instead of Default. 2022-09-09 09:35:12 -04:00
Isaac Connor 9276ae7d67 calling trim on null is deprecated 2022-09-08 15:11:53 -04:00
Isaac Connor 0e2e1903c1 Only init the boostrap events table if we can view Events. 2022-09-08 15:11:39 -04:00
Isaac Connor 834dc3c986 Restore status value to pre 1.36.16 value by substracting 1. So Unknown == -1, 0 = IDLE etc. Fixes #3584 2022-09-08 13:01:45 -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 7398fd97d7 Fix eslint 2022-09-07 09:35:03 -04:00
Isaac Connor 8aaa5e52b3
Merge pull request #3582 from megasaturnv/3516-CaseInsensitiveLogin 
Issue #3516 case insensitive login
 2022-09-06 16:39:53 -04:00
Isaac Connor bb8b11a2a1 Allow viewing a specific video file instead of DefaultVideo 2022-09-06 15:44:41 -04:00
Isaac Connor 11bfdebc72 clean up, give generation options even if viewing. Fix viewing. Add transform option. 2022-09-06 15:44:09 -04:00
Isaac Connor dbf92147d7 setup video.js on the video tag if it exists 2022-09-06 15:42:49 -04:00
Isaac Connor 82fb209e7f include video.js for video view as well as event 2022-09-06 15:42:11 -04:00
Isaac Connor f98f5648d9 Center video obj 2022-09-06 15:41:55 -04:00
Isaac Connor 7059e5a1ea For mp4, use video tag, with videojs instead of embed 2022-09-06 15:41:42 -04:00
Isaac Connor 4c40ef8cfb Add transform support and use Event::createVideo 2022-09-06 13:46:54 -04:00
Isaac Connor 3079438038 Move createVideo from functions to Event 2022-09-06 13:46:41 -04:00
Isaac Connor c4b895045b format filesize into human_readable in generate video view 2022-09-06 11:41:53 -04:00
Isaac Connor e6c8081fb6 Convert password fields to hidden fields on submit so that browser doesn't offer to remember passwords 2022-09-06 11:22:47 -04:00
Isaac Connor 70073719e4 use ajax() instead of getJSON so that we can specify no timeout. This prevents log queries from stacking up overloading the db 2022-09-06 11:22:47 -04:00
Isaac Connor ce2aea9615 fix updating donation reminder. I would always be a month or more 2022-09-06 11:22:47 -04:00
Isaac Connor d9babda8ad remove extra spacing, move dropdown option own to where they are used 2022-09-06 11:22:47 -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
megasaturnv 6c4fb3e2cd
Moved case-insensitive username checks to SQL 2022-09-05 15:43:53 +01:00
megasaturnv d80026cab1
Fix typo 2022-09-05 15:29:23 +01:00
Isaac Connor 85278293c2 Make monitor rows in event stats a link if user can view monitors. Include path to event. 2022-09-04 13:54:18 -04:00
Isaac Connor b611a4fc08 Use y instead of Y for path generation when using Deep scheme. Fixes #3583 2022-09-04 13:53:19 -04:00
megasaturnv 6c0f40f570 Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516 2022-09-02 12:03:47 +01:00
megasaturnv 63e5b63eec Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516 2022-09-02 11:58:02 +01:00
Isaac Connor 87e251561d Hide fieldset borders on filter edit. They look weird because the top one is hidden 2022-09-01 07:09:36 -04:00
Isaac Connor 0378023a11 Fix colours on hr to match button blue. 2022-09-01 07:09:27 -04:00
Isaac Connor 4c90bd0ac6 Add a title to the zone polygon 2022-09-01 07:08:39 -04:00
Isaac Connor 6c8819977e Cache Group Monitors Ids so we don't query the database multiple times for them. 2022-09-01 07:08:04 -04:00
Isaac Connor 980e49b547 Don't query for Monitors if there are no Monitors in the Group. 2022-09-01 07:07:55 -04:00
Isaac Connor 3d1a9c5b2d Add LIMIT 1 when filtering by AlarmZoneId to speed up 2022-09-01 07:06:46 -04:00
Isaac Connor 606fb108d5 Fix use of filter instead of this 2022-09-01 07:06:10 -04:00
Isaac Connor 3115952782 Check for key existing instead of value to fix duplication of the first label dataset 2022-08-31 23:39:33 +02:00
Isaac Connor 148460630b use ajax() instead of getJSON so that we can specify no timeout. This prevents log queries from stacking up overloading the db 2022-08-31 23:38:50 +02:00
Isaac Connor ee4302f2cf Hide fieldset borders on filter edit. They look weird because the top one is hidden 2022-08-31 23:37:32 +02:00
Isaac Connor 45e916573b Fix colours on hr to match button blue. 2022-08-31 23:09:43 +02:00
Isaac Connor 4eeb49d09a Merge branch 'master' into reports 2022-08-31 18:38:08 +02:00
Isaac Connor 1038e2d069 Cache Group Monitors Ids so we don't query the database multiple times for them. 2022-08-31 18:36:57 +02:00
Isaac Connor 382b586986 Fix typo on dateTimeFormater=>dateTimeFormatter. Fixes #3580. Make conversion to integer on Length explicit to remove warning on php8. 2022-08-31 10:08:30 -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
Isaac Connor b571c81887 Turn off autocomplete on the monitor form so that browsers don't offer to save the values 2022-08-30 17:42:35 -04:00
Isaac Connor 62a8b72dc4 Fix add monitorlink to not prepend a | onto and empty expr 2022-08-30 20:03:55 +02:00
Isaac Connor de30ad97b1 add report.js 2022-08-30 19:40:35 +02:00
Isaac Connor e24432ee4d Merge branch 'master' into reports 2022-08-30 19:40:14 +02:00
Isaac Connor 442f2a95b3 improve dataset labels 2022-08-30 19:37:38 +02:00
Isaac Connor 3005ddff49 Still parse even if no tokens 2022-08-30 19:36:43 +02:00
Isaac Connor 85c59970a6 Add a title to the zone polygon 2022-08-30 19:36:07 +02:00
Isaac Connor 4668534bf9 Don't query for Monitors if there are no Monitors in the Group. 2022-08-30 19:35:47 +02:00
Isaac Connor 54f87aa4cf Add LIMIT 1 when filtering by AlarmZoneId to speed up 2022-08-30 19:34:51 +02:00
Isaac Connor d6fea1c740 Don't specify return type as old php doesn't support it. maybe Fixes #3579 2022-08-30 10:40:00 -04:00
Isaac Connor f9f53dd0d2 When there are less than 3 storage areas, just list them in the header instead of making it a dropdown 2022-08-29 14:12:45 -04:00
Isaac Connor d465966069 Add a back to frames button from view 2022-08-26 14:33:46 -04:00
Isaac Connor 48377334fe Gracefully handle when FrameRate is empty 2022-08-26 14:12:51 -04:00
Isaac Connor 855dd6ac93 Use HTTP_X_FORWARDED_HOST or HTTP_X_FORWARDED_SERVER if present to get correct hostname to use when behind a reverse proxy. 2022-08-26 14:12:25 -04:00
Isaac Connor 3c2db0d53d Remove boot strap class styling and re-implement it in css so as to use semantic html 2022-08-26 09:33:41 -04:00
Isaac Connor d4c817328c Drop severity of log looking for @ because auth gets removed from Path 2022-08-26 09:32:23 -04:00
Isaac Connor 1609051cd2 Add id's so that we can toggle password inputs by id and not use jquery 2022-08-25 20:31:34 -04:00
Isaac Connor fa39983b69 Merge branch 'master' into add_mqtt 2022-08-25 18:41:59 -04:00
Isaac Connor 29750a56e7 Merge branch 'master' into add_mqtt 2022-08-25 18:37:54 -04:00
Isaac Connor 2a90aaf02b
Merge pull request #3576 from Garkus98/patch-1 
update Russian
 2022-08-25 18:29:34 -04:00
Isaac Connor 58df355903 Make password fields be passwords fields with a visibility toggle 2022-08-24 20:29:51 -04:00
Isaac Connor 2ee9c0a9d5 Add toggle_password_visibility function 2022-08-24 20:29:27 -04:00
Isaac Connor 3dac07fcfa Make ONVIF_URL be longer so that the flex container has some width 2022-08-24 20:29:08 -04:00
Garkus98 f18c80efa9
update Russian 
full translate Russian
 2022-08-23 18:34:57 +03: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 1b48f9dc5a log error if Date.parse fails to figure out why 2022-08-22 11:24:30 -04:00
Isaac Connor e7e811df39 Fix eslint 2022-08-22 11:24:05 -04:00
Isaac Connor cf29f4b0a4 Selecting any of the monitor filters causes a reload with no mid specified. So don't log an error if no mid was specified. 2022-08-22 10:37:16 -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
Isaac Connor 5bf1d92956 SCALE_BASE is const now in skin.js.php 2022-08-19 13:33:22 -04:00
Isaac Connor c36a8a28fe Fix eslint 2022-08-19 13:33:22 -04:00
Isaac Connor 9287d06ced currentTimeSecs is already calculated, so use it instead of parsing string version 2022-08-19 13:33:22 -04:00
Isaac Connor 4ee998b350 If current time is specified, calculate minTime and maxTime from it. 2022-08-19 13:33:22 -04:00
Isaac Connor f1c92d9729 Implement binary search functions for finding event based on time. 2022-08-19 13:33:22 -04:00
Isaac Connor bb810e3d8d Make a.btn the same line-height as button.btn 2022-08-19 13:33:22 -04:00
Isaac Connor 28731e549d Add a button to jump this event time in montage review 2022-08-19 13:33:22 -04:00
Isaac Connor 0681a199c3 Update material icons to v1.11.10 2022-08-19 13:33:22 -04:00
Isaac Connor 8b73e3311d SCALE BASE is already deifned 2022-08-19 13:33:22 -04:00
Isaac Connor 3feb089740 Clear out width=auto and height=auto to prevent warnings in logs 2022-08-19 13:33:22 -04:00
Isaac Connor 4ec1187056 Remove SCALE_BASE as it is defined globally already 2022-08-19 13:33:22 -04:00
Isaac Connor e42fd15e44 Use const instead of var to flush out duplicates for things that shouldn't change in javascript land 2022-08-19 13:33:22 -04:00
Isaac Connor a0008a6a6c Set auto_relay as well as auth_hash. getNavBar uses it 2022-08-19 13:33:22 -04:00
Isaac Connor 394e518722 Remove debug 2022-08-19 13:33:22 -04:00
Isaac Connor b17ce950a9 Quote and spacing 2022-08-19 13:33:22 -04:00
Isaac Connor f202e82b78 Remove no longer used code to protect percentage widths 2022-08-19 13:33:22 -04:00
Isaac Connor 71024dabb1 Don't setScale after layout, just do setSteamScale because setScale will alter widths and heights 2022-08-19 13:33:22 -04:00
Isaac Connor 331e3f483a Handle width=100% and remove code that worked around montage layouts with width=%. 2022-08-19 13:33:22 -04:00
Isaac Connor fcccf33cf6 Don't call format on an empty string and only pass the integer part of it 2022-08-19 13:33:22 -04:00
Isaac Connor 11bfc74cff Log entire backtrace when invalid value for width 2022-08-19 13:33:22 -04:00
Isaac Connor 38b37ff39b Fix deprecation warning due to implicit conversion to integer. Make it explicit. 2022-08-19 13:33:22 -04:00
Isaac Connor 4514ceddd5 Rework code to be smaller. Don't require SystemView permission to post a log entry. Default to ERR if invalid err code provided instead of PANIC so that the log entry still gets saved 2022-08-19 13:33:22 -04:00
Jonathan Bennett e55dfe4d4c Fix typo in field name 2022-08-19 13:33:22 -04:00
Isaac Connor 3c38f5d3f9 Test for existence of monitors[i] before trying to kill it just to reduce javascript errors 2022-08-19 13:33:22 -04:00
Jonathan Bennett 4b5db75d90 Properly hide Janus options when Janus is disabled for a given monitor. 2022-08-19 13:33:22 -04:00
Jonathan Bennett 71c5339c2b Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues 2022-08-19 13:33:22 -04:00
Isaac Connor 18152f82a2 Fix eslint 2022-08-19 13:33:22 -04:00
Isaac Connor a5e730ff01 Ignore errors decoding log message 2022-08-19 13:33:22 -04:00
ovargasp 336e65761b Modify config.php.in 
Modifies config.php to use ZM_TIMEZONE if defined by user
 2022-08-19 13:33:22 -04:00
Isaac Connor 512509af15 Setting padding to 0 for ptz buttons 2022-08-19 13:33:22 -04:00
Isaac Connor 8b4472b753 Don't use array_keys_first as it doesn't exist in php < 7.3. 2022-08-19 13:33:22 -04:00
Isaac Connor 0d2be2683d Set button padding to 0 for ptz buttons 2022-08-19 13:33:22 -04:00
Isaac Connor e2ebccc9aa fix eslint 2022-08-19 13:33:20 -04:00
Isaac Connor f8af46b92a SCALE_BASE is const now in skin.js.php 2022-08-19 08:56:03 -04:00
Isaac Connor 5563d312dc Fix eslint 2022-08-18 12:22:14 -04:00
Isaac Connor 59c2edfb0a currentTimeSecs is already calculated, so use it instead of parsing string version 2022-08-18 10:38:59 -04:00
Isaac Connor 27ac7a585c If current time is specified, calculate minTime and maxTime from it. 2022-08-18 10:37:17 -04:00
Isaac Connor ff8d549732 Implement binary search functions for finding event based on time. 2022-08-18 10:36:48 -04:00