2715 Commits

Author	SHA1	Message	Date
Isaac Connor	8fabeb78d3	Merge branch 'fix_zone_edit' into storageareas	2016-05-24 15:55:49 -04:00
Isaac Connor	3f880fad3a	Merge pull request #1500 from knnniggett/zmdc_unlink ... remove one unlink, add better error reporting to the rest	2016-05-24 14:35:39 -04:00
Andrew Bauer	0052bb080c	unlink only if file exists	2016-05-24 12:13:17 -05:00
Andrew Bauer	11701357aa	remove one unlink, add better error reporting to the rest	2016-05-24 09:01:32 -05:00
Andrew Bauer	bc163b33fc	move multiserver message to once during startup only	2016-05-23 20:06:29 -05:00
josh4trunks	57a25373fa	Add logic to Config.pm	2016-05-22 08:53:30 -07:00
josh4trunks	a3fe6ea181	Apply changes to Logger.pm	2016-05-22 08:28:23 -07:00
josh4trunks	38e1cc909c	Reapply changes to Database.pm	2016-05-22 08:19:18 -07:00
Isaac Connor	1e52934dcf	Implement a time function that gets unix_timestamp from StartTime, and implement check_for_files_in_filessytem	2016-05-20 20:33:47 -04:00
Andrew Bauer	8bbb443c67	fix invalid key name in config hash	2016-05-20 10:35:03 -05:00
Isaac Connor	bb5dbf3e4a	Need to import Config Data into Config	2016-05-20 09:29:40 -04:00
Isaac Connor	182fa9a5cd	revert the bulk of the merge_db_connects changes.	2016-05-20 08:53:53 -04:00
Isaac Connor	924acf4284	fix zmdc.pl hang due to needing to connect to db after fork	2016-05-19 15:01:31 -04:00
Isaac Connor	8e06c0ec63	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2016-05-19 12:08:56 -04:00
Isaac Connor	183f9c70a4	Must use ZoneMinder instead of ZoneMinder::Logger	2016-05-19 12:08:45 -04:00
Isaac Connor	d57690903d	Must use ZoneMinder instead of ZoneMinder::Logger	2016-05-19 12:08:25 -04:00
Andrew Bauer	8bac5fbdfb	typo - remove extra comma	2016-05-18 16:58:04 -05:00
Andrew Bauer	46039a1887	Merge pull request #1472 from ZoneMinder/v4l1_compat ... V4l1 compat	2016-05-16 13:02:27 -05:00
Isaac Connor	0b00659f26	Merge branch 'update_zmupdate' into storageareas	2016-05-16 12:24:14 -04:00
Isaac Connor	b53a0a564d	Don't need the extra use ZoneMinder::Config	2016-05-16 10:07:24 -04:00
Isaac Connor	dd24c35afa	revert bogus optimisation	2016-05-16 10:05:12 -04:00
Isaac Connor	3780f8a2e6	move functions from ConfigAdmin into Config. I see no reason for them to be in a separate module	2016-05-16 09:31:54 -04:00
Isaac Connor	5df85770cd	zmupdate.pl.in	2016-05-13 13:52:34 -04:00
Isaac Connor	3a0aa09c2f	Force reconnect to the db after fork.	2016-05-13 09:09:49 -04:00
Isaac Connor	e9d8b7925a	Merge branch 'db_reconnect' into storageareas	2016-05-10 11:13:09 -04:00
Isaac Connor	aaa4b3a824	check for db connection before assuming that dbh is valid	2016-05-10 11:11:45 -04:00
Isaac Connor	a5ba4759bf	fix new config entry	2016-05-10 10:54:40 -04:00
Isaac Connor	17f4f5789e	Merge branch 'master' into v4l1_compat	2016-05-10 10:10:48 -04:00
Isaac Connor	56e0e4e3c6	Use Event->getPath instead of something wrong	2016-05-10 09:07:09 -04:00
Isaac Connor	a012320a3e	Whitespace and code style changes. Change Event->getEventPath to Event->getPath to sync with PHP version	2016-05-10 09:06:49 -04:00
Isaac Connor	07e988266a	Merge branch 'merge_db_connects' into storageareas	2016-05-09 13:28:40 -04:00
Isaac Connor	1a1e009533	simplify use's, add some sth->finishes and move some lines to take properly use DBI	2016-05-09 13:28:09 -04:00
Isaac Connor	9d9f2453c3	deprecate ConfigAdmin, merge it into Config.pm	2016-05-09 13:27:22 -04:00
Isaac Connor	cd8c9703c0	remove extra q	2016-05-09 12:48:56 -04:00
Isaac Connor	2fec880ff6	fix help/description mixup	2016-05-09 12:48:35 -04:00
Isaac Connor	5806eb0958	Merge branch 'v4l1_compat' into storageareas	2016-05-09 12:46:34 -04:00
Isaac Connor	605edfd6d0	add ENV{LD_PRELOAD} setting	2016-05-09 12:46:26 -04:00
Isaac Connor	08bf97fe85	Add a config entry for ZM_LD_PRELOAD	2016-05-09 12:44:41 -04:00
Isaac Connor	beebe74e7b	Merge branch 'merge_db_connects' into storageareas	2016-05-09 12:26:17 -04:00
Isaac Connor	b33e35bda7	move the require to the top	2016-05-09 12:14:59 -04:00
Isaac Connor	3522c5796b	add BEGIN Back to ZoneMinder.pm	2016-05-09 12:01:26 -04:00
Isaac Connor	e064af4214	Merge branch 'merge_db_connects' into storageareas	2016-05-07 09:35:14 -04:00
Isaac Connor	b444c8a6b4	Move the BEGIN from ZoneMinder to ZoneMinder/Base.	2016-05-07 09:34:45 -04:00
Isaac Connor	6e32b5d266	Use fully specified COnfig hash to simplify Symbol tables	2016-05-07 09:34:04 -04:00
Isaac Connor	1d63062188	Merge branch 'merge_db_connects' into storageareas	2016-05-07 09:30:18 -04:00
Isaac Connor	f55f979cc9	use fully specified Config to simplify symbol tables	2016-05-07 09:30:03 -04:00
Isaac Connor	18442be77f	Merge branch 'merge_db_connects' into storageareas	2016-05-03 14:09:18 -04:00
Isaac Connor	e3d581dcab	use single quotes instead of double quotes	2016-05-03 10:23:09 -04:00
Isaac Connor	24bf91707f	Database module should really use DBI	2016-05-03 10:22:38 -04:00
Isaac Connor	e80db4c433	Use zmDbConnect instead of duplicated db connect code	2016-05-03 10:22:16 -04:00