Isaac Connor
7a8beffdcc
Merge branch 'master' into storageareas
2018-12-20 15:10:52 -05:00
Isaac Connor
a277f697e9
whitespace
2018-12-20 14:58:38 -05:00
Isaac Connor
0bfe1007c8
Merge branch 'master' into storageareas
2018-12-14 10:16:08 -05:00
Mike Rosack
567b60ffa7
support for forwarded proto/port in Server.php ( #2343 )
2018-12-13 10:24:32 -05:00
Andrew Bauer
8d74354fcb
Merge pull request #2242 from connortechnology/cleanup_auth
...
Cleanup auth
2018-12-12 20:53:24 -06:00
Isaac Connor
eba8b3327d
Merge branch 'master' into cleanup_auth
2018-12-11 16:04:42 -05:00
Andrew Bauer
4d7e98475f
Merge pull request #2297 from connortechnology/introduce_getBodyTopHTML
...
Introduce get body top html
2018-12-11 09:35:54 -06:00
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
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
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
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
