Commit Graph

4690 Commits

Author SHA1 Message Date
Isaac Connor 40cd27e68a when refreshing because ajax failed, reload the current view, not just index.php 2018-08-15 17:21:54 -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
Andrew Bauer 3dc424282b Support quoting config variables (#2175)
* allow handling of quotes in config files

* copy paste error

* surround zm_arptool in quotes
2018-08-11 12:56:16 -04:00
Isaac Connor 037abd4916 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-08 15:11:42 -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 23ddc83ad4
fix_2167 (#2168)
* Populate a global  from the session on every request. Use the  object instead of using allowedMonitors in session.

* fix when  gets loaded.

* use  for auth, and add Monitor Edit checks to Zone add/delete/edit

* add back the ZM_OPT_USE_AUTH test for being logged in in AppController

* Update permissions code to use

* change quotes

* Update permission code to use

* Use  instal of session for systemPermission

* deprecate montiorPermision in session

* use  instead of session streamPermission

* move login code back into AppController. Has to be done for every request

* deprecate eventPermission, controlPermission and systemPermission in session.

* handle auth params in query string as well as post

* exit on HUP to free up memory.

* add missing global user

* system should be System
2018-08-08 09:59:46 -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 886391a547 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-31 10:16:05 -04:00
Isaac Connor 363e1dda97 Add some more Monitor defaults, mainly Refresh which gets called in watch.js.php 2018-07-31 10:15:26 -04:00
Roman Dissertori 48b91c5544 Bugfix in Control and added new Camera (#2171)
* fixed control typos

missing word "s" for "Controls" Table for database queries

* added Dericam P2 camera Control

* fixed missing CanReset column

* Update DericamP2.pm

* added some more missing controls

CanSleep, CanWake

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update zm_create.sql.in
2018-07-28 09:26:02 -04:00
Isaac Connor 2ff47e04da the updated video-js.css puts the fonts into a font dir. 2018-07-25 17:04:42 -04:00
Isaac Connor 00bdfdcb16 increase height of function popup so that dropdown options fit in it 2018-07-25 09:39:24 -04:00
Isaac Connor 6ab1c3ced8 proper case table header 2018-07-25 09:39:08 -04:00
Isaac Connor dc57a3c91c fix spacing/quotes/google code style 2018-07-24 16:41:09 -04:00
Pliable Pixels 997aa6aa55 fixed getCredentials not working if called directly 2018-07-17 13:57:20 -04:00
Pliable Pixels 0ff9002adf 2156 api login (#2157)
* error can be due to bad user or password

* added login/logout and related private functions

* handle case when userLogin fails, current code returns PHP error for  and API throw is not called

* formatting

* converted login params to POST, removed user=&pass= for other APIs

* formatting

* add auth check back but leave out login/out

* fixes to make it work across zmN, postman and curl

* added back enabled check
2018-07-15 21:17:35 -04:00
Isaac Connor 0d75586fac Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-12 15:05:13 -04:00
Isaac Connor 43827953cd test for existence of HTTP_X_FORWARDED_PROTO 2018-07-12 15:04:54 -04:00
Isaac Connor 82115ed2d3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-12 11:44:26 -04:00
Isaac Connor 4aa289cd66 fix reCaptcha failure still allowing login 2018-07-12 11:44:20 -04:00
Isaac Connor 903127fe85 Merge branch 'storageareas' 2018-07-12 11:39:33 -04:00
Isaac Connor eb610cd3a1 rewrite the HTTP_X_FORWARDED_PROTO test to just make it part of the if instead of modifying SERVER['HTTPS'] 2018-07-12 11:38:58 -04:00
Isaac Connor 2767e7cca3 remove unneeded packaging files from chosen. 2018-07-12 11:35:02 -04:00
Isaac Connor 87f68e4a5b Merge branch 'master' into storageareas 2018-07-12 10:47:18 -04:00
Isaac Connor dd4392bf12 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-07-12 10:11:18 -04:00
Mike Brown 6a5ff83848 Adding support for HTTP_X_FORWARDED_PROTO 2018-07-11 21:01:37 -05:00
Isaac Connor 0acad44b4a test for existence of Storage path before trying things like disk_total_space which will fill the html output with php errors. 2018-07-11 17:21:44 -04:00
Isaac Connor 410b1ad810 Merge branch 'master' into cycle_width 2018-07-11 15:49:44 -04:00
Isaac Connor 856608d720 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-11 15:48:27 -04:00
Isaac Connor 05615c5cf4 We should not use a hard path in cache bust 2018-07-11 15:48:01 -04:00
Dmitry Smirnov 7db1fabbe1 Removed "chosen" web site; "prism.js" is not distributable. (#2154) 2018-07-11 15:46:43 -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 fe5ebe094d More work just using auth.php instead of cake code. Don't reload the User object 2018-07-11 11:45:49 -04:00
Isaac Connor b8691e4654 Don't need global cookies. Only open session if needed in userLogin 2018-07-11 11:45:19 -04:00
Isaac Connor c6ded845d0 Return the user db row ifrom userLogin instead of assuming it will be accessed as a global. Add is_session_started function and use it to detect when we need to start/stop the session in generateAuthHash 2018-07-11 10:34:45 -04:00
Isaac Connor 4f80ca6871 Use userLogin function from auth.php instead of cake code. 2018-07-11 10:33:49 -04:00
Isaac Connor 983e3c45be Fix spacing and quotes 2018-07-11 09:54:25 -04:00
Isaac Connor f10509690b add username and passwordHash to Session so that generateAuthHash works 2018-07-11 09:54:15 -04:00
Isaac Connor f56d751661 join multiple echos into 1 2018-07-10 13:47:30 -04:00
Isaac Connor 21438d17ac Fix authenticating User 2018-07-10 13:19:51 -04:00
Isaac Connor 930d929427 Merge branch 'storageareas' into api_auth 2018-07-10 12:46:30 -04:00
Isaac Connor d9f5d5fe4c Merge branch 'master' into storageareas 2018-07-10 12:46:09 -04:00
Isaac Connor e6a9422636 Add entry for StorageArea 2018-07-10 12:26:25 -04:00
Isaac Connor a0992baa16 Add entry for SignalCheckPoints 2018-07-10 12:25:36 -04:00
Isaac Connor d05ad12b48 We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148 2018-07-10 11:54:30 -04:00
Isaac Connor 46a496aefa rework monitorprobe to be more logical, and not use Fatal. 2018-07-10 11:54:16 -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 77fbfccee0 fix #2149 2018-07-10 10:31:43 -04:00
Isaac Connor 8db6561030 Add missing ; 2018-07-09 13:08:20 -04:00
Isaac Connor 3ecf0055b5 spacing 2018-07-09 13:07:16 -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 65564fa480 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-09 12:39:08 -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 9561401a44 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-09 12:02:14 -04:00
Isaac Connor fd5cf07bfb Make server name and hostname full width. 2018-07-09 10:48:14 -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 b5ca671103 Misc JS hygiene (#2150)
* fixed "jquery-ui.js" symlink.

* Bootstrap source, matching minified version.

Also origin URL.

* moment.js: added missing source and URL of origin.

* video-js: replaced bad case of source-less minified binary.

 Original file was not identical to https://github.com/videojs/video.js/blob/v4.11.4/dist/video-js/video-js.min.css
 i.e. it was modified in unknown way without sources. Very bad.

* jQuery: renamed URL file for consistency

* mootools-core-compat.js: replaced original with unknown modifications; renamed; added origin URL.

* mootools-more: rename file to properly reflect version.

 This is a default build without any options.

* prism.js.FIXME: note about outdated source-less file.
2018-07-07 10:30:16 -04:00
Andrew Bauer f5dce7e863
Merge pull request #2145 from onlyjob/arp_regex
fix regex to match IP and first numbers of MAC in the `arp -a` output (Closes: #2144)
2018-07-07 08:24:47 -05:00
Andrew Bauer 015013f247
Center WEB_CONSOLE_BANNER
Center WEB_CONSOLE_BANNER under the server stats
2018-07-06 15:59:10 -05: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 cf4a1c73fd Always us /zm in cache_bust 2018-07-04 14:46:22 -04:00
Andrew Bauer 32d103c216 fix submodule again 2018-07-01 08:23:00 -05:00
Andrew Bauer 5d0719f18d fixes #2137 2018-07-01 08:16:06 -05:00
Isaac Connor 29f0747895 Merge branch 'master' into storageareas 2018-06-25 16:15:46 -04:00
Isaac Connor e04eac57ae Include values in /etc/zm files in viewByName 2018-06-25 15:43:01 -04:00
Isaac Connor 4f0c56d731 Merge branch 'master' into include_fs_config_in_api_config 2018-06-25 15:10:52 -04:00
Isaac Connor 10531df543 Merge ../ZoneMinder.connortechnology 2018-06-25 14:51:53 -04:00
Isaac Connor 6bbd4f1083 google code style 2018-06-25 14:51:46 -04:00
Isaac Connor d271d8bf1d Fix my botched change to generateAuthHash 2018-06-25 14:50:54 -04:00
Isaac Connor e98a4b1562 Merge branch 'master' into storageareas 2018-06-25 14:31:00 -04:00
Andrew Bauer 741267bd6c
Merge pull request #2135 from connortechnology/fix_auth_hash_with_zmu
Rework generateAuthHash to take a force parameter so that it can be u…
2018-06-25 13:01:20 -05:00
Isaac Connor 54e7b0ac16
create ZM_EXPORT_DIR if needed (#2136) 2018-06-25 13:57:00 -04:00
Isaac Connor 99a97543f1 Rework generateAuthHash to take a force parameter so that it can be used to generate auth hashes for zmu 2018-06-25 13:43:08 -04:00
Isaac Connor 24ceb75936 Merge branch 'master' into include_fs_config_in_api_config 2018-06-21 21:41:54 -04:00
Andrew Bauer 3ffd30ffbd Allow selection of different source column filtering on the console (#2132) 2018-06-20 11:12:43 -04:00
Carlos R. Pasqualini 5e43cd99bc Change langfile's charset to UTF-8 as in #583 2018-06-19 20:38:55 -03: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 a594a1b6f1 Merge branch 'master' into storageareas 2018-06-15 09:45:11 -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 37badbfb17 fix #2123 2018-06-12 08:58:19 -04:00
Isaac Connor 67155e98eb add debug message when no changes are being made to a monitor 2018-06-11 16:34:40 -04:00
Isaac Connor 73555edfdc Add Error message when a monitor has no server assigned in a multi-server setup 2018-06-11 16:34:23 -04:00
Isaac Connor e88c73195d Merge branch 'fix_perl_logging' into storageareas 2018-06-08 09:30:16 -04:00
Andrew Bauer aa055c147b
classic skin - fix dvr control buttons
The buttons were being drawn too small which cropped the symbols inside the buttons. Deleting the classic-skin-specific override of the css file allows the default css to apply which looks good to me.
2018-06-07 14:32:36 -05: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 9050ffaf92 spacing, remove some debug lines 2018-06-06 12:57:35 -04:00
Isaac Connor cd64619743 Fix controlling daemon when the monitor is Local 2018-06-06 12:56:33 -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 2aac2e1e05 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-06-06 11:41:36 -04:00
Isaac Connor b4e0cb5eab WHen we are storing jpgs we don't generate a snapshot, so handle that 2018-06-06 11:41:28 -04:00
Isaac Connor d961b74084 spacing and double to single quotes 2018-06-06 11:41:00 -04:00
Isaac Connor db6bd67f59 just fix structure/spacing 2018-06-06 11:40:38 -04:00
Isaac Connor 798d046d81 Remove some debugging lines 2018-06-06 11:39:41 -04:00
Andrew Bauer c30992be3f fixes #2105
A more simplified approach to fixing #2105, compared to previous attempts.
2018-06-06 08:18:33 -05:00
Isaac Connor 5d772f16f6 fix closing td 2018-06-01 16:18:07 -04:00
Isaac Connor 405b1f92ed add a .fail to log the errors given when a navbar ajax call fails 2018-05-31 10:25:53 -04:00
Isaac Connor af3ce3660f Only unlink if file exists, removing warning. Always return a Storage object in Monitor->Storage() fixes Monitor Delete. 2018-05-24 09:54:45 -04:00
Isaac Connor be424f46f0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-05-18 12:07:22 -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 337db8bb18 Include Content-Length so we get a download progress 2018-05-18 15:52:30 +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 cfbbc238c9 remove extra spaces and parenthesis 2018-05-18 15:51:12 +02:00
Isaac cc27ce7ee9 Turn off csrf for archive downloading, which prevents out of memeory 2018-05-18 15:50:45 +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 25703fb2d4 Speed up log query response by generating the options out of the log rows instead of hitting the db again. 2018-05-18 09:05:25 -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 af63619ce6 Fix Messages=>Messaged 2018-05-15 21:56:17 +02:00
Isaac Connor 49d75ce039 handle Width and Height not being in ->{} and returnining defaults. Include Path in Source 2018-05-15 10:45:47 -07:00
Isaac Connor f16e1953d9 Make Source filter apply to Path as well 2018-05-15 10:45:10 -07:00
Isaac Connor 88b66fe5dd Merge ../ZoneMinder.master into storageareas 2018-05-14 14:07:51 -04:00
Isaac Connor 63e6cb1d62 remove parenthesis that confuse older php 2018-05-14 13:56:55 -04:00
Andrew Bauer 485f292943 fix php 5.4 compatibility - remove calls to empty 2018-05-14 12:32:48 -05:00
Isaac Connor 47ba435471 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-05-12 19:44:40 -04:00
Isaac Connor bb76079d54 fix logic when snapshot.jpg doesn't exist. We need an actual frame, to get a Delta to tell ffmpeg which frame to use. So load the Frame with Score=MaxScore 2018-05-11 10:37:00 -04:00
Isaac Connor b20cb5d0ae Add all the other Event columns to fields 2018-05-11 10:36:14 -04:00
Isaac Connor 230a59cd8e fix case where it wouldn't generate the snapshot.jpg because we hadn't specified whether to show a capture or analysis image 2018-05-11 09:53:24 -04:00
Isaac Connor 8b8bcbd1e2 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-05-10 17:47:12 -04:00
Isaac Connor 571b27a025 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-05-10 14:39:16 -04:00
Isaac Connor c61deb422f update to -zm versions 2018-05-10 14:38:49 -04:00
Isaac Connor 2a5f05499e Munge the config in the global configvals into the configs array before returning it. 2018-05-10 13:44:46 -04: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 e7bd5900bc rough in a Storage Model 2018-05-07 14:09:05 -07:00
Isaac Connor da7c953e3d adda blank line 2018-05-07 14:08:32 -07: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 9127eb63dc Implement file_exists function to determine either locally or through remote api calls whether the file for an event exists. 2018-05-07 14:07:30 -07:00
Isaac Connor 1a012c62ff Add fileExists to event view 2018-05-07 14:07:03 -07:00
Isaac Connor 9c44f56f37 Add Storage to belongsTo. Implement Relative_Path and fileExists functions 2018-05-07 14:06:48 -07:00
Isaac Connor 5772ff9161 return default values for Width and Height 2018-05-05 12:49:00 -04:00
Isaac Connor f2c099f1e4 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-05-04 16:01:25 -04:00
Isaac Connor dbdf937a56 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-05-04 06:47:23 -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 84c94efaa8 Move redunddant close methods into parent. Use Fatal instead of croak. Croak is not defined so it causes an infinite loop 2018-05-04 02:26:25 +02:00
Pliable Pixels e953a04f61 naming consistency of attribute (#2096) 2018-05-03 14:03:49 -04:00
Isaac Connor 769d4a8693 DB connect can die, so put it in an eval 2018-05-03 09:50:54 -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 f76827a450 redo thumbnail code. Always link to server they event is located on 2018-05-03 09:36:50 -07:00
Pliable Pixels a3158fcc97 auth_key api for different situations (#2090)
* auth_key api for different situations

* added new flag to indicate if password needs to be appended

* pure json view
2018-05-02 12:26:28 -04:00
Isaac Connor 4e7bf6efe7 remove duplicated css for watch view in dark skin 2018-05-02 11:39:16 -04:00
Isaac Connor bbe0025641 correct sort order default 2018-05-01 09:43:09 -04:00
Isaac Connor 433cffcce7 include Id in Filter dropdown 2018-04-30 15:21:05 -04:00
Isaac Connor acd6b5f4a9 limit the # of log lines deleted to 100 to limit the time spent there. 2018-04-30 14:33:41 -04:00
Isaac Connor 3bb1a5b544 Whitespace 2018-04-30 13:02:53 -04:00
Isaac Connor c3b6cd4bab include auth.php if auth is on, and return '' for auth_hash is auth is disabled 2018-04-30 11:24:53 -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 ecf8003aef remove extra spaces 2018-04-28 12:32:21 -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
Isaac Connor 7e88d28857 bump version to .44 2018-04-26 21:58:19 -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 117555a857 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-04-25 09:39:10 -04:00
Isaac Connor 161fc94496 remove useless () 2018-04-25 09:33:12 -04:00
Isaac Connor 80f73854c7 Include the groupIds hidden when not on general tab 2018-04-25 09:33:02 -04:00
Isaac Connor dfae6661ab use isset when determining if a column exists, otherwise we throw warnings 2018-04-25 09:32:40 -04:00
Isaac Connor 5f415873d4 Update GroupIds regardless of changes returned from getFormChanges on Monitor save 2018-04-25 09:32:15 -04:00
Isaac Connor 2a81877664 spacing 2018-04-25 09:31:40 -04:00
Isaac Connor 80803a164c in set(), check to see if there is a method and if there is call it to set the value. Implement using GroupIds to set the GroupIds value. If the new value is a scalar, then turn it into an array. 2018-04-25 09:27:43 -04:00
Isaac Connor 28921a653b Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-24 11:22:48 -07:00
Isaac Connor 5b4d160710 add total bandwidth at bottom and move buttons to top 2018-04-24 14:18:41 -04:00
Isaac Connor 20f6985dff implement capturing bandwidth 2018-04-24 14:11:27 -04:00
Isaac Connor ad376fc267 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-24 09:40:39 -07:00
Isaac Connor bbb10fa4b4 Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34 2018-04-24 12:40:15 -04:00
Isaac Connor de149c1328 spacing 2018-04-24 08:48:35 -07:00
Isaac Connor 9fd2c12765 DB Logging is a Debug level 2018-04-24 08:42:52 -04:00
Isaac Connor 662215d125 Merge ../ZoneMinder.connortechnology 2018-04-21 10:35:49 -04:00