4815162bea
fix extra }
2018-05-18 09:11:15 -04:00
8276386a44
We always return an associative array now
2018-05-18 09:06:17 -04:00
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
fdaf992156
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-05-16 14:18:48 -04:00
93dd943fec
Fix some spacing
2018-05-16 20:17:57 +02:00
780cb693c2
google code style
2018-05-16 11:14:11 -04:00
81c4542a94
correct use of getValue. Use standard ddm element value instead
2018-05-16 11:13:59 -04:00
af63619ce6
Fix Messages=>Messaged
2018-05-15 21:56:17 +02:00
49d75ce039
handle Width and Height not being in ->{} and returnining defaults. Include Path in Source
2018-05-15 10:45:47 -07:00
f16e1953d9
Make Source filter apply to Path as well
2018-05-15 10:45:10 -07:00
88b66fe5dd
Merge ../ZoneMinder.master into storageareas
2018-05-14 14:07:51 -04:00
63e6cb1d62
remove parenthesis that confuse older php
2018-05-14 13:56:55 -04:00
485f292943
fix php 5.4 compatibility - remove calls to empty
2018-05-14 12:32:48 -05:00
47ba435471
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-12 19:44:40 -04:00
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
b20cb5d0ae
Add all the other Event columns to fields
2018-05-11 10:36:14 -04:00
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
8b8bcbd1e2
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-10 17:47:12 -04:00
571b27a025
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-05-10 14:39:16 -04:00
c61deb422f
update to -zm versions
2018-05-10 14:38:49 -04:00
2a5f05499e
Munge the config in the global configvals into the configs array before returning it.
2018-05-10 13:44:46 -04:00
b2115f9dcf
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-08 13:34:03 -07:00
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
3c4befc73a
improve Name and Source filtering. Default to case insensitive text search.
2018-05-08 14:07:24 -04:00
e7bd5900bc
rough in a Storage Model
2018-05-07 14:09:05 -07:00
da7c953e3d
adda blank line
2018-05-07 14:08:32 -07:00
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
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
1a012c62ff
Add fileExists to event view
2018-05-07 14:07:03 -07:00
9c44f56f37
Add Storage to belongsTo. Implement Relative_Path and fileExists functions
2018-05-07 14:06:48 -07:00
5772ff9161
return default values for Width and Height
2018-05-05 12:49:00 -04:00
f2c099f1e4
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-05-04 16:01:25 -04:00
dbdf937a56
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-04 06:47:23 -07:00
2076508374
add Source and Name filters
2018-05-04 06:47:02 -07:00
3fd953a4eb
Move code to generate Source from console into Monitor Object
2018-05-04 06:46:46 -07:00
84c94efaa8
Move redunddant close methods into parent. Use Fatal instead of croak. Croak is not defined so it causes an infinite loop
2018-05-04 02:26:25 +02:00
e953a04f61
naming consistency of attribute ( #2096 )
2018-05-03 14:03:49 -04:00
769d4a8693
DB connect can die, so put it in an eval
2018-05-03 09:50:54 -07:00
d43cd322f4
Make event count a link to a filter to list them.
2018-05-03 09:42:14 -07:00
81758fab38
use new Thumbnail code
2018-05-03 09:39:23 -07:00
e64de07560
spacing
2018-05-03 09:39:09 -07:00
dbf760d8af
cleanup no longer needed StatusFilter code. Use class=MonitorFilter instead of id=monitorControl to be consistent
2018-05-03 09:38:56 -07:00
f76827a450
redo thumbnail code. Always link to server they event is located on
2018-05-03 09:36:50 -07:00
a3158fcc97
auth_key api for different situations ( #2090 )
...
* auth_key api for different situations
* added new flag to indicate if password needs to be appended
* pure json view
2018-05-02 12:26:28 -04:00
4e7bf6efe7
remove duplicated css for watch view in dark skin
2018-05-02 11:39:16 -04:00
bbe0025641
correct sort order default
2018-05-01 09:43:09 -04:00
433cffcce7
include Id in Filter dropdown
2018-04-30 15:21:05 -04:00
acd6b5f4a9
limit the # of log lines deleted to 100 to limit the time spent there.
2018-04-30 14:33:41 -04:00
3bb1a5b544
Whitespace
2018-04-30 13:02:53 -04:00
c3b6cd4bab
include auth.php if auth is on, and return '' for auth_hash is auth is disabled
2018-04-30 11:24:53 -04:00
6c5e6e6184
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-30 07:10:38 -07:00
3f05d46012
Merge zmdc.pl fixes. We can now handle database disconnects gracefully.
2018-04-30 07:09:23 -07:00
e891c88a3e
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-28 12:38:57 -04:00
abd52ebfb1
Add DiskSpace column to storage listing
2018-04-28 12:38:10 -04:00
ecf8003aef
remove extra spaces
2018-04-28 12:32:21 -04:00
a4da624f4c
break out of loops when zm-terminate is set
2018-04-27 13:20:38 -07:00
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -04:00
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
7e88d28857
bump version to .44
2018-04-26 21:58:19 -04:00
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
00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
dd6683f0be
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-25 10:31:47 -07:00
636d0caf30
handle no swap
2018-04-25 10:28:19 -07:00
117555a857
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-04-25 09:39:10 -04:00
161fc94496
remove useless ()
2018-04-25 09:33:12 -04:00
80f73854c7
Include the groupIds hidden when not on general tab
2018-04-25 09:33:02 -04:00
dfae6661ab
use isset when determining if a column exists, otherwise we throw warnings
2018-04-25 09:32:40 -04:00
5f415873d4
Update GroupIds regardless of changes returned from getFormChanges on Monitor save
2018-04-25 09:32:15 -04:00
2a81877664
spacing
2018-04-25 09:31:40 -04:00
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
28921a653b
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-24 11:22:48 -07:00
5b4d160710
add total bandwidth at bottom and move buttons to top
2018-04-24 14:18:41 -04:00
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -04:00
ad376fc267
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-24 09:40:39 -07:00
bbb10fa4b4
Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34
2018-04-24 12:40:15 -04:00
de149c1328
spacing
2018-04-24 08:48:35 -07:00
9fd2c12765
DB Logging is a Debug level
2018-04-24 08:42:52 -04:00
662215d125
Merge ../ZoneMinder.connortechnology
2018-04-21 10:35:49 -04:00
3560c0d610
fix displayed tbale header twice
2018-04-21 10:35:36 -04:00
578df0c5cc
update submodules
2018-04-20 16:18:58 -04:00
c65255a067
Merge ../ZoneMinder.connortechnology
2018-04-20 15:56:42 -04:00
a868bb70ed
Better debug when fail to attach images
2018-04-20 15:56:14 -04:00
fac3cde1e7
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-20 15:23:23 -04:00
3ea39ad417
whitespace
2018-04-20 15:22:45 -04:00
8b165c34b0
Handle event and frame no found earlier
2018-04-20 14:25:54 -04:00
781438d4c5
specify E.* in query because otherwise it uses M.Id for Id
2018-04-20 14:25:38 -04:00
fedc4d4cb1
spacing
2018-04-20 14:24:56 -04:00
ac775f13f6
always return an array from find_all
2018-04-20 14:23:27 -04:00
9de3c44702
Add find_one and caching
2018-04-20 14:23:04 -04:00
07e7ab1547
fix spacing
2018-04-20 14:21:41 -04:00
970830aee3
tidy up
2018-04-20 13:10:38 -04:00
ed140426ab
rpm packaging changes and documentation
2018-04-19 15:36:43 -05: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
fb44619a66
output the initial table head
2018-04-19 14:33:05 -04:00
2aa689a14a
Use a class instead of an id for consoleTable
2018-04-19 14:20:02 -04:00
5b5cd3f330
fix broken table when no monitors to display
2018-04-19 14:16:30 -04:00
983cd83054
Add default for SignalCheckPoints and add it as a hidden field to the non-misc tabs
2018-04-19 10:01:04 -04:00
cd70ed3dec
always show SignalCheckColour and add a SignalCheckPoints option
2018-04-19 09:45:28 -04:00
8da9bc412b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-18 21:12:33 -04:00
fcaac016b5
Merge ../ZoneMinder.connortechnology
2018-04-18 21:12:14 -04:00
a5cbc8abd1
buildsystem - update git submodules
2018-04-18 19:21:14 -05:00
bbee7fd0f2
fix array_key_exists
2018-04-18 14:17:41 -07:00
28b85e1977
Add ZeroSize test to Event Audit Report
2018-04-18 13:48:20 -07:00
f6540aeba1
point git submodules to our own forks
2018-04-18 14:00:00 -05:00
75248e7465
use array_key_exists instead of isset so that we can return nulls
2018-04-18 14:21:27 -04:00
d31207dd53
use find_one instead of new Group so that caching will happen
2018-04-18 12:30:47 -04:00
88a2c0d953
spacing
2018-04-18 12:30:32 -04:00
61249ccf2a
Show pause/play/stop when no stream buffer
2018-04-18 12:30:18 -04:00
36b8cfb115
test element so that processing will continue if buton doesn't exist
2018-04-18 12:29:59 -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
12d46e2377
change event_id in status_msg to 64bit when unpacking
2018-04-18 09:52:57 -04:00
ef86746991
Merge ../ZoneMinder.connortechnology
2018-04-17 21:07:48 -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
3b0282f6ec
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-17 12:32:10 -04:00
92cb7dabd5
merge some fixes from other branches
2018-04-17 08:48:59 -07:00
ef70ff86e9
cleanup zmaControl
2018-04-17 11:36:14 -04:00
34111251d9
Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error.
2018-04-17 07:02:52 -07:00
dc098b5299
put the status into the function column
2018-04-16 14:51:10 -04:00
98b54f87f2
make thumbnail code more readable
2018-04-15 10:27:08 -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
dcfd9a60bc
close the session earlier
2018-04-14 22:26:47 -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
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
c466f50255
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-11 13:50:50 -07:00
47b871ed9f
implement MIN_STREAMING_PORT for Multi-server
2018-04-11 13:50:35 -07:00
989ed65f52
spacing and braces, remove a dead unused function
2018-04-11 10:50:28 -04:00
22f86da372
Have to use the .sock file instead of w.lock
2018-04-11 10:38:13 -04:00
bb924ee078
add report_event_audit
2018-04-10 13:06:01 -07:00
03ff2fcde4
add caching and find_one to Storage and Groups
2018-04-10 13:05:37 -07:00
ae3ccf6ffe
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-06 12:32:07 -07:00
fdd8be5daf
brackets and spaces
2018-04-06 14:52:56 -04: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
7f850890cb
whitespace
2018-04-06 14:42:20 -04:00
513708b11c
don't need to define the config, it will have already been done. Include auth.php instead of functions.php as the code has been moved
2018-04-06 14:42:10 -04:00
a789fc88aa
implement getAuthHash
2018-04-06 14:41:39 -04:00
2c02a479d6
remove duplicated config code from bootstrap and just include config.php
2018-04-06 14:38:32 -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
2c85e5e4c6
remove unneccessary type tags.
2018-04-06 11:43:19 -04:00
c4a00e0657
changing the querySep in Event.php to allow gapless playback
2018-04-05 20:42:15 -05:00
7a12589a83
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-05 13:41:47 -07:00
f1a8d5f1ff
start of work on .41. Adding foreign keysy
2018-04-05 13:41:24 -07:00
9ecbba0947
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-05 14:22:23 -04:00
632ab143fe
error when can't set session in cake
2018-04-05 14:21:56 -04: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
4adebfce1d
Add Monitor Status breakdown to console
2018-04-05 09:53:53 -07:00
87f5204c46
rename process_configfile to remove namesspace colision
2018-04-05 11:44:21 -04:00
fb392b2765
put back process_configfile
2018-04-05 11:33:24 -04:00
6faf9b5c35
fix including auth on remote restart
2018-04-05 11:24:47 -04:00
8fee795fb4
don't duplicate declaration of process_configfile, because we include our version from ZM
2018-04-05 11:24:17 -04:00
70c7eaef0e
fix using wrong array. Should use StorageById
2018-04-04 20:29:01 -04:00
2f6adff1b2
handle when storage area is gone
2018-04-04 20:27:21 -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
489f11bd07
empty contents of zone.css because it is no different from base.
2018-04-03 21:18:29 -04:00
053322c2c3
add NextFrameId to Frames
2018-04-03 12:32:14 -07:00
66920eb5b8
fix status colour when not capturing
2018-04-03 12:31:54 -07:00
7a5d4d3b19
adjust frame_id for bulk frames
2018-04-03 12:31:39 -07:00
6a8084652e
add min width to Status Filter
2018-04-03 12:31:12 -07:00
85bb26668e
translate Statuses beter
2018-04-03 12:30:57 -07:00
49aeb4b467
whitespace
2018-04-03 10:38:38 -07:00
1f29fc601e
add Function Filter min width
2018-04-03 10:38:22 -07:00
09e05b1313
Clean up date stuff, use moment for formatting in secs2dbstr etc
2018-04-03 10:38:03 -07:00
7346a8c733
add select button
2018-04-03 10:36:58 -07:00
e91729692e
add Function filter
2018-04-03 10:36:44 -07:00
48ff480907
whitespace
2018-04-03 10:36:14 -07:00
b26707b647
fix resetting DiskSpace
2018-04-03 09:57:14 -07:00
614170c181
Add EndTime to event list
2018-04-03 06:57:22 -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
d1dd16b81c
fix event_id to EventId
2018-03-28 13:07:53 -07:00
842a42bcd5
test for existence of mp4 before trying to grab images from it
2018-03-28 13:01:58 -07:00
a2452db3de
Add Url to storage for S3 support
2018-03-28 08:23:36 -07:00
4d68f9a757
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-27 13:24:57 -07:00
62a0890383
Merge pull request #89 from pliablepixels/ui-tweaks
...
Ui tweaks for storage areas
2018-03-27 11:00:25 -04:00
d3350919de
Reintroduced empty check rule, closed paranthesis
2018-03-27 10:55:36 -04:00
caffe5f7c9
dot should be red when either fclass or source_class is red
2018-03-27 08:55:15 -04:00
1b5d802890
dot should be red when either fclass or source_class is red
2018-03-27 08:43:58 -04:00
5b7011c61b
commented out incomplete definition - please complete it if you need it
2018-03-27 03:58:28 -04:00
b077cc8900
table header - keep consistent
2018-03-26 11:50:14 -04:00
dfcee7c6c1
table header - keep consistent
2018-03-26 11:14:46 -04:00
411e1d05f2
used chosen for log filters
2018-03-26 11:09:35 -04:00
f790306990
added account icon
2018-03-25 16:18:50 -04:00
980684a2f0
adjusted h1 size
2018-03-25 16:09:31 -04:00
cc2f285408
log view tweaks, cleaned up header issues
2018-03-25 16:01:04 -04:00
Isaac Connor
Isaac
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac
Pliable Pixels
Isaac Connor
Andy Bauer
Andrew Bauer
Mike Brown
Isaac Connor
Pliable Pixels