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
be424f46f0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-18 12:07:22 -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
63e6cb1d62
remove parenthesis that confuse older php
2018-05-14 13:56:55 -04:00
47ba435471
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-12 19:44:40 -04:00
b20cb5d0ae
Add all the other Event columns to fields
2018-05-11 10:36:14 -04:00
8b8bcbd1e2
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-10 17:47:12 -04: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
da7c953e3d
adda blank line
2018-05-07 14:08:32 -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
5772ff9161
return default values for Width and Height
2018-05-05 12:49:00 -04:00
3fd953a4eb
Move code to generate Source from console into Monitor Object
2018-05-04 06:46:46 -07:00
769d4a8693
DB connect can die, so put it in an eval
2018-05-03 09:50:54 -07:00
f76827a450
redo thumbnail code. Always link to server they event is located on
2018-05-03 09:36:50 -07:00
bbe0025641
correct sort order default
2018-05-01 09:43:09 -04:00
3bb1a5b544
Whitespace
2018-04-30 13:02:53 -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
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
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
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
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -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
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
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
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
Isaac Connor
Isaac Connor
Isaac
Isaac Connor
Andrew Bauer
Isaac Connor
Mike Brown
Isaac Connor
Isaac