b254e1e392
For column name title field should be taken instead of array name ( #2635 )
2019-06-06 12:58:33 -04:00
4879249d77
V4LMultiBuffer has a string value so testing against an integer fails.
2019-06-06 12:53:25 -04:00
43d24cda8e
Completed Polish translation ( #2634 )
...
* Completed Polish translation
* Changing translation to be simillar with other lines
2019-06-05 17:07:32 -04:00
08cc4e0383
add null value to set() function
2019-06-05 10:22:20 -04:00
5346f82de9
Fix unable to login when ZM_AUTH_RELAY != hashed and fix setting the password in session when ZM_AUTH_RELAY==plain
2019-06-05 09:23:34 -04:00
83b00c2cd1
Merge branch 'master' into storageareas
2019-06-04 16:43:43 -04:00
4b9b2015cb
write a note why regnerateAuthHash doesn't work when saving config
2019-06-04 16:30:57 -04:00
cc269378cf
regenerate auth_hash in session because we might have changed an auth hash setting
2019-06-04 16:27:25 -04:00
168aa35461
force regeneration of auth_hash on login. Fix failed auth_hash verification not logging you out by returning null instead of false. Update session with new auth_hash when forcing regeneration
2019-06-04 16:26:29 -04:00
86ad96b788
increase height of donate popup to hold all content
2019-06-04 12:08:08 -04:00
7649f5d6b9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-04 10:33:14 -04:00
9d6091e271
better fix for #2453 . Pushing an element causes td's within td's. Weird formatting, etc. We use an html escaping function to prevent XSS
2019-06-04 10:32:54 -04:00
a6f3303859
add options help to linked monitors option ( #2633 )
...
* add options help to linked monitors option
* fix typo and clarify instructions for new widget
2019-06-04 10:05:08 -04:00
7445f5588f
show storage when there are 4 areas. Used to only do it for < 4
2019-05-31 11:01:09 -04:00
aefd735abb
quotes
2019-05-31 11:00:30 -04:00
eaa1939f6b
comment out debug lines
2019-05-31 10:35:54 -04:00
274737d1b1
Fix moocord to mocord.
2019-05-31 10:35:18 -04:00
b0869a0b13
spaces and quotes
2019-05-31 10:34:53 -04:00
75ec4818a6
WHen saving a monitor, only start zmc and zma if appropriate
2019-05-31 10:15:02 -04:00
ba96f0709c
fix saving user using password_hash
2019-05-30 09:58:54 -04:00
628760d5b9
Spacing and braces cleanup from asker's code
2019-05-29 10:29:03 -04:00
8e0f828aa1
Add APIEnabled to translations
2019-05-29 10:28:42 -04:00
ee0c21d587
Add API Enabled to User edit
2019-05-29 10:28:25 -04:00
722411475d
Fix +/- buttons on new line in filter not having onclick events bound
2019-05-29 09:23:56 -04:00
21761a35ad
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-05-29 08:40:52 -04:00
07d4310466
Can't cache-bust jquery-ui-theme.css as it loads sprites by relative path
2019-05-29 08:40:48 -04:00
bc0565858b
check for API disabled only when auth is on ( #2624 )
2019-05-28 13:44:06 -04:00
c4d76f03c9
Introduce ZM_PATH_SHUTDOWN to cmake config
2019-05-27 12:09:32 -04:00
ac8197f2e5
fix eslint errors in monitor.js
2019-05-27 11:25:49 -04:00
3c5d20a2e1
when an event view is scaled, adjust the frame popup window size accordingly
2019-05-24 15:06:37 -04:00
fad919adec
Fix incorrect fix for dealing with bulk frames. prev and next fid should just be +/- 1, so that we show the actual capture frame as opposed to the non-existent db frame record. Fix is by specifying the EventId as well
2019-05-24 14:59:33 -04:00
4765b9d936
Don't generate php errors when returned row doesn't have the specified column
2019-05-24 14:52:04 -04:00
d5b29923a4
add a.disabled css style
2019-05-24 14:51:39 -04:00
0c00752ab4
fix nextFid and prevFid when using bulk frames. Disable buttons instead of removing them entirely.
2019-05-24 14:51:08 -04:00
1ddd5b1f74
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-05-24 13:56:30 -04:00
34400419e8
Add shutdown capability ( #2575 )
...
* Add Config for showing a system shutdown/restart option
* Add a translation for Shutdown
* add a shutdown power button to the navbar
* but the shutdown icon in a navbar-txt
* set width and height of shutdown window
* Add instructions for enabling the web user to run shutdown
* add the shutdown view and actions
2019-05-24 13:53:24 -04:00
fc27393a96
Replace MySQL Password() with bcrypt, allow for alternate JWT tokens ( #2598 )
...
* added sha1 and bcrypt submodules
* added bcrypt and sha to src build process
* added test sha1 and bcrypt code to validate working
* bcrypt auth migration in PHP land
* added include path
* add sha source
* added bcrypt to others
* put link_dir ahead of add_executable
* fixed typo
* try add_library instead
* absolute path
* absolute path
* build bcrypt as static
* move to wrapper
* move to fork
* logs tweak
* added lib-ssl/dev for JWT signing
* Moved to openSSL SHA1, initial JWT plugin
* removed vog
* fixed SHA1 algo
* typo
* use php-jwt, use proper way to add PHP modules, via composer
* fixed module path
* first attempt to fix cast error
* own fork
* own fork
* add composer vendor directory
* go back to jwt-cpp as PR merged
* moved to jwt-cpp after PR merge
* New token= query for JWT
* Add JWT token creation, move old code to a different function for future deprecation, simplified code for ZM_XX parameter reading
* JWT integration, validate JWT token via validateToken
* added token validation to zms/zmu/zmuser
* add token to command line for zmu
* move decode inside try/catch
* exception handling for try/catch
* fix db read, forgot to exec query
* remove allowing auth_hash_ip for token
* support refresh tokens as well for increased security
* remove auth_hash_ip
* Error out if used did not create an AUTH_HASH_SECRET
* fixed type conversion
* make sure refresh token login doesn't generate another refresh token
* fix absolute path
* move JWT/Bcrypt inside zm_crypt
* move sha headers out
* move out sha header
* handle case when supplied password is hashed, fix wrong params in AppController
* initial baby step for api tab
* initial plumbing to introduce token expiry and API bans per user
* remove M typo
* display user table in api
* added revoke all tokens code, removed test code
* use strtoul for conversion
* use strtoul for conversion
* use strtoul for conversion
* more fixes
* more fixes
* add mintokenexpiry to DB seek
* typo
* add ability to revoke tokens and enable/disable APIs per user
* moved API enable back to system
* comma
* enable API options only if API enabled
* move user creation to bcrypt
* added password_compat for PHP >=5.3 <5.5
* add Password back so User object indexes don't change
* move token index after adding password
* demote logs
* make old API auth optional, on by default
* make old API auth mechanism optional
* removed stale code
* forgot to checkin update file
* bulk overlay hash mysql encoded passwords
* add back ssl_dev, got deleted
* fix update script
* added token support to index.php
* reworked API document for new changes in 2.0
* Migrate from libdigest to crypt-eks-blowfish due to notice
* merge typo
* css classess for text that disappear
* fixed html typo
* added deps to ubuntu control files
* spaces
* removed extra line
* when regenerating using refresh tokens, username needs to be derived from the refresh token, as no session would exist
* add libssl1.0.0 for ubuntu 16/12
* small API fixes
* clean up of API, remove redundant sections
* moved to ZM fork for bcrypt
* whitespace and google code style
* regenerate auth hash if doing password migration
* dont need AUTH HASH LOGIN to be on
* Add auth hash verification to the user logged in already case
* fix missing ]
* reject requests if per user API disabled
2019-05-24 13:48:40 -04:00
e2d56597bf
Don't use an onlick inline js to show the caution text
2019-05-24 12:40:02 -04:00
2eebdb094c
move chosen setup to initPage
2019-05-24 11:54:14 -04:00
b6747e9b1f
spacing
2019-05-24 11:49:59 -04:00
3dd5caebca
fix quotes and stop merging lines of options help. Change MaxFPS help to advise against setting a value
2019-05-24 11:49:27 -04:00
729dee5dda
Merge branch 'master' into storageareas
2019-05-24 10:06:14 -04:00
db9ba7eeab
Add StartDateTime and EndDateTime as Sort options. Fixes #2614
2019-05-24 10:02:15 -04:00
c02eb2cd46
spacing
2019-05-24 10:00:51 -04:00
4e51379087
spacing
2019-05-24 10:00:15 -04:00
f9004443cf
Merge branch 'master' into storageareas
2019-05-24 09:37:03 -04:00
843a9a6630
Merge branch 'pliablepixels-crypt-replacement3' into storageareas
2019-05-24 09:36:54 -04:00
2fc7b3cf4d
Don't allow deleting of in-progress recording
2019-05-24 09:31:48 -04:00
aa1264f4d2
fix missing ]
2019-05-23 16:26:40 -04:00
4466ef13fd
Merge branch 'pliablepixels-crypt-replacement3' into storageareas
2019-05-23 15:21:58 -04:00
7559c975e3
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement3
2019-05-23 15:15:52 -04:00
883688a72d
Add auth hash verification to the user logged in already case
2019-05-23 15:15:37 -04:00
57708c016c
dont need AUTH HASH LOGIN to be on
2019-05-23 14:59:21 -04:00
d5120f7506
regenerate auth hash if doing password migration
2019-05-23 14:30:45 -04:00
bc9116dd94
whitespace and google code style
2019-05-23 14:27:17 -04:00
2ce2381269
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-19 08:45:42 -04:00
8e1037458a
when regenerating using refresh tokens, username needs to be derived from the refresh token, as no session would exist
2019-05-18 11:23:16 -04:00
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
a4eff3e8e0
fixed html typo
2019-05-17 09:44:22 -04:00
923f798e69
css classess for text that disappear
2019-05-17 09:32:23 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
96f578f1bd
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup. ( #2604 )
2019-05-16 15:37:37 -04:00
1855ee441a
Fix #2609 invalid value horz instead of hori in orientations enumeration
2019-05-15 19:35:19 -04:00
95460a945a
added token support to index.php
2019-05-14 19:22:49 -04:00
e9f843f297
bulk overlay hash mysql encoded passwords
2019-05-13 14:29:24 -04:00
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
7f704263d8
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup.
2019-05-13 10:30:41 -04:00
74d9f4f1aa
Spelling and grammar fixes in help ( #2603 )
...
* Edit Help array to make it match others below. This should not affect the results
* Misc. grammer and spelling fixes along with removing some duplicated words. This should not affect compilation.
* More grammer and spelling errors
* Replace Javascript with ZoneMinder because it did not make sense there.
* More spelling and grammar edits
2019-05-13 07:58:18 -04:00
41ae745b17
removed stale code
2019-05-12 18:53:51 -04:00
ec279ccc9a
make old API auth mechanism optional
2019-05-12 18:51:07 -04:00
881d531fe9
make old API auth optional, on by default
2019-05-12 18:19:19 -04:00
21710b6e49
demote logs
2019-05-12 15:45:39 -04:00
adb01c4d0e
added password_compat for PHP >=5.3 <5.5
2019-05-12 13:57:25 -04:00
d7dbaf52d4
move user creation to bcrypt
2019-05-12 13:01:29 -04:00
91dd6630b5
enable API options only if API enabled
2019-05-12 12:34:55 -04:00
9998c26101
comma
2019-05-12 12:21:49 -04:00
c1891e35b9
moved API enable back to system
2019-05-12 12:15:08 -04:00
a9d601e5ae
add ability to revoke tokens and enable/disable APIs per user
2019-05-12 10:56:17 -04:00
225893fcd6
add mintokenexpiry to DB seek
2019-05-12 05:50:19 -04:00
88d50ec9ca
added revoke all tokens code, removed test code
2019-05-11 15:47:57 -04:00
2ee466f5e4
display user table in api
2019-05-11 14:08:49 -04:00
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
e6b7af4583
initial baby step for api tab
2019-05-10 15:11:35 -04:00
95b448abdd
handle case when supplied password is hashed, fix wrong params in AppController
2019-05-10 11:25:55 -04:00
1770ebea23
make sure refresh token login doesn't generate another refresh token
2019-05-08 15:26:51 -04:00
0bc96dfe83
Error out if used did not create an AUTH_HASH_SECRET
2019-05-08 14:26:16 -04:00
f9730bb46b
remove auth_hash_ip
2019-05-08 14:07:48 -04:00
bc050fe330
support refresh tokens as well for increased security
2019-05-08 13:38:42 -04:00
27e6e46f84
remove allowing auth_hash_ip for token
2019-05-08 12:11:32 -04:00
b293592e4c
added token validation to zms/zmu/zmuser
2019-05-08 10:55:32 -04:00
e8f79f3254
JWT integration, validate JWT token via validateToken
2019-05-07 15:04:51 -04:00
d36c1f5d3c
Add JWT token creation, move old code to a different function for future deprecation, simplified code for ZM_XX parameter reading
2019-05-07 15:04:12 -04:00
0bbc582971
New token= query for JWT
2019-05-07 15:03:13 -04:00
5fe565b99d
spacing
2019-05-06 10:49:18 -04:00
1ca5eee53a
spacing
2019-05-06 10:45:40 -04:00
ca3f65deef
go back to jwt-cpp as PR merged
2019-05-05 14:32:09 -04:00
37040f33a8
add composer vendor directory
2019-05-05 12:49:33 -04:00
a55a11dad1
first attempt to fix cast error
2019-05-05 11:24:55 -04:00
8d62c61b7a
fixed module path
2019-05-05 07:50:52 -04:00
725c3c50ed
use php-jwt, use proper way to add PHP modules, via composer
2019-05-05 07:08:25 -04:00
887912e7ad
bcrypt auth migration in PHP land
2019-05-01 13:22:24 -04:00
91f7034642
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-01 08:57:40 -04:00
25614bb75e
Merge branch 'master' into storageareas
2019-05-01 08:57:20 -04:00
b3fb934fb5
add namespace to Logging calls
2019-04-29 14:16:55 -04:00
940338ea12
namespace escape Error calls
2019-04-29 12:51:02 -04:00
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
a0dbb70af6
filter the form submit on enter to only affect input elements, not textareas
2019-04-26 10:40:11 -04:00
735a996e41
dsiable form submit on enter on the monitor view
2019-04-26 10:26:16 -04:00
6a250d61e3
cache_bust logger.js and overlay.js
2019-04-26 10:25:32 -04:00
0d4651c2d6
Update url to donate page ( #2586 )
2019-04-23 10:58:28 -04:00
8195c4e395
Fixing video export view ( #2585 )
2019-04-20 11:19:27 -04:00
5b68ddcc9a
add a note deprecating getDiskPercent
2019-04-17 09:55:34 -04:00
14791ec19b
Merge branch 'master' into storageareas
2019-04-15 13:27:41 -04:00
164a2d4d70
Fix image path ( #2576 )
...
Change the path of the "center.png" image from skins/classic/graphics/graphics/center.png to skins/classic/graphics/center.png.
Note that the `graphics/` directory was previously duplicated.
2019-04-14 15:41:58 -04:00
8828e2fe61
Merge branch 'master' into storageareas
2019-04-14 13:50:31 -04:00
733bd66773
Merge pull request #2562 from santos995/master
...
Added and edited tranlations to ru_ru.php
2019-04-13 08:25:09 -04:00
f0af0619e4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-04-12 14:58:24 -04:00
3f3ae748f0
Merge branch 'add_shutdown_capability' into storageareas
2019-04-12 14:58:11 -04:00
160f5c7bd9
Merge branch 'master' into storageareas
2019-04-12 14:57:54 -04:00
d59f058956
basic update of optionhelp view
2019-04-12 14:57:11 -04:00
1a1c2db15f
add the shutdown view and actions
2019-04-12 14:55:56 -04:00
c9d45b143c
Merge branch 'master' into add_shutdown_capability
2019-04-12 13:09:45 -04:00
36336d67be
set width and height of shutdown window
2019-04-12 13:09:25 -04:00
7b98dcbb94
but the shutdown icon in a navbar-txt
2019-04-12 13:08:58 -04:00
d7747b3385
add a shutdown power button to the navbar
2019-04-12 09:37:14 -04:00
ec6d56fd7e
Add a translation for Shutdown
2019-04-12 09:36:56 -04:00
df348c3513
lets go with reporting actual errors
2019-04-10 11:48:17 -04:00
f7dfe2982b
Fix deleting single events
2019-04-10 11:46:12 -04:00
d270fbd0ad
added support for named params to consoleEvents ( #2571 )
2019-04-09 16:28:46 -04:00
37b7c32465
fix errors when no filter specified
2019-04-09 09:45:28 -04:00
5ad9219609
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-09 09:39:39 -04:00
50dd63c21d
fix eslint
2019-04-08 19:58:18 -05:00
8af96e3c00
fix eslint errors
2019-04-08 18:40:52 -05:00
3abf263e7a
fixup half-merged changes to filter to view in montagereview
2019-04-08 16:57:41 -04:00
780f4f9b9a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-06 09:27:44 -04:00
381f526d66
spacing
2019-04-05 15:18:20 -04:00
79de2b65cd
If we are saving jpegs we don't save a snapshot image, and since we may delay writing frame info to the db, we have to default to frame 0 instead of snapshot
2019-04-04 12:18:46 -04:00
8f3d1f8653
fix a missing = and use csrf_get_tokens instead of csrf_get_secret which is the wrong function
2019-04-02 15:25:14 -04:00
9e96c29620
Log a failed csrf check
2019-04-02 15:24:47 -04:00
8a90176a2c
Add CanReboot to Controls
2019-04-02 09:25:50 -04:00
501324d778
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-04-01 22:09:57 -04:00
d5402e9cba
Correct Storaage Server name in list
2019-04-01 22:09:47 -04:00
110e5075f4
fix namespace fixes #3566
2019-04-01 17:21:01 -04:00
15fb546e15
spacing
2019-04-01 11:13:35 -04:00
7d07cdf530
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-01 10:12:09 -04:00
fa9803d819
Can't use this->data to avoid another db hit. Must load by id
2019-04-01 10:11:56 -04:00
e97751558f
eslint fix
2019-03-30 10:41:04 -05:00
90e97ff135
Merge branch 'master' into storageareas
2019-03-28 11:20:29 -04:00
49e3f0a68e
eslint fixes
2019-03-28 09:43:31 -04:00
ee4b452e42
Update monitor edit to not use inline js
2019-03-25 16:25:09 -04:00
c7e09e03d3
add cache busting to base.js
2019-03-25 16:24:46 -04:00
052a2ef1fd
fix eventserver => eventnotification
2019-03-25 12:20:21 -04:00
7565e171b4
spacing
2019-03-25 12:18:15 -04:00
4eafc52955
spacing
2019-03-25 12:18:01 -04:00
7e62ccca3c
Handle div by zero when TotalMem is not known for Server
2019-03-25 12:08:56 -04:00
8d07a4a08f
Log useful error messages when can't mkdir the monitor events dir or the symlink to it. symlink is a warning because the symlink is just a user aid
2019-03-25 11:58:04 -04:00
accf826ae9
New translations
2019-03-25 11:44:01 +03:00
42196ed5aa
Update translation ru 2
2019-03-25 10:20:27 +03:00
677b9cfbed
Make controlcap popup wider
2019-03-24 09:59:04 -04:00
bd5c9b5b20
add Control to ZM namespace
2019-03-24 09:58:50 -04:00
01056fc0f4
Перевод некоторых слов
2019-03-24 04:14:06 +03:00
f311fcc9e0
change to a button
2019-03-22 17:28:23 -04:00
8f28ba0be3
beter debug and less often when no terms in parseFilter
2019-03-22 17:28:12 -04:00
6d4d353209
fix namespace on MontageLayout
2019-03-22 17:27:58 -04:00
16467595d4
Fix clicking in montage
2019-03-21 17:00:51 -04:00
65fab1b032
add px to width and height of event img
2019-03-21 14:14:45 -04:00
7f7acc18ee
spacing and code doc
2019-03-21 14:14:30 -04:00
f434042c52
fix spacing
2019-03-21 14:14:15 -04:00
f5dfa0d740
Spacing and fix clone monitor by setting the Id to 0 instead of nextId, so that when we go to save it, we use an insert instead of an update
2019-03-20 15:03:20 -04:00
10a972f2a0
fixes to download video
2019-03-20 14:51:59 -04:00
d4353af8af
Fix eslint errors
2019-03-20 14:51:39 -04:00
a5366d522d
Fixup exporting
2019-03-20 14:29:05 -04:00
ae7391689b
Add some code doc
2019-03-20 14:28:19 -04:00
ad059f985e
spacing
2019-03-20 14:27:23 -04:00
09b42f8b55
remove nonce from js because it is the exported html not part of the zm web ui
2019-03-20 14:27:10 -04:00
6efeab5f8d
improve readability of parseFilter
2019-03-20 14:26:48 -04:00
b988ce0573
more parentheses to make logic more clear
2019-03-20 14:26:35 -04:00
c3324ada18
Put back mkdir ZM_PATH_SOCKS
2019-03-20 14:26:03 -04:00
84a200395e
spacing and turn off errors because ajax should only return json
2019-03-20 14:25:34 -04:00
52e66adc99
Fix namespace
2019-03-20 14:25:12 -04:00
a634d8b774
use id instead of this->data when loading Event to delete in API
2019-03-19 17:26:20 -04:00
0623afb0ae
add language entry for Monitor DefaultCodec
2019-03-19 12:19:58 -04:00
71cd024fda
spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown
2019-03-19 12:16:31 -04:00
6b6e787e4e
fix ajax stream code
2019-03-19 12:05:45 -04:00
418276ff1c
cleanup/debug
2019-03-19 12:02:42 -04:00
3f9564c10a
Merge branch 'master' into storageareas
2019-03-19 10:37:35 -04:00
428f7e8e8f
create setup_onclick and disable_onclick in the monitor object. Use it to setup and disable the click event when editing/cancelling layout editing
2019-03-19 10:24:30 -04:00
72b87a7c00
Add code to be a bit more careful about not deleting all events when an incomplete event object is used.
2019-03-19 09:36:58 -04:00
2c1c9fe6cd
fix missing ZM namespaces
2019-03-19 09:23:35 -04:00
1d3af44d02
Fix namespace Warning
2019-03-19 09:13:56 -04:00
ad5f6a8729
Camera reboot function ( #2554 )
...
* Adding a button for camera reboot function
This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.
* Adding reboot function option to contorl configuration
This patch adds a reboot option to the camera control configuration
view.
* Adding Reboot field to Controls table
This patch adds a Reboot field to the Controls table to support
a camera reboot control option.
* Correcting button value to match reset
* Updating language files
I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.
* Add missing forward slash
2019-03-18 14:49:05 -04:00
520c41da23
Merge ../ZoneMinder.connortechnology.bad into storageareas
2019-03-18 14:40:03 -04:00
06eb38f802
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-03-18 11:24:33 -04:00
9482207f5c
revert namespace stuff in index.php
2019-03-18 11:24:28 -04:00
3c31dd63ce
Use zm_session_start() for API auth. Fixes #2547
2019-03-11 00:27:46 -07:00
abb6ef1688
API: Escape 'named' params for SQLi in two more Event endpoints.
...
Fixes #2099
2019-03-11 00:21:51 -07:00
056b96f7fc
API: Monitor and Event 'index' SQLi. Fixes #2099
2019-03-11 00:21:51 -07:00
ac547e0d5d
Don't scroll to the top of the page when force/cancel alarm is clicked
2019-03-10 20:58:24 -07:00
e6220e9d07
Fix eslint issues in cycle.js
2019-03-10 20:56:08 -07:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
24665264a2
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-05 20:16:05 -05:00
fa124eb29a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-03-05 14:35:15 -05:00
f0f2b6a17c
implement click_automove and submitToMontrageReview for onclick handlers
2019-03-05 14:35:02 -05:00
5a66969fd1
change buttons from inputs to buttons. Add submit to montagereview. get rid of onclick handlers
2019-03-05 14:34:34 -05:00
7b7a58b2f1
remove old xhtml-isms
2019-03-05 14:33:03 -05:00
0022dbfb76
add a newline to improve readability
2019-03-05 14:31:39 -05:00
e59eb510e3
update and fix the donate popup
2019-03-05 13:10:04 -05:00
73ae3f49ed
Merge branch 'master' into storageareas
2019-03-05 11:35:55 -05:00
36b00d09e3
fix destination view on the monitors view
2019-03-05 11:02:58 -05:00
7779edb485
Fix saving multiple monitors at once by moving the relevant code to includes/actions/monitors.php
2019-03-05 11:02:37 -05:00
8053f61a08
fix eslint missing {}
2019-03-05 11:02:09 -05:00
76ee31bf68
fix eslint missing {}
2019-03-05 11:01:58 -05:00
49a1954f96
fix typo and remove deprecated DefaultView
2019-03-05 11:01:39 -05:00
8b29c5f54c
Fix typo: Ineterval to Interval
2019-03-05 10:58:23 -05:00
f446e73ff7
Typo: AnalysisUpdateDelete to AnalysisUpdateDelay
2019-03-05 10:55:27 -05:00
778707c8df
Merge branch 'master' into storageareas
2019-03-04 14:33:28 -05:00
7cee8356bd
Fix setting frame width when changing from fixed width to scaled
2019-03-04 13:43:03 -05:00
96e29c0299
fix up remaining issues with cycle updates
2019-03-04 13:35:40 -05:00
e9a6eee2bb
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-01 17:47:50 -05:00
190142b24c
Merge branch 'master' into storageareas
2019-03-01 17:47:07 -05:00
ff8c5c5db8
remove debug
2019-03-01 17:28:00 -05:00
78513e22fd
When doing an OPTIONS just do CORS and exit. if xmlHttpRequest don't do a redirect login. Do a failed auth header and quit
2019-03-01 17:27:08 -05:00
7703661cb1
Don't use streaming port in UrlToIndex because xmlHttpRequest won't send cookies to a different port
2019-03-01 17:25:17 -05:00
520bd4e7a7
Add ZM namespace to Logger
2019-03-01 14:42:05 -05:00
05bc57e245
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-01 14:27:30 -05:00
466c379e94
Merge branch 'master' into storageareas
2019-03-01 14:03:49 -05:00
675b4975b0
Fix control presets
2019-03-01 13:37:34 -05:00
2d75ab50af
Implement deleting from Logs based on line count instead of interval
2019-02-28 16:12:34 -05:00
20fe502ca4
Add ZM to ErrorHandler. Spacing and quotes
2019-02-27 12:02:40 -05:00
2db030265b
Merge branch 'master' into storageareas
2019-02-27 11:08:04 -05:00
a1f1c19c0f
fix missing ZM namepsace
2019-02-27 11:07:52 -05:00
af9c87a112
Merge branch 'master' into storageareas
2019-02-27 10:53:19 -05:00
6e4444099b
Only populate session with user info on successful login. Use parameters in sql when loading users in getAuthUser. Fixes #2542
2019-02-27 09:57:50 -05:00
804c384b4c
add Event Notification support to server
2019-02-27 09:29:11 -05:00
a7ca75758b
add Event Notification label
2019-02-27 09:29:00 -05:00
c0ae7820bb
add zmeventnotification to Server object
2019-02-27 09:28:36 -05:00
4c35f2910c
fix ZM namespace
2019-02-26 18:09:18 -05:00
df3e11d83c
Fix authentication in api because we no longer store the user object in the session
2019-02-26 17:01:45 -05:00
95567e07a4
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-26 11:43:07 -05:00
a00e2381b7
Merge branch 'master' into storageareas
2019-02-26 11:33:29 -05:00
92dc7878de
Fix 2340 ( #2368 )
...
* include includes/functions.php so that we have access to all it's contents
* add a beforeDelete function which deletes the files. Add other needed functions like Path() LinkPath() etc.
* add require_once for Storage and functions because we use them in Event
* Now that ZM has namespaces use the ZM Event class to do the heavy lifting of delete
* Don't need functions in AppController anymore
2019-02-26 11:28:56 -05:00
5da51d51bc
Merge branch 'master' into storageareas
2019-02-26 10:55:51 -05:00
53c0fae688
Merge fix from storageareas for archive/delete in events list
2019-02-26 10:22:58 -05:00
627e9f74cf
fix spacing
2019-02-25 15:24:25 -05:00
2187dea2aa
add namespace to Warnings
2019-02-25 15:11:08 -05:00
cbd8ee80f8
add namespace for Monitor
2019-02-24 12:40:40 -05:00
3b06f3015a
redirect to console of successfullogin takes us to login
2019-02-24 10:07:42 -05:00
dd590aa729
remove warning when QUERY_STRING is not set
2019-02-24 10:05:45 -05:00
46c6735311
Missing namespace on filter. Fixes #2541
2019-02-24 10:02:49 -05:00
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
45778384a6
Merge branch 'release-1.32'
2019-02-22 11:24:23 -05:00
9a2dd06e1d
Fix use of empty which isn't supported in old php. Remove the code entirely as I think it was just cutnpasted from somewhere else. We don't care if it is a new server or not in the validate code.
...
Fixes #2540
2019-02-22 11:22:44 -05:00
5098329d94
remove ob_clean stuff which logs errors when output buffering is turned off ( #2395 )
...
* remove ob_clean stuff which logs errors when output buffering is turned off.
* Don't ob_clean because if buffering is off php will output an error
2019-02-22 09:58:16 -05:00
2b90bf15a6
Improve session ( #2487 )
...
* Introduce ZM_COOKIE_LIFETIME which sets the life of the SESSION cookie, instead of using what is in php.ini
* Use zm specific session functions, which are now located in includes/session.php. Be more agressive about clearing session on logout.
* Move session code to includes/session.php
* remove duplicate line
* Move is_session_open to session.php. Move code to clear a session into session.php
* improve debug line when there is a problem updating config entry
* split description into description and help text for COOKIE_LIFETIME
* Remove redirect on line. We do it in javascript on postlogin view so that we can say logging in before switching to console
* If there is a username in the session, then we are logged in, but we need to load the user object from the db. We can't just trust it from the session. The user may have been deleted and having that data in the session can be a security risk. So load the user object on every request.
* Use session_regenerate_id instead of our broken code to do the same
* Move auth code to includes/auth.php
* add autocomplete tags to username and password inputs
* Don't redirect to login if we are already viewing login. Put auth before including skin includes
* need to include session.php in auth.php
* update to php namespace
2019-02-22 09:43:38 -05:00
0a7667f2d0
Use buttons instead of divs and inputs ( #2522 )
2019-02-22 09:23:06 -05:00
410cb70ddb
get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again. ( #2534 )
2019-02-22 09:20:54 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
e087522203
remove debug
2019-02-21 14:15:10 -05:00
d93924bd89
increase width of controls popup.
2019-02-20 15:39:26 -05:00
8837015239
remove bogus test for Filter Id
2019-02-19 13:54:25 -05:00
6d1541a4d2
Merge branch 'fix_privacy_view' into storageareas
2019-02-19 12:57:01 -05:00
97a888c0db
get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again.
2019-02-19 12:54:12 -05:00
fbdb5bcb62
Merge branch 'master' into storageareas
2019-02-19 12:06:32 -05:00
eaa7341935
Add missing / in path to auth.php
2019-02-19 10:07:36 -05:00
87988185e5
remove data-on-click-this from markEids[] because we have an onclick bind in initPage
2019-02-19 09:58:03 -05:00
5029d7214a
Merge branch 'master' into storageareas
2019-02-18 17:00:45 -05:00
4cd3a93e96
add missing /
2019-02-18 16:30:03 -05:00
b646284da3
don't quote dbEscape values it will quote it already ( #2529 )
2019-02-17 11:31:28 -05:00
04c17283ec
need to prefix with _dir_ otherwise relative to initial script ( #2531 )
2019-02-17 11:31:10 -05:00
b7a6aed1cd
Merge branch 'master' into storageareas
2019-02-16 11:51:23 -05:00
34873d5636
We must leave ZM_HOME_CONTENT unescaped so that we can insert actual html like image tags
2019-02-16 11:50:09 -05:00
6156aa2af9
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-15 10:49:06 -05:00
b25770a2f0
Merge branch 'master' into storageareas
2019-02-13 11:52:31 -05:00
d0745da11c
fix path to Control.php
2019-02-13 11:52:16 -05:00
a41e8a8834
Merge branch 'master' into storageareas
2019-02-13 11:38:38 -05:00
400d4dc27e
encode the label on the preset so that weird characters and quotes don't break the button
2019-02-13 11:24:09 -05:00
dd641793a2
Merge branch 'improve_session' into storageareas
2019-02-13 11:17:30 -05:00
91a280e56e
need to include session.php in auth.php
2019-02-13 11:17:15 -05:00
3d6efe2253
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-13 11:10:07 -05:00
d1b3b23c09
Merge branch 'master' into storageareas
2019-02-13 09:42:03 -05:00
b6a0e704d2
whitespace, remove xhtml cruft
2019-02-12 16:41:08 -05:00
7a8668ea99
whitespace
2019-02-12 16:40:48 -05:00
9a0f3801de
fix + instead of .
2019-02-12 16:25:31 -05:00
2f301cf5fe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-02-12 13:18:08 -05:00
5b9bb93703
fix navbar auth
2019-02-12 13:17:55 -05:00
28f5ac4220
Merge pull request #2518 from connortechnology/reload_zmfilter_on_filter_save
...
rough in a control function in Filter object. Use it to start/stop z…
2019-02-12 09:26:17 -06:00
f95e9c0363
Fix comment about hiding navbar ( #2521 )
...
Fixes #2520
2019-02-11 17:14:33 -05:00
5ce681b463
instantiate a false Frame object with id = objectect
2019-02-11 16:37:22 -05:00
5a924ab176
cleanup redundant code and spacing
2019-02-11 16:29:19 -05:00
3871c28089
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-02-11 14:15:35 -05:00
40e0019267
fix all the nav missing when a users Monitors Permission is None
2019-02-11 14:15:24 -05:00
a3374aa26c
Merge branch 'reload_zmfilter_on_filter_save' into storageareas
2019-02-11 13:26:53 -05:00
5695be9f32
rough in a control function in Filter object. Use it to start/stop zmfilter processes when filters are deleted or Saved.
2019-02-11 13:21:00 -05:00
5a333e153c
show object detected file, if object detection in place ( #2514 )
2019-02-11 10:58:34 -05:00
9675367e03
event.js: Wait for delete request to succeed before navigating. Fixes #2384 ( #2515 )
2019-02-11 09:34:51 -05:00
cdbd59f054
bandwidth.php: Submit to the 'bandwidth' view but render the 'none' view. Fixes #2493
2019-02-10 13:22:08 -08:00
cda4a28fec
Fix accidental use of 'let' in 255806bd54
2019-02-10 11:14:55 -08:00
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
c9032d3cb4
add autocomplete tags to username and password inputs
2019-02-10 00:27:33 -08:00
c8e41bfee7
log.php: Ensure 'line' is an integer. Helps with #2466
2019-02-10 00:10:39 -08:00
a6ee79f428
Fix typo in dbc1c7b72f comment
2019-02-09 22:40:39 -08:00
dbc1c7b72f
Only output the CSRF Try Again button (and add a warning) when ZM_LOG_DEBUG is on. Fixes #2469
2019-02-09 22:39:54 -08:00
a97711de89
Replace or sanitize remaining uses of PHP_SELF. Fixes #2446
2019-02-09 22:12:36 -08:00
99f1e23c5b
Replace usage of PHP_SELF in views/. Fixes #2450
2019-02-09 21:39:19 -08:00
effd609ff7
Escape output of state names. Fixes #2475
2019-02-09 20:40:08 -08:00
d7ede4643d
_monitor_filters.php: Escape MonitorName and Source. Fixes #2457
2019-02-09 19:14:31 -08:00
c9d597dced
logger.php: Don't output Panic messages unless debugging is on. Fixes #2460
2019-02-09 18:51:30 -08:00
255806bd54
log.js: Escape HTML to be shown in the log HtmlTable. Fixes #2453
2019-02-09 18:43:55 -08:00
6af2c4ad0e
Escape output of WEB_TITLE, HOME_URL, HOME_CONTENT, & WEB_CONSOLE_BANNER. Fixes #2468
2019-02-09 18:06:21 -08:00
9ce05a9a09
user.php: Escape the Username upon display. Fixes #2467
2019-02-09 17:45:52 -08:00
6d2f3c265f
events.php: Remove inline event handlers and enforce CSP
2019-02-09 17:34:59 -08:00
fcbc22b6a2
functions.php: Ensure 'limit' request parameter is an integer. Fixes #2456
2019-02-09 17:27:47 -08:00
502f53fad0
functions.php: Fix SQLi in getFormChanges
2019-02-09 17:15:02 -08:00
ef0e5f453a
monitor.php: Fix XSS from LinkedMonitors. Fixes #2463
2019-02-09 17:11:53 -08:00
9705edfe24
monitor.php: Escape monitor method. Fixes #2464
2019-02-09 17:01:45 -08:00
cef54feaf9
monitor.php: Escape a bug of output variables. Fixes #2465
2019-02-09 16:54:06 -08:00
254b7286b4
monitor.php: Escape SignalCheckColour to prevent XSS. Fixes #2451
2019-02-09 16:41:54 -08:00
bb75dad091
filter.php: Escape filter query term value to avoid XSS. Fixes #2462
2019-02-09 15:35:55 -08:00
dd37808ef7
filter.php: Escape AutoExecuteCmd before output to prevent XSS. Fixes #2461
2019-02-09 15:24:13 -08:00
70e59ed546
filter.php: Escape the filter name on output. Fixes #2455
2019-02-09 15:19:15 -08:00
b2a97ee190
frame.php: Fix multiple XSS from 'show' and 'scale' parameters and enforce CSP.
...
Fixes #2448 , fixes #2449 , and fixes #2447 .
2019-02-09 15:10:45 -08:00
c8066919ff
functions.php: Esacepe textContent in htmlOptions()
2019-02-09 14:14:46 -08:00
7b0ee8a6a2
group: Escape group name in heading. Fixes #2454
2019-02-09 14:05:50 -08:00
fa6716a64b
console: Escape source column output to prevent XSS. Fixes #2452
2019-02-09 02:28:40 -08:00
98e0a0d2c5
Don't output Fatal(...) error messages unless debugging is on to avoid leaking info. Fixes #2459
2019-02-09 02:18:57 -08:00
02f09aad7f
view=export: Remove inline event handlers and fix arbitrary URL/XSS usage. Fixes #2443
2019-02-09 02:01:26 -08:00
61f6a92cc0
view=download: Validate the eid parameter to avoid XSS. Fixes #2442
2019-02-09 01:37:32 -08:00
0b38e72f88
view=download: Remove inline event handlers and fix arbitrary URL/XSS usage. Fixes #2441
2019-02-09 01:16:32 -08:00
e36ac1b872
Add a polyfill for NodeList.prototype.forEach
2019-02-08 21:54:23 -08:00
2dc935b488
added object detection frame rendering ( #2505 )
2019-02-08 13:49:00 -05:00
0eb1efff8b
fix eslint errors
2019-02-08 13:48:38 -05:00
ee3a0c1fd1
fix validateForm running on monitor cancel due to lack of type=button on cancel button
2019-02-08 09:55:32 -05:00
ca781523a8
Merge branch 'master' into storageareas
2019-02-07 08:57:50 -05:00
1039149866
fix buttons on events page. data-onclick-this to data-on-click-this
2019-02-07 08:56:48 -05:00
d33e094526
Merge branch 'master' into storageareas
2019-02-06 17:03:41 -05:00
7e84a5914c
fix CSP policy violations on filters view
2019-02-06 13:55:19 -05:00
0783802d0c
fix CSP violations on events
2019-02-06 13:31:34 -05:00
b04b67c39d
Fix CSP violation in the onclick of the monitor view in montagereview
2019-02-06 12:17:10 -05:00
6744a9a116
Make montagereview more robust when the storage area of an event has been deleted. Add the onmouse events using javascript instead of in the html canvas element so that our CSP policy works.
2019-02-06 11:46:55 -05:00
edaf582eb4
Make montagereview more robust when the storage area of an event has been deleted. Add the onmouse events using javascript instead of in the html canvas element so that our CSP policy works.
2019-02-06 11:46:48 -05:00
8e62c93f5f
add to_json function to Storage.
2019-02-06 11:44:36 -05:00
a9f0463223
Merge branch 'master' into storageareas
2019-02-05 16:46:47 -05:00
dca9a81cfd
implement data-on-click-true
2019-02-05 16:45:05 -05:00
d121ecab75
Merge branch 'improve_session' into storageareas
2019-02-05 15:48:42 -05:00
141f2afc8c
Merge branch 'master' into storageareas
2019-02-05 15:46:58 -05:00
21702dcc68
Merge branch 'master' into improve_session
2019-02-05 12:35:29 -05:00
a40cd144fa
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-02-05 12:35:15 -05:00
c54fe7e89a
fix state actions
2019-02-05 12:35:06 -05:00
d08a6fcc7c
Don't redirect to login if we are already viewing login. Put auth before including skin includes
2019-02-05 12:32:24 -05:00
78bc2c1dc2
add autocomplete tags to username and password inputs
2019-02-05 11:53:57 -05:00
b6b4a21dbe
Move auth code to includes/auth.php
2019-02-05 11:45:58 -05:00
cb0d9325e6
Use session_regenerate_id instead of our broken code to do the same
2019-02-05 11:45:09 -05:00
2466d765bf
If there is a username in the session, then we are logged in, but we need to load the user object from the db. We can't just trust it from the session. The user may have been deleted and having that data in the session can be a security risk. So load the user object on every request.
2019-02-05 11:44:45 -05:00
5a9083fe86
Remove redirect on line. We do it in javascript on postlogin view so that we can say logging in before switching to console
2019-02-05 11:40:58 -05:00
a2e04c307d
update buttons. reduce duplicated code. Make it so that users with System=View can at least see if there is an update.
2019-01-31 09:40:19 -05:00
86b7fe5d29
fix spacing
2019-01-30 16:08:41 -05:00
4bacd26c98
log redirections
2019-01-30 16:08:24 -05:00
97e3a8178a
use session_regenerate_id instead of other strange code
2019-01-30 16:08:09 -05:00
b09a71d0e2
code style
2019-01-30 16:06:16 -05:00
71f961d012
remove redirect to console on login, as it is done in javascript after Logging in message is displayed
2019-01-30 16:05:51 -05:00
4e10e6f0ae
Merge branch 'improve_session' into storageareas
2019-01-30 15:26:37 -05:00
9a3aa49bae
Merge branch 'fix_bandwidth' into storageareas
2019-01-30 15:18:16 -05:00
533d021dea
Merge branch 'master' into storageareas
2019-01-30 15:17:27 -05:00
604dbf8776
fix state changing/etc
2019-01-30 14:36:46 -05:00
2e2404643f
Fix bandwidth due to new actions code. Update buttons on bandwidth popup
2019-01-30 13:20:24 -05:00
cc0b5e0f1f
Move is_session_open to session.php. Move code to clear a session into session.php
2019-01-30 12:52:01 -05:00
0eba430932
remove duplicate line
2019-01-30 11:05:43 -05:00
4e9ce3c5b7
Move session code to includes/session.php
2019-01-30 11:05:36 -05:00
85bb70df68
Use zm specific session functions, which are now located in includes/session.php. Be more agressive about clearing session on logout.
2019-01-30 11:05:19 -05:00
7ea8be3fa8
spacing, remove non html5 elements
2019-01-25 09:22:08 -05:00
8c5687ca30
Fix name/protocol XSS in controlcaps.php. Fixes #2445 ( #2479 )
2019-01-25 08:35:07 -05:00
fd6179d7c8
Enforce CSP on many more views ( #2480 )
2019-01-25 08:34:29 -05:00
a3e8fd4fd5
Fix zones.php self-xss. Fixes #2444
2019-01-24 23:40:41 -08:00
47d8c9b066
plugin.php: Remove undefined onclick function reference and enforce CSP
...
Also fix tag closing.
2019-01-23 19:47:58 -08:00
59cc65411f
plugin.php: Fix XSS and directory traversal bugs. Fixes #2436
...
This view seems like dead code so maybe it should be removed instead.
2019-01-23 19:41:38 -08:00
e53678f869
Can't use a normal subsitution on the Order by field. So parse the sort param instead
2019-01-23 12:22:00 -05:00
6eb4d7ae27
Filter improvements ( #2438 )
...
* Put back code to close the popup when view is none
* clean up and reduce depth of some logic
* Increase width of user popup
* fix code style
* Make execute_filter work on a filter Id instead of name
* rework logic to reduce code depth. Change view to events to display the results of execute.
* Change the redirect to stay on the new view. When redirecting from executing a filter, it was redirecting to filter.
* Set a form action for correctness. Change execute button to a button instead of a submit. Stay on the filter view when executing
2019-01-23 11:30:51 -05:00
4da95369f9
Fix zone area calculation ( #2437 )
...
Previous method resulted in bogus zone areas (in the range of
1000s of % of frame area) when entering points with the keyboard, even
after applying commit 4937a68650http://mathworld.wolfram.com/PolygonArea.html
It has been tested on ZoneMinder 1.32.3 and works correctly when
either entering coordinates with the keyboard or dragging points with
the mouse.
2019-01-23 10:35:18 -05:00
7026ebafac
Make ajax/stream wait longer for zms. On pi can take up to 3 seconds. Also for php < 5.6, we need to fake 64bit unpack support
2019-01-22 16:45:38 -05:00
cc8de69eba
Merge branch 'master' into storageareas
2019-01-22 11:44:42 -05:00
2914fb1d58
Update to html5, remove code to close popup (as it is taken care of in skin.js now. Use cache_bust on skin.js
2019-01-22 09:15:25 -05:00
e712cedbde
spacing and quotes
2019-01-22 09:14:44 -05:00
ae703c45ee
Set closePopup=true so that we don't need code in the none view to close the popup. The common code in skin.js will take care of it.
2019-01-22 09:14:33 -05:00
0619a4a161
Validate cnj, obr, and cbr arguments in parseFilter ( #2434 )
2019-01-22 08:03:25 -05:00
e7e45b2d95
Remove jQuery use from top-level event listeners in skin.js since view=none doesn't have $j ( #2433 )
2019-01-22 08:00:39 -05:00
7260f823cb
Merge branch 'master' into storageareas
2019-01-21 13:52:38 -05:00
785c208ecf
Fixes #2426 . Ca should have been endTime
2019-01-21 12:01:46 -05:00
326ac60ae4
add missing braces to fix logic
2019-01-21 11:20:56 -05:00
a2d4dc974b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-21 11:19:07 -05:00
e663397816
spacing
2019-01-21 11:17:21 -05:00
c6311b7079
When logging in, stay on the login view
2019-01-21 11:17:09 -05:00
fbc236128e
add a function to format a time into a duration. Can't use date() because 0 doesn't give us 00:00:00 it gives 19:00:00
2019-01-21 11:16:14 -05:00
b24b930f65
After login go to postlogin, not console. the login view is in a popup so we want to close
2019-01-21 11:15:36 -05:00
19c272061a
Replace MooTools usage for adding window event listeners ( #2429 )
2019-01-21 11:14:32 -05:00
27bcf3f994
Upgrade jQuery version ( #2430 )
...
* Upgrade jQuery to 1.12.4
* Upgrade jQuery to 2.2.4; Stop support for IE8
* 2.2.4 is compatible with 1.12.4
* This fixes a CSP violation on every page load due to jQuery testing of focusin support with a hidden element.
2019-01-21 11:13:40 -05:00
f0b33145f5
Log CSP violations in ZM logs in supported browsers ( #2431 )
2019-01-21 11:12:17 -05:00
d7ebc85d81
Replace remaining `console` inline event handlers ( #2432 )
...
* Use a hidden submit button in _monitor_filters rather than onkeydown
* events/console: Convert checkbox header toggle inline event listeners
2019-01-21 11:11:40 -05:00
f69b77e38f
fix eslint complaints
2019-01-19 12:40:17 -05:00
a1a42345e3
More eslint fixes; eslint in php; add eslint to travis ( #2419 )
...
* Add eslint to travis.yml
* Update eslint package versions and apply new indent rules
* Enable the brace-style and block-style eslint rules
* Enable the 'curly' eslint rule
* Enable the 'keyword-spacing' eslint rule
* Enable the 'key-spacing' eslint rule
* Enable the 'object-curly-spacing' eslint rule
* Enable the 'no-new-object' eslint rule
* Only disable the no-caller eslint rule in the one affected file
* Enable the 'no-unused-vars' eslint rule for local variables
* Add linting of JS in .php files
2019-01-19 10:32:40 -05:00
35fb4366b6
Fix recaptcha support with the CSP ( #2420 )
2019-01-19 09:47:04 -05:00
c0a6e54d60
skins/classic/views/control.php second order sqli ( #2422 )
2019-01-19 09:46:21 -05:00
02fd1e79b3
Fix ajax/status.php orderby sql injection ( #2421 )
...
https://github.com/LoRexxar/CVE_Request/tree/master/zoneminder%20vul%20before%20v1.32.3#ajaxstatusphp-line-276-orderby-sql-injection
2019-01-19 09:46:08 -05:00
34e2e47993
controlcap.php: Reflected xss fix with validHtmlStr ( #2423 )
2019-01-19 09:43:28 -05:00
d3f8037e58
Replace onclick='submitTab(...' with a click listener ( #2424 )
2019-01-19 09:42:12 -05:00
4e48939660
Add a validateForm event listener and enforce CSP on some views ( #2425 )
...
* Add a validateForm event listener and enforce CSP on the controlcap view
* filter.php: Use .validateFormOnSubmit
* server.php: Use .validateFormOnSubmit and fix makePopupButton condition check
* Use .validateFormOnSubmit and enforce CSP on the storage view
2019-01-19 09:41:53 -05:00
552e14a971
Merge branch 'master' into storageareas
2019-01-18 10:36:59 -05:00
43a1725060
Fix duplicate 'class' attribute in options ( #2418 )
2019-01-18 10:05:44 -05:00
eef113b6a7
Convert some characters to HTML entities ( #2417 )
2019-01-18 10:02:48 -05:00
deaf651aad
Fix eslint violations ( #2416 )
...
* Add more JS libraries to eslintignore
* eslint . --fix
Automatic fixes only
* frame.js: eslint fixes
* events.js: manual eslint fixes
* skin.js: manual eslint fixes
* watch.js: manual eslint fixes
* Remove some tabs used for indentation in JS
* state.js: Fix new-cap eslint violation
* Disable guard-for-in eslint rule to get everything passing
2019-01-18 10:00:55 -05:00
6bb5aa1b87
More inline JS / nonce conversions ( #2415 )
...
* monitor.php: Add nonce and move <script> inside </body>
* export_functions.php: Untested: Add @nonce to <script>
* blank.php: Add @nonce to <script> and add to CSP enforced views
* Enforce CSP on login and privacy views
* group.php: Add nonce and move <script> inside </body>
* filter.php: Add @nonce to <script>
* Fix updateButtons argument on the filter page upon change and page load
* events.php: Add @nonce to <script>
2019-01-18 09:51:06 -05:00
599769b701
rework logic of functions to be more verbose about errors. Implement javascript Nonce support when view=none
2019-01-17 08:50:33 -05:00
87d1390fed
Merge branch 'storageareas' into h265
2019-01-16 15:20:17 -05:00
f49dd93b6a
Merge branch 'master' into storageareas
2019-01-16 14:39:56 -05:00
1f3da476b8
switch to single quotes
2019-01-16 14:04:24 -05:00
b1cc0c2b82
add CSP nonce to CSRF rewriting
2019-01-16 14:04:07 -05:00
a7db6f08f5
single vs double quotes
2019-01-16 13:47:50 -05:00
42076ad09b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-16 13:46:01 -05:00
a2c23d3263
Need nonce in inline script setting display css
2019-01-16 13:45:26 -05:00
d8ef33396a
If multi-port is on, we need to output CORS headers
2019-01-16 13:44:57 -05:00
e156a6cda0
logout view should go to logout view
2019-01-16 12:23:18 -05:00
ba21820fd0
fix typo
2019-01-16 12:10:34 -05:00
eee1d871e0
get rid of default value for PathToIndex so that it will use PHP_SELF instead
2019-01-16 12:09:26 -05:00
d33fec9c3f
Add a CSP script-src policy with nonce-source and convert more inline event handlers ( #2413 )
...
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy
* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'
Only handle ones that don't return a value.
* Use @data-on-click to attach inline click event handlers with no args and no return value
* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument
* Enforce a script-src CSP on views without inline JS
* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
fd696bc066
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-15 11:38:56 -05:00
ac27005944
remove debug
2019-01-15 11:38:43 -05:00
07c7c271a6
prevent error when event has no frames. Fix PathToIndex() -> PathToIndex. Fixes #2411
2019-01-15 11:38:19 -05:00
3182d8bab7
implement to_json method so that defaults get included
2019-01-15 11:36:56 -05:00
07d8ac1d49
implement timezone check function ( #2387 )
...
* implement timezone check function
* remove comment
* also check if the timezone is valid
* whitespace
2019-01-15 09:05:11 -05:00
083f284599
Replace onclick inline event handlers for createPopup ( #2410 )
...
* Move <script> before </body>
* Change makePopupLink to not use onclick
* Change makePopupButton to not use onclick
* Use .popup-link in control_functions.php
* Use makePopupButton in controlcaps.php
* Prevent double-encoding in makePopup*
* Use makePopupButton in devices.php
* Use makePopupButton in logout.php
* Use makePopupLink in monitor.php
* Use makePopupLink and .popup-link in montage.php
* Use makePopupButton in options.php
* Use makePopupButton, makePopupLink, and .popup-link in zones.php
2019-01-15 09:01:58 -05:00
f726666f54
Merge branch 'master' into h265
2019-01-14 12:36:11 -05:00
fc7403fe3d
Merge branch 'master' into storageareas
2019-01-13 14:53:34 -05:00
c834fbe462
the filter action should singular filter, not filters
2019-01-13 14:52:39 -05:00
a282b487d1
load Help from Config as it is not longer always loaded into ram.
2019-01-11 13:55:03 -05:00
b373577589
fix function view after actions cleanup
2019-01-10 12:08:25 -05:00
1d54216e80
spacing
2019-01-09 16:23:58 -05:00
c1e4fbac6a
extend input path and options to the full width of the popup
2019-01-09 12:37:42 -05:00
2d03583b78
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-08 13:12:42 -05:00
ffa37d8c10
Fix margins on replayControl
2019-01-08 13:12:35 -05:00
3f5a2a2aa6
disable delete button when event is archived.
2019-01-07 15:56:23 -05:00
f3a807f1f8
Merge branch 'master' into storageareas
2019-01-07 09:21:25 -05:00
b4f8500cb5
Merge branch 'split_actions'
2019-01-05 18:33:04 -05:00
3f10553464
Fix include path to Monitors.php
2019-01-05 18:32:53 -05:00
1a75cf333e
Merge branch 'master' into storageareas
2019-01-05 11:12:38 -05:00
e34a5e972a
fix missing }
2019-01-05 11:12:26 -05:00
cf0d55d3db
Merge branch 'master' into storageareas
2019-01-05 10:59:01 -05:00
e6ba8e58ef
Fix #2391 by defining monitor variable ( #2392 )
2019-01-05 10:20:34 -05:00
8eb61b1c11
Merge branch 'master' into storageareas
2019-01-05 10:16:38 -05:00
5b5905c83a
We always use markEids[] now
2019-01-04 16:29:16 -05:00
de0ef6ce43
Merge branch 'master' into split_actions
2019-01-04 15:55:54 -05:00
e72e4e7ce4
Spacing, remove some html4 stuff, clean up duplicated hidden form elements.
2019-01-04 15:52:36 -05:00
dea64320f0
Fix a + that should be a .
2019-01-04 15:52:14 -05:00
0e20666992
fix eventdetail actions being in events
2019-01-04 15:43:31 -05:00
ab198bfd75
remove master version of actions.php
2019-01-04 15:29:21 -05:00
52466c398b
Merge branch 'split_actions' into storageareas
2019-01-04 15:28:55 -05:00
b8d065275b
Merge branch 'master' into storageareas
2019-01-04 15:22:18 -05:00
e2f32ab091
Upgrade config saving
2019-01-04 09:43:36 -05:00
7ec96655c3
fix missing ! when testing for permission on editing config
2019-01-04 09:37:26 -05:00
5b9bf48945
Merge branch 'master' into split_actions
2019-01-04 09:35:54 -05:00
46adcbb66b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-04 09:34:51 -05:00
edeaa07c12
Fix no quotes around Id
2019-01-04 09:34:42 -05:00
6cad852e11
fix path to MontageLayout
2019-01-04 09:34:18 -05:00
dbe9817bc8
Split actions.php into individual files per view
2019-01-04 09:26:34 -05:00
225fca08e3
Merge pull request #2379 from connortechnology/improve_config_efficiency
...
Improve config efficiency
2019-01-02 19:34:34 -06:00
874930d8fc
Merge branch 'master' into improve_config_efficiency
2019-01-02 13:07:53 -05:00
99471836b7
Use monitor's serverId when loading server object so that images load from recording server.
2019-01-02 11:28:12 -05:00
8a1707a615
Add monitorServerId array to provide server info for each monitor so that we can load images from the recording server.
2019-01-02 11:27:46 -05:00
79113a6869
Add a default Server object to handle non-multi-server case
2019-01-02 10:56:40 -05:00
5060358870
Merge branch 'master' into storageareas
2018-12-29 09:56:53 -05:00
d14e9ecf74
force overloadframes and ExtendAlarmFrames to int ( #2373 )
2018-12-29 09:53:31 -05:00
3258d8e590
remove ZM_DIR_IMAGES ( #2374 )
2018-12-29 09:52:58 -05:00
1a1231fdaa
Merge branch 'master' into storageareas
2018-12-28 10:47:27 -05:00
a029909972
fix path to thumb and anal images ( #2367 )
2018-12-28 10:46:13 -05:00
fb37fc48e1
update viewImagePatch ( #2370 )
2018-12-28 10:38:39 -05:00
101f24feb5
Update area when editing x and y coords ( #2366 )
2018-12-27 14:28:14 -05:00
3e06bbcef8
Merge branch 'master' into storageareas
2018-12-27 13:50:29 -05:00
5f9a113da1
redirect to montage rather than montagereview
2018-12-26 10:34:01 -06:00
27dd8166ea
Merge pull request #2362 from connortechnology/small_groups_fixes
...
Small groups fixes
2018-12-24 11:30:57 -06:00
e0a9c4a21e
fix event popup detection
2018-12-24 11:23:58 -05:00
2b8fa653ed
Merge branch 'small_groups_fixes' into storageareas
2018-12-24 09:48:36 -05:00
27826b4aca
Merge branch 'master' into storageareas
2018-12-24 09:48:29 -05:00
68adc289fe
Fix colspan count now that depth is zero-based
2018-12-24 09:40:23 -05:00
e0cae5709f
Group::find is now more powerful so we can just use it to return all Groups to be deleted
2018-12-24 09:39:40 -05:00
63199289ad
Change depth function to be 0-based.
2018-12-24 09:38:55 -05:00
0cce0a642b
Update chosen library to 1.8.7
2018-12-24 09:37:49 -05:00
153877b9c0
Merge pull request #2359 from connortechnology/fix_2353
...
Update permissions checking for Groups to not use session. Fixes #2353
2018-12-21 15:16:49 -06:00
1130d6650a
Fix spacing and pass popup to previous/next event so that popups stay as popups
2018-12-21 10:50:19 -05:00
47465260d1
Update permissions checking for Groups to not use session. Fixes #2353
2018-12-21 10:01:48 -05:00
7a8beffdcc
Merge branch 'master' into storageareas
2018-12-20 15:10:52 -05:00
a277f697e9
whitespace
2018-12-20 14:58:38 -05:00
e626049f6b
Merge branch 'swresample' into storageareas
2018-12-20 14:08:40 -05:00
d4fb85a9aa
Merge branch 'master' into swresample
2018-12-20 09:16:27 -05:00
3a068ae6a3
Merge branch 'master' into swresample
2018-12-16 16:15:28 -05:00
622c17f628
make sure auth is regenerated each time we call this API ( #2347 )
2018-12-16 11:02:07 -05:00
0bfe1007c8
Merge branch 'master' into storageareas
2018-12-14 10:16:08 -05:00
567b60ffa7
support for forwarded proto/port in Server.php ( #2343 )
2018-12-13 10:24:32 -05:00
8d74354fcb
Merge pull request #2242 from connortechnology/cleanup_auth
...
Cleanup auth
2018-12-12 20:53:24 -06:00
eba8b3327d
Merge branch 'master' into cleanup_auth
2018-12-11 16:04:42 -05:00
21a98f3653
Merge branch 'remove_default_view' of https://github.com/connortechnology/ZoneMinder into connortechnology-remove_default_view
2018-12-11 09:44:13 -06:00
278abbc201
Merge branch 'master' into remove_default_view
2018-12-11 10:37:26 -05:00
3cf6bf1786
Merge pull request #2243 from connortechnology/add_archive_filter_to_montagereview
...
Rough in an archived status filter in montagereview.
2018-12-11 09:36:35 -06:00
fe5cb4bfdc
Merge pull request #2283 from connortechnology/warn_colour_when_disabled
...
Use a warning colour when motion detection is disabled.
2018-12-11 09:36:07 -06:00
4d7e98475f
Merge pull request #2297 from connortechnology/introduce_getBodyTopHTML
...
Introduce get body top html
2018-12-11 09:35:54 -06:00
22460f580b
Merge pull request #2305 from pliablepixels/save-first-alarm
...
Save first alarm
2018-12-11 09:35:40 -06:00
c530337c50
Merge pull request #2331 from connortechnology/fix_ios9
...
Fix ios9
2018-12-11 09:29:50 -06:00
c8c34d3f95
Merge branch 'master' into storageareas
2018-12-11 10:21:22 -05:00
b3bed9a28a
fix whitespace
2018-12-11 10:20:02 -05:00
e1ecd47bff
Fix missing use of UrlToApi
2018-12-11 09:40:40 -05:00
1e8c4276bb
fix #2319 some more. This is fixing rate sticking across gapless events and reload
2018-12-10 17:32:17 -05:00
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
757e538550
strip port from HTTP_HOST
2018-12-06 17:12:03 -05:00
50017057de
Merge branch 'master' into storageareas
2018-12-05 09:05:27 -05:00
9ffd77428a
fix paths to jquery-ui-theme components, thereby upgrading them to the proper version. This fixes the datetime filters not being shown on skins that don't specify a custom theme for jquery-ui
2018-12-05 09:05:10 -05:00
bc5f8d0d8d
rework pts/dts of audio stream. Spacing. Fix crash
2018-12-04 18:23:08 -05:00
a9290759a5
Merge branch 'fix_ios9' into storageareas
2018-12-03 16:25:34 -05:00
18ce7c9ea0
Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead.
2018-12-03 15:17:16 -05:00
27d4ba9e5f
use output of babeljs.io to provide code that works on older browsers. The nice class notation is ES6 upwards.. Safari on IOS9 doesn't like it
2018-12-03 15:16:47 -05:00
2df6d74a3e
Merge branch 'master' into storageareas
2018-12-02 17:15:12 -05:00
e327ad100e
fix WebSite camera startup issue
2018-12-01 17:03:50 -06:00
cae6ffd5a3
use HTTP_HOST instead of SERVER_NAME
2018-12-01 13:27:08 -06:00
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
7d90a56561
Merge branch 'master' into storageareas
2018-11-30 14:46:42 -05:00
9bb4f1804e
Merge branch 'server_path_prefix'
2018-11-30 14:46:20 -05:00
8c626c984b
Need to pass port through all Url functions
2018-11-30 14:45:58 -05:00
fe45e83bb4
Fix PathToIndex
2018-11-29 15:54:25 -05:00
4cf7ff7fe4
Merge branch 'server_path_prefix' into storageareas
2018-11-29 15:53:58 -05:00
945770c819
Merge branch 'server_path_prefix'
2018-11-29 15:53:35 -05:00
3bd5774ea1
Default to PathToIndex should have the index.php in it
2018-11-29 15:53:19 -05:00
af2bb992e9
Merge branch 'server_path_prefix' into storageareas
2018-11-29 14:33:46 -05:00
17551eacee
Merge branch 'server_path_prefix'
2018-11-29 14:27:32 -05:00
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
d83fb2e985
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-29 14:08:03 -05:00
5e0d742e26
Use history.go(-1) which works on safari
2018-11-29 14:04:35 -05:00
a74a9ae292
Merge pull request #2328 from pliablepixels/login-auth-relay
...
returns user=&pass= in credentials for auth_relay plain and none #2327
2018-11-29 09:59:09 -06:00
5a88cbcddb
Merge pull request #2329 from connortechnology/fix_2319
...
Fix rate resetting
2018-11-29 09:57:13 -06:00
be07e4413f
Merge pull request #2152 from connortechnology/server_path_prefix
...
Server path prefix
2018-11-29 09:56:25 -06:00
df0b600431
Merge branch 'master' into storageareas
2018-11-29 10:49:06 -05:00
c0a9fae01f
Merge branch 'fix_2319' into storageareas
2018-11-29 09:57:41 -05:00
605397b565
Fix rate resetting by storing it in a cookie and using that on initial event load. Fixes #2319
2018-11-29 09:43:21 -05:00
e6b8a7bc66
resolves #2327
2018-11-29 09:21:10 -05:00
4625f7c879
Merge branch 'master' into storageareas
2018-11-28 10:46:49 -05:00
1e915e9567
Merge branch 'master' into server_path_prefix
2018-11-28 10:45:36 -05:00
57acb2aac6
Merge branch 'server_path_prefix' into storageareas
2018-11-28 10:41:11 -05:00
a89dd83565
Update to use object instead of db row
2018-11-28 09:55:34 -05:00
cd13dda294
fix use of instead of
2018-11-28 09:54:22 -05:00
2b48b09ef5
Add entries for PathToIndex and PathToZMS
2018-11-28 09:53:35 -05:00
f5328265ef
fix missing daemons definition
2018-11-28 09:12:22 -05:00
94d8e043ce
Fix unreadable input text when OS theme dark ( #2324 )
...
* Update skin.css
* Update skin.css
2018-11-27 18:25:05 -05:00
f8b2ff5c77
rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()
2018-11-27 17:35:25 -05:00
10ce55c396
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-26 16:20:22 -05:00
17c1933913
remove an extra l
2018-11-26 16:20:15 -05:00
b5430a1927
Merge branch 'fix_2317' into storageareas
2018-11-23 15:35:55 -05:00
6128d2a4d9
fix #2317 by updating the url encoding of a filter to match events for that monitor
2018-11-23 15:34:23 -05:00
19f3cce41f
Dont auto-guess pathPrefix
2018-11-23 13:54:14 -05:00
7ad19be0d7
Merge branch 'server_path_prefix' into storageareas
2018-11-23 13:29:01 -05:00
dea5db9dd9
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 11:11:39 -05:00
c5f7fb7b18
Merge branch 'master' into server_path_prefix
2018-11-22 10:04:33 -05:00
62e511cfd1
Merge branch 'master' into h265
2018-11-17 10:41:20 -05:00
d8d9544497
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-17 10:39:52 -05:00
87140ecdb5
white space and quiet warning
2018-11-17 10:39:42 -05:00
5c2e5d89ed
fix gpl mailing address
...
This makes rpmlint & lintian complain less
2018-11-15 19:53:45 -06:00
415d43fafb
Include Server Name when testing for CORS. Also be case insensitive.
2018-11-15 12:23:52 -05:00
f72651da5a
Add auth hash to ajax fps and status calls in zone edit
2018-11-15 12:22:35 -05:00
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
d89c0bc737
Merge branch 'master' into storageareas
2018-11-14 15:55:00 -05:00
aa8ac9c31c
spaces and quotes
2018-11-14 15:54:45 -05:00
3a409b26aa
Use buttons instead of anchor tags for Prev/Next/FIrst/Last buttons
2018-11-14 15:54:34 -05:00
3be31020b7
Automatically add width to frames view when thumbnails are turned on.
2018-11-14 15:54:01 -05:00
9d5772b517
Merge branch 'fix_multiserver_daemon_restarting' into storageareas
2018-11-14 13:02:30 -05:00
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
51d8c0ea73
add back daemon parameter, but make it actually work
2018-11-14 12:59:44 -05:00
9d8f0fef0c
add templates for daemonControl to api
2018-11-14 12:54:40 -05:00
d671761a35
simplify params to daemonControl since they really aren't being used anyways. Return the status text
2018-11-14 12:54:10 -05:00
490fb40917
DefaultView in the past was used to control whether the watch view starts up with ptz controls visible or the events list. Isaac changed the watch view to always have the controls visible... so this setting is no longer useful.
2018-11-14 09:22:38 -05:00
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
abeafe9ba6
fix log export. minTime and maxTime were being cleared by the regexp to detect sub second time. Also use ZM_DIR_EXPORTS instead of ZM_PATH_SWAP
2018-11-12 15:43:03 -05:00
d76d6bb9d1
include overlay.js when viewing the log, so that export works
2018-11-12 15:09:15 -05:00
01a57222d3
keep track if we have written alarmed frame incase savejpeg is off
2018-11-12 12:43:20 -05:00
246765ced9
Add tooltip for sorting monitors
2018-11-11 16:23:19 -05:00
82abd04f36
Add type=button to buttons so they don't act like submit buttons
2018-11-07 13:19:42 -05:00
ec09a71ba0
Include defaults for all the missing Monitor Columns
2018-11-07 13:18:53 -05:00
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
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
6360b84e15
Merge pull request #2288 from connortechnology/add_monitor_status_to_api
...
rough in adding Monitor_Status to Monitors
2018-11-03 20:46:11 -05:00
0e6fbe2213
Merge pull request #2286 from ratmole/api-php-notice-fix
...
API - Disable E_NOTICE from php error reporting in cake debug
2018-11-03 20:41:52 -05:00
a50c2bae35
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg
...
Audio only with ffmpeg
2018-11-03 20:39:18 -05:00
89c3de432f
fix crud version
2018-11-01 17:50:51 -04:00
1dac088000
Merge branch 'audio_only_with_ffmpeg' into storageareas
2018-10-31 14:48:24 -04:00
48c9c2b6c0
Merge branch 'add_monitor_status_to_api' into storageareas
2018-10-31 14:47:52 -04:00
eb6d978927
Merge branch 'master' into storageareas
2018-10-31 14:47:43 -04:00
fb25c0c4eb
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-31 11:56:19 -04:00
bdb50567df
fix disk_event_space to event_disk_space
2018-10-31 11:56:08 -04:00
589b6f3eef
add further note about needing h264 passthrough
2018-10-31 11:35:06 -04:00
69f7d36729
Make it clear that audio recording is only for ffmpeg input type
2018-10-31 11:34:30 -04:00
e87ded35f1
rough in adding Monitor_Status to Monitors
2018-10-31 11:08:44 -04:00
2b0df3e4e2
API - Disable E_NOTICE from php error reporting in cake debug
...
Using zmNinja, the API reports E_NOTICE errors
Notice (8): compact(): Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact '>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact '>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact '>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
and zmNinja will not work...
there is a better way, but i think disabling E_NOTICE error is way easier
see: https://github.com/ZoneMinder/zoneminder/pull/2269
2018-10-31 10:17:36 +02:00
80cfb02570
Merge branch 'warn_colour_when_disabled' into storageareas
2018-10-30 12:05:47 -04:00
f95379742b
Use a warning colour when motion detection is disabled.
2018-10-30 12:04:05 -04:00
f790eacc92
Merge pull request #2273 from connortechnology/fix_rce
...
use json_encode/decode instead of serialize/unserialize to pass onvif…
2018-10-30 07:06:45 -05:00
073193e410
Merge pull request #2281 from connortechnology/fix_2279_delete_camera_through_api
...
Fix 2279 delete camera through api
2018-10-30 07:06:14 -05:00
39061038fb
Don't include related models in Storage index
2018-10-29 14:40:05 -04:00
34d6ec40a1
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-10-29 12:52:40 -04:00
bc4fada34c
Merge branch 'fix_2279_delete_camera_through_api' into storageareas
2018-10-29 12:52:27 -04:00
461ce3c1f8
Merge branch 'master' into storageareas
2018-10-29 12:52:06 -04:00
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
9a2d58adce
We don't store all the permissions in the session anymore. We just use the global user object
2018-10-29 11:03:03 -04:00
95a6d0666a
Improve behaviour and reduce extra logging when db goes away
2018-10-29 09:59:26 -04:00
33235a19ba
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:11:32 -04:00
9e999294df
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:09:32 -04:00
91d83a89fa
include semaphore function replacements
2018-10-25 15:40:12 -04:00
d025adab6d
Need to load Config Categories in options save
2018-10-25 09:13:07 -04:00
d0080684b8
Bosnian translation ( #2266 )
...
* Zoneminder bosnian translation
Hi,
this is a bosnian translation for zoneminder, but it can be used as croatian and serbian translation too
* Delete BA_ba.php
* Bosnian translation
80% translated, tested on my Zoneminder v1.30.4 installation and is looking good. ZmNinja also translated into Bosnian lagnuage.
2018-10-24 13:52:32 -04:00
9148d3f7c4
Merge branch 'zone_point_buttons' into storageareas
2018-10-24 12:44:21 -04:00
9cf31eafa0
Use a button element instead of an anchor tag for plus and minus point buttons. Cleanup dead code
2018-10-24 12:43:43 -04:00
875bc3caf9
Merge branch 'master' into storageareas
2018-10-24 10:17:27 -04:00
ca8770bd5a
Merge branch 'fix_rce' into storageareas
2018-10-24 10:17:16 -04:00
6488122862
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-24 10:03:11 -04:00
115141bf9f
add caching to Group::find
2018-10-24 10:02:42 -04:00
2024df4393
use json_encode/decode instead of serialize/unserialize to pass onvif probe results around. Also clean up some code/ add some missing things. Fixes #2271 and #2272
2018-10-24 09:49:56 -04:00
18850d8779
API getVersion Fix -> Undefined variable: eTagMatches... ( #2268 )
...
see https://github.com/cakephp/cakephp/issues/12536
2018-10-23 07:58:07 -04:00
86b0e4ea18
fix auth_hash. Should use generateAuthHash instead of accessing session directly
2018-10-22 18:32:39 -04:00
9938346752
Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder
2018-10-22 16:14:36 -04:00
7b69bc4292
Merge branch 'master' of github.com:/connortechnology/ZoneMinder
2018-10-22 16:13:55 -04:00
f4ddc0fe9b
ob_clcean and flush break outputting the image
2018-10-22 16:13:12 -04:00
ccd64b0fae
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-22 14:21:34 -04:00
7e4c54fec0
Use proper buttons and remove extra bootstrap styles from buttons so that they aren't all jammed together
2018-10-22 13:54:27 -04:00
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
559f34a838
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:33:09 -04:00
069f67a10f
Break some long lines
2018-10-20 14:32:58 -04:00
c9c46aa12d
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:32:25 -04:00
f5eca2da1e
No longer need to add thisUrl to monitorUrl
2018-10-20 11:37:36 -04:00
3237a10d0a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-10-20 11:36:45 -04:00
8878397622
fix spacing
2018-10-20 11:36:25 -04:00
c47b4a5a04
Merge branch 'improve_config_efficiency' into storageareas
2018-10-19 15:03:00 -04:00
530a53f138
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-19 15:02:31 -04:00
3723f7acb3
comment out redundatn code increasing load on server
2018-10-19 15:02:10 -04:00
4c7fe8741b
Load the complete config info only for options
2018-10-19 15:00:47 -04:00
e30b100e8e
Don't load & process categories in initial config loading
2018-10-19 15:00:30 -04:00
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
98579fc02a
Merge branch 'master' into storageareas
2018-10-19 11:27:43 -04:00
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
23fd5db5c8
fix #2265 extra graphics in url
2018-10-19 10:06:51 -04:00
e7ec2faccd
monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url
2018-10-18 20:33:50 -04:00
4fdac25ae1
remove blank last line
2018-10-18 09:20:15 -04:00
37a48550e5
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-18 08:57:29 -04:00
b0078fb1d9
whitespace, get rid of redundant ajax startup
2018-10-16 17:20:10 -04:00
f7de3a87e2
show event notes in same event view ( #2259 )
2018-10-16 12:11:25 -04:00
c2af380e29
Merge branch 'master' into storageareas
2018-10-16 11:39:26 -04:00
1b9b2811b3
remove ? from streamCmdParms. Mootools adds it in so this gives us a double ?
2018-10-16 11:39:16 -04:00
37065d15ac
fix url to api in monitor restart.
2018-10-16 09:47:24 -04:00
7149576a7c
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 10:59:50 -04:00
d1bef49d0b
Don't reload on a timeout when refreshing the navbar
2018-10-11 11:30:30 -04:00
a76e33bd48
rough in for alarmed frame retrieval ( #2248 )
...
* rough in for alarmed frame retrieval
* add sorting
2018-10-11 10:07:56 -04:00
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
c4c8a728f2
Handle no controls found more gracefully
2018-10-10 19:04:00 -04:00
be78cb1b34
correct falsepi=> false
2018-10-10 16:08:48 -04:00
8e053aa04b
Merge branch 'master' into storageareas
2018-10-10 14:51:52 -04:00
4d5b0ca864
Merge pull request #2247 from connortechnology/turn_off_navbar
...
Turn off navbar
2018-10-10 13:21:46 -05:00
2881d2af3f
Merge branch 'master' into storageareas
2018-10-10 14:13:27 -04:00
bf3e783c42
remove link to zones_overview that I never got around to creating
2018-10-10 14:13:12 -04:00
c58f043998
Add a mouseover tooltip saying Toggle Filters on up arrow
2018-10-10 14:12:16 -04:00
031c96c71d
Merge branch 'master' into turn_off_navbar
2018-10-10 14:04:29 -04:00
a46c9a8a7a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-10 14:03:35 -04:00
63a5211789
use url instead of server_url in Monitor object
2018-10-10 14:03:27 -04:00
a1ab0855db
if navbar=0 is given in the url, don't output the navbar
2018-10-10 14:02:46 -04:00
6ed146b4dd
Use Hostname instead of Url in test for CORS access.
2018-10-10 14:01:36 -04:00
48e805c09f
Make header flips perisisent based on cookie
2018-10-10 13:11:27 -04:00
229315fc92
Merge branch 'add_archive_filter_to_montagereview' into storageareas
2018-10-09 11:10:27 -04:00
ff00f15b58
add missing ;
2018-10-09 11:10:09 -04:00
90ea6aa076
remove : from labels on monitor filters. They can be put back in css
2018-10-09 11:09:42 -04:00
217d1e44ba
Rough in an archived status filter in montagereview.
2018-10-09 11:06:54 -04:00
e268264761
Merge branch 'cleanup_auth' into storageareas
2018-10-09 10:24:32 -04:00
1958351a13
Merge branch 'master' into storageareas
2018-10-09 10:24:24 -04:00
cbc26e0cec
cleanup trailing whitespace
2018-10-09 10:07:40 -04:00
a3d0cb42ea
Move GOOGLE RECAPCHA to includes/auth.php, clean login actions.
2018-10-09 10:05:50 -04:00
918d5fd469
move utility functions for doing get/post requests into functions.php from actions.php
2018-10-09 09:39:04 -04:00
4d626dfb4e
allow username&password even if AUTH_HASH is enabled ( #2231 )
2018-10-08 17:28:03 -04:00
52b1439d51
fix the lack of /zm/index.php in url in Server->Url() and multiport
2018-10-08 09:55:47 -04:00
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
409fd6aa6f
Merge pull request #2232 from connortechnology/fix_2229_getDiskPercent
...
Fix 2229 get disk percent
2018-10-03 18:11:28 -05:00
04c06d0893
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-03 11:23:01 -04:00
66221e39ab
rough in a StorageController for api
2018-10-03 11:22:51 -04:00
12bed9b6ac
Use alternate, working test for relative ZM_DIR_EVENTS. Don't use human output from du when specifying mid to be consistent.
2018-10-03 11:11:33 -04:00
03f09bdc48
Use defined CONFIG constants instead of looking up config from db
2018-10-03 10:56:02 -04:00
e7790ebeef
Documentation Improvements + Fixes ( #2230 )
...
* get
* get
2018-10-03 10:29:10 -04:00
efda26121b
allow login by username&password in request
2018-10-02 16:59:05 -04:00
015890a509
Merge branch 'master' into storageareas
2018-10-02 15:27:12 -04:00
c9423aa902
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-01 10:40:20 -04:00
592f55a550
do a location.reload instead of trying to guess what the current url is. Should solve permission denied problem when watching live view and auth times out.
2018-10-01 10:39:00 -04:00
1978882825
dim x264 encode when on arm ( #2227 )
2018-10-01 09:17:22 -04:00
613d885930
!= E.id is not sufficient. Since we are enforcing chronological ordering, > and < work better than !=
2018-09-30 10:15:04 -04:00
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
c88dc690a6
Make getNearEvents smarter. When Sorting by something other than Id, include Id in the sort so that events with identical starttime for example maintain the correct chronological order.
2018-09-28 13:24:50 -04:00
c481fc868f
be more robust when curFrames is empty.
2018-09-28 11:25:19 -04:00
4b97fc9480
Merge pull request #2221 from pliablepixels/font-license
...
added license
2018-09-27 16:45:34 -05:00
da6a142d12
Merge branch 'master' into storageareas
2018-09-27 14:21:43 -04:00
c5c01d56be
fix unsetting fixed width/height/layout. Since they are actually controlled by cookies, the session will overwrite when we try to unset the cookie. Also fix some missing ;'s
2018-09-27 14:20:41 -04:00
e0dc8a5f6b
Merge branch 'master' into storageareas
2018-09-27 13:54:53 -04:00
7ffb46302f
When events have the same starttime, sort secondly by Id
2018-09-26 14:10:49 -04:00
2399615a0a
When events have the same starttime, sort secondly by Id
2018-09-26 14:10:21 -04:00
fri.K
Isaac Connor
fri.K
Isaac Connor
Tom Hodder
Pliable Pixels
Isaac Connor
Pliable Pixels
Jonathan Meredith
Steve Root
Javier González Calleja
andornaut
Andrew Bauer
Andrew Bauer
Andrew Bauer
santos995
Chris
Matthew Noorenberghe
Mitch Capper
timwsuqld
montagdude
David Beitey
Mike Rosack
Elmar Pruesse
ratmole
Damir Merdan
raTmole
Dhanika Bulathsinhala