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
415d43fafb
Include Server Name when testing for CORS. Also be case insensitive.
2018-11-15 12:23:52 -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
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
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