mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-02-02 02:21:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,122 Commits 67 Branches 102 Tags
2fc7b3cf4d69e25fa68d190dd6b052d7fef94077
Commit Graph

58 Commits

Author SHA1 Message Date
Isaac Connor
c3324ada18 Put back mkdir ZM_PATH_SOCKS 2019-03-20 14:26:03 -04:00
Isaac Connor
6b6e787e4e fix ajax stream code 2019-03-19 12:05:45 -04:00
Isaac Connor
418276ff1c cleanup/debug 2019-03-19 12:02:42 -04:00
Isaac Connor
95567e07a4 Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2019-02-26 11:43:07 -05:00
Isaac Connor
fd310c0f0a Merge branch 'master' into storageareas 2019-02-22 11:33:47 -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
Isaac Connor
7026ebafac Make ajax/stream wait longer for zms. On pi can take up to 3 seconds. Also for php < 5.6, we need to fake 64bit unpack support 2019-01-22 16:45:38 -05:00
Isaac Connor
94401b6765 create ZM_PATH_SOCKS if it doesn't exist 2018-08-11 13:35:57 -04:00
Isaac Connor
798d046d81 Remove some debugging lines 2018-06-06 11:39:41 -04:00
Isaac Connor
12d46e2377 change event_id in status_msg to 64bit when unpacking 2018-04-18 09:52:57 -04:00
Isaac Connor
0b0fbae1c5 Add output of paused image when paused 2018-04-12 18:43:57 -04:00
Isaac Connor
22f86da372 Have to use the .sock file instead of w.lock 2018-04-11 10:38:13 -04:00
Isaac Connor
a610d564d1 tweak timeouts 2018-01-31 15:51:12 -05:00
Isaac Connor
a76fcb331c Remove debugging. Treat can't get semaphore as a non-error 2018-01-29 08:25:46 -08:00
Isaac Connor
b1b8b42f2b Fix getting stream status updates when # of files open is > 1024. 2018-01-29 07:21:31 -08:00
Isaac Connor
bc6d8623a6 add a semaphore around the socket creation and retention. I think concurrent processes are messing with the sockets. 2018-01-27 15:03:22 -05:00
Isaac
1b23f7b564 turn off debug 2018-01-23 17:34:49 +01:00
Isaac Connor
cb70a3627f Fixes to montagereview and only load event data when in History mode 2017-11-28 14:50:21 -05:00
Isaac Connor
b565125df9 montage layout improvements 2017-11-22 12:33:34 -05:00
Isaac Connor
9473fbecd8 more debug 2017-10-31 13:32:42 -07:00
Isaac Connor
eb48759ff8 wip 2017-10-27 13:37:51 -07:00
Isaac Connor
8f8d66189c Google code style 2017-10-04 10:48:24 -04:00
Isaac Connor
f4224bb88e Merge branch 'master' into storageareas 2017-05-17 17:47:39 -04:00
Matt N
33092e4022 Allow API authentication using the auth query parameter containing an auth. hash. (#1845) 
* Allow API authentication using the `auth` query parameter containing an auth. hash.

Fixes #1827

The same auth. hash for zms is used here. This allows consumers to use the API without sending the password in the query string and not require forging logins via the login form.

* Move logger.php's global Debug function to Logger::Debug to avoid polluting globals

This avoids a conflict with CakePHP when logger.php gets included indrectly from API code.

* Protect action=login when ZM_ENABLE_CSRF_MAGIC is enabled
 2017-05-15 21:51:48 -04:00
Isaac Connor
fd90de5952 if no AuthHashGEneratedAt then generate one instead of outputting an error 2017-05-05 16:47:50 -04:00
Joergen Edelbo
fb5668c9ef Fix spelling of remSocketFile 2017-04-29 09:02:35 +02:00
Isaac Connor
ebafc62b51 Must reopen the session so we can generate an auth hash 2017-03-01 15:27:42 -05:00
Isaac Connor
16fdac3179 fix remSocketFile to remSockFile 2017-01-11 11:14:00 -05:00
Isaac Connor
ef71ae248c fix ramSocketFile to remSocketFile 2017-01-02 09:31:26 -05:00
Isaac Connor
d97926c478 fix ramSocketFile to remSocketFile 2017-01-02 09:31:06 -05:00
Isaac Connor
c27d0270dc Merge branch 'knnniggett-zmMemDetach' into storageareas 2016-12-20 15:40:14 -05:00
Isaac Connor
8b726996f7 FAQ fixes, more text about zms problems in it, and adjust the socket_sendto error message to point to the FAQ entry that is relevant. 2016-12-19 21:36:39 -05:00
Isaac Connor
fe3f3d91ce replace the old socket_sendto error message with something more useful so that people stop asking us how to fix it. 2016-12-16 09:12:27 -05:00
Isaac Connor
017085aee7 Use proper rounding instead of sprintf based rounding for fps 2016-10-20 11:49:35 -04:00
Isaac Connor
8bc7b9562f introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for 2016-09-29 10:04:53 -04:00
Isaac Connor
303a2c6c5f re-open session if neccessary to save AuthHashGeneratedAt 2016-09-27 11:56:31 -04:00
Isaac Connor
4ce531099c add an auth field to request=stream results to give the client a new auth hash to use 2016-09-27 11:03:12 -04:00
Isaac Connor
e10fdaf344 reduce the wait to 2/10ths instead of a whole second 2015-06-05 11:49:05 -04:00
Isaac Connor
5e262f5a67 the var is remSockFile, not remSocketFile 2014-07-24 11:05:35 -04:00
Isaac Connor
eb5f299512 increase max_socket_tries to 10 as #470 2014-07-11 10:51:24 -04:00
Isaac Connor
3f4e13dd47 redo the patch that add the < 0 test. Since it isn't technically an error, there won't be an error message set by php. So I've made it it's own separate case and added whcih socket is having the problem to some of the other error messages as well. 2013-09-12 10:51:51 -04:00
stan
7e55373b87 Fixed incorrect scaling of timeout on select call 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3470 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-27 16:15:16 +00:00
stan
6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan
ccfdd30988 Fixed typo in error message 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3275 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-06 15:28:01 +00:00
stan
77a2d16493 Cosmetic/whitespace change 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3157 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:45:44 +00:00
stan
eaaaf88493 Applied 'mitch' IE compatibility patch. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2865 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-08 10:04:12 +00:00
stan
72f908c4e7 Changed streaming to dynamically reduce frame rates if streams are sent too slowly. Made low bandwidth montage more resilient. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2844 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-03 12:10:54 +00:00
stan
fa5db09a73 FIxed issues with negative FPS affecting streaming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2839 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-04-01 19:39:23 +00:00
stan
73ad3a7097 Changed types/order of stream status structs to work on 64 bit systems. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2797 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-08 14:34:09 +00:00
viseon
f2ad7cc770 Add offset to replay_rate to make it unsigned 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2708 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 23:56:15 +00:00