Commit Graph

6020 Commits

Author SHA1 Message Date
Isaac Connor 9dbeaa2c7b Add default for Orientation. Fixes saving WebSite type monitors 2020-05-01 15:32:26 -04:00
Isaac Connor 1bd340d602 spacing in watch.php 2020-05-01 13:30:00 -04:00
Isaac Connor 6dbc917215 Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha 2020-05-01 13:24:47 -04:00
Isaac Connor 82188c266e Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol. 2020-05-01 13:23:39 -04:00
Isaac Connor 45a445ac48 sync up index.php to master, where is a global 2020-05-01 13:21:02 -04:00
Isaac Connor ad373a5549 add Zone.php from master 2020-05-01 13:20:42 -04:00
Isaac Connor e960e638b3 Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets 2020-05-01 13:07:29 -04:00
Isaac Connor bd7475a450 use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working 2020-05-01 13:06:15 -04:00
Isaac Connor e29c426f04 Pass event object to data-on-click events 2020-05-01 13:04:55 -04:00
Isaac Connor 89245e0d46 Add auth relay information when auth_relay is something other than hashed. 2020-05-01 13:04:37 -04:00
Isaac Connor 2da88be307 Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none. 2020-05-01 13:04:16 -04:00
Isaac Connor 4c9f67eb5a Fix no redirect on login with palemoon browser 2020-05-01 13:03:56 -04:00
Isaac Connor 289045500b Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target 2020-05-01 13:03:35 -04:00
Isaac Connor daa08e8740 Always just default to scale from monitor 2020-05-01 13:03:17 -04:00
Isaac Connor 62ddc02d52 quotes to match master 2020-05-01 13:01:34 -04:00
Isaac Connor 830929a85f Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets 2020-05-01 12:53:47 -04:00
Isaac Connor 496fd6b15a reorganize to reduce code depth 2020-04-23 18:17:20 -04:00
Isaac Connor 775b0d1ccd fix XSS in monitor Name 2020-04-23 18:16:38 -04:00
Isaac Connor bc9137bd93 defend against XSS in Monitor Name 2020-04-23 17:56:05 -04:00
Isaac Connor 0f91797d85 defend against XSS in Monitor Name 2020-04-23 17:53:54 -04:00
Isaac Connor 189d4a6f02 add Emailed status to events list 2020-04-23 17:52:18 -04:00
Isaac Connor 8be08d942a Scale must be an integer value so use '0' instead of auto 2020-04-23 17:40:42 -04:00
Isaac Connor 9d42d0e2f0 silence warning when no language is set 2020-04-23 17:38:15 -04:00
Isaac Connor b3a8ac0b2a tidy up, be more efficient and warn when language files are not found. 2020-04-23 17:37:46 -04:00
Isaac Connor d90177fb74 handle a 0 value for scale 2020-04-23 16:41:00 -04:00
Isaac Connor 56a43741c5 Handle a zero value for scale 2020-04-23 16:37:26 -04:00
Isaac Connor bf99daf494 Merge branch 'rate_dropdown' 2020-04-23 16:36:34 -04:00
Isaac Connor 5503458874 correct label_size array and add translations 2020-04-23 16:32:19 -04:00
Isaac Connor 010b230804 Fix value of auto in width dropdown. Allow a 0 value for scale. 2020-04-23 16:30:39 -04:00
Isaac Connor 8ef70f9080 defend against XSS in Monitor Name 2020-04-23 16:28:19 -04:00
Isaac Connor 25cd13f8ad When sending eventCmdReq, pass eventCmdParms since it might have been updated. 2020-04-23 16:25:35 -04:00
Isaac Connor da79f761ad add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons 2020-04-23 16:17:27 -04:00
Isaac Connor 908e892d48 Merge branch 'fix_auth_timeouts' 2020-04-23 16:15:30 -04:00
Isaac Connor 81d329af2f spacing, eslint 2020-04-23 16:12:04 -04:00
Isaac Connor 5bf068791b Merge branch 'rate_dropdown' into release-1.34 2020-04-23 16:11:59 -04:00
Isaac Connor 91e78410a9 Stop the montagereview update while we reload the page 2020-04-23 16:08:36 -04:00
Isaac Connor 9a3f699644 Use a little less ram by passing by reference 2020-04-23 16:07:59 -04:00
Isaac Connor d3f2dd4d6a fix 2020-04-23 16:07:23 -04:00
Isaac Connor 7d0421a02c defend against XSS in Monitor Name 2020-04-23 16:06:44 -04:00
Isaac Connor 93a37671c2 Merge branch 'release-1.34' 2020-04-23 16:01:52 -04:00
Isaac Connor 8e2c76df61 minor code cleanup, adding monitor click event in a previous for loop instead of iterating again 2020-04-23 15:59:12 -04:00
Isaac Connor 63aaf76f0d handle a 0 value for scale as the scale to fit value 2020-04-23 15:57:42 -04:00
Isaac Connor 6a9a8f1d5f check length of returned tr array to prevent errors in js log 2020-04-23 15:55:46 -04:00
Isaac Connor 12252f1f37 defend against XSS in Monitor Name 2020-04-23 15:54:12 -04:00
Isaac Connor 7347ef4030 Handle a zero value for scale 2020-04-23 15:52:47 -04:00
Isaac Connor b7fd4e26a5 defend against XSS in Monitor Name 2020-04-23 15:51:29 -04:00
Isaac Connor bab609426d spacing in views/event.php 2020-04-23 15:47:10 -04:00
Isaac Connor 4e9f0b3463 defend against XSS in Monitor Name 2020-04-23 15:46:05 -04:00
Isaac Connor b6c1a328a8 Fix XSS from monitor Name, group Name, storage Name, server Name 2020-04-23 15:45:02 -04:00
Isaac Connor 8d2ce34149 include id in monitors dropdown so that it is searchable 2020-04-23 15:44:27 -04:00