Isaac Connor
c8c34d3f95
Merge branch 'master' into storageareas
2018-12-11 10:21:22 -05:00
Isaac Connor
e1ecd47bff
Fix missing use of UrlToApi
2018-12-11 09:40:40 -05:00
Isaac Connor
a1141d2dc4
remove second use of HTTP_HOST and use a better method of stripping off port from HTTP_HOST
2018-12-07 08:39:23 -05:00
Isaac Connor
757e538550
strip port from HTTP_HOST
2018-12-06 17:12:03 -05:00
Isaac Connor
bc5f8d0d8d
rework pts/dts of audio stream. Spacing. Fix crash
2018-12-04 18:23:08 -05:00
Isaac Connor
2df6d74a3e
Merge branch 'master' into storageareas
2018-12-02 17:15:12 -05:00
Andrew Bauer
e327ad100e
fix WebSite camera startup issue
2018-12-01 17:03:50 -06:00
Andrew Bauer
cae6ffd5a3
use HTTP_HOST instead of SERVER_NAME
2018-12-01 13:27:08 -06:00
Isaac Connor
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
Isaac Connor
7d90a56561
Merge branch 'master' into storageareas
2018-11-30 14:46:42 -05:00
Isaac Connor
8c626c984b
Need to pass port through all Url functions
2018-11-30 14:45:58 -05:00
Isaac Connor
fe45e83bb4
Fix PathToIndex
2018-11-29 15:54:25 -05:00
Isaac Connor
4cf7ff7fe4
Merge branch 'server_path_prefix' into storageareas
2018-11-29 15:53:58 -05:00
Isaac Connor
3bd5774ea1
Default to PathToIndex should have the index.php in it
2018-11-29 15:53:19 -05:00
Isaac Connor
af2bb992e9
Merge branch 'server_path_prefix' into storageareas
2018-11-29 14:33:46 -05:00
Isaac Connor
1c17f334d3
fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well
2018-11-29 14:26:30 -05:00
Isaac Connor
4625f7c879
Merge branch 'master' into storageareas
2018-11-28 10:46:49 -05:00
Isaac Connor
1e915e9567
Merge branch 'master' into server_path_prefix
2018-11-28 10:45:36 -05:00
Isaac Connor
57acb2aac6
Merge branch 'server_path_prefix' into storageareas
2018-11-28 10:41:11 -05:00
Isaac Connor
f8b2ff5c77
rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()
2018-11-27 17:35:25 -05:00
Isaac Connor
17c1933913
remove an extra l
2018-11-26 16:20:15 -05:00
Isaac Connor
19f3cce41f
Dont auto-guess pathPrefix
2018-11-23 13:54:14 -05:00
Isaac Connor
7ad19be0d7
Merge branch 'server_path_prefix' into storageareas
2018-11-23 13:29:01 -05:00
Isaac Connor
dea5db9dd9
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 11:11:39 -05:00
Isaac Connor
c5f7fb7b18
Merge branch 'master' into server_path_prefix
2018-11-22 10:04:33 -05:00
Isaac Connor
62e511cfd1
Merge branch 'master' into h265
2018-11-17 10:41:20 -05:00
Isaac Connor
415d43fafb
Include Server Name when testing for CORS. Also be case insensitive.
2018-11-15 12:23:52 -05:00
Isaac Connor
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
Isaac Connor
9d5772b517
Merge branch 'fix_multiserver_daemon_restarting' into storageareas
2018-11-14 13:02:30 -05:00
Isaac Connor
786ca5b22a
implement remove service restart for zma. Use daemonControl instead of saving the monitor when restarting zmc
2018-11-14 13:00:19 -05:00
Isaac Connor
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
Isaac Connor
ec09a71ba0
Include defaults for all the missing Monitor Columns
2018-11-07 13:18:53 -05:00
Isaac Connor
702143e51b
Create a function called getBodyTopHTML that outputs the body tag and anything else that should go at the top.
...
Things like the we require javascript message, and any other messages like error messages.
Use this on the monitor and console view to stick an error message at the top when saving a monitor fails.
This is a pretty quick, crude implementation.
2018-11-07 12:33:54 -05:00
Isaac Connor
a066968aca
fix dbError and cause it to return the error string instead of just logging it. Add error logging of db errors that don't throw exceptions.
2018-11-07 12:33:18 -05:00
Isaac Connor
eb6d978927
Merge branch 'master' into storageareas
2018-10-31 14:47:43 -04:00
Isaac Connor
bdb50567df
fix disk_event_space to event_disk_space
2018-10-31 11:56:08 -04:00
Isaac Connor
461ce3c1f8
Merge branch 'master' into storageareas
2018-10-29 12:52:06 -04:00
Isaac Connor
6691b5fb52
Include CORS headers when there is a Server defined, instead of requiring there to be more than 1
2018-10-29 12:50:50 -04:00
Isaac Connor
95a6d0666a
Improve behaviour and reduce extra logging when db goes away
2018-10-29 09:59:26 -04:00
Isaac Connor
91d83a89fa
include semaphore function replacements
2018-10-25 15:40:12 -04:00
Isaac Connor
d025adab6d
Need to load Config Categories in options save
2018-10-25 09:13:07 -04:00
Isaac Connor
875bc3caf9
Merge branch 'master' into storageareas
2018-10-24 10:17:27 -04:00
Isaac Connor
ca8770bd5a
Merge branch 'fix_rce' into storageareas
2018-10-24 10:17:16 -04:00
Isaac Connor
115141bf9f
add caching to Group::find
2018-10-24 10:02:42 -04:00
Isaac Connor
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
Isaac Connor
c47b4a5a04
Merge branch 'improve_config_efficiency' into storageareas
2018-10-19 15:03:00 -04:00
Isaac Connor
e30b100e8e
Don't load & process categories in initial config loading
2018-10-19 15:00:30 -04:00
Isaac Connor
17a5519dd6
Include the remoteAddr in the session authhash cache, so that a change of ip won't allow the same useless auth hash. ( #2264 )
2018-10-19 13:39:37 -04:00
Isaac Connor
98579fc02a
Merge branch 'master' into storageareas
2018-10-19 11:27:43 -04:00
Isaac Connor
f9b1453705
Include SERVER_PORT when not doing multi-server or multi-port but are running on a port other than 80.
2018-10-19 10:59:16 -04:00
Isaac Connor
c2af380e29
Merge branch 'master' into storageareas
2018-10-16 11:39:26 -04:00
Isaac Connor
37065d15ac
fix url to api in monitor restart.
2018-10-16 09:47:24 -04:00
Isaac Connor
7149576a7c
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 10:59:50 -04:00
Isaac Connor
f2b38f175d
Update Frame::find_one so that we can specify an ordering for find_one and so that semantics match other objects find methods
2018-10-11 09:14:40 -04:00
Isaac Connor
c4c8a728f2
Handle no controls found more gracefully
2018-10-10 19:04:00 -04:00
Isaac Connor
2881d2af3f
Merge branch 'master' into storageareas
2018-10-10 14:13:27 -04:00
Isaac Connor
6ed146b4dd
Use Hostname instead of Url in test for CORS access.
2018-10-10 14:01:36 -04:00
Isaac Connor
e268264761
Merge branch 'cleanup_auth' into storageareas
2018-10-09 10:24:32 -04:00
Isaac Connor
1958351a13
Merge branch 'master' into storageareas
2018-10-09 10:24:24 -04:00
Isaac Connor
cbc26e0cec
cleanup trailing whitespace
2018-10-09 10:07:40 -04:00
Isaac Connor
a3d0cb42ea
Move GOOGLE RECAPCHA to includes/auth.php, clean login actions.
2018-10-09 10:05:50 -04:00
Isaac Connor
918d5fd469
move utility functions for doing get/post requests into functions.php from actions.php
2018-10-09 09:39:04 -04:00
Isaac Connor
52b1439d51
fix the lack of /zm/index.php in url in Server->Url() and multiport
2018-10-08 09:55:47 -04:00
Isaac Connor
1eb8e9ed9e
Include PHP_SELF in url to Server. This will assume that all servers in a multi-server setup use the same path
2018-10-08 09:45:03 -04:00
Isaac Connor
5dba17e1fc
Merge branch 'master' into storageareas
2018-09-21 10:50:10 -04:00
Isaac Connor
999e4c6c43
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-20 13:37:46 -04:00
Isaac Connor
90d1d79e9a
Add missing AutoUpload field to Filter
2018-09-20 13:37:36 -04:00
Isaac Connor
7fe2749de6
Merge branch 'master' into storageareas
2018-09-20 10:58:36 -04:00
Isaac Connor
ba4878d2b5
fix use of instead of ['limit']
2018-09-20 10:11:55 -04:00
Isaac Connor
503b40cb62
Need to cache the object not the row
2018-09-20 10:07:15 -04:00
Isaac Connor
520d1bb7bf
Merge branch 'master' into storageareas
2018-09-20 09:08:29 -04:00
Isaac Connor
c6e953c4a9
if Monitor is not found, return empty Monitor instead of null
2018-09-20 09:02:20 -04:00
Isaac Connor
c4108a2610
Fix missing quotes inc Event::Monitor
2018-09-20 08:59:15 -04:00
Isaac Connor
7f98277571
Merge updated Monitor.php that does caching
2018-09-15 09:52:08 -04:00
Isaac Connor
b0c555599c
Merge updated objects from sa. Implements caching of objects and fixes logged errors when using the default storage group. Fixes #2209
2018-09-15 09:42:59 -04:00
Isaac Connor
5dc852132e
Add defaults to Server, getting rid of error log when loading the default non existent storage area
2018-09-15 09:39:40 -04:00
Isaac Connor
246b50be9c
add caching to Server
2018-09-15 09:39:04 -04:00
Isaac Connor
02403c4c30
add caching to Monitor
2018-09-15 09:38:52 -04:00
Isaac Connor
27bc9d0a50
fix $limit should be $options['limit']
2018-09-15 09:38:36 -04:00
Isaac Connor
1db59283e3
use find_one when loading Monitor to take advantage of caching
2018-09-15 09:38:09 -04:00
Isaac Connor
2b66b28689
fix $limit should be $options['limit']
2018-09-15 09:37:44 -04:00
Isaac Connor
fa55cec12c
fix error when scale is auto
2018-09-14 16:57:28 -04:00
Isaac Connor
77edb8f74b
Add test for auto scale and don't rescale. Use find_one when loading StorageArea so as to use caching
2018-09-14 16:19:29 -04:00
Isaac Connor
34c7ee32ee
Merge branch 'master' into storageareas
2018-09-14 15:13:57 -04:00
Isaac Connor
f1442eba90
once we have found a match for our origin, break out of loop
2018-09-14 14:56:26 -04:00
Isaac Connor
d9b1d3ec11
fix CORS Headers when we are coming from a non-standard port. Use a regexp instead of == so that we match regardless of port
2018-09-14 14:52:33 -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
Isaac Connor
03f769eacc
Rough in codec specification for Events
2018-09-10 12:22:55 -04:00
Isaac Connor
5eec7e00c5
Merge branch 'master' into storageareas
2018-09-09 14:09:52 -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
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
Isaac Connor
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
Isaac Connor
c9b4f14171
fix deleting events
2018-09-04 09:57:32 -04:00
Isaac Connor
2858564155
Merge branch 'master' into storageareas
2018-08-31 16:06:13 -04:00
Isaac Connor
7ee80e7cca
Debug lines should be debug, not warning
2018-08-31 11:58:03 -04:00
Isaac Connor
4b30ea7877
cleanup, whitespace
2018-08-31 10:35:23 -04:00
Isaac Connor
4e32089a48
Merge branch 'master' into storageareas
2018-08-30 14:51:27 -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
4be2a0501c
Merge branch 'master' into storageareas
2018-08-22 17:22:54 -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
d768f5f7fc
Merge branch 'master' into storageareas
2018-08-13 15:35:55 -04:00
Isaac Connor
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
.
2018-08-13 15:33:43 -04:00
Isaac Connor
026390ccd8
Merge branch 'master' into storageareas
2018-08-13 15:26:29 -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
3ab542199c
Merge branch 'master' into storageareas
2018-08-13 11:17:04 -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
683789eb41
Merge branch 'master' into storageareas
2018-08-03 10:27:48 -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
c934295bf9
we shall always pass width & height as pixels without units.
2018-07-31 16:55:13 -04:00
Isaac Connor
d50e95fe9b
redirect to montage instead of montagereview
2018-07-31 16:46:36 -04:00
Isaac Connor
588ca2cf62
Merge branch 'master' into storageareas
2018-07-31 10:52:24 -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
a12c7d90ab
Merge branch 'master' into add_export_to_filter
2018-07-17 08:26:58 -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
95e4341d28
test for existence of DiskSpace in array
2018-07-12 14:05:43 -04:00
Isaac Connor
4aa289cd66
fix reCaptcha failure still allowing login
2018-07-12 11:44:20 -04: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
05615c5cf4
We should not use a hard path in cache bust
2018-07-11 15:48:01 -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
3ecf0055b5
spacing
2018-07-09 13:07:16 -04:00
Isaac Connor
7ef43a0684
Merge ../ZoneMinder.master into server_path_prefix
2018-07-09 12:10:48 -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
cf4a1c73fd
Always us /zm in cache_bust
2018-07-04 14:46:22 -04:00
Isaac Connor
d271d8bf1d
Fix my botched change to generateAuthHash
2018-06-25 14:50:54 -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
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
Andrew Bauer
3ffd30ffbd
Allow selection of different source column filtering on the console ( #2132 )
2018-06-20 11:12:43 -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
9050ffaf92
spacing, remove some debug lines
2018-06-06 12:57:35 -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
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
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
63e6cb1d62
remove parenthesis that confuse older php
2018-05-14 13:56:55 -04:00
Isaac Connor
47ba435471
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-12 19:44:40 -04:00
Isaac Connor
b20cb5d0ae
Add all the other Event columns to fields
2018-05-11 10:36:14 -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
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
da7c953e3d
adda blank line
2018-05-07 14:08:32 -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
5772ff9161
return default values for Width and Height
2018-05-05 12:49:00 -04:00
Isaac Connor
3fd953a4eb
Move code to generate Source from console into Monitor Object
2018-05-04 06:46:46 -07:00
Isaac Connor
769d4a8693
DB connect can die, so put it in an eval
2018-05-03 09:50:54 -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
Isaac Connor
bbe0025641
correct sort order default
2018-05-01 09:43:09 -04:00
Isaac Connor
3bb1a5b544
Whitespace
2018-04-30 13:02:53 -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
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
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
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -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
fac3cde1e7
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-20 15:23:23 -04:00
Isaac Connor
3ea39ad417
whitespace
2018-04-20 15:22:45 -04:00
Isaac Connor
ac775f13f6
always return an array from find_all
2018-04-20 14:23:27 -04:00
Isaac Connor
9de3c44702
Add find_one and caching
2018-04-20 14:23:04 -04:00
Andrew Bauer
3c225c9f1c
Migrate Webcache out of webroot ( #2083 )
...
* migrate webcache folder out of webroot, migrate htaccess files
* rpm specfile - add missing reference to cache folder
* fix submodule mixup
2018-04-19 15:01:46 -04:00
Isaac Connor
bbee7fd0f2
fix array_key_exists
2018-04-18 14:17:41 -07:00
Isaac Connor
75248e7465
use array_key_exists instead of isset so that we can return nulls
2018-04-18 14:21:27 -04:00
Isaac Connor
88a2c0d953
spacing
2018-04-18 12:30:32 -04:00
Isaac Connor
940c791d4f
GroupIds won't be set if no groups are selected
2018-04-18 12:14:49 -04:00
Isaac Connor
e3afa5e309
handle scale not being defined when using mpeg streaming
2018-04-18 11:28:19 -04:00
Isaac Connor
f620781f7e
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-17 21:07:00 -04:00
Isaac Connor
aaa7844350
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-17 14:18:01 -07:00
Isaac Connor
10a191ae5b
add event_disk_space to storage to differentiate between real used space versus event used disk space. Use this in the navbar to show actual disk use and also event disk use
2018-04-17 14:14:40 -07:00
Isaac Connor
fd1c69d48a
switch to uint64_t for event_id because long long can actually be 128 bit
2018-04-17 13:51:20 -04:00
Isaac Connor
c043a157ad
spacing and add Server function
2018-04-17 12:37:30 -04:00
Isaac Connor
92c8b9038c
fix to group caching and group deleting
2018-04-17 12:36:35 -04:00
Isaac Connor
196b8c52dc
Apply multiport to event viewing as well
2018-04-17 12:35:59 -04:00
Isaac Connor
ef70ff86e9
cleanup zmaControl
2018-04-17 11:36:14 -04:00
Isaac Connor
2860e067bc
Fix caching when an array is passed to new
2018-04-15 10:26:57 -04:00
Isaac Connor
bef7098cb4
Fix Event->Storage()
2018-04-15 10:26:38 -04:00
Isaac Connor
998d60a4b2
whitespace
2018-04-14 22:26:57 -04:00
Isaac Connor
ce5e484f2a
Work harder to ensure we return a Storage object
2018-04-14 21:50:27 -04:00
Isaac Connor
0b0fbae1c5
Add output of paused image when paused
2018-04-12 18:43:57 -04:00
Isaac Connor
47b871ed9f
implement MIN_STREAMING_PORT for Multi-server
2018-04-11 13:50:35 -07:00
Isaac Connor
03ff2fcde4
add caching and find_one to Storage and Groups
2018-04-10 13:05:37 -07:00
Isaac Connor
74fb8db5e2
make configvals global
2018-04-06 14:52:39 -04:00
Isaac Connor
530ac15344
remove csrf_startup
2018-04-06 14:46:33 -04:00
Isaac Connor
7076ff1b1b
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-06 14:42:30 -04:00
Isaac Connor
53ce8c008a
move auth functions into it's own file
2018-04-06 14:36:23 -04:00
Isaac Connor
7b23ef80a4
blah
2018-04-06 14:31:11 -04:00
Mike Brown
c4a00e0657
changing the querySep in Event.php to allow gapless playback
2018-04-05 20:42:15 -05:00
Isaac Connor
140f11fd58
fix clearing groups
2018-04-05 13:10:25 -04:00
Isaac Connor
2a000cb5f8
fix clearing groups
2018-04-05 13:09:14 -04:00
Isaac Connor
6faf9b5c35
fix including auth on remote restart
2018-04-05 11:24:47 -04:00
Isaac Connor
1033755dc8
add missing {
2018-04-04 16:46:38 -04:00
Isaac Connor
6ebedff2e1
If using MIN_STREAMING_PORT then use ['SERVER_NAME'] instead of HTTP_HOST because HTTP_HOST may contain a custom port
2018-04-04 16:45:25 -04:00
Isaac Connor
48ff480907
whitespace
2018-04-03 10:36:14 -07:00
Isaac Connor
b26707b647
fix resetting DiskSpace
2018-04-03 09:57:14 -07:00
Isaac Connor
793f630ee0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-02 10:43:07 -07:00
Isaac Connor
df3a5b7d58
must reopen the session before destorying it
2018-03-29 19:19:08 -04:00
Isaac Connor
3fe5bb6fe2
open and close the session around user login
2018-03-29 11:30:20 -04:00
Isaac Connor
f8457e04e2
clean out commented out code
2018-03-29 11:30:09 -04:00
Isaac Connor
914de097db
Fix typo
2018-03-23 13:34:46 -07:00
Isaac Connor
61d438511f
Fixes to delete
2018-03-21 11:32:54 -07:00
Isaac Connor
a037974e26
Fix automatic server selection
2018-03-21 11:25:42 -07:00
Isaac Connor
f64ef370c9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-20 12:18:42 -07:00
Isaac Connor
eade5316b9
Move Monitor delete logic to the object. Don't fixSequences when deleting monitors
2018-03-20 12:18:07 -07:00
Isaac Connor
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
Andrew Bauer
16a2c173cb
fix Column 'Method' cannot be null
2018-03-10 20:29:25 -06:00
Andrew Bauer
0df59c26b8
fix typo
...
Fix unable to enable camera
2018-03-10 19:48:53 -06:00
Andrew Bauer
ed4dac761a
Merge pull request #2049 from ZoneMinder/fix_2044
...
Fix 2044
2018-03-03 12:49:57 -06:00
Isaac Connor
3fc7ebee6c
Merge ../ZoneMinder.master into storageareas
2018-03-03 09:32:23 -08:00
Isaac Connor
2864876d28
fix spacing, add code comment
2018-03-03 09:25:04 -08:00
Isaac Connor
9a157bf4ca
add Type, MaxFPS, AlarmMaxFPS to field defaults
2018-03-01 19:23:27 -08:00
Isaac Connor
debe4607bc
add Parent and Parents functions
2018-03-01 19:23:03 -08:00
Isaac Connor
0312dc3c2d
Add Group saving to Monitor saving
2018-02-27 11:20:52 -08:00
Isaac Connor
67cc7dcf7c
Add a GroupIds function to return the groups
2018-02-27 11:20:41 -08:00
Isaac Connor
735e36c2a8
split htmlSelect into htmlOptions
2018-02-26 17:08:30 -08:00
Isaac Connor
944298428a
break out get_groups_dropdown to call a function called get_dropdown_options to populate thje options
2018-02-26 16:10:10 -08:00
Isaac Connor
bfbefc4c32
Use our new Control object to do the saving instead of a generic function
2018-02-26 07:31:48 -08:00
Isaac Connor
c6f632325e
create an object for Controls entries, with appropriate defaults
2018-02-26 07:31:22 -08:00
Isaac Connor
464b588f08
add a case for toggle, which are booleans and default them to false
2018-02-26 07:29:49 -08:00
Isaac Connor
9480adcc31
include authentication info when building the link to mp4
2018-02-22 13:05:53 -05:00
Isaac Connor
c5081d1e4e
drop session before executing filter
2018-02-21 13:54:06 -05:00
Isaac Connor
7d88e25ef9
simplify thumbnail/snapshot usage a bit
2018-02-19 17:25:49 -05:00
Isaac Connor
505e726636
turn off debug
2018-02-14 13:51:49 -05:00
Isaac Connor
a09bf3b097
slightly improve auth debugging
2018-02-14 11:58:00 -05:00
Isaac Connor
9fa28106e5
return proper hostname when not using multiple servers
2018-02-12 14:44:58 -05:00
Isaac Connor
6b6fdc7cee
Log the sql before running it
2018-02-09 07:29:10 -08:00
Isaac Connor
93996402d9
turn off debug
2018-02-02 13:24:07 -05:00
Isaac Connor
b0f755b5fc
put unarchive, archive, delete in a transaction for speed
2018-02-02 12:14:01 -05:00
Isaac Connor
68521aa0d4
spacing, remove debug lines
2018-02-02 10:27:50 -05:00
Isaac Connor
929e49c301
early return if there is no rows returned. Improve debug when there is a row but the specified column isn't present
2018-02-02 10:27:30 -05:00
Isaac Connor
212882efb9
db errors should NOT BE FATAL!
2018-02-01 11:31:25 -05:00
Isaac Connor
018523134e
use ZM_BASE_PROTOCOL when loading plugins. https can't load http content
2018-01-31 14:35:23 -05:00
Isaac Connor
31b7deb101
Return NULL on error in dbQuery
2018-01-29 10:41:24 -08:00
Isaac Connor
c9e32fb344
Check for successful Monitor db Insertion
2018-01-29 10:41:09 -08:00
Isaac Connor
e638817cb9
Check for ServerId exists in MonitorObject
2018-01-29 10:40:50 -08:00
Isaac Connor
73d84c6b08
fix typo
2018-01-29 07:53:48 -08:00
Isaac Connor
fc4edefd81
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-29 07:35:24 -08:00
Isaac Connor
8c4a786114
Move status fields out of the object fields
2018-01-29 10:27:46 -05:00
Isaac Connor
2dcb0d183f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-28 18:07:33 -08:00
Isaac Connor
f2b335c7b2
SORT auto server selection in ascending order
2018-01-28 18:07:01 -08:00
Isaac Connor
8a4b17fb50
turn into a url instead of boolean. Use it to refresh the options page on change so that changes are instantly noticable
2018-01-28 15:13:57 -05:00
Isaac Connor
2ea2f46ec8
braes
2018-01-25 09:13:31 -08:00
Isaac Connor
703cd332df
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-25 08:43:53 -08:00
Isaac Connor
356015a492
Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla
2018-01-25 08:42:08 -08:00
Isaac Connor
7165f3cfd8
Add server auto-selection
2018-01-25 08:41:42 -08:00
Isaac Connor
57bae7cf17
Fix filtering
2018-01-25 09:14:09 -05:00
Isaac Connor
fb50f6f996
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-24 17:14:42 -08:00
Isaac Connor
a271f1776d
Fix #80 don't escape NULL value when building SQL
2018-01-24 10:35:22 -05:00
Isaac Connor
9f89ccfa32
revert issue with AUTH_HASH_LOGINS
2018-01-24 07:46:56 -05:00
Isaac Connor
994766fd50
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-22 13:25:38 -08:00
Isaac Connor
97595051ce
whitespace
2018-01-22 11:42:19 -05:00
Isaac Connor
924fa80ea6
When renaming a monitor, take change of storage area into account when creating dirs and symlinks
2018-01-22 11:42:07 -05:00
Isaac
06c9266c62
use snapshot.jpg more
2018-01-22 03:27:01 +01:00
Isaac Connor
9b7fee03c7
Add Server auto-selection
2018-01-19 11:00:46 -08:00
Isaac Connor
773ed11742
use Object methods to restart zmc and zma. restart them on save of existing Monitor
2018-01-19 08:17:53 -08:00
Isaac Connor
d1dbf4cc31
Turn off debug
2018-01-19 08:17:33 -08:00
Isaac Connor
3abd873c34
Turn off debug
2018-01-19 08:17:17 -08:00
Isaac Connor
0f3cf33565
Move unparse_url from add_monitors to functions to make it generally available
2018-01-19 08:16:52 -08:00
Isaac Connor
2720b254ff
Add Triggers to Monitors field to quiet error
2018-01-19 08:16:41 -08:00
Isaac Connor
484a361af8
use Object methods to restart zmc and zma. restart them on save of existing Monitor
2018-01-18 12:40:10 -08:00
Isaac Connor
30b0d2c5b1
Turn off debug
2018-01-18 12:39:50 -08:00
Isaac Connor
c08cbdb9dd
Turn off debug
2018-01-18 12:39:39 -08:00
Isaac Connor
f9d8c349e1
Move unparse_url from add_monitors to functions to make it generally available
2018-01-18 12:39:08 -08:00
Isaac Connor
04eef58883
Add Triggers to Monitors field to quiet error
2018-01-18 12:38:48 -08:00
Isaac Connor
1fbb5bc0f8
Fix zmaudit.pl => zmaudit, etc.
2018-01-17 14:22:04 -05:00
Isaac Connor
fe7c54bc26
Fix Debug
2018-01-16 17:54:37 -05:00
Isaac Connor
a8dde207e1
Warning should be a debug
2018-01-16 12:33:50 -05:00
Isaac Connor
9f42871c86
Fix Zone Triggers, bump version
2018-01-16 11:49:17 -05:00
Isaac Connor
004fdbad9b
We don't need to update ZoneCount manually anymore
2018-01-16 09:31:23 -05:00
Isaac Connor
9284e26512
get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot.
2018-01-13 15:15:14 -05:00
Isaac Connor
4b37c6fc42
Change the Group dropdown to a single indented dropdown, and use chosen on it
2018-01-12 11:25:15 -08:00
Isaac
3c55557c77
Handle to val in a filter term
2018-01-11 22:53:53 +01:00
Isaac Connor
b013da6b95
Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.
2018-01-11 13:14:11 -05:00
Isaac Connor
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05:00
Isaac Connor
74269fea73
make montagereview load event images from the server that the storage is located on
2017-12-22 12:33:30 -08:00
Isaac Connor
0d7fff761c
upgrade find_all to take parameters
2017-12-22 11:38:42 -08:00
Isaac Connor
cc8ed75eb9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-22 09:03:11 -08:00
Isaac Connor
f51259443c
fix disk_used_percentage to use db calculated used size
2017-12-22 09:02:49 -08:00
Isaac
9dfad4886d
fix saving Monitors
2017-12-22 16:13:00 +01:00
Isaac Connor
148e21d707
fugro
2017-12-21 21:46:21 -05:00
Isaac Connor
915ea93348
source remote server when streaming event
2017-12-21 16:53:46 -08:00
Isaac Connor
e9141ca3e8
re-init logger after loading config to actually pick up the appropriate values. This stops the error logging of Info to weblog when weblog is actually set to None. Also update quotes
2017-12-20 10:19:24 -05:00
Isaac Connor
e47c8fad88
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-12-19 11:01:42 -05:00
Isaac Connor
2922a86d23
fixes to new Storage Schemes code
2017-12-19 11:01:03 -05:00
Isaac Connor
5f4b2ca53f
don't close the session when logging in
2017-12-18 14:35:11 -05:00
Isaac Connor
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
Isaac Connor
c93de992c2
add Scheme to the list of fields
2017-12-18 13:04:57 -05:00
Isaac Connor
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
digital-gnome
c0fcfe6eb6
Combine possible sort inputs to one in sortQuery, output limitQuery
2017-12-15 08:47:08 -05:00
Isaac Connor
7d7e73977f
use stored session group
2017-12-13 16:51:56 -05:00
Isaac Connor
abad266c5b
introduce chosen to use it to make the filtering dropdowns awesome
2017-12-13 16:15:03 -05:00
Isaac Connor
e364641d7b
on initial page hit, the cookie might not be set. Use global instead.
2017-12-13 11:21:50 -05:00
Isaac Connor
2643ac9f97
fix a quoting problem that prevented saving config
2017-12-12 11:16:08 -05:00
Isaac Connor
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
Isaac Connor
d741cc1a72
fix saving Groups
2017-12-04 22:02:56 -05:00
digital-gnome
f8d3c07586
Add h264 event view functionality and new feature alarmCues ( #2012 )
...
* Fix nearEventsQuery
Removed dbEscape from getNearEvents previous event because it only returns 0. Now matches next. Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch. Also added start times to allow for videoJS replaymode.
* Unescape filters
Filters need to be unescaped
* Add initial values to page load
* Add replay modes to videojs
* rough in figuring out a frame in between bulk frames
* Add alarmCues
Add a graphical indication of where alarm frames happened in an event. Similar to what zmNinja shows.
* Add remaining buttons to videojs
Functionality for all buttons on videojs streams. FF/RW buttons show as active when they are active.
* Whitespace and fix Bulkframe calcs
* Fix zms events trying to generate with mp4 code
ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed
* ZMS scrub bar
Move zms scrub bar to bottom of image feed. Make it simpler and more like videojs style.
* Wrap event feeds properly
* Fix dvrControls on watch view
* Add scaleToFit
Add a scaleToFit option to event view
* Add navigation for videoJS streams
Disables nav buttons at beginning and end of events. Handles switching from zms to videojs. If zms crashes changes next event function to reload page instead of ajax.
* Add scaleToFit to watch and frame view
Adds scaleToFit to watch view. Since frame view uses the watch cookie this required changes to frame view
* Add transition to zoom
* Change stills view to match stream
Move stills slider bar to match scrub bar on streams. Allow it to resize, make it larger. Add alarmcues.
* Add Stills for every event
Add stills for every event. Match size to stream size
* Progressbox transitions
2017-12-04 21:26:59 -05:00
digital-gnome
fb952179cd
Fix delete filter ( #2010 )
...
Delete filter didn't work because the request does not include 'object'.
2017-12-04 21:26:21 -05:00
Isaac Connor
0171d532fc
fix the test for DB_DEBUG
2017-12-04 16:50:56 -05:00
Isaac Connor
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
Isaac Connor
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
Isaac Connor
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
Isaac Connor
dd3f9492ba
fix dulicate logic
2017-11-26 15:12:35 -05:00
Isaac Connor
b1bb0020d3
turn off database debug
2017-11-24 15:42:44 -05:00
Isaac Connor
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
Isaac Connor
a9f0f3813a
Merge branch 'tesla' into storageareas
2017-11-24 09:31:00 -05:00
Isaac Connor
900fbe1e0f
update save to a button tag, and add a saveas functionality
2017-11-23 08:26:55 -08:00
Isaac Connor
485567349d
Don't calc DiskSpace if it is already defined
2017-11-23 07:29:05 -08:00
Isaac Connor
2a669896c2
Merge branch 'tesla' into storageareas
2017-11-23 08:42:53 -05:00
Isaac Connor
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
Isaac Connor
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
Isaac Connor
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
Isaac Connor
095e1ecadb
remove extra ), add AnalysisFPS and CaptureFPS
2017-11-21 23:58:13 -05:00
Isaac Connor
e2aa278d78
add SaveJPEGs
2017-11-21 23:57:44 -05:00
Isaac Connor
e617ffca2d
can't use BASE_URL since it will be empty. Have to construct a full URL when using MIN_STREAMING_PORT
2017-11-21 21:00:27 -05:00
Isaac Connor
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
Isaac Connor
12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
...
Minor UI fixes
2017-11-20 20:15:32 -05:00
digital-gnome
b655689f47
Fix cache_bust
...
Cache busting was preventing changing css due to leaving symlinks behind. Adding the css name to each symlink prevents the need for a forced refresh since mtime is the same on unchanged files but filename does not change between css sets.
2017-11-20 12:27:20 -05:00
digital-gnome
d8af654338
Fix dvrControls on watch view
2017-11-18 14:05:11 -05:00
Isaac Connor
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -05:00
Isaac Connor
821717b06e
turn off debug
2017-11-08 11:26:13 -05:00
Isaac Connor
59a87c14d3
fix error message
2017-11-08 11:17:46 -05:00
Isaac Connor
625170bffc
fix getVideoStream to getVideoStreamHTML. Change how scaling works
2017-11-08 11:17:30 -05:00
Isaac Connor
bef7c0ed94
Only start a monitor if it has a Function
2017-11-05 11:54:00 -05:00
Isaac Connor
63c788ef0e
handle when sql error occurs and no params given
2017-11-03 15:45:11 -04:00
Isaac Connor
f39353a4a3
add missing breaks
2017-11-03 15:44:53 -04:00
Isaac Connor
0ef5c16bcc
when doing parseSort, reset the sortfield to StartTime instead of DateTime
2017-11-03 15:07:04 -04:00
Isaac Connor
67bb8c302f
add missing /
2017-11-03 10:00:29 -04:00
Isaac Connor
4ef28bb30d
don't put the leading / in the cache link
2017-11-03 09:22:43 -04:00
Isaac Connor
96e0959c35
clear the cookie for zmMontageLayout
2017-11-01 13:07:35 -04:00
Isaac Connor
0af389c984
populate the Id of the layout when inserting it
2017-11-01 13:07:24 -04:00
Isaac Connor
d4080dcdbd
when saving a new layout, auto-select it
2017-11-01 12:19:27 -04:00
Isaac Connor
a9d4dfac45
fix the file extension so that mime type works better
2017-11-01 11:52:32 -04:00
Isaac Connor
e6918cd1bd
implement crude cache busting code for .js and .css files
2017-11-01 09:41:19 -04:00
Isaac Connor
b5491102ef
Fix saving MontageLayouts
2017-10-30 20:21:16 -04:00
Isaac Connor
ce6cc24de5
turn off debug
2017-10-30 20:20:40 -04:00
Isaac Connor
1694eeb436
debugging and code simplification
2017-10-30 16:29:27 -04:00
Isaac Connor
97757ba6cd
add Inserting when saving
2017-10-30 16:29:13 -04:00
Isaac Connor
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
Isaac Connor
8312bf52a4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-10-30 08:37:54 -04:00
Isaac Connor
71222d7f2f
rework how montage layouts are done, pull from db now
2017-10-27 12:06:26 -07:00
Isaac Connor
71c8562b46
Rough in a MontageLayout class
2017-10-27 10:01:16 -07:00
Isaac Connor
82fbec697f
add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid
2017-10-27 08:37:53 -07:00
Isaac Connor
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
Isaac Connor
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
Isaac Connor
b6dde354be
rename AnalysisFPS to AnalysisFPSLimit
2017-10-24 17:34:32 -07:00
Isaac Connor
b5e59efda5
improve updating diskSpace entries
2017-10-23 17:02:04 -07:00
Isaac Connor
d2c8a0240a
add a monitors view which is for editing function/enabled/server/storage of multiple monitors
2017-10-23 17:01:43 -07:00
Isaac Connor
ced5015a83
move zmcControl and zmaControl to the Monitor Object
2017-10-23 17:00:59 -07:00
Isaac Connor
df8fbaccea
Fixes
2017-10-23 11:50:45 -07:00
Isaac Connor
f99e404730
update the total_disk_space function to do and sql sum on the events that already have a space assigned and only update ones that don't. This reduces ram requirements.
2017-10-23 11:02:36 -07:00
Isaac Connor
ed9da696b3
Rough in save functionality into Event.
2017-10-23 10:53:58 -07:00
Isaac Connor
6fba9fa65a
google code style and quotes
2017-10-20 14:54:28 -04:00
Isaac Connor
cf2eace2c7
improve htmlSelect and add Storage and Server filters to console
2017-10-19 09:50:07 -04:00
Isaac Connor
32ba53cf1b
turn off database debugging
2017-10-18 16:37:45 -04:00
Isaac Connor
ba4e5572d6
add setting of values to anonymouse member function
2017-10-17 10:09:14 -07:00
Isaac Connor
6bf9e28a1e
fix use of api when auth not in use and actually specify which monitor to restart
2017-10-16 10:00:41 -07:00
Isaac Connor
b96b2636bb
add the update to add Type to Storage
2017-10-12 07:50:43 -07:00
Isaac Connor
8abb8a9259
add Type to Storage
2017-10-12 07:32:48 -07:00
Isaac Connor
3f01f887aa
only count event size when s3
2017-10-11 14:10:53 -04:00
Isaac Connor
e845af94cc
include params when blowing up a dbQuery
2017-10-11 14:06:18 -04:00
Isaac Connor
a286b60150
use already loaded Storage object when lading events
2017-10-10 12:39:53 -07:00
Isaac Connor
67cb3a7d3c
better human_filesize function
2017-10-10 12:39:36 -07:00
Isaac Connor
aaffe475d8
turn off debug
2017-10-10 12:39:23 -07:00
Isaac Connor
26699953bb
allow setting Storage object in the Event object so as not to go back to db for it. Fix null test in DiskSpace
2017-10-10 12:39:14 -07:00
Isaac Connor
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
Isaac Connor
ffc1ac43f5
put back disk space in header, more debug in caching storagea
2017-10-10 14:06:21 -04:00
Isaac Connor
a9d3be549f
try caching storage
2017-10-10 10:39:17 -07:00
Isaac Connor
76d37d4c95
update db record when we findout the disk space of an event
2017-10-10 13:02:26 -04:00
Isaac Connor
7f73f0bf8c
do a backtrace when we ca;; generateAuthHash without open session
2017-10-10 11:51:35 -04:00
Isaac Connor
d0f0ab1afe
refreshparent when saving group
2017-10-10 11:51:11 -04:00
Isaac Connor
3af795264d
add actual disk space as a mouseover in nav bar
2017-10-10 10:38:13 -04:00
Isaac Connor
8da7d845b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-10 09:37:23 -04:00
Isaac Connor
c654d008f0
add monitor selector to montagereview and montage.
2017-10-10 09:36:56 -04:00
Andrew Bauer
e825e5d61e
initial commit to change color of web console systemstats ( #1981 )
...
* initial commit to change color of web console systemstats
* use css classes
2017-10-07 18:42:39 -04:00
Isaac Connor
d0541b0837
Merge pull request #27 from digital-gnome/eventnavFix
...
Fix nearevents path
2017-10-07 12:49:50 -04:00
digital-gnome
e23b4a0d5d
Fix event path
2017-10-07 12:42:16 -04:00
Isaac Connor
f230aa01ef
turn off debug
2017-10-07 11:31:48 -04:00
Isaac Connor
09242d72b3
implement alternate ports for streaming
2017-10-05 16:05:41 -04:00
Isaac Connor
40972383c1
remove debug
2017-10-05 10:48:04 -04:00
Isaac Connor
b56a976d7a
fixes to montage review and cleanup in group filtering/editing
2017-10-05 10:46:04 -04:00
Isaac Connor
87a49ad009
work on infinite depths of groups
2017-10-04 16:40:09 -04:00
Isaac Connor
b5a5f45e04
turn off debug
2017-10-02 10:06:07 -04:00
Isaac Connor
4be133ed09
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
2017-09-30 14:19:32 -04:00
Steve Gilvarry
9c40f65757
Fix user language setting never being used
...
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858675 pointed here
https://forums.zoneminder.com/viewtopic.php?t=19403
Checked and sure enough was still there not pointing to the lang folder.
2017-09-29 11:20:20 +10:00
Isaac Connor
35482ba53c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-26 16:13:51 -04:00
Isaac Connor
aada54769f
add a Group object
2017-09-23 13:42:39 -04:00
Isaac Connor
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
Isaac Connor
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
Isaac Connor
9b95259567
fix deleting monitor, but passing an event Id to deleteEvent instead of a hash consisting of just the Id
2017-08-22 09:33:51 -04:00
Isaac Connor
f01adc6be5
fixes
2017-08-17 10:18:51 -04:00
Isaac Connor
f573158fbb
fix breakage caused by empty SSL_CERT options
2017-08-15 19:40:02 -04:00
Isaac Connor
adab628af9
fix video speed, various other
2017-08-14 18:22:52 -04:00
Isaac Connor
b6965a2c3f
fix spacing/braces
2017-08-14 11:38:21 -04:00
Isaac Connor
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
ralimi
ecb7df0e8b
Support SSL for mysql connections ( #1965 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
Isaac Connor
b9addeecfd
update deleting the events when deleting a monitor
2017-08-08 15:02:40 -04:00
Isaac Connor
792d8640c2
use the analyze file if exists as thumbnail
2017-07-28 09:54:33 -04:00
Isaac Connor
63e974192c
handle case when no filter is specified
2017-07-13 14:57:27 -04:00
Isaac Connor
fed4dae7e5
fix width and height in options
2017-07-11 19:13:29 -04:00
Isaac Connor
c372787882
fix typo
2017-07-06 10:50:56 -04:00
Isaac Connor
874dc79948
tell eventdetail popup to close on save
2017-07-06 10:48:33 -04:00
Isaac Connor
9b4fb05d5b
Fix parseFilter because terms is now under Query
2017-07-06 10:47:47 -04:00
Isaac Connor
a263de144b
fixup defaults for Filter
2017-06-29 15:00:17 -04:00
Isaac Connor
621d2e0e41
remove debug code
2017-06-28 15:18:12 -04:00
Isaac Connor
8b1459a510
fixes for cambozola on ie, and fixes to setting fixed widths
2017-06-28 15:17:55 -04:00
Isaac Connor
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
Isaac Connor
b5565bb16a
fix filters, refreshparent in wrong block
2017-06-23 09:04:46 -04:00
Isaac Connor
375e4a3e9c
More filter UI fixes
2017-06-20 10:45:16 -04:00
Isaac Connor
93f81daa8d
Fix saving logic
2017-06-20 09:08:25 -04:00
Isaac Connor
dc96ca72a8
Fix AutoDetail=>AutoDelete, add Id to defaults and remove debugging
2017-06-20 09:08:15 -04:00
Isaac Connor
965b306ebc
continue redoing filters
2017-06-19 13:24:02 -04:00
Isaac Connor
1d9e0b7d69
fix saving filters
2017-06-19 10:18:44 -04:00
Isaac Connor
75c11431e6
deprecate filtersavepopup
2017-06-16 11:10:25 -04:00
Isaac Connor
3225891843
update/fix filter behaviour
2017-06-15 15:45:43 -04:00
Isaac Connor
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
Andrew Bauer
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
Andrew Bauer
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
Isaac Connor
528582fec6
fix tabs
2017-06-09 10:36:38 -04:00
Isaac Connor
1788aabb6c
Merge branch 'storageareas' into move_dirs
2017-06-09 10:35:58 -04:00
Isaac Connor
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
Isaac Connor
2c1f576da4
Don't need to check for values in args, beacuse we set one above
2017-06-08 14:01:44 -04:00
Isaac Connor
405078686a
update getStreamSrc to take a hash instead of an array of thing=thing
2017-06-08 14:01:22 -04:00
Isaac Connor
01717a5c14
Merge branch 'master' into filter_by_runstate
2017-06-06 20:34:47 -04:00
Isaac Connor
d524f98d43
add find_all function
2017-06-06 20:29:17 -04:00
Andrew Bauer
2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
Isaac Connor
ad4264dad7
spacing
2017-06-05 15:21:27 -04:00
Isaac Connor
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
Isaac Connor
a1af422d29
the [filter][terms] etc part needs to be urlencoded as well. Becase [] are not valid in urls.
2017-06-01 09:35:38 -04:00
Isaac Connor
4889f3d0e8
rework logic in GetStreamImg a bit. If no frame is specified, then we can use snapshot...otherwise it should do the frame image!
2017-05-31 20:54:34 -04:00
Isaac Connor
b6ed806d6c
braces and comments
2017-05-30 13:51:00 -04:00
Isaac Connor
8b3b9eb30e
more merges/fixes from SA
2017-05-30 13:47:30 -04:00
Isaac Connor
1a43334113
Use NULLs instead of '' when saving things
2017-05-30 13:38:57 -04:00
Isaac Connor
e9a0474cf7
add back required lines with a comment
2017-05-30 12:04:12 -04:00
Isaac Connor
8a732dff8a
add back required lines with a comment
2017-05-30 12:03:31 -04:00
Isaac Connor
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -04:00
Isaac Connor
c5288a172d
fix merge problem
2017-05-30 11:57:20 -04:00