Commit Graph

4570 Commits

Author SHA1 Message Date
Isaac Connor d9b1d3ec11 fix CORS Headers when we are coming from a non-standard port. Use a regexp instead of == so that we match regardless of port 2018-09-14 14:52:33 -04:00
Isaac Connor b5b71edbf6 Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80 2018-09-14 14:26:45 -04:00
Andrew Bauer b3565fb983 remove file that should not be there 2018-09-12 07:02:57 -05:00
Andrew Bauer c66dd25ebb implement collapsible headers (#2203) 2018-09-11 17:39:40 -04:00
Isaac Connor eef928a742 fix find_all => find 2018-09-11 14:31:03 -04:00
Isaac Connor 684f48979a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-11 14:30:19 -04:00
Isaac Connor 8608fc97be fix trms=>terms 2018-09-10 15:11:57 -04:00
Isaac Connor 0ee261fae3 get rid of code that hid the close/back button on events if there was no history. 2018-09-10 15:11:41 -04:00
Isaac Connor 534aebb21f When loading previous and subsequent log lines, merge the fields in the filters instead of replacing 2018-09-09 16:36:09 -04:00
Isaac Connor 55dcb161ae find should always return an array 2018-09-09 13:59:10 -04:00
Isaac Connor b4f80fbe11 Always return an array from find 2018-09-09 13:56:29 -04:00
Isaac Connor b8f6617db3 fix another instance of find_all 2018-09-09 12:15:06 -04:00
Isaac Connor dfdac2ed70 make find and find_one functions consistent across Objects 2018-09-07 16:31:11 -04:00
Isaac Connor f4c2d8adea Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-03 12:29:09 -04:00
Andrew Bauer e5a2581dcc optionhelp - support links markdown style (#2198) 2018-09-03 09:56:52 -04:00
Isaac Connor 9ec415b30a Just reload the event view instead of dynamically updating the stream. Fixes #2196 2018-08-31 15:56:21 -04:00
Isaac Connor 798aab84f3 whitespace changes 2018-08-31 11:58:33 -04:00
Isaac Connor 623d31edae Don't do csrf for view=image 2018-08-31 11:58:17 -04:00
Isaac Connor 7ee80e7cca Debug lines should be debug, not warning 2018-08-31 11:58:03 -04:00
Isaac Connor 57d5e28870 clear output buffer before sending image. Adjust filename for saveAs when doing a scaled image. whitespace corrections. More Debug output 2018-08-31 11:57:47 -04:00
Isaac Connor 0823b28712 whitespace changes. Make Privacy test an else so that PRIVACY checks don't happen if not logged in 2018-08-31 10:37:11 -04:00
Isaac Connor 4b30ea7877 cleanup, whitespace 2018-08-31 10:35:23 -04:00
Isaac Connor 799b34eee8 handle xhr errors like when auth is no longer valid. Do a page refresh when this happens 2018-08-31 10:34:54 -04:00
Isaac Connor b1fe80a0bd Add JSON/MaybeXS to dependencies, replacing JSON/Any 2018-08-30 18:30:33 -04:00
Andrew Bauer 8f0fb0843a Add Privacy Statement (#2194)
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* create and load default.php

* fix typos

* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
Isaac Connor b7c86ef3d4 remove escapes that mess up the quoting 2018-08-30 12:26:18 -04:00
Isaac Connor d3e089e3ce remove an escape that messed up the quoting 2018-08-30 11:18:48 -04:00
Isaac Connor 21d193294f Log errors shouldn't be fatal 2018-08-22 17:22:40 -04:00
Isaac Connor 24f8d63b69 comment out a debug line 2018-08-20 11:13:38 -04:00
Isaac Connor 871e3807e6 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-17 12:57:27 -04:00
Isaac Connor 40cd27e68a when refreshing because ajax failed, reload the current view, not just index.php 2018-08-15 17:21:54 -04:00
Isaac Connor 15a6eb7e78
Revert "Add Privacy Statement (#2176)" (#2179)
This reverts commit 56f4d768c2.
2018-08-13 15:33:43 -04:00
Andrew Bauer 56f4d768c2 Add Privacy Statement (#2176)
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* push privacy text to all language files
2018-08-13 15:23:44 -04:00
Andrew Bauer 3dc424282b Support quoting config variables (#2175)
* allow handling of quotes in config files

* copy paste error

* surround zm_arptool in quotes
2018-08-11 12:56:16 -04:00
Isaac Connor 037abd4916 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-08 15:11:42 -04:00
Isaac Connor d87a41b629 Set button types so that they do things in all browsers.Fix Delete button when translated 2018-08-08 15:11:30 -04:00
Isaac Connor 23ddc83ad4
fix_2167 (#2168)
* Populate a global  from the session on every request. Use the  object instead of using allowedMonitors in session.

* fix when  gets loaded.

* use  for auth, and add Monitor Edit checks to Zone add/delete/edit

* add back the ZM_OPT_USE_AUTH test for being logged in in AppController

* Update permissions code to use

* change quotes

* Update permission code to use

* Use  instal of session for systemPermission

* deprecate montiorPermision in session

* use  instead of session streamPermission

* move login code back into AppController. Has to be done for every request

* deprecate eventPermission, controlPermission and systemPermission in session.

* handle auth params in query string as well as post

* exit on HUP to free up memory.

* add missing global user

* system should be System
2018-08-08 09:59:46 -04:00
Isaac Connor b72d520e02 implement the ability to pass a disabled option to htmlSelect. Use it to disable the h264 passthrough option for non-ffmpeg monitors. Instead of disappearing it. 2018-08-03 10:02:42 -04:00
Isaac Connor 886391a547 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-31 10:16:05 -04:00
Isaac Connor 363e1dda97 Add some more Monitor defaults, mainly Refresh which gets called in watch.js.php 2018-07-31 10:15:26 -04:00
Roman Dissertori 48b91c5544 Bugfix in Control and added new Camera (#2171)
* fixed control typos

missing word "s" for "Controls" Table for database queries

* added Dericam P2 camera Control

* fixed missing CanReset column

* Update DericamP2.pm

* added some more missing controls

CanSleep, CanWake

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update zm_create.sql.in
2018-07-28 09:26:02 -04:00
Isaac Connor 2ff47e04da the updated video-js.css puts the fonts into a font dir. 2018-07-25 17:04:42 -04:00
Isaac Connor 00bdfdcb16 increase height of function popup so that dropdown options fit in it 2018-07-25 09:39:24 -04:00
Isaac Connor 6ab1c3ced8 proper case table header 2018-07-25 09:39:08 -04:00
Isaac Connor dc57a3c91c fix spacing/quotes/google code style 2018-07-24 16:41:09 -04:00
Pliable Pixels 997aa6aa55 fixed getCredentials not working if called directly 2018-07-17 13:57:20 -04:00
Pliable Pixels 0ff9002adf 2156 api login (#2157)
* error can be due to bad user or password

* added login/logout and related private functions

* handle case when userLogin fails, current code returns PHP error for  and API throw is not called

* formatting

* converted login params to POST, removed user=&pass= for other APIs

* formatting

* add auth check back but leave out login/out

* fixes to make it work across zmN, postman and curl

* added back enabled check
2018-07-15 21:17:35 -04:00
Isaac Connor 0d75586fac Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-12 15:05:13 -04:00
Isaac Connor 43827953cd test for existence of HTTP_X_FORWARDED_PROTO 2018-07-12 15:04:54 -04:00
Isaac Connor 82115ed2d3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-12 11:44:26 -04:00