Andrew Bauer
b3565fb983
remove file that should not be there
2018-09-12 07:02:57 -05: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
55dcb161ae
find should always return an array
2018-09-09 13:59:10 -04:00
Isaac Connor
b4f80fbe11
Always return an array from find
2018-09-09 13:56:29 -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
798aab84f3
whitespace changes
2018-08-31 11:58:33 -04:00
Isaac Connor
623d31edae
Don't do csrf for view=image
2018-08-31 11:58:17 -04:00
Isaac Connor
7ee80e7cca
Debug lines should be debug, not warning
2018-08-31 11:58:03 -04:00
Isaac Connor
57d5e28870
clear output buffer before sending image. Adjust filename for saveAs when doing a scaled image. whitespace corrections. More Debug output
2018-08-31 11:57:47 -04:00
Isaac Connor
0823b28712
whitespace changes. Make Privacy test an else so that PRIVACY checks don't happen if not logged in
2018-08-31 10:37:11 -04:00
Isaac Connor
4b30ea7877
cleanup, whitespace
2018-08-31 10:35:23 -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
b7c86ef3d4
remove escapes that mess up the quoting
2018-08-30 12:26:18 -04:00
Isaac Connor
d3e089e3ce
remove an escape that messed up the quoting
2018-08-30 11:18:48 -04:00
Isaac Connor
21d193294f
Log errors shouldn't be fatal
2018-08-22 17:22:40 -04:00
Isaac Connor
6e5472d305
Merge branch 'master' into server_path_prefix
2018-08-22 12:57:16 -04:00
Isaac Connor
24f8d63b69
comment out a debug line
2018-08-20 11:13:38 -04:00
Isaac Connor
871e3807e6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-17 12:57:27 -04:00
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
c2c7b75956
check for ZM_SERVER_ID being defined
2018-07-09 15:30:15 -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
ee017a1ef7
Add PathPrefix to language
2018-07-09 14:29:40 -04:00
Isaac Connor
45f6eaf530
Add the current serverId to the available javascript variables
2018-07-09 14:28:21 -04:00
Isaac Connor
87aa146d84
remove debug output from updating navbar
2018-07-09 14:10:36 -04:00
Isaac Connor
ebe55cf6a4
Include new Server.js
2018-07-09 14:10:06 -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
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
7ef43a0684
Merge ../ZoneMinder.master into server_path_prefix
2018-07-09 12:10:48 -04:00
Isaac Connor
d051342e9f
Add PathPrefix
2018-07-09 12:10:29 -04:00
Isaac Connor
62f45b430e
Add PathPrefix and use it in Url. Make Url() smarter so it can do more of the heavy lifting.
2018-07-09 12:09:57 -04:00
Isaac Connor
661876b998
Use Server->Url() more,, moving the logic into Server->Url()
2018-07-09 12:09:29 -04:00
Isaac Connor
90e4c2632d
Use Server->Url() more,, moving the logic into Server->Url()
2018-07-09 12:08:50 -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