Commit Graph

13754 Commits

Author SHA1 Message Date
Isaac Connor 2fe9442257 Fix time_base conversion when flushing audio queue. Add more debugging. COrrect pkt_Duration when resampling audio 2019-08-23 18:17:26 -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 45aa5bd58c Code style, spacing, quotes and documentation 2019-08-22 08:28:42 -04:00
Isaac Connor 886a203bf1 Support hwaccel for non-passthrough case as well 2019-08-21 10:11:58 -04:00
Isaac Connor 01e988ffba remove some redundant debugs. Improve some messages 2019-08-20 14:09:47 -04:00
Isaac Connor 4a82ce83a7 quit a bit earlier when stream is broken. 2019-08-20 11:13:38 -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 ed190340b9 fix typo 2019-08-19 11:12:47 -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 369dd03909 remove errant i 2019-08-18 21:32:19 -04:00
Isaac Connor 503cf6cd24 More backticking of SQL 2019-08-17 14:37:19 -04:00
Isaac Connor d464296637 More backticking of SQL 2019-08-17 14:36: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 ba94e98949 Add docs regarding the use of cookies and stateful query param 2019-08-16 14:24:51 -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 f813741730 Add maxage 7 to logrotate config so that it will clear out all the zms_e logs. 2019-08-16 11:31:27 -04:00
Isaac Connor efa264e0c7 Fix playing in reverse. Fix not sending first frame. Fix sql problem with backticks. Not being able to open a frame image is now non-fatal. 2019-08-16 10:24:51 -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 81dadc17dc Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-14 16:18:31 -04:00
Isaac Connor c7b6db9be7 Put backticks around all columns and tables in sql to deal with mysql 8 2019-08-14 16:18:21 -04:00
Isaac Connor e390195ebb Merge branch 'storageareas' 2019-08-13 15:34:38 -04:00
Isaac Connor ed9175b4ad Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2019-08-13 15:34:11 -04:00
Isaac Connor 74e414eb00 Clean up ugly hack in CopyTo. Do not modify the object resulting in cached crap 2019-08-13 15:33:38 -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