Commit Graph

5671 Commits

Author SHA1 Message Date
Isaac Connor f568e0da30 Fix event->id() to event->Id() 2019-09-04 10:11:16 -04:00
Isaac Connor a57c5196f3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-09-04 10:07:31 -04:00
Isaac Connor dde655950f Use locking when deleting an event 2019-09-04 10:07:17 -04:00
Isaac Connor 26670c2df2 Add lock function to write lock an object 2019-09-04 10:07:08 -04:00
Pliable Pixels be99f6a4d6
In production mode, debug should be 0 2019-09-04 08:47:09 -04:00
Isaac Connor f46662a062 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-09-03 12:55:51 -04:00
Isaac Connor 16f0ad4f59 Fix Monitorid => MonitorId 2019-09-03 12:55:45 -04:00
Isaac Connor 92bc1791f5 fix accidentally removed code 2019-09-03 11:33:13 -04:00
Isaac Connor 50aa0108e5 Add authhash to session 2019-09-03 11:33:02 -04:00
Isaac Connor a384e978c8 don't load user from session if we have already gotten it from elsewhere 2019-09-03 11:19:42 -04:00
Isaac Connor b84d005d8f Load use from session when it exists 2019-09-03 10:54:34 -04:00
Isaac Connor 99a2ddba63 Add listing of Secondary Storage area in events list 2019-08-29 11:27:06 -04:00
Isaac Connor 6b9e8bec69 Add logging of delete events 2019-08-29 11:26:32 -04:00
Isaac Connor ef5497cba8 If we have an ajax request, don't do actions. 2019-08-29 11:26:14 -04:00
Isaac Connor a4b057fa2b Upgrade Event object to use the common Object methods. Add deleting files from Secondary storage 2019-08-29 11:25:37 -04:00
Isaac Connor c80ef0e0ab spacing 2019-08-28 12:20:03 -04:00
Isaac Connor c6dd3ffbec tabs to spaces 2019-08-28 09:19:09 -04:00
Isaac Connor 320bf823c5 Don't report errors when creating monitor symlink when it already exists 2019-08-28 09:18:33 -04:00
Isaac Connor 91ef4f5932 x264 encode works on arm now, so let people choose it 2019-08-28 08:51:42 -04:00
Isaac Connor 8043ba8092 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-27 16:49:12 -04:00
Paulius Gedrikas 9b3fecd7a0 Fix iOS autocapitalizing username field on login (#2687)
I propose removing the auto-capitalization from the username field for Safari under iOS by adding autocapitalize="none" to the username form field. Usernames rarely start with a capital letter, so I think this would be a usability improvement for users logging in through iPhones or iPads.

Having to login to ZM under iOS, I've been frustrated at the need to always press on the Caps Lock key on the virtual keyboard to disable the capitalization of the first letter. This is because iOS auto capitalized non-password and non-email HTML form fields. ZM is also case sensitive, so "Admin" will not work if the main user is "admin".
2019-08-27 16:49:03 -04:00
Isaac Connor dfb65d23bf Fix eslint warnings 2019-08-27 16:48:42 -04:00
Isaac Connor 41fb11d776 Fix Arched lacking () so not working 2019-08-27 15:19:38 -04:00
Isaac Connor d7d2c140a0 Use index to server hosting storage where event is saved to talk to zms 2019-08-27 15:19:18 -04:00
Isaac Connor c482fa7d5d Fix executing filter 2019-08-26 20:45:38 -04:00
Isaac Connor cd883e23b8 Extend inputs to full width on storage popup 2019-08-26 20:45:20 -04:00
Isaac Connor f01bedb33e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-26 18:49:12 -04:00
Isaac Connor 231c9c3902 move executeFilter to Filter->execute. If no changes have been made, don't make a tempfilter. 2019-08-26 18:48:34 -04:00
Isaac Connor 5527685162 Merge branch 'storageareas' 2019-08-26 16:22:10 -04:00
Isaac Connor 292b530f99 Allow montage review maxdatetime to be less than minDateTime. This allows us to set it first so that the reload does kill us 2019-08-26 16:20:23 -04:00
Isaac Connor 7768d39eb9 Add auth to streamParms so that multi-server event viewing works 2019-08-26 16:19:44 -04:00
Isaac Connor 82e8bde406 Fix SaveAs 2019-08-26 16:19:19 -04:00
Isaac Connor 7cab22b450 Use Event->SaveJPEGs instead of Monitor->SaveJPEGs 2019-08-26 15:04:59 -04:00
Isaac Connor c4c6935c6e Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2019-08-23 18:17:50 -04:00
Isaac Connor 73ba699dc4 Sort filter fields dropdown 2019-08-23 18:17:45 -04:00
Isaac Connor e707bd8e72 correct getting frame_id so we get images instead of nodata 2019-08-23 17:59:29 -04:00
Isaac Connor 7598654740 add auth hash to ajax streams, and use monitorUrl instead of thisUrl to talk to zms 2019-08-23 17:58:40 -04:00
Isaac Connor 7ef26275bc use isset to get rid of warnings when eid is not in REQUEST 2019-08-20 10:28:19 -04:00
Isaac Connor a064f6c23f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-20 10:03:55 -04:00
Isaac Connor 61926d3b85 Only parse the filter if it is valid. Remove unused filterQuery var 2019-08-20 10:03:44 -04:00
Isaac Connor 84492f29b1
Fix token auth sessions (#2676)
* If token is present do token based auth and do not do anything with session

* update HostController.  Use config constants, don't use sessions

* Remove Session from the components list

* spacing

* Remove Session from App Components list.

* Move APIEnabled check to the api from auth.php

* Rework auth.  login using username and password only occurs on login action now.  Including auth.php should not touch the session.  auth_hash logins no longer touch the session.  replace userLogin with a function called validateUser which matches the semantics of validateToken.

* remove debugging

* Add session storage if stateful query param is on, but only for LEGACY_API_AUTH

* fix mUser to username, etc.

* shuffle lines

* use  instead of session when generating auth hash.

* Add docs regarding the use of cookies and stateful query param

* Only open/close session if we are clearing a session var

* Use zm_session_start instead of session_start

* Should use zm_session_start instead of session_start

* document that zm_session_start should be called previously to session_regenerate_id

* Don't actually write out the session when generating auth hashes.  Means they should never actually persist.

* More backticking of SQL

* add .. to fix #2686

* Use material icons for sort because they look nicer

* fix typo

* have to add authhash to session on login

* restore username&password login for all urls

* fix

* fixes
2019-08-20 09:46:53 -04:00
Isaac Connor b344701dea fixes 2019-08-19 12:15:58 -04:00
Isaac Connor 3b58da860f fix 2019-08-19 12:08:41 -04:00
Isaac Connor b1132087b8 restore username&password login for all urls 2019-08-19 12:07:38 -04:00
Isaac Connor 87e7ba0e50 have to add authhash to session on login 2019-08-19 11:38:56 -04:00
Isaac Connor bf34d8901e Merge branch 'master' into fix_token_auth_sessions 2019-08-19 11:13:24 -04:00
Isaac Connor ca0b583007 Use material icons for sort because they look nicer 2019-08-19 08:59:15 -04:00
Isaac Connor 239c68dd7f add .. to fix #2686 2019-08-19 08:58:52 -04:00
Isaac Connor d39da61b66 Don't actually write out the session when generating auth hashes. Means they should never actually persist. 2019-08-16 15:27:24 -04:00
Isaac Connor 070b8066f2 document that zm_session_start should be called previously to session_regenerate_id 2019-08-16 15:08:35 -04:00
Isaac Connor 28155ebd90 Should use zm_session_start instead of session_start 2019-08-16 15:08:10 -04:00
Isaac Connor cfeedd39a4 Use zm_session_start instead of session_start 2019-08-16 15:07:20 -04:00
Isaac Connor 660eddc69d Only open/close session if we are clearing a session var 2019-08-16 15:06:56 -04:00
Isaac Connor 3475a11e15 use instead of session when generating auth hash. 2019-08-16 14:13:13 -04:00
Isaac Connor 51c7f0b73f shuffle lines 2019-08-16 14:12:52 -04:00
Isaac Connor 1d0ee227d7 fix mUser to username, etc. 2019-08-16 14:12:37 -04:00
Isaac Connor 4108495a7d Add session storage if stateful query param is on, but only for LEGACY_API_AUTH 2019-08-16 14:12:14 -04:00
Isaac Connor 376b8af889 Make links in donate text actual links 2019-08-16 11:40:38 -04:00
Isaac Connor fdb66aaa72 Merge branch 'master' into fix_token_auth_sessions 2019-08-15 16:22:09 -04:00
Isaac Connor 336f45219b fix object caching 2019-08-15 16:04:56 -04:00
Isaac Connor 68052368f7 use backticks on table and column names. Use data-on-change-this in group dropdown 2019-08-15 16:04:37 -04:00
Isaac Connor 1103928ed7 only call check_timezone on console for efficiency in all other requests 2019-08-15 15:16:20 -04:00
Isaac Connor f09941ed48 timezone errors shouldn't be fatal 2019-08-15 15:16:02 -04:00
Isaac Connor 7c54ac85a0 remove debugging 2019-08-15 15:05:37 -04:00
Isaac Connor 618e6816ef Rework auth. login using username and password only occurs on login action now. Including auth.php should not touch the session. auth_hash logins no longer touch the session. replace userLogin with a function called validateUser which matches the semantics of validateToken. 2019-08-15 14:59:15 -04:00
Isaac Connor 0ec6e8d635 Merge branch 'master' into fix_token_auth_sessions 2019-08-15 12:05:07 -04:00
Isaac Connor ed9175b4ad Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2019-08-13 15:34:11 -04:00
Isaac Connor 4140d51e9f database.php cleanup. remove dbFetchMonitor and dbFetchGroup. Their usage has been replaced with the Object::find_one usage. Also more quoting of table and colume names to fix #2659 2019-08-13 11:45:50 -04:00
Isaac Connor 9da10abca9 Move APIEnabled check to the api from auth.php 2019-08-13 11:29:32 -04:00
Isaac Connor a63b6486b9 Remove Session from App Components list. 2019-08-12 15:36:40 -04:00
Isaac Connor c2e1293472 spacing 2019-08-12 15:10:58 -04:00
Isaac Connor 0bf036fc55 Remove Session from the components list 2019-08-12 15:06:46 -04:00
Isaac Connor 2320ab4d66 update HostController. Use config constants, don't use sessions 2019-08-12 15:01:40 -04:00
Isaac Connor 4922861d1d Merge branch 'master' into fix_token_auth_sessions 2019-08-12 13:59:11 -04:00
Isaac Connor 38a09bbd18 Don't auto-add default storage area to header. If someone wants to see it's space in the header they can add it to storage areas 2019-08-08 15:34:07 -04:00
Isaac Connor 5f77634aca Update Group object to use shared code in Object.php. Should fix #2659 2019-08-08 13:51:56 -04:00
Isaac Connor 702cb65d2a Merge branch 'storageareas' 2019-08-08 13:38:36 -04:00
Isaac Connor 45b970fb09 fix spacing 2019-08-08 13:34:28 -04:00
Isaac Connor df285006d2 change sortHeader to include eid if it is in the request 2019-08-08 13:34:10 -04:00
Isaac Connor a9de537e01 Merge branch 'master' into storageareas 2019-08-08 09:27:27 -04:00
Isaac Connor 1892528679 quotes 2019-08-08 09:26:15 -04:00
Isaac Connor 5b0509e000 When invalid operator terms, use print_r on the term instead of just the operator 2019-08-08 09:26:00 -04:00
Isaac Connor 3a142df14f Only send zmdc.pl commands for filters to running servers 2019-08-07 15:51:01 -04:00
Isaac Connor fb414b3f19 remove debug statements 2019-08-07 15:34:45 -04:00
Isaac Connor fb7ab993b5 Have to include the --daemon param when telling zmdc.pl what to do with zmfilter.pl 2019-08-07 15:34:30 -04:00
Isaac Connor d4b59211cd Merge branch 'master' into storageareas 2019-08-07 11:21:19 -04:00
Isaac Connor 962049fa31 Merge branch 'master' into filter_add_copy 2019-08-06 20:17:21 -04:00
Isaac Connor 7e6b0058d2 Update Zone buttons. Fix double submit. Fixes #2671 2019-08-02 08:04:38 -04:00
Isaac Connor 6a425b6988 If token is present do token based auth and do not do anything with session 2019-08-01 10:02:31 -04:00
Isaac Connor 7f19831e0c Use isset when testing for existence of authash in session 2019-07-29 14:54:55 -04:00
Isaac Connor 8167ff2143 fix eslint 2019-07-26 12:28:02 -04:00
Isaac Connor 547e80b1a9
Fix download and export button from events list. Fixes #2668 (#2670) 2019-07-24 12:31:43 -04:00
Isaac Connor a6a2239e5b
Fixes #2579 by putting the event Id into an attribute of the delete button. Also uses a button instead of a link. Also only does parent refresh if parent exists (#2662) 2019-07-24 11:39:21 -04:00
Isaac Connor 39262d55f5 Also show secondary storage area when viewing event 2019-07-24 11:26:07 -04:00
Isaac Connor 2d46f2adab add Secondary Storage Area options. 2019-07-24 11:25:51 -04:00
Isaac Connor 1a0beab703 add Secondary Storage Area options. Storage array is now an array of Objects so use the Name key 2019-07-24 11:25:38 -04:00
Isaac Connor 1254e8ab67 Add AttrSecondaryStorageArea to lang 2019-07-24 11:24:50 -04:00
Isaac Connor 45afc2a534 introduce array_recursive_diff which we use to compare two arrays in Object::changes 2019-07-24 11:24:37 -04:00
Isaac Connor e3a9d5d488 Rewrite changes to run through the keys of the passed in new values array, and handle object methods as well as basic values 2019-07-24 11:24:14 -04:00
Isaac Connor 341f4adbdf Functions that change the Query must reset Query_json as well 2019-07-24 11:23:38 -04:00
Isaac Connor 58851d23d2 Add Secondary Storage support to the Event object 2019-07-24 11:22:55 -04:00
Isaac Connor a4a144d2fa Merge branch 'master' into filter_add_copy 2019-07-23 10:04:23 -04:00
Isaac Connor 88beb46c3e Add FilterCopyEvents 2019-07-23 10:04:15 -04:00
Isaac Connor df0aef89af gracefully handle when window[fnName] doesn't exist 2019-07-23 10:03:28 -04:00
Isaac Connor 0e040fc2fc Add click_autocopy function 2019-07-23 10:00:05 -04:00
Isaac Connor 346933126d Update filter view to use Filter::find 2019-07-23 09:59:49 -04:00
Isaac Connor 9b6dedb35d Update Filter saving action to use object set/save etc 2019-07-23 09:58:28 -04:00
Isaac Connor 35ec60ca03 Change Storage object to extend ZM_Object 2019-07-23 09:58:05 -04:00
Isaac Connor 7c52f8a4ae Fixes and add Objects_Indexed_By_Id 2019-07-23 09:57:44 -04:00
Isaac Connor b05aff1d5d Update Filter Object to extend ZM_Object. Rename Query to Query_json and implement a Query function to parse Query_json 2019-07-23 09:57:16 -04:00
Isaac Connor fe71a9abaa php_errormsg is deprecated 2019-07-19 16:32:40 -04:00
Pliable Pixels a9d01ba3d2 Alarm api (#2665)
* fixed alarm api to use tokens if present

* clearer debug logs for tokens

* space
2019-07-17 20:38:58 -04:00
Isaac Connor d244aadee6 Fix #2655 2019-07-08 14:27:49 -04:00
Isaac Connor df8c46f0f0 Fix #2657 2019-07-08 14:22:46 -04:00
Isaac Connor da5e8d19b8 Fix #2656 2019-07-07 17:54:45 -04:00
Isaac Connor b84e3499f4 Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message 2019-07-07 17:25:49 -04:00
Isaac Connor 4b41655dc5 fix 2019-07-07 16:10:53 -04:00
Isaac Connor 3c1cd1e750 rename var from nevents to nFrames because that's what they are. Fix an error when page=0 2019-07-07 16:03:54 -04:00
Isaac Connor 256a0aa679 google code style 2019-07-04 09:04:43 -04:00
Isaac Connor 2470c09b20 Honour thumbnail width when bringing up frames popup for frames and alarm frames 2019-07-03 17:19:10 -04:00
Isaac Connor 268bc2264b Merge branch 'storageareas' 2019-07-02 10:19:03 -04:00
Isaac Connor 1161c251fc Add a warning when the monitor is not capturing in live view 2019-06-28 10:28:53 -04:00
Isaac Connor d972ab6006 add min_section_length test to alarmed events that go unalarmed 2019-06-27 21:50:12 -04:00
Isaac Connor 305a954ee2 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2019-06-25 22:20:19 -04:00
Isaac Connor 0dbe48fb31 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2019-06-25 22:19:53 -04:00
Isaac Connor 46f3aabc25 Merge branch 'hwdecode' into storageareas 2019-06-25 15:35:56 -04:00
Isaac Connor a28f17653f Add DecoderHWAccel fields to Monitor 2019-06-25 15:34:45 -04:00
Tom Hodder 46c19c7efb fix for zone overlay scaling issues in montage (#2643)
* remove extra px in svg tag

* add js method to track liveStream img size for zones

* switch to using SVG scaling to deal with zone polygons

* update jsdoc for eslint

* fix blank lines eslint issue
2019-06-24 11:45:40 -04:00
Isaac Connor 44e4d93445 Merge branch 'master' into storageareas 2019-06-24 11:35:36 -04:00
Isaac Connor 6ed0074077
End continuous events on alarm (#2644)
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it

* Spacing, google code style and tabs to spaces

* add update script to add MinSectionLength

* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
Isaac Connor 46032385fe fix viewport on mobile. Fix duplicated css when selected css is base 2019-06-22 14:10:55 -04:00
Isaac Connor 38bcdbbffe ONly close session if we opened it in generateAuthHash, only try to validate auth hash if it is set in the session 2019-06-21 18:04:39 -04:00
Isaac Connor 85b9b045cc Copy Profile Token to ControlDevice for use with Netcat PTZ script 2019-06-21 12:42:26 -04:00
Isaac Connor 60618d5998 Fix hour subtraction in getAuthUser to actually subtract an hour 2019-06-21 11:45:33 -04:00
Isaac Connor db7362dbcb Merge branch 'master' into storageareas 2019-06-20 14:18:47 -04:00
Isaac Connor d026c61077 Don't allow saving to built in layouts 2019-06-20 13:48:14 -04:00
Isaac Connor 71eadfc40e Merge branch 'remove-extra-px' of https://github.com/tolland/zoneminder into tolland-remove-extra-px 2019-06-20 13:28:24 -04:00
Isaac Connor 3bae7a5432 spaces and parenthesis 2019-06-20 13:28:12 -04:00
tolland ffaad88bf0 switch to using SVG scaling to deal with zone polygons 2019-06-20 17:11:22 +00:00
tolland edd52e7fbf add js method to track liveStream img size for zones 2019-06-20 12:46:04 +00:00
tolland 4da5c52cd2 remove extra px in svg tag 2019-06-19 20:18:38 +00:00
Isaac Connor 77eb15ff17 fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns 2019-06-19 09:22:21 -04:00
Tom Hodder 70a91c7069 WIP: Add pagination to frames.php in classic (#2618)
* add pagination to the frames.php results

* remove commented code, fix view all paging

* removing debugging logging statements

* default frames paging to on
2019-06-19 09:22:21 -04:00
Pliable Pixels a6e42e4317 remove a password log, corrected PHP version in log (#2627)
* remove a password log, corrected PHP version in log

* PHP version correction
2019-06-19 09:22:21 -04:00
Pliable Pixels 2d5f84cd22 add event file system path to API (#2639) 2019-06-19 09:22:21 -04:00
Isaac Connor 199e8182be Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-06-19 08:36:48 -04:00
Isaac Connor dc7707bbc1 fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns 2019-06-18 10:03:14 -04:00
Tom Hodder 1336c03f97 WIP: Add pagination to frames.php in classic (#2618)
* add pagination to the frames.php results

* remove commented code, fix view all paging

* removing debugging logging statements

* default frames paging to on
2019-06-16 12:02:00 -04:00
Pliable Pixels 98bf7800b0 remove a password log, corrected PHP version in log (#2627)
* remove a password log, corrected PHP version in log

* PHP version correction
2019-06-16 11:59:48 -04:00
Pliable Pixels c4dc5f34e4 add event file system path to API (#2639) 2019-06-16 11:59:23 -04:00