Commit Graph

1714 Commits

Author SHA1 Message Date
Andrew Bauer b8a2e71bb6
use base64_encode for monitor probe
We need to employ the same method of encoding as the onvif probe to avoid fixing one while breaking the other
2018-09-21 12:00:03 -05:00
Andy Bauer f53533e61e fix populating onvif probe data 2018-09-20 10:30:23 -05:00
Isaac Connor 6181e52c47 gracefully handle non-existence of imageFeed 2018-09-20 09:07:28 -04:00
Isaac Connor 8a5c989cac fix warning when editing users after a monitor has been deleted 2018-09-18 08:52:43 -04:00
Isaac Connor b5b71edbf6 Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80 2018-09-14 14:26:45 -04:00
Andrew Bauer c66dd25ebb implement collapsible headers (#2203) 2018-09-11 17:39:40 -04:00
Isaac Connor eef928a742 fix find_all => find 2018-09-11 14:31:03 -04:00
Isaac Connor 684f48979a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-11 14:30:19 -04:00
Isaac Connor 8608fc97be fix trms=>terms 2018-09-10 15:11:57 -04:00
Isaac Connor 0ee261fae3 get rid of code that hid the close/back button on events if there was no history. 2018-09-10 15:11:41 -04:00
Isaac Connor 534aebb21f When loading previous and subsequent log lines, merge the fields in the filters instead of replacing 2018-09-09 16:36:09 -04:00
Isaac Connor b8f6617db3 fix another instance of find_all 2018-09-09 12:15:06 -04:00
Isaac Connor dfdac2ed70 make find and find_one functions consistent across Objects 2018-09-07 16:31:11 -04:00
Isaac Connor f4c2d8adea Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-03 12:29:09 -04:00
Andrew Bauer e5a2581dcc optionhelp - support links markdown style (#2198) 2018-09-03 09:56:52 -04:00
Isaac Connor 9ec415b30a Just reload the event view instead of dynamically updating the stream. Fixes #2196 2018-08-31 15:56:21 -04:00
Isaac Connor 799b34eee8 handle xhr errors like when auth is no longer valid. Do a page refresh when this happens 2018-08-31 10:34:54 -04:00
Isaac Connor b1fe80a0bd Add JSON/MaybeXS to dependencies, replacing JSON/Any 2018-08-30 18:30:33 -04:00
Andrew Bauer 8f0fb0843a Add Privacy Statement (#2194)
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* create and load default.php

* fix typos

* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
Isaac Connor 6e5472d305 Merge branch 'master' into server_path_prefix 2018-08-22 12:57:16 -04:00
Isaac Connor 15a6eb7e78
Revert "Add Privacy Statement (#2176)" (#2179)
This reverts commit 56f4d768c2.
2018-08-13 15:33:43 -04:00
Andrew Bauer 56f4d768c2 Add Privacy Statement (#2176)
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* push privacy text to all language files
2018-08-13 15:23:44 -04:00
Isaac Connor d87a41b629 Set button types so that they do things in all browsers.Fix Delete button when translated 2018-08-08 15:11:30 -04:00
Isaac Connor b72d520e02 implement the ability to pass a disabled option to htmlSelect. Use it to disable the h264 passthrough option for non-ffmpeg monitors. Instead of disappearing it. 2018-08-03 10:02:42 -04:00
Isaac Connor 6ab1c3ced8 proper case table header 2018-07-25 09:39:08 -04:00
Isaac Connor 87f68e4a5b Merge branch 'master' into storageareas 2018-07-12 10:47:18 -04:00
Isaac Connor 410b1ad810 Merge branch 'master' into cycle_width 2018-07-11 15:49:44 -04:00
Isaac Connor 115e554d94 Remove erroneous t and convert tabs to spaces 2018-07-11 15:46:11 -04:00
Andrew Bauer 18c3618e28 Arp tool (#2155)
* let cmake set path to arp

* declare cameras array

* fix probeV4L function

* typo

* fix another typo - my machine is possessed.

* update redhat, debian, ubuntu build dependencies
2018-07-11 15:43:59 -04:00
Isaac Connor f56d751661 join multiple echos into 1 2018-07-10 13:47:30 -04:00
Isaac Connor 7ed316d3a5 We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148 2018-07-10 11:49:45 -04:00
Isaac Connor 13055bdda6 rework monitorprobe to be more logical, and not use Fatal. 2018-07-10 11:49:02 -04:00
Isaac Connor d3034670a0 Merge branch 'master' into storageareas 2018-07-10 11:03:33 -04:00
Isaac Connor a26ab59c30 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-10 11:01:47 -04:00
Isaac Connor 831fe57025 Spacing and google code style 2018-07-10 11:00:52 -04:00
Isaac Connor 0b4d76f931 Add PathPrefix column to the server list 2018-07-09 14:36:46 -04:00
Isaac Connor e98578b2d7 Use Server.js objects for Servers array populated by json 2018-07-09 14:30:55 -04:00
Isaac Connor 51cfd9b265 Use Server.js object for generating url to images 2018-07-09 14:30:06 -04:00
Isaac Connor 8db6561030 Add missing ; 2018-07-09 13:08:20 -04:00
Isaac Connor 0824f740ae Make video 100% width in cycle. Also fix monitors filtering by putting it in a form 2018-07-09 12:50:57 -04:00
Isaac Connor 3d1fe728f1 Merge ../ZoneMinder.master into server_path_prefix 2018-07-09 12:33:58 -04:00
Isaac Connor 12a673169f spacing 2018-07-09 12:33:37 -04:00
Isaac Connor ba8dc2059d spacing 2018-07-09 12:33:21 -04:00
Isaac Connor afa31842b5 spacing 2018-07-09 12:28:39 -04:00
Isaac Connor d051342e9f Add PathPrefix 2018-07-09 12:10:29 -04:00
Isaac Connor 6cf336cc33 Always use a /zm in urls to zm assets 2018-07-09 09:47:20 -04:00
Isaac Connor 4a4e845e9c Fix stupid code that defaulted minTimeSecs to 2010 instead of the first event 2018-07-08 16:24:53 -04:00
Isaac Connor ade8d078df Define minTimeSecs and maxTimeSecs 2018-07-08 15:28:55 -04:00
Isaac Connor d8a4acf319 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-08 15:08:54 -04:00
Isaac Connor d257b53e82 Add missing ) to frame sql when no min/max time specified 2018-07-08 15:08:49 -04:00
Dmitry Smirnov dcb9999398 fix regex to match IP and first numbers of MAC in the `arp -a` output (Closes: #2144);
fixes probing of network cameras.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2018-07-06 16:16:36 +10:00
Andrew Bauer 084f1ab1d6
Add missing reloadWebSite js function
Somehow this went missing when the new website monitor type was merged
2018-07-05 08:43:21 -05:00
Isaac Connor 29f0747895 Merge branch 'master' into storageareas 2018-06-25 16:15:46 -04:00
Isaac Connor d271d8bf1d Fix my botched change to generateAuthHash 2018-06-25 14:50:54 -04:00
Isaac Connor b0411cbfd2 Merge branch 'master' into storageareas 2018-06-16 16:47:53 -04:00
Isaac Connor 09aa3afaac Fix capitalisation of Ffmpeg 2018-06-16 16:47:09 -04:00
Isaac Connor 55f2e7c6a2 Fix #2124. Always allow selection of checkboxes, include canEdit(Events) in button disabling. 2018-06-15 15:21:10 -04:00
Isaac Connor f2d00b6af5 update Storage Video Writer options to only allow Passthrough for FFmpeg 2018-06-14 13:39:13 -04:00
Isaac Connor 7520d20751 update Storage Video Writer options to only allow Passthrough for FFmpeg 2018-06-14 13:36:32 -04:00
Isaac Connor e88c73195d Merge branch 'fix_perl_logging' into storageareas 2018-06-08 09:30:16 -04:00
Isaac Connor 05a434893e We should be able to edit zones even if zm isn't running 2018-06-06 16:59:07 -04:00
Isaac Connor 0937bfdf84 consoleTableBody needs to be an id in order for dragndrop sorting to work 2018-06-06 13:37:12 -04:00
Isaac Connor 3109536dda Alternate fix for video generation under csrf. Now we just turn off output buffering (discarding contents before sending the avi 2018-06-06 11:55:51 -04:00
Isaac Connor d961b74084 spacing and double to single quotes 2018-06-06 11:41:00 -04:00
Isaac Connor 5d772f16f6 fix closing td 2018-06-01 16:18:07 -04:00
Isaac 77b144a13e must specify type=button or else some browsers treat it as a submit button 2018-05-18 16:07:58 +02:00
Isaac 7ad6b01310 double to single quotes and spacing 2018-05-18 15:52:12 +02:00
Isaac d8a62e0ede Show total size for non-montage review downloads as well 2018-05-18 15:51:42 +02:00
Isaac Connor 2a8ea98249 remove blank space at end of line 2018-05-18 09:12:10 -04:00
Isaac Connor 4815162bea fix extra } 2018-05-18 09:11:15 -04:00
Isaac Connor 8276386a44 We always return an associative array now 2018-05-18 09:06:17 -04:00
Isaac Connor fdaf992156 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-05-16 14:18:48 -04:00
Isaac 93dd943fec Fix some spacing 2018-05-16 20:17:57 +02:00
Isaac Connor 780cb693c2 google code style 2018-05-16 11:14:11 -04:00
Isaac Connor 81c4542a94 correct use of getValue. Use standard ddm element value instead 2018-05-16 11:13:59 -04:00
Isaac Connor f16e1953d9 Make Source filter apply to Path as well 2018-05-15 10:45:10 -07:00
Andrew Bauer 485f292943 fix php 5.4 compatibility - remove calls to empty 2018-05-14 12:32:48 -05:00
Isaac Connor b2115f9dcf Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-05-08 13:34:03 -07:00
Isaac Connor 62edca6dcb add fileSize to the api, and use it to add remote fileSize reporting in includes/Event 2018-05-08 13:33:56 -07:00
Isaac Connor 3c4befc73a improve Name and Source filtering. Default to case insensitive text search. 2018-05-08 14:07:24 -04:00
Isaac Connor a4911d8f39 use Event object call for file_exists, which will check remotely. Make MissingFiles and ZeroSize be a link to filter results for those events 2018-05-07 14:08:17 -07:00
Isaac Connor 2076508374 add Source and Name filters 2018-05-04 06:47:02 -07:00
Isaac Connor 3fd953a4eb Move code to generate Source from console into Monitor Object 2018-05-04 06:46:46 -07:00
Isaac Connor d43cd322f4 Make event count a link to a filter to list them. 2018-05-03 09:42:14 -07:00
Isaac Connor 81758fab38 use new Thumbnail code 2018-05-03 09:39:23 -07:00
Isaac Connor e64de07560 spacing 2018-05-03 09:39:09 -07:00
Isaac Connor dbf760d8af cleanup no longer needed StatusFilter code. Use class=MonitorFilter instead of id=monitorControl to be consistent 2018-05-03 09:38:56 -07:00
Isaac Connor 433cffcce7 include Id in Filter dropdown 2018-04-30 15:21:05 -04:00
Isaac Connor 6c5e6e6184 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-30 07:10:38 -07:00
Isaac Connor 3f05d46012 Merge zmdc.pl fixes. We can now handle database disconnects gracefully. 2018-04-30 07:09:23 -07:00
Isaac Connor e891c88a3e Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-28 12:38:57 -04:00
Isaac Connor abd52ebfb1 Add DiskSpace column to storage listing 2018-04-28 12:38:10 -04:00
Isaac Connor a4da624f4c break out of loops when zm-terminate is set 2018-04-27 13:20:38 -07:00
Isaac Connor 348468a98d Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-26 22:09:48 -04:00
Isaac Connor 8a80cf686b Merge branch 'master' into storageareas 2018-04-26 21:58:34 -04:00
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 00e82fb751 Implement MonitoServerId,StorageServerId,FilterServerID in Filters 2018-04-25 13:05:19 -07:00
Isaac Connor dd6683f0be Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-25 10:31:47 -07:00
Isaac Connor 636d0caf30 handle no swap 2018-04-25 10:28:19 -07:00
Isaac Connor 80f73854c7 Include the groupIds hidden when not on general tab 2018-04-25 09:33:02 -04:00