28a3868069
report both capture_fps and analysis_fps
2020-12-09 15:03:33 -05:00
130588eb8f
fix typos
2020-11-04 18:22:50 -05:00
10c0a6617c
Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php.
2020-10-14 10:39:25 -04:00
c28ff1f2b4
Include loading EndTime when loading Events data so that we can determine if an event is in-progress
...
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
d7429014b6
Convert progress to a double instead of int.
2020-10-06 16:36:56 -04:00
0e89d28c26
Send SEEK as two integers representing a float
2020-10-06 16:34:06 -04:00
7c21f065bd
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
2020-03-02 12:07:11 -05:00
1865df3fe0
remove some debug, add some parenthesis to ensure logic works as intended
2020-01-07 17:08:07 -05:00
cfca67f663
spacing and quotes
2019-06-07 14:07:23 -04:00
c02eb2cd46
spacing
2019-05-24 10:00:51 -04:00
c3324ada18
Put back mkdir ZM_PATH_SOCKS
2019-03-20 14:26:03 -04:00
6b6e787e4e
fix ajax stream code
2019-03-19 12:05:45 -04:00
418276ff1c
cleanup/debug
2019-03-19 12:02:42 -04:00
95567e07a4
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-26 11:43:07 -05:00
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
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
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
94401b6765
create ZM_PATH_SOCKS if it doesn't exist
2018-08-11 13:35:57 -04:00
798d046d81
Remove some debugging lines
2018-06-06 11:39:41 -04:00
12d46e2377
change event_id in status_msg to 64bit when unpacking
2018-04-18 09:52:57 -04:00
0b0fbae1c5
Add output of paused image when paused
2018-04-12 18:43:57 -04:00
22f86da372
Have to use the .sock file instead of w.lock
2018-04-11 10:38:13 -04:00
a610d564d1
tweak timeouts
2018-01-31 15:51:12 -05:00
a76fcb331c
Remove debugging. Treat can't get semaphore as a non-error
2018-01-29 08:25:46 -08:00
b1b8b42f2b
Fix getting stream status updates when # of files open is > 1024.
2018-01-29 07:21:31 -08:00
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
1b23f7b564
turn off debug
2018-01-23 17:34:49 +01:00
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
9473fbecd8
more debug
2017-10-31 13:32:42 -07:00
eb48759ff8
wip
2017-10-27 13:37:51 -07:00
8f8d66189c
Google code style
2017-10-04 10:48:24 -04:00
f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
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
fd90de5952
if no AuthHashGEneratedAt then generate one instead of outputting an error
2017-05-05 16:47:50 -04:00
fb5668c9ef
Fix spelling of remSocketFile
2017-04-29 09:02:35 +02:00
ebafc62b51
Must reopen the session so we can generate an auth hash
2017-03-01 15:27:42 -05:00
16fdac3179
fix remSocketFile to remSockFile
2017-01-11 11:14:00 -05:00
ef71ae248c
fix ramSocketFile to remSocketFile
2017-01-02 09:31:26 -05:00
d97926c478
fix ramSocketFile to remSocketFile
2017-01-02 09:31:06 -05:00
c27d0270dc
Merge branch 'knnniggett-zmMemDetach' into storageareas
2016-12-20 15:40:14 -05:00
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
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
017085aee7
Use proper rounding instead of sprintf based rounding for fps
2016-10-20 11:49:35 -04:00
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
303a2c6c5f
re-open session if neccessary to save AuthHashGeneratedAt
2016-09-27 11:56:31 -04:00
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
e10fdaf344
reduce the wait to 2/10ths instead of a whole second
2015-06-05 11:49:05 -04:00
5e262f5a67
the var is remSockFile, not remSocketFile
2014-07-24 11:05:35 -04:00
eb5f299512
increase max_socket_tries to 10 as #470
2014-07-11 10:51:24 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Isaac
Matt N
Isaac Connor
Joergen Edelbo
Isaac Connor