132 Commits

Author	SHA1	Message	Date
Isaac Connor	ebafc62b51	Must reopen the session so we can generate an auth hash	2017-03-01 15:27:42 -05:00
Isaac Connor	d135216ac7	Merge branch 'master' into storageareas	2017-02-15 09:30:35 -05:00
Isaac Connor	9135da92ed	fix typo fileFields => filterFields	2017-01-31 21:33:43 -05:00
Isaac Connor	a8d1450adf	Merge branch 'master' into fix_sql_injection	2017-01-27 17:18:34 -05:00
Isaac Connor	5b598fe90d	cleanup and use cleaned up monitor_id	2017-01-23 21:51:38 -05:00
Isaac Connor	e937b4099b	add an ajax file for console to do sorting	2017-01-23 10:13:16 -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	ad157cf21c	fix tabs	2016-12-14 14:56:54 -05:00
Isaac Connor	4fa24dcda4	Merge branch 'fix_sql_injection' into storageareas	2016-12-08 15:53:46 -05:00
Isaac Connor	7c84e2417d	remove extra ?	2016-12-08 15:53:38 -05:00
Isaac Connor	f68c73b4a8	Merge branch 'fix_sql_injection' into storageareas	2016-12-08 15:52:52 -05:00
Isaac Connor	c8009baf3f	fix missing ; and test for integer string in limit	2016-12-08 15:46:42 -05:00
Isaac Connor	ced701f56f	Merge branch 'fix_sql_injection' into storageareas	2016-12-08 14:58:50 -05:00
Isaac Connor	587fd16aa6	Add testing for limit, sortField and all the filters to ensure that they are valid.	2016-12-08 13:31:44 -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	bf4bbf8b8d	use object methods for event deletion. Main benefit is error message when deleting	2016-10-12 15:36:40 -04:00
Steve Gilvarry	bdd0790106	Merge pull request #1522 from ZoneMinder/video_session ... Move the session start down to where it is actually needed so that we…	2016-06-29 21:45:12 +10:00
Steve Gilvarry	f804f7739d	Adjust download file path to swap path to match the file generated.	2016-06-14 20:49:38 +10:00
Isaac Connor	1930b18100	Move the session start down to where it is actually needed so that we don't hold it open while generating videos	2016-06-07 10:38:37 -04:00
Isaac Connor	5c867aa5f5	Merge branch 'fix_auth_timeout' into storageareas	2016-09-29 10:10:38 -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	e217ca17cd	Merge branch 'fix_auth_timeout' into storageareas	2016-09-27 11:57:53 -04:00
Isaac Connor	303a2c6c5f	re-open session if neccessary to save AuthHashGeneratedAt	2016-09-27 11:56:31 -04:00
Isaac Connor	6840031ee3	fix auth timeout and user session[username] when checking auth hash for speedup	2016-09-27 11:51:55 -04:00
Isaac Connor	e04266600e	Merge branch 'fix_auth_timeout' into storageareas	2016-09-27 11:04:12 -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	a30610fbda	Merge branch 'master' into storageareas	2016-07-12 10:31:10 -04:00
Isaac Connor	4fc68c0aa0	Use a subquery instead of a join to fix group by errors when sql_mode=only_full_group_by	2016-06-27 10:26:37 -04:00
Isaac Connor	e29a0ebe71	Merge branch 'feature-h264-videostorage' into storageareas	2016-06-21 13:48:32 -04:00
Isaac Connor	26bba58c56	Merge branch 'master' into feature-h264-videostorage	2016-06-17 11:09:47 -04:00
Isaac Connor	e62ea454ba	Merge branch 'master' into storageareas	2016-05-17 10:48:52 -04:00
Isaac Connor	6084e2d00f	improve error message. The unrecognized action error happens above, so this error should just mention permissions	2016-05-16 14:38:40 -04:00
Isaac Connor	1f6425b1b7	Fix for SQL to load next and previous event	2016-05-05 14:50:15 -04:00
Isaac Connor	026d3e3189	Merge branch 'master' into feature-h264-videostorage	2016-04-11 09:30:56 -04:00
Isaac Connor	78c6e14e0c	Merge branch 'master' into storageareas	2016-04-09 14:52:28 -04:00
Isaac Connor	c0c543e029	change quotes to prevent php7 complaint	2016-04-09 11:25:56 -04:00
Isaac Connor	238a25a302	Merge branch 'master' into iconnor_video	2016-04-05 09:38:59 -04:00
SteveGilvarry	4d7ded5ef0	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: configure.ac src/Makefile.am web/js/Makefile.am	2016-04-05 22:06:14 +10:00
SteveGilvarry	5ff427d9e9	Removed Autotools Makefile.am ... Conflicts: Makefile.am misc/Makefile.am src/Makefile.am web/includes/Makefile.am web/js/Makefile.am web/skins/classic/css/classic/views/Makefile.am web/skins/classic/css/flat/views/Makefile.am web/skins/classic/views/Makefile.am web/skins/classic/views/js/Makefile.am	2016-02-26 22:19:02 +11:00
SteveGilvarry	7301e803ed	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h	2016-01-30 15:45:08 +11:00
Isaac Connor	bd71c4999d	test for Server in servers_by_Id as well as just having a value for ServerId. Fixup export as well.	2016-01-02 14:36:37 -05:00
Isaac Connor	cf7e168872	Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist	2016-01-01 17:10:37 -05:00
Isaac Connor	ec7504f925	Translate ServerId to Server in Log record before sending back	2016-01-01 16:33:28 -05:00
Isaac Connor	bfe4175fdf	Add Server to filters and log results	2015-12-31 10:13:25 -05:00
Isaac Connor	6d34f8f424	Use Monitor class instead of old sql	2015-12-09 09:23:42 -05:00