Commit Graph

6150 Commits

Author SHA1 Message Date
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
Isaac Connor 91b1d7bbeb alter setButtonState to take either an id or an element so that we can log the missing element 2020-04-23 15:43:36 -04:00
Isaac Connor a6f5ae2601 fix cyclePlay button not working. Move SetButtonState into skin.js 2020-04-23 15:42:30 -04:00
Isaac Connor ced36a5333 remove debug and spacing 2020-04-23 15:40:35 -04:00
Isaac Connor 96774bd038 fix inline javascript in ptz buttons 2020-04-23 15:39:31 -04:00
Isaac Connor 042086b565 Extend width of ControlDevice and Address to full width 2020-04-23 15:38:40 -04:00
Isaac Connor 617b74b8bb fix botched merge 2020-04-23 15:28:38 -04:00
out a7e49bd62a update chinese translation (~ ̄▽ ̄)~ 2020-04-23 15:27:06 -04:00
Isaac Connor c0b7aad2c8 add passive to addEventListener 2020-04-23 15:23:53 -04:00
Isaac Connor 17896b656a cleanup and revert adding Event stack trace 2020-04-23 15:23:11 -04:00
Isaac Connor 54995ab0d1 handle sort_asc not being set. Handle term['val'] not being set. 2020-04-23 15:18:05 -04:00
Isaac Connor f06dc3f171 Update group save action, using Group object methods. Fixes errors on new MariaDB 2020-04-23 15:16:22 -04:00
Isaac Connor b05916fc50 Use === when testing for empty value and setting defaults 2020-04-23 15:08:01 -04:00
Isaac Connor eb26c5f798 Fix use of array_key_exists instead of property_exists 2020-04-23 15:07:28 -04:00
Isaac Connor f5bf474ba6 filter bad characters out of Monitor Name 2020-04-23 14:59:21 -04:00
Isaac Connor 6f08322f7f add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving 2020-04-23 11:12:47 -04:00
Isaac Connor daff14df9b Allow users without System::View to read servers.json 2020-04-23 11:10:30 -04:00
Pliable Pixels 9b77f77ac3 better logs 2020-04-23 11:09:39 -04:00
Isaac Connor c3a80e7e40 Add MonitorId to event data returned for status request 2020-04-23 11:07:07 -04:00
Isaac Connor 59f9f37fff cleanup. Don't output errors that break json response 2020-04-23 11:06:41 -04:00
Isaac Connor 055c20c3cc fix eslint 2020-04-23 10:23:46 -04:00
Isaac Connor eab08783e9 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-04-23 10:10:08 -04:00
Isaac Connor 264ba6525b Remove debug 2020-04-21 12:19:18 -04:00
Isaac Connor b384d233ae add async and defer to recaptcha load 2020-04-21 09:20:33 -04:00
Isaac Connor 543628d0ee cleanup, and add missing </ul> in the navbar when not logged in which seems to be causing the recaptcha render to fail 2020-04-21 09:20:04 -04:00
Isaac Connor d0e83fcfcb handle case where g-recaptcha-response is not in the request, due to failure to render the recaptcha 2020-04-21 09:19:29 -04:00
Isaac Connor 3e8de7dd6c Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918 2020-04-21 08:30:42 -04:00
Isaac Connor ac017a5c72 Add support for strftimes' %r when converting to moment.js formatting 2020-04-18 17:51:34 -04:00
Isaac Connor 210d380029 CSP must include all Servers. 2020-04-04 16:57:52 -04:00
Isaac Connor 024431808e fix onchange to data-on-change-this in width,height,scale, layout dropdowns 2020-04-04 16:57:24 -04:00
Isaac Connor e2cb8a656d change exportEvent to expertEvents 2020-04-04 11:53:07 -04:00
Isaac Connor 402c38725b Limit version check popups to once per hour 2020-04-04 11:52:40 -04:00
Isaac Connor 6feffe2aa9 whitespace 2020-04-04 11:51:39 -04:00
Isaac Connor 61e6627fce fix fail to update version reminder due to submit button both submitting and formSubmitting as well as view not being set to version 2020-04-04 11:48:42 -04:00
Isaac Connor f81cfc0513 add 1 month as an option to the version popup dropdown 2020-04-04 11:46:31 -04:00
Isaac Connor 2441ae2924 Improve event export a little bit. Add links to eventFrames and eventDetail html. 2020-04-03 15:34:20 -04:00
Isaac Connor 5d72e3b1b5 ensure no output buffering when downloading an archive. 2020-04-03 15:33:28 -04:00
Isaac Connor 4547332fad Move more styles into export.css. Remove content from dark/export.css and classic/export.css as it is duplicated. 2020-04-03 15:32:22 -04:00
Isaac Connor 4e58a38317 use ini_set(display_errors,0) instead of turning off errors entirely so that we still log errors, just not output them instead of json. 2020-04-03 15:21:31 -04:00
Isaac Connor ef9fbac90c Add Noscript warnings. Whitespace, improve some logic 2020-04-02 18:14:14 -04:00
Isaac Connor 1cc60f0857 fix action on cycle play button 2020-04-02 16:06:27 -04:00
Isaac Connor 87069b99b6 Fix inline-script errors on groups page referenced in #2890 2020-04-02 14:13:28 -04:00
Isaac Connor 3bfcd8eb33 Check for definition of ZM_TIMEZONE before using it. Fixes #2895 2020-04-02 14:00:36 -04:00
Isaac Connor 50700031b1 Use zm_session_start instead of session_start 2020-03-27 13:05:12 -04:00
Isaac Connor 1ab294e291 Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto. 2020-03-27 12:43:21 -04:00
Isaac Connor 17fbafd7de including the language files must come after auth in order to user the user's language setting 2020-03-27 11:41:04 -04:00
Isaac Connor 3e55795cad Handle different command line syntax for zmcontrol.pl 2020-03-26 13:57:43 -04:00
Isaac Connor b354641df3 fix syntax errors in triggers in monitor view 2020-03-26 13:57:19 -04:00
Isaac Connor af36cc3e52 Fix starting and stopping zmcontrol processes across servers. 2020-03-26 13:57:00 -04:00
Isaac Connor d3df0defc9 Support missing openssl_random_pseudo_bytes by using alternate functions 2020-03-21 15:28:18 -04:00
Isaac Connor ecaaae90f3 fix streamImg loading when using applet. Also don't alter actParms as it is not a global. 2020-03-20 11:06:01 -04:00
Isaac Connor 59bd658a96 replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc. 2020-03-10 18:46:20 -04:00
Isaac Connor 84d719f2dd Merge branch 'release-1.34' into rate_dropdown 2020-03-10 16:06:11 -04:00
Isaac Connor 5fe1452a1a
Merge pull request #2879 from pliablepixels/1.34-dev
return frame IDs of snapshot and alarm frames for a specific e…
2020-03-09 14:44:41 -04:00
Isaac Connor e8553babfa remove extra spaces, fix eslint 2020-03-09 14:43:54 -04:00
Pliable Pixels a261efe0a7 return relative frameId, also sort score frame by lowest frame to avoid bulk frames incase score is 0 2020-03-09 12:04:40 -04:00
Pliable Pixels 3611d147e6 fix score frameID to return ID not Score 2020-03-09 11:25:07 -04:00
Pliable Pixels c5e838fa33 return global frame IDs of snapshot and alarm frames for a specific event 2020-03-09 11:09:20 -04:00
Isaac Connor e56976c800 Triggers cannot be null, it is '' instead 2020-03-08 17:23:48 -04:00
Isaac Connor 53f262a4cb Merge pull request #2870 from pliablepixels/dev
#2866 - fixes incorrect token type comparison
2020-03-04 11:31:16 -05:00
Isaac Connor bd59ae8856 Move the Basic Auth login code from skin.php to includes/auth.php 2020-03-02 15:00:31 -05:00
Isaac Connor 7c21f065bd Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different 2020-03-02 12:07:11 -05:00
Isaac Connor 76131d1887 Fix timeline. Update parseFilterToTree to add missing operators. Fix logging calls to include ZM namespace. Update code style. 2020-03-01 11:07:31 -05:00
Isaac Connor bab0b2e830 handle a scale value of auto 2020-02-27 11:35:40 -05:00
Isaac Connor 1b70ed2076 Merge branch 'fix_generate_video_page' into release-1.34 2020-02-25 18:22:24 -05:00
Isaac Connor 0c70c5c2a4 Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value 2020-02-25 18:14:27 -05:00
Isaac Connor a34af39ca7 Fix logging line in generate video function 2020-02-25 18:14:14 -05:00
Isaac Connor c08ec996f7 Fix various aspects of the video generating page. Clean up and update code. Remove inline javascript. Fixes #2843 2020-02-25 18:12:25 -05:00
Isaac Connor 8fcd5b37ed API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials 2020-02-25 17:15:59 -05:00
Isaac Connor 7787ba1040 Fix adding auth string screwing up url to remote api in zmaControl and zmcControl 2020-02-25 17:15:45 -05:00
Isaac Connor 4c2fb6bf08 populate a js var minTime and maxTime and use it when setting up the calendar widget to set minTime for end calendar. 2020-02-25 13:40:44 -05:00
Isaac Connor 173d58d8b3
Merge pull request #2852 from connortechnology/Event_list_is_not_filtered_when_Group_is_selected_on_Console
Event list is not filtered when group is selected on console
2020-02-24 14:37:42 -05:00
Isaac Connor 55c99c5ff3 Include filtered monitors for filter query on totals line of event counts. Fixes #2846 2020-02-24 14:34:21 -05:00
Isaac Connor d0a8d241d2 Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849 2020-02-24 13:13:54 -05:00
Isaac Connor d7f8f201be Fix zoneminder.com url getting undefined being added to it 2020-02-22 10:51:26 -05:00
Isaac Connor 1a87eb40bd Fixes #2841 and maintains login through password change 2020-02-19 16:55:38 -05:00
Isaac Connor 789db4e5a6 Fix filter new rows missing their onchange event on attribute dropdown. Fixes #2817 2020-02-18 13:29:06 -05:00
zlodag a8615c1c85 fixed bug in control functions where left arrow panStep was inverted 2020-02-16 11:41:14 +13:00
Isaac Connor 289bde869d use a better language for unset value 2020-02-11 14:31:48 -05:00
Isaac Connor 9f9a97f596 fix dropdown with unset option 2020-02-11 14:29:21 -05:00
Isaac Connor 844ff529e1 add an unset value to ZM_TIMEZONE in Options->System 2020-02-11 13:24:26 -05:00
Isaac Connor 600dbba8c5 We don't need to set date_default_timezone_get 2020-02-11 13:23:53 -05:00
Isaac Connor 821355c117 Only set date.timezone if we have a configured value in the Config 2020-02-11 13:21:28 -05:00
Isaac Connor 137bdb1f24 Make shm have error or warning class if full 2020-02-10 14:20:46 -05:00
Isaac Connor 389a6b3ec8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-06 13:22:30 -05:00
Isaac Connor c465fa55d8 Use ZM_PATH_FFMPEG instead of ffmpeg 2020-02-06 13:22:22 -05:00
Isaac Connor 1cbc75813c improve the output of the ajaxError to say what the action was and who the user was 2020-02-06 13:21:57 -05:00
Isaac Connor dd0ce50c17 quotes and improve the output of the ajaxError to say what the action was and who the user was 2020-02-06 13:21:30 -05:00
Isaac Connor e8a0ed9208 quotes and improve the output of the ajaxError to say what the action was and who the user was 2020-02-06 13:20:35 -05:00
Isaac Connor 1c2f2657d2 We don't do automatic login when recaptcha is enabled, so add the login calls on successful recaptcha 2020-02-04 16:41:19 -05:00
Isaac Connor 42b3bb6a53 increase width of google sitekey and secret key inputs to 100% 2020-02-04 16:40:52 -05:00
Isaac Connor 6345ecc479 remove debug 2020-01-23 17:04:33 -05:00
Isaac Connor dbdb13efd7 Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811 2020-01-20 11:02:43 -05:00
Garrett Scott ead52f30b1 Bug fix: Allows for inital/base install without the option MultiPort config value assigned 2020-01-20 00:44:20 -08:00
Isaac Connor 75fa1d693d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-18 16:09:44 -05:00
Isaac Connor a3754709e4 allow filters to not have terms specified. We can't pass an empty array in a url, so we will just have to handle it. 2020-01-18 16:09:33 -05:00
Isaac Connor 6c7f003198 revert bogus change not including skin.js 2020-01-18 16:08:55 -05:00
Andrew Bauer de5bf21d8a
fix eslint 2020-01-17 15:06:46 -06:00
Isaac Connor 5b8e5eb349 don't output duplicated js when css=base 2020-01-17 14:51:02 -05:00
Isaac Connor d0003215b1 Merge branch 'master' into rate_dropdown 2020-01-17 12:30:35 -05:00
Isaac Connor 86a2523498 break up a long line, add some parenthesis to clarify logic 2020-01-17 12:30:26 -05:00
Isaac Connor a398f33e68 fix delTerm button not being enabled because it is a button now, not an input 2020-01-17 09:17:29 -05:00
Isaac Connor 4f2df830a8 fix inline js 2020-01-17 09:17:05 -05:00
Isaac Connor 74b3ad6dd9 add options help for HWACCEL options 2020-01-16 14:33:37 -05:00
Isaac Connor 6a43c2deb5 fix zoom_range to zoomout_range 2020-01-16 14:17:40 -05:00
Isaac Connor 028e7e8dde Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-15 19:03:11 -05:00
Isaac Connor 09f2298838 return empty array instead of nothing in probeNetwork 2020-01-15 19:02:40 -05:00
Javier Gonzalez 8b375de455 Avoid duplicate Monitors in API 2020-01-15 20:31:05 +01:00
Isaac Connor 02e9096d2b When saving an existing Filter and we are unchecking Background, need to stop the filter before saving. Remove dead code 2020-01-13 17:32:57 -05:00
Isaac Connor e4ba1fd432 fix restarting zmcontrol on remote servers by passing object=filter as well 2020-01-13 17:16:15 -05:00
Isaac Connor d7dc7cdc47 Add ServerId to database log entries in php 2020-01-13 16:18:01 -05:00
Isaac Connor 9036b6db77 fix typo 2020-01-13 16:17:39 -05:00
Isaac Connor f3a9e608db Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-13 16:11:19 -05:00
Isaac Connor 91acb775eb Fix Eventount to EventCount 2020-01-13 13:43:14 -05:00
Isaac Connor b11815cfa9 Introduce Storage->EventCount to get the # of events per storage without actually loading all events. 2020-01-13 12:53:50 -05:00
Isaac Connor 6cd76ee2ff Clear cache after loading Events so as to free ram. 2020-01-13 12:53:05 -05:00
Isaac Connor f7e2359818 Implement a clear_cache function so that we can free up cached objects 2020-01-13 10:57:56 -05:00
Isaac Connor 398688550b fixtypo 2020-01-10 20:15:52 -05:00
Isaac Connor fabb7180d6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-10 20:13:28 -05:00
Isaac Connor 0c478c7962 fix Monitor->Server 2020-01-10 20:13:09 -05:00
PrplHaz4 6a4b66a792
add 3840x2160 4k UHD to monitor dropdown
I think this is fairly common in consumer IP cams now...
2020-01-10 19:44:06 -05:00
Isaac Connor 2f5caf2bb5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-10 17:21:10 -05:00
Isaac Connor 5ee0158735 Set defaults for vars == '' 2020-01-10 16:42:41 -05:00
Isaac Connor f61f6eaf7d remove line cutnpasted erroneously 2020-01-10 12:45:47 -05:00
Isaac Connor d433590f74 use find_one in stead of new to use Cached Server 2020-01-10 12:45:30 -05:00
Isaac Connor ef4ecd40fb Set defaults before saving Objects 2020-01-10 12:44:59 -05:00
Alex Porosanu 28a4bef6ba fix tar invocation for *BSD platforms
"--xform" switch is not supported by tar on BSD platforms i.e. *BSD,
MacOS, etc. As such, use "-s" switch on these platforms, with a
similar regexp.
2020-01-09 22:03:02 +02:00
Andrew Bauer f13a7199e1
fix eslint 2020-01-07 21:53:55 -06:00
Isaac Connor c64de372a7 when auth_hash changes, update various CmdParms 2020-01-07 17:08:57 -05:00
Isaac Connor 0571909d05 add remote_IP to log entries on php side 2020-01-07 17:08:29 -05:00
Isaac Connor 1865df3fe0 remove some debug, add some parenthesis to ensure logic works as intended 2020-01-07 17:08:07 -05:00
Isaac Connor 1c197db619 Merge branch 'master' into rate_dropdown 2020-01-07 14:49:58 -05:00
Isaac Connor 61bc0ddd0a add missing t and merge some lines 2020-01-07 11:01:53 -05:00
Isaac Connor 2f1b725ee4 quote SQL for mysql8 2020-01-07 11:01:02 -05:00
Isaac Connor 7535769e4b controlcap needs to be larger 2020-01-05 17:34:40 -05:00
Isaac Connor 71581831b5 fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons 2020-01-05 17:34:27 -05:00
Isaac Connor 6ac26ec1aa quotes 2020-01-05 17:33:53 -05:00
Isaac Connor c3641df531 spaces 2020-01-05 17:30:06 -05:00
Isaac Connor 00f8a450de spaces and quotes 2020-01-05 14:59:25 -05:00
Isaac Connor 7fdf6165d5 Fix case in var name 2020-01-03 17:08:11 -05:00
Isaac Connor c8e39e2418 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-03 16:35:15 -05:00
Isaac Connor e951b0af1c add code to set default value for checkboxes 2020-01-03 16:35:04 -05:00
Isaac Connor 0a495395b0 Restore Gain tab 2020-01-03 16:34:46 -05:00
Isaac Connor f572c4092a add checks for Zoom, Focus, White, Iris movement types 2020-01-03 15:58:57 -05:00
Isaac Connor 158e26bb25 split long lines 2020-01-03 15:58:02 -05:00
Isaac Connor c4aaa33bea add widths for number inputs on controlcap view 2020-01-03 15:57:51 -05:00
Isaac Connor 0b3776dbf0 change text inputs to number inputs, cleanups 2020-01-03 15:57:29 -05:00
Isaac Connor 89844f72f4
Merge pull request #2790 from pliablepixels/jwt-token-duration
fix JWT access token always being 1 hr
2020-01-02 17:22:37 -05:00
Isaac Connor d42e9beddc Add warnings when the type of movement is not selected 2020-01-02 17:03:52 -05:00
Isaac Connor e9815bf9c7 add ZM Namespace to Error calls 2020-01-02 16:54:50 -05:00
Isaac Connor 3cfc1a0a6d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-02 16:45:39 -05:00
Pliable Pixels 399508b211 fix JWT access token always being 1 hr 2020-01-02 10:25:48 -05:00
Isaac Connor 60d45d967f test for existence of selected checkboxes in post data because if none are selected, the array won't exist 2020-01-02 10:17:07 -05:00
Andrew Bauer 98f7fb63b9 fix eslint errors 2019-12-31 19:24:51 -06:00
Isaac Connor 6a39893c1d include i elements in data-on-click 2019-12-31 19:11:14 -05:00
Isaac Connor 714d304528 Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation 2019-12-31 19:10:29 -05:00
Isaac Connor 77cfb7c190 fix spacing 2019-12-31 12:42:49 -05:00
Isaac Connor 2c76c12664 Fix export to include files when using DEEP scheme. Also make it more efficient 2019-12-30 22:18:55 -05:00
Andrew Bauer 2301103da5 use small, non-zero values, for image buffer & pre & post buffers 2019-12-28 09:49:42 -06:00
Isaac Connor 845f35fe00 Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name() 2019-12-26 15:57:25 -05:00
Isaac Connor 66ec110b02 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-12-26 15:21:33 -05:00
Isaac Connor 1977e48ddd DefaultScale is a member of the Monitor, not the event 2019-12-26 15:21:27 -05:00
Isaac Connor 9e43e06a55 Add empty array value for terms when there isn't any to get rid of warning when loading all events 2019-12-26 11:22:42 -05:00
Isaac Connor 76b54a468f use left join instead of inner join when listing monitors 2019-12-22 18:43:53 -05:00
Isaac Connor 42a724891b spacing 2019-12-20 16:11:38 -05:00
Isaac Connor 63d20a1514 Move hidden inputs to top of form 2019-12-20 16:11:24 -05:00
Isaac Connor 5a45835006 break up long lines 2019-12-20 16:11:10 -05:00
Isaac Connor 23dde04725 remove timeout on changing runstate. 2019-12-20 16:10:30 -05:00
Isaac Connor fc017893bc Sort the log filtering options. Fixes #2756 2019-12-20 16:09:34 -05:00
Isaac Connor d25a91ad13 Make Group containable 2019-12-20 14:56:14 -05:00
Isaac Connor bcda92058e proper way to make cakephp filter by group. Make Group containable, always add the join 2019-12-20 14:56:01 -05:00