9de3c44702
Add find_one and caching
2018-04-20 14:23:04 -04:00
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
bbee7fd0f2
fix array_key_exists
2018-04-18 14:17:41 -07:00
75248e7465
use array_key_exists instead of isset so that we can return nulls
2018-04-18 14:21:27 -04:00
88a2c0d953
spacing
2018-04-18 12:30:32 -04:00
940c791d4f
GroupIds won't be set if no groups are selected
2018-04-18 12:14:49 -04:00
e3afa5e309
handle scale not being defined when using mpeg streaming
2018-04-18 11:28:19 -04:00
f620781f7e
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-17 21:07:00 -04:00
aaa7844350
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-17 14:18:01 -07:00
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
fd1c69d48a
switch to uint64_t for event_id because long long can actually be 128 bit
2018-04-17 13:51:20 -04:00
c043a157ad
spacing and add Server function
2018-04-17 12:37:30 -04:00
92c8b9038c
fix to group caching and group deleting
2018-04-17 12:36:35 -04:00
196b8c52dc
Apply multiport to event viewing as well
2018-04-17 12:35:59 -04:00
ef70ff86e9
cleanup zmaControl
2018-04-17 11:36:14 -04:00
2860e067bc
Fix caching when an array is passed to new
2018-04-15 10:26:57 -04:00
bef7098cb4
Fix Event->Storage()
2018-04-15 10:26:38 -04:00
998d60a4b2
whitespace
2018-04-14 22:26:57 -04:00
ce5e484f2a
Work harder to ensure we return a Storage object
2018-04-14 21:50:27 -04:00
0b0fbae1c5
Add output of paused image when paused
2018-04-12 18:43:57 -04:00
47b871ed9f
implement MIN_STREAMING_PORT for Multi-server
2018-04-11 13:50:35 -07:00
03ff2fcde4
add caching and find_one to Storage and Groups
2018-04-10 13:05:37 -07:00
74fb8db5e2
make configvals global
2018-04-06 14:52:39 -04:00
530ac15344
remove csrf_startup
2018-04-06 14:46:33 -04:00
7076ff1b1b
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-06 14:42:30 -04:00
53ce8c008a
move auth functions into it's own file
2018-04-06 14:36:23 -04:00
7b23ef80a4
blah
2018-04-06 14:31:11 -04:00
c4a00e0657
changing the querySep in Event.php to allow gapless playback
2018-04-05 20:42:15 -05:00
140f11fd58
fix clearing groups
2018-04-05 13:10:25 -04:00
2a000cb5f8
fix clearing groups
2018-04-05 13:09:14 -04:00
6faf9b5c35
fix including auth on remote restart
2018-04-05 11:24:47 -04:00
1033755dc8
add missing {
2018-04-04 16:46:38 -04:00
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
48ff480907
whitespace
2018-04-03 10:36:14 -07:00
b26707b647
fix resetting DiskSpace
2018-04-03 09:57:14 -07:00
793f630ee0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-02 10:43:07 -07:00
df3a5b7d58
must reopen the session before destorying it
2018-03-29 19:19:08 -04:00
3fe5bb6fe2
open and close the session around user login
2018-03-29 11:30:20 -04:00
f8457e04e2
clean out commented out code
2018-03-29 11:30:09 -04:00
914de097db
Fix typo
2018-03-23 13:34:46 -07:00
61d438511f
Fixes to delete
2018-03-21 11:32:54 -07:00
a037974e26
Fix automatic server selection
2018-03-21 11:25:42 -07:00
f64ef370c9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-20 12:18:42 -07:00
eade5316b9
Move Monitor delete logic to the object. Don't fixSequences when deleting monitors
2018-03-20 12:18:07 -07:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
16a2c173cb
fix Column 'Method' cannot be null
2018-03-10 20:29:25 -06:00
0df59c26b8
fix typo
...
Fix unable to enable camera
2018-03-10 19:48:53 -06:00
ed4dac761a
Merge pull request #2049 from ZoneMinder/fix_2044
...
Fix 2044
2018-03-03 12:49:57 -06:00
3fc7ebee6c
Merge ../ZoneMinder.master into storageareas
2018-03-03 09:32:23 -08:00
2864876d28
fix spacing, add code comment
2018-03-03 09:25:04 -08:00
9a157bf4ca
add Type, MaxFPS, AlarmMaxFPS to field defaults
2018-03-01 19:23:27 -08:00
debe4607bc
add Parent and Parents functions
2018-03-01 19:23:03 -08:00
0312dc3c2d
Add Group saving to Monitor saving
2018-02-27 11:20:52 -08:00
67cc7dcf7c
Add a GroupIds function to return the groups
2018-02-27 11:20:41 -08:00
735e36c2a8
split htmlSelect into htmlOptions
2018-02-26 17:08:30 -08:00
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
bfbefc4c32
Use our new Control object to do the saving instead of a generic function
2018-02-26 07:31:48 -08:00
c6f632325e
create an object for Controls entries, with appropriate defaults
2018-02-26 07:31:22 -08:00
464b588f08
add a case for toggle, which are booleans and default them to false
2018-02-26 07:29:49 -08:00
9480adcc31
include authentication info when building the link to mp4
2018-02-22 13:05:53 -05:00
c5081d1e4e
drop session before executing filter
2018-02-21 13:54:06 -05:00
7d88e25ef9
simplify thumbnail/snapshot usage a bit
2018-02-19 17:25:49 -05:00
505e726636
turn off debug
2018-02-14 13:51:49 -05:00
a09bf3b097
slightly improve auth debugging
2018-02-14 11:58:00 -05:00
9fa28106e5
return proper hostname when not using multiple servers
2018-02-12 14:44:58 -05:00
6b6fdc7cee
Log the sql before running it
2018-02-09 07:29:10 -08:00
93996402d9
turn off debug
2018-02-02 13:24:07 -05:00
b0f755b5fc
put unarchive, archive, delete in a transaction for speed
2018-02-02 12:14:01 -05:00
68521aa0d4
spacing, remove debug lines
2018-02-02 10:27:50 -05:00
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
212882efb9
db errors should NOT BE FATAL!
2018-02-01 11:31:25 -05:00
018523134e
use ZM_BASE_PROTOCOL when loading plugins. https can't load http content
2018-01-31 14:35:23 -05:00
31b7deb101
Return NULL on error in dbQuery
2018-01-29 10:41:24 -08:00
c9e32fb344
Check for successful Monitor db Insertion
2018-01-29 10:41:09 -08:00
e638817cb9
Check for ServerId exists in MonitorObject
2018-01-29 10:40:50 -08:00
73d84c6b08
fix typo
2018-01-29 07:53:48 -08:00
fc4edefd81
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-29 07:35:24 -08:00
8c4a786114
Move status fields out of the object fields
2018-01-29 10:27:46 -05:00
2dcb0d183f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-28 18:07:33 -08:00
f2b335c7b2
SORT auto server selection in ascending order
2018-01-28 18:07:01 -08:00
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
2ea2f46ec8
braes
2018-01-25 09:13:31 -08:00
703cd332df
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-25 08:43:53 -08:00
356015a492
Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla
2018-01-25 08:42:08 -08:00
7165f3cfd8
Add server auto-selection
2018-01-25 08:41:42 -08:00
57bae7cf17
Fix filtering
2018-01-25 09:14:09 -05:00
fb50f6f996
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-24 17:14:42 -08:00
a271f1776d
Fix #80 don't escape NULL value when building SQL
2018-01-24 10:35:22 -05:00
9f89ccfa32
revert issue with AUTH_HASH_LOGINS
2018-01-24 07:46:56 -05:00
994766fd50
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-22 13:25:38 -08:00
97595051ce
whitespace
2018-01-22 11:42:19 -05:00
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
06c9266c62
use snapshot.jpg more
2018-01-22 03:27:01 +01:00
9b7fee03c7
Add Server auto-selection
2018-01-19 11:00:46 -08:00
773ed11742
use Object methods to restart zmc and zma. restart them on save of existing Monitor
2018-01-19 08:17:53 -08:00
d1dbf4cc31
Turn off debug
2018-01-19 08:17:33 -08:00
3abd873c34
Turn off debug
2018-01-19 08:17:17 -08:00
0f3cf33565
Move unparse_url from add_monitors to functions to make it generally available
2018-01-19 08:16:52 -08:00
2720b254ff
Add Triggers to Monitors field to quiet error
2018-01-19 08:16:41 -08:00
484a361af8
use Object methods to restart zmc and zma. restart them on save of existing Monitor
2018-01-18 12:40:10 -08:00
30b0d2c5b1
Turn off debug
2018-01-18 12:39:50 -08:00
c08cbdb9dd
Turn off debug
2018-01-18 12:39:39 -08:00
f9d8c349e1
Move unparse_url from add_monitors to functions to make it generally available
2018-01-18 12:39:08 -08:00
04eef58883
Add Triggers to Monitors field to quiet error
2018-01-18 12:38:48 -08:00
1fbb5bc0f8
Fix zmaudit.pl => zmaudit, etc.
2018-01-17 14:22:04 -05:00
fe7c54bc26
Fix Debug
2018-01-16 17:54:37 -05:00
a8dde207e1
Warning should be a debug
2018-01-16 12:33:50 -05:00
9f42871c86
Fix Zone Triggers, bump version
2018-01-16 11:49:17 -05:00
004fdbad9b
We don't need to update ZoneCount manually anymore
2018-01-16 09:31:23 -05:00
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
4b37c6fc42
Change the Group dropdown to a single indented dropdown, and use chosen on it
2018-01-12 11:25:15 -08:00
3c55557c77
Handle to val in a filter term
2018-01-11 22:53:53 +01:00
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
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05:00
74269fea73
make montagereview load event images from the server that the storage is located on
2017-12-22 12:33:30 -08:00
0d7fff761c
upgrade find_all to take parameters
2017-12-22 11:38:42 -08:00
cc8ed75eb9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-22 09:03:11 -08:00
f51259443c
fix disk_used_percentage to use db calculated used size
2017-12-22 09:02:49 -08:00
9dfad4886d
fix saving Monitors
2017-12-22 16:13:00 +01:00
148e21d707
fugro
2017-12-21 21:46:21 -05:00
915ea93348
source remote server when streaming event
2017-12-21 16:53:46 -08:00
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
e47c8fad88
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-12-19 11:01:42 -05:00
2922a86d23
fixes to new Storage Schemes code
2017-12-19 11:01:03 -05:00
5f4b2ca53f
don't close the session when logging in
2017-12-18 14:35:11 -05:00
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
c93de992c2
add Scheme to the list of fields
2017-12-18 13:04:57 -05:00
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
c0fcfe6eb6
Combine possible sort inputs to one in sortQuery, output limitQuery
2017-12-15 08:47:08 -05:00
7d7e73977f
use stored session group
2017-12-13 16:51:56 -05:00
abad266c5b
introduce chosen to use it to make the filtering dropdowns awesome
2017-12-13 16:15:03 -05:00
e364641d7b
on initial page hit, the cookie might not be set. Use global instead.
2017-12-13 11:21:50 -05:00
2643ac9f97
fix a quoting problem that prevented saving config
2017-12-12 11:16:08 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
d741cc1a72
fix saving Groups
2017-12-04 22:02:56 -05:00
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
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
0171d532fc
fix the test for DB_DEBUG
2017-12-04 16:50:56 -05:00
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
dd3f9492ba
fix dulicate logic
2017-11-26 15:12:35 -05:00
b1bb0020d3
turn off database debug
2017-11-24 15:42:44 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
a9f0f3813a
Merge branch 'tesla' into storageareas
2017-11-24 09:31:00 -05:00
900fbe1e0f
update save to a button tag, and add a saveas functionality
2017-11-23 08:26:55 -08:00
485567349d
Don't calc DiskSpace if it is already defined
2017-11-23 07:29:05 -08:00
2a669896c2
Merge branch 'tesla' into storageareas
2017-11-23 08:42:53 -05:00
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
095e1ecadb
remove extra ), add AnalysisFPS and CaptureFPS
2017-11-21 23:58:13 -05:00
e2aa278d78
add SaveJPEGs
2017-11-21 23:57:44 -05:00
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
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
...
Minor UI fixes
2017-11-20 20:15:32 -05:00
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
d8af654338
Fix dvrControls on watch view
2017-11-18 14:05:11 -05:00
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -05:00
821717b06e
turn off debug
2017-11-08 11:26:13 -05:00
59a87c14d3
fix error message
2017-11-08 11:17:46 -05:00
625170bffc
fix getVideoStream to getVideoStreamHTML. Change how scaling works
2017-11-08 11:17:30 -05:00
bef7c0ed94
Only start a monitor if it has a Function
2017-11-05 11:54:00 -05:00
63c788ef0e
handle when sql error occurs and no params given
2017-11-03 15:45:11 -04:00
f39353a4a3
add missing breaks
2017-11-03 15:44:53 -04:00
0ef5c16bcc
when doing parseSort, reset the sortfield to StartTime instead of DateTime
2017-11-03 15:07:04 -04:00
67bb8c302f
add missing /
2017-11-03 10:00:29 -04:00
4ef28bb30d
don't put the leading / in the cache link
2017-11-03 09:22:43 -04:00
96e0959c35
clear the cookie for zmMontageLayout
2017-11-01 13:07:35 -04:00
0af389c984
populate the Id of the layout when inserting it
2017-11-01 13:07:24 -04:00
d4080dcdbd
when saving a new layout, auto-select it
2017-11-01 12:19:27 -04:00
a9d4dfac45
fix the file extension so that mime type works better
2017-11-01 11:52:32 -04:00
e6918cd1bd
implement crude cache busting code for .js and .css files
2017-11-01 09:41:19 -04:00
b5491102ef
Fix saving MontageLayouts
2017-10-30 20:21:16 -04:00
ce6cc24de5
turn off debug
2017-10-30 20:20:40 -04:00
1694eeb436
debugging and code simplification
2017-10-30 16:29:27 -04:00
97757ba6cd
add Inserting when saving
2017-10-30 16:29:13 -04:00
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
8312bf52a4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-10-30 08:37:54 -04:00
71222d7f2f
rework how montage layouts are done, pull from db now
2017-10-27 12:06:26 -07:00
71c8562b46
Rough in a MontageLayout class
2017-10-27 10:01:16 -07:00
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
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
b6dde354be
rename AnalysisFPS to AnalysisFPSLimit
2017-10-24 17:34:32 -07:00
b5e59efda5
improve updating diskSpace entries
2017-10-23 17:02:04 -07:00
d2c8a0240a
add a monitors view which is for editing function/enabled/server/storage of multiple monitors
2017-10-23 17:01:43 -07:00
ced5015a83
move zmcControl and zmaControl to the Monitor Object
2017-10-23 17:00:59 -07:00
df8fbaccea
Fixes
2017-10-23 11:50:45 -07:00
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
ed9da696b3
Rough in save functionality into Event.
2017-10-23 10:53:58 -07:00
6fba9fa65a
google code style and quotes
2017-10-20 14:54:28 -04:00
cf2eace2c7
improve htmlSelect and add Storage and Server filters to console
2017-10-19 09:50:07 -04:00
32ba53cf1b
turn off database debugging
2017-10-18 16:37:45 -04:00
ba4e5572d6
add setting of values to anonymouse member function
2017-10-17 10:09:14 -07:00
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
b96b2636bb
add the update to add Type to Storage
2017-10-12 07:50:43 -07:00
8abb8a9259
add Type to Storage
2017-10-12 07:32:48 -07:00
3f01f887aa
only count event size when s3
2017-10-11 14:10:53 -04:00
e845af94cc
include params when blowing up a dbQuery
2017-10-11 14:06:18 -04:00
Isaac Connor
Andrew Bauer
Isaac Connor
Mike Brown
Isaac Connor
Isaac Connor
Isaac Connor
Isaac
digital-gnome
Isaac Connor
Isaac Connor