Isaac Connor
b5ef7b08b9
settings popup has to come from the server hosting the v4l device, so use monitor->UrlToIndex and include auth.
2020-08-25 12:40:22 -04:00
Isaac Connor
6587cdd3de
Handle failure to get v4l settings. Fix assignment of values to monitor object.
2020-08-25 12:39:44 -04:00
Isaac Connor
b0f5f3617a
Always set auth_hash and always set auth_relay, using our handy new get_auth_relay function
2020-08-25 12:39:14 -04:00
Isaac Connor
f1fab6361f
fix dimensions of v4l settings popup
2020-08-25 12:38:46 -04:00
Isaac Connor
98dce06d6b
Introduce get_auth_relay to return an auth string to use in urls.
2020-08-25 12:38:31 -04:00
Isaac Connor
3c29228df5
Use zm_session_start
2020-08-25 11:30:22 -04:00
Isaac Connor
586f9f3e52
Use zm_session_start
2020-08-25 11:27:25 -04:00
Isaac Connor
c2d6b8f493
revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors.
2020-08-19 14:39:15 -04:00
Isaac Connor
d0c21995cd
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-19 14:14:32 -04:00
Isaac Connor
efec1e7d4f
remove debug
2020-08-19 14:13:48 -04:00
Isaac Connor
177df46113
Apply min=0 to filterX and Y so that we don't get negative values
2020-08-19 14:11:16 -04:00
Isaac Connor
16efa9dbb2
Add extra checks for Deleting without an Archived State term and Running in the background without any actions.
2020-08-18 11:17:22 -04:00
Isaac Connor
a92a16f13e
Merge branch 'update_users_controller' into release-1.34
2020-08-17 19:33:31 -04:00
Isaac Connor
c87886f5a5
Fix v4l2 channel and palette dropdowns allowing the saving of local monitors.
2020-08-15 12:31:30 -04:00
Isaac Connor
81b55589db
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
2020-08-10 13:59:47 -04:00
Isaac Connor
bafffdb486
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
2020-08-10 12:26:37 -04:00
Isaac Connor
b4a3ccdfed
only put the hostname in the CSP headers so that we accept as source either http or https or any port. Useful for multiport.
2020-08-09 22:18:07 -04:00
Isaac Connor
a001c93321
fix zone editing globals and inputs being too big
2020-08-08 11:41:24 -04:00
Isaac Connor
8533ce7018
fix CSP on polygons
2020-08-08 11:38:54 -04:00
Isaac Connor
eff96c5fa3
Only save the DiskSpace on completed events. Fixes #3007
2020-08-07 09:53:15 -04:00
Isaac Connor
3242ce6ec9
Handle backticks in matches sort fields. Fixes regression in 1.34.17
2020-08-06 10:37:56 -04:00
Isaac Connor
366ce5b3eb
Add 100% width to LabelFormat
2020-07-30 19:36:27 -04:00
Isaac Connor
3df58fc9db
handle array args in daemonStatus
2020-07-30 19:36:05 -04:00
Isaac Connor
0a782814a7
Don't start filter if the command was execute
2020-07-30 17:13:30 -04:00
Isaac Connor
204086a56d
spacing and quotes
2020-07-30 17:12:00 -04:00
Isaac Connor
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -04:00
Isaac Connor
2cfa5fde98
Add missing view tempplates for zone add/edit. Fixes #2986
2020-07-30 16:54:00 -04:00
Isaac Connor
d8cd4386cf
rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
...
Use EncoderParams when setting movflags in VideoStore.
Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
Isaac Connor
6a4ce29bce
eslint fixes
2020-07-30 12:15:05 -04:00
Isaac Connor
bf163beedb
Update permissions checking when viewing/editing users. Fixes #2982 . Also add a beforeFind that will remove the Password field from the query so that we don't return passwords
2020-07-30 11:03:24 -04:00
Isaac Connor
8e37efaa7a
handle when [fid] = 0; Fixes #2994
2020-07-29 18:50:14 -04:00
Isaac Connor
c4d4a73c2a
json decoding errors shouldnt' be fatal
2020-07-29 16:41:37 -04:00
Isaac Connor
0139d06fcd
Fix data-on-input-this using onchange instead of oninput
2020-07-29 16:41:27 -04:00
Isaac Connor
e23c6de373
populate monitors with monitor array which will be json-encoded. Fixes failed population of monitor names dropdown
2020-07-20 17:42:25 -04:00
Isaac Connor
4e2633d22b
Update code to make calls to api on remote servers
2020-07-20 16:25:29 -04:00
Isaac Connor
e839919b5e
Add foreign key MonitorId validation
2020-07-20 16:25:08 -04:00
Isaac Connor
955fc00b87
Fix Zone add api. Restart zmc when adding a zone. Use validation. Fixes #2983
2020-07-20 16:24:49 -04:00
Isaac Connor
bbee6b4f58
Whitespace, delete dead code
2020-07-20 16:23:55 -04:00
Isaac Connor
cb0e54d3be
consider Monitor->Controllable as well in stopping zmtrack. Don't complain about ControlCommand being told to start/stop
2020-07-20 10:23:26 -04:00
Isaac Connor
135bbb4190
remove unneeded config loading, just use defines. Spacing, remove commented out dead code
2020-07-19 17:51:28 -04:00
Isaac Connor
9d6e0fc3af
Merge pull request #2977 from roddone/fix_events_table_responsive
...
make events table (events view) responsive
2020-07-16 15:49:01 -04:00
Isaac Connor
dcd67a1acf
Remove args with non-sensical values from cgi params as a micro-opt
2020-07-13 14:50:21 -04:00
Isaac Connor
6469300af5
fix some csp violations
...
y
2020-07-07 18:57:11 -04:00
Isaac Connor
89f975e646
remove code to play a sound on alarm. Not going to support that when editing a zone.
2020-07-07 16:40:33 -04:00
Isaac Connor
33d4680f02
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
2020-07-07 16:35:37 -04:00
Isaac Connor
8a35ae2daf
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-04 09:04:38 -04:00
Isaac Connor
ff265d2f17
replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs
2020-07-04 09:00:30 -04:00
Isaac Connor
e2a38268a0
replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs
2020-07-04 08:59:41 -04:00
Isaac Connor
fd10f545bd
if width/height don't evaluate to an integer, set to auto.
2020-07-04 08:58:09 -04:00
Isaac Connor
cc0624eb3f
Don't allow viewing of monitor setting if monitor permissions are set to View
2020-07-03 19:19:13 -04:00
Isaac Connor
1860ad188b
Don't allow viewing of zones or zone if Monitor permissions are view
2020-07-03 19:18:36 -04:00
Isaac Connor
343d8d832e
handle scale values of '' and 'auto'
2020-07-03 19:18:05 -04:00
Isaac Connor
2026788e7a
Turn close link into a button
2020-07-03 19:17:26 -04:00
Isaac Connor
66b155008c
Fix scale defaulting to monitor default Scale
2020-07-03 19:17:11 -04:00
Isaac Connor
9f821c74f6
Add tooltip on Add Monitor button explaining that the user doesn't have permission to add a monitor
2020-07-03 19:16:41 -04:00
Isaac Connor
697f117ecd
Make width of content 100% instead of 96%.
2020-07-02 17:22:34 -04:00
Isaac Connor
346fe63ef0
Add styles for inputs on monitor view
2020-06-30 19:19:17 -04:00
Isaac Connor
c47a348fea
Handle empty string version of scale
2020-06-30 19:18:45 -04:00
Isaac Connor
4d8d926c89
minor code updates. Use user_row instead of generic row variable name.
2020-06-23 22:19:46 -04:00
Isaac Connor
e778ea0918
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:19:04 -04:00
Isaac Connor
93b0552ed7
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:18:45 -04:00
Isaac Connor
910d4b51c9
Escape table names for mysql-8
2020-06-04 11:44:59 -04:00
Isaac Connor
8802447b10
Handle no DB_HOST specifed so default to localhost
2020-06-04 11:36:10 -04:00
Isaac Connor
ef3fc758cb
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
2020-06-04 11:34:48 -04:00
Isaac Connor
20870e22fa
fix eslint errors
2020-05-29 13:28:33 -04:00
Isaac Connor
eb41e4fb39
Fix the array for the de-interlacing options
2020-05-24 11:09:13 -04:00
Isaac Connor
ce15e1c921
remove debug, don't pass element through event handler anymore on layout ddm
2020-05-20 09:42:29 -04:00
Isaac Connor
cc04ced406
load zmMontageLayout ddm explicitly instead of passing event element
2020-05-20 09:42:06 -04:00
Isaac Connor
4dc693022e
Failure to parse output shouldn't be fatal. Just skp to the next instead. Use json_encode instead of serialize
2020-05-15 16:02:19 -04:00
Isaac Connor
c4c4c5bcbf
fix Crud submodule version
2020-05-15 11:34:34 -04:00
Isaac Connor
424a4ed0b1
add onclick to div.zoom
2020-05-15 11:34:23 -04:00
Isaac Connor
0dd426d64c
handle range being set to an empty value. Fixes zoom out on timeline. Fix on-click to data-on-click
2020-05-15 11:33:10 -04:00
Isaac Connor
94b29c6c7a
replace inline javascript in timeline zoom
2020-05-15 10:44:48 -04:00
Isaac Connor
88a910793c
Spacing
2020-05-13 08:06:55 -04:00
Isaac Connor
edd718afd2
xtell and ytell are data-xtell and data-ytell fixes #2932
2020-05-13 08:02:49 -04:00
Isaac Connor
24c09a8207
Accept 0 as a value for scale meaning scale to fit
2020-05-08 17:55:12 -04:00
Isaac Connor
8195223a86
merge some php
2020-05-08 17:54:51 -04:00
Isaac Connor
c99db3a03f
Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
2020-05-01 18:47:10 -04:00
Isaac Connor
0085e3d34f
Don't warn about image for WebSite Monitors
2020-05-01 18:15:19 -04:00
Isaac Connor
683bf3f982
Handle no default set for array defaults. Fixes Warning when saving WebSite type Monitors
2020-05-01 15:32:54 -04:00
Isaac Connor
9dbeaa2c7b
Add default for Orientation. Fixes saving WebSite type monitors
2020-05-01 15:32:26 -04:00
Isaac Connor
1bd340d602
spacing in watch.php
2020-05-01 13:30:00 -04:00
Isaac Connor
6dbc917215
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-05-01 13:24:47 -04:00
Isaac Connor
82188c266e
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
2020-05-01 13:23:39 -04:00
Isaac Connor
45a445ac48
sync up index.php to master, where is a global
2020-05-01 13:21:02 -04:00
Isaac Connor
ad373a5549
add Zone.php from master
2020-05-01 13:20:42 -04:00
Isaac Connor
e960e638b3
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 13:07:29 -04:00
Isaac Connor
bd7475a450
use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working
2020-05-01 13:06:15 -04:00
Isaac Connor
e29c426f04
Pass event object to data-on-click events
2020-05-01 13:04:55 -04:00
Isaac Connor
89245e0d46
Add auth relay information when auth_relay is something other than hashed.
2020-05-01 13:04:37 -04:00
Isaac Connor
2da88be307
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-05-01 13:04:16 -04:00
Isaac Connor
4c9f67eb5a
Fix no redirect on login with palemoon browser
2020-05-01 13:03:56 -04:00
Isaac Connor
289045500b
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
2020-05-01 13:03:35 -04:00
Isaac Connor
daa08e8740
Always just default to scale from monitor
2020-05-01 13:03:17 -04:00
Isaac Connor
62ddc02d52
quotes to match master
2020-05-01 13:01:34 -04:00
Isaac Connor
830929a85f
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 12:53:47 -04:00
Isaac Connor
496fd6b15a
reorganize to reduce code depth
2020-04-23 18:17:20 -04:00
Isaac Connor
775b0d1ccd
fix XSS in monitor Name
2020-04-23 18:16:38 -04:00
Isaac Connor
bc9137bd93
defend against XSS in Monitor Name
2020-04-23 17:56:05 -04:00
Isaac Connor
0f91797d85
defend against XSS in Monitor Name
2020-04-23 17:53:54 -04:00