Commit Graph

43 Commits

Author SHA1 Message Date
Andrew Bauer 86b2f6a12e New Monitor Type - Website (#2065)
* implement website monitor

* don't check certain fields when using website monitor

* continue to fix javascript errors for website monitors

* check $monitor, not $new_monitor here

* add website monitor documentation

was somehow left out of the initial commit

* fix corruption of functions.php

* add missing comma

* remove errors by testing for existence of key.  If it's a new monitor, then none of the keys will be valid

* If the monitor type is WebSite, then default Status to Running.

* put back start function that got lost in merge.  Don't start StreamCmd's if it's a WebSite

* Add midding comma

* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite

* Don't show control or any of the status fields for WebSite type monitors

* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
Isaac Connor 9fde052d39 merge 2018-04-03 14:41:32 -07:00
Pliable Pixels e5505de1d1 fixed brace styling 2018-03-29 11:27:31 -04:00
Pliable Pixels d64e58e374 silly mistake - wrong names 2018-03-29 11:23:35 -04:00
Pliable Pixels 95eb1d3045 merged master storage areas, resolved conflicts 2018-03-29 08:51:35 -04:00
Pliable Pixels 990d60926e #92 new key 2018-03-29 08:47:55 -04:00
Isaac Connor 306e9a75ee Fix issues with a period in the column name 2018-01-16 21:45:01 -05:00
Isaac Connor abec2ce4cd Add code to optionally run zmstats.pl and zmaudit.pl 2018-01-16 09:31:58 -05:00
Isaac Connor 5516a62a0e google code style, switch quotes 2017-09-11 22:12:10 -04:00
Isaac Connor 104bf07c5a fix pod docs 2017-09-11 21:52:22 -04:00
SteveGilvarry 2f3ebd80da Remove zmf, die..die..die 2017-01-16 13:20:05 -08:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Andrew Bauer bc163b33fc move multiserver message to once during startup only 2016-05-23 20:06:29 -05:00
Kyle Johnson b9085cea64 Fix issue where programs are installed in unexpected paths.
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
2016-03-11 14:28:16 -07:00
Andrew Bauer 8a537029ea Initial commit to add zmtelemetry.pl 2016-02-06 14:08:28 -06:00
Isaac Connor 54bff42fa0 Remove warnings when no server set 2016-01-01 21:27:30 -05:00
Isaac Connor aa108eff6e Add Info line on startup saying which Server it is loading for 2015-10-02 12:33:09 +00:00
Isaac Connor 9cdf8ec317 tabs to spaces 2015-08-27 11:13:44 -04:00
Isaac Connor 75919c9cd5 Merge branch 'master' into multi-server
Conflicts:
	docs/installationguide/ubuntu.rst
	misc/apache.conf.in
	src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
Pliable Pixels b4e9a0f0cf whitespacing 2015-08-26 12:08:10 -04:00
Pliable Pixels 46bd7b492b adds sanity checks to isActive and default states 2015-08-26 11:20:58 -04:00
Isaac Connor 51af432468 Only load monitors for our server if ZM_SERVER_ID is specified 2015-07-15 16:18:05 -04:00
Pliable Pixels e758d9bf7c Modified to handle setting isActive for custom states 2015-06-21 09:30:46 -04:00
Rick Sayre fb5c1abc87 Undid ZM_VERSION hacks 2015-05-18 21:44:41 -07:00
Rick Sayre 12516da3dc Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
Dmitry Smirnov afb127125d zmpkg.pl: correction for "Use of uninitialized value $command in string eq at zmpkg.pl line 62" 2015-04-11 22:41:07 +10:00
Dmitry Smirnov fa97348535 zmpkg.pl: pod2usage, tabs-to-spaces + readability 2015-04-11 22:39:32 +10:00
Isaac Connor 3013d87783 Add -v --version command line param to zmpkg.pl 2015-01-07 09:05:16 -05:00
Andrew Bauer 1a5844afef auto-recreate missing folders during startup 2014-10-05 11:25:41 -05:00
Andrew Bauer 1e8e710f5a full systemd support 2014-08-10 08:47:11 -05:00
Kfir Itzhak e9bb632a78 Remove zmfix 2013-12-22 16:08:17 +02:00
Isaac Connor 42642937e4 fix ZM_VERSION 2013-12-17 13:05:58 -05:00
Isaac Connor 48a6dcf5ce Change COnfig from using the subroutine symbol table to just using a global hash 2013-12-16 16:32:02 -05:00
Isaac Connor 2775752a41 use proper DBI parameter passing to improve security
remark out call to zmupdate.pl -f
2013-12-06 16:46:21 -05:00
stan b7ca4dba77 Fixed a few more incorrectly quoted split patterns, though these were not disfunctional.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3505 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 07:51:36 +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 962b61f269 Fixed typo.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3380 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-30 10:39:26 +00:00
stan d2f5e9623c Added checks for mismatches between system and database versions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3364 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 09:15:14 +00:00
stan ca3646677d Be more intelligent about custom directories. Don't chown/delete standard system dirs and recreate temp directory on startup if missing.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3348 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-20 09:46:14 +00:00
stan ee5d8db0cd Moved the runCommand function into the library plus shell detection. Should have been there anyway.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3343 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-16 22:54:37 +00:00
stan f15ef08d90 Do database freshening unconditionally on startup
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3318 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 09:27:55 +00:00
stan ccff3f8a50 Fixed issue with changing to new state from state where cameras disabled.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2935 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-29 15:27:48 +00:00
stan 11a1cc2d41 Now supports custom perl install path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +00:00