Commit Graph

141 Commits

Author SHA1 Message Date
Isaac Connor 4d8d926c89 minor code updates. Use user_row instead of generic row variable name. 2020-06-23 22:19:46 -04: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 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 61bc0ddd0a add missing t and merge some lines 2020-01-07 11:01:53 -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
Isaac Connor 5ebf929598 Add Event counts, event disk usage to storage tab of options. Disable checkbox selection when there are events stored on the storage area. 2019-11-26 14:36:39 -05:00
Isaac Connor d02aee64e4 Add setting of timezone to Options/Config instead of php.ini 2019-10-02 09:07:18 -04:00
Isaac Connor deef948964 Allow anyone to change their skin 2019-09-28 12:58:17 -04:00
Isaac Connor ce1823bd29 spacing and fix saving 2019-09-17 12:46:11 -04:00
Isaac Connor f0cfd674c1 Cleanup options skins tab. Setting the values happens in index.php. Use global and 2019-09-17 12:06:54 -04:00
Isaac Connor ee0c21d587 Add API Enabled to User edit 2019-05-29 10:28:25 -04:00
Isaac Connor 93aeceecfc Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-17 10:18:15 -04:00
Pliable Pixels a4eff3e8e0 fixed html typo 2019-05-17 09:44:22 -04:00
Pliable Pixels 923f798e69 css classess for text that disappear 2019-05-17 09:32:23 -04:00
Pliable Pixels 21710b6e49 demote logs 2019-05-12 15:45:39 -04:00
Pliable Pixels adb01c4d0e added password_compat for PHP >=5.3 <5.5 2019-05-12 13:57:25 -04:00
Pliable Pixels 91dd6630b5 enable API options only if API enabled 2019-05-12 12:34:55 -04:00
Pliable Pixels c1891e35b9 moved API enable back to system 2019-05-12 12:15:08 -04:00
Pliable Pixels a9d601e5ae add ability to revoke tokens and enable/disable APIs per user 2019-05-12 10:56:17 -04:00
Pliable Pixels 88d50ec9ca added revoke all tokens code, removed test code 2019-05-11 15:47:57 -04:00
Pliable Pixels 2ee466f5e4 display user table in api 2019-05-11 14:08:49 -04:00
Pliable Pixels ae14be916c initial plumbing to introduce token expiry and API bans per user 2019-05-11 13:39:40 -04:00
Pliable Pixels e6b7af4583 initial baby step for api tab 2019-05-10 15:11:35 -04:00
Isaac Connor 1ca5eee53a spacing 2019-05-06 10:45:40 -04:00
Isaac Connor 501324d778 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2019-04-01 22:09:57 -04:00
Isaac Connor d5402e9cba Correct Storaage Server name in list 2019-04-01 22:09:47 -04:00
Isaac Connor 052a2ef1fd fix eventserver => eventnotification 2019-03-25 12:20:21 -04:00
Isaac Connor 7e62ccca3c Handle div by zero when TotalMem is not known for Server 2019-03-25 12:08:56 -04:00
Isaac Connor 804c384b4c add Event Notification support to server 2019-02-27 09:29:11 -05:00
Isaac Connor 8dd8888975
Php namespace (#2537)
* experiment with namespaces on the Server class

* experiment with namespaces on the Server class

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
Matthew Noorenberghe 99f1e23c5b Replace usage of PHP_SELF in views/. Fixes #2450 2019-02-09 21:39:19 -08:00
Matt N 43a1725060 Fix duplicate 'class' attribute in options (#2418) 2019-01-18 10:05:44 -05:00
Isaac Connor a2c23d3263 Need nonce in inline script setting display css 2019-01-16 13:45:26 -05:00
Matt N d33fec9c3f Add a CSP script-src policy with nonce-source and convert more inline event handlers (#2413)
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy

* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'

Only handle ones that don't return a value.

* Use @data-on-click to attach inline click event handlers with no args and no return value

* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument

* Enforce a script-src CSP on views without inline JS

* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
Matt N 083f284599 Replace onclick inline event handlers for createPopup (#2410)
* Move <script> before </body>

* Change makePopupLink to not use onclick

* Change makePopupButton to not use onclick

* Use .popup-link in control_functions.php

* Use makePopupButton in controlcaps.php

* Prevent double-encoding in makePopup*

* Use makePopupButton in devices.php

* Use makePopupButton in logout.php

* Use makePopupLink in monitor.php

* Use makePopupLink and .popup-link in montage.php

* Use makePopupButton in options.php

* Use makePopupButton, makePopupLink, and .popup-link in zones.php
2019-01-15 09:01:58 -05:00
Isaac Connor 874930d8fc Merge branch 'master' into improve_config_efficiency 2019-01-02 13:07:53 -05:00
Isaac Connor 1c17f334d3 fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well 2018-11-29 14:26:30 -05:00
Isaac Connor cd13dda294 fix use of instead of 2018-11-28 09:54:22 -05:00
Isaac Connor f8b2ff5c77 rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS() 2018-11-27 17:35:25 -05:00
Isaac Connor c5f7fb7b18 Merge branch 'master' into server_path_prefix 2018-11-22 10:04:33 -05:00
Isaac Connor 4c7fe8741b Load the complete config info only for options 2018-10-19 15:00:47 -04:00
Isaac Connor 8a5c989cac fix warning when editing users after a monitor has been deleted 2018-09-18 08:52:43 -04:00
Isaac Connor dfdac2ed70 make find and find_one functions consistent across Objects 2018-09-07 16:31:11 -04:00
Isaac Connor 6e5472d305 Merge branch 'master' into server_path_prefix 2018-08-22 12:57:16 -04:00
Isaac Connor 6ab1c3ced8 proper case table header 2018-07-25 09:39:08 -04:00
Isaac Connor 0b4d76f931 Add PathPrefix column to the server list 2018-07-09 14:36:46 -04:00
Isaac Connor 5d772f16f6 fix closing td 2018-06-01 16:18:07 -04:00