Commit Graph

1413 Commits

Author SHA1 Message Date
Isaac Connor ad373a5549 add Zone.php from master 2020-05-01 13:20:42 -04:00
Isaac Connor cb44f2c5de Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol. 2020-04-29 16:30:59 -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 ced36a5333 remove debug and spacing 2020-04-23 15:40:35 -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 e770be2e13 Merge branch 'release-1.34' 2020-04-23 10:26:16 -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 bdfdc2a20c add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving 2020-04-10 12:17:09 -04:00
Isaac Connor 81ed022d5a Add a filter_regexp to Monitor Name 2020-04-10 12:16:32 -04:00
Isaac Connor 2d748091a2 handle sort_asc not being set. Handle term['val'] not being set. 2020-04-10 11:13:30 -04:00
Isaac Connor d0fe1b60df Merge branch 'release-1.34' 2020-04-04 16:58:53 -04:00
Isaac Connor 210d380029 CSP must include all Servers. 2020-04-04 16:57:52 -04:00
Isaac Connor 571ff260cc Merge branch 'release-1.34' 2020-04-04 16:35:09 -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 3bfcd8eb33 Check for definition of ZM_TIMEZONE before using it. Fixes #2895 2020-04-02 14:00:36 -04:00
Isaac Connor eec634c1b0 Add Source() support for VNC type 2020-03-30 10:10:06 -04:00
Isaac Connor 599960ef05 Update group save action, using Group object methods. Fixes errors on new MariaDB 2020-03-28 10:09:13 -04:00
Isaac Connor c3bcdcff64 Use zm_session_start instead of session_start 2020-03-27 14:30:42 -04:00
Isaac Connor 50700031b1 Use zm_session_start instead of session_start 2020-03-27 13:05:12 -04:00
Isaac Connor 4ce944da23 Merge branch 'release-1.34' 2020-03-26 15:38:35 -04:00
Isaac Connor af36cc3e52 Fix starting and stopping zmcontrol processes across servers. 2020-03-26 13:57:00 -04:00
Isaac Connor b611e2616b handle scale=auto 2020-03-24 16:15:24 -04:00
Isaac Connor e06912a995 Merge branch 'release-1.34' 2020-03-21 15:28:27 -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 a0bd602339 Use === when testing for empty value and setting defaults 2020-03-09 14:39:22 -04:00
Isaac Connor f0791c8118 silence warning when no language is set 2020-03-05 22:13:32 -05:00
Isaac Connor f003daa791 Merge branch 'add_enabled_to_storage' 2020-03-05 15:48:43 -05: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 4dae0c4609
Merge pull request #2870 from pliablepixels/dev
#2866 - fixes incorrect token type comparison
2020-03-04 11:21:48 -05:00
Isaac Connor d24069e3d0 Look for global array so we don't load all Servers multiple times. Add all servers to allowed script-src in CSPHeaders 2020-03-04 11:03:07 -05:00
Pliable Pixels 1381cb194e
#2866 - fixes incorrect token type comparison 2020-03-04 10:50:59 -05:00
Isaac Connor 0b267fbdee Add Enabled to Storage 2020-03-04 10:46:16 -05:00
Isaac Connor fa6ac399be Fix code in makePopupLink. Return content-type application/json for json response 2020-03-02 17:21:58 -05:00
Isaac Connor 85e5ade07a fix makePopupLink when condition is false 2020-03-02 16:10:56 -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 c1e13221f7 Move the Basic Auth login code from skin.php to includes/auth.php 2020-03-02 14:59:36 -05:00
Isaac Connor d0e70fc501 Merge branch 'fix_auth_timeouts' of github.com:connortechnology/ZoneMinder into fix_auth_timeouts 2020-03-02 12:04:45 -05:00
Isaac Connor f0e7b84001 Only load user from session if other auth mechanisms aren't present. 2020-03-02 11:51:07 -05:00
Isaac Connor 6456d52b97 Merge branch 'fix_user_lang' 2020-02-27 17:43:51 -05:00
Isaac Connor e19332f36a tidy up, be more efficient and warn when language files are not found. 2020-02-27 17:40:31 -05:00
Isaac Connor bab0b2e830 handle a scale value of auto 2020-02-27 11:35:40 -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 e82ed3a098 Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value 2020-02-25 18:13:42 -05:00
Isaac Connor 4d044a1f14 Fix logging line in generate video function 2020-02-25 18:11:07 -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 54a6dfff66 API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials 2020-02-25 17:12:48 -05:00
Isaac Connor bd097bf8ce Fix adding auth string screwing up url to remote api in zmaControl and zmcControl 2020-02-25 17:00:16 -05:00
Isaac Connor f719514998 remove debug 2020-02-25 13:39:33 -05:00
Isaac Connor a2c5e4943a Merge branch 'fix_scale' 2020-02-25 12:18:27 -05:00
Isaac Connor 4dda37a6ee remove extra } 2020-02-25 12:13:12 -05:00
Isaac Connor d68d115581 Handle scale==0 to do width=100%. 2020-02-25 11:12:49 -05:00
Isaac Connor 583350ef06 Fix use of array_key_exists instead of property_exists 2020-02-25 11:09:12 -05:00
Isaac Connor 6cf448c74e remove debug and spacing 2020-02-25 11:08:23 -05:00
Isaac Connor b389f9660d Merge branch 'fix_class_PTZ_presets_almost_invisible' 2020-02-24 13:17:09 -05:00
Isaac Connor 1a87eb40bd Fixes #2841 and maintains login through password change 2020-02-19 16:55:38 -05:00
Isaac Connor dab5c520fe Merge branch 'master' into add_alarmed_zone_to_filters 2020-02-19 14:20:08 -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 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 df5bf788d9 Filtering by Alarmed Zone now only supports a single value using EXISTS as the operator. We now also support CURDATE() and NOW() as values for Date/StartDate/EndDate 2020-01-24 11:09:27 -05:00
Isaac Connor 29a04dc1b9 Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters 2020-01-24 09:50:53 -05:00
Isaac Connor adf376e4a6 add Zone.php 2020-01-24 09:45:02 -05:00
Isaac Connor 8aa0fe665f Add EmailTo,EmailSubjecet,EmailBody fields to Filter object 2020-01-22 14:04:42 -05:00
Isaac Connor 9d41334e8f Merge branch 'master' into add_alarmed_zone_to_filters 2020-01-22 13:45:37 -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 86a2523498 break up a long line, add some parenthesis to clarify logic 2020-01-17 12:30:26 -05: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 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 0c478c7962 fix Monitor->Server 2020-01-10 20:13:09 -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
Isaac Connor 0571909d05 add remote_IP to log entries on php side 2020-01-07 17:08:29 -05:00
Isaac Connor c3641df531 spaces 2020-01-05 17:30:06 -05:00
Isaac Connor e951b0af1c add code to set default value for checkboxes 2020-01-03 16:35:04 -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 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
Andrew Bauer 2301103da5 use small, non-zero values, for image buffer & pre & post buffers 2019-12-28 09:49:42 -06: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 958a6b8218 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-12-18 19:06:19 -05:00
Isaac Connor e39a95d761 Add AlarmedZoned to filters, work on fixing filter behaviour in js. Enable viewing filter results in montagereview 2019-12-18 19:06:10 -05:00
Isaac Connor d21fa5c48a Do not set defaults in Object->set(). This allows us to set an empty timestamp. 2019-12-18 19:03:37 -05:00
Isaac Connor 34354f5871 Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab. 2019-12-18 12:13:00 -05:00