Isaac Connor
0eba430932
remove duplicate line
2019-01-30 11:05:43 -05:00
Isaac Connor
4e9ce3c5b7
Move session code to includes/session.php
2019-01-30 11:05:36 -05:00
Isaac Connor
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
Isaac Connor
7ea8be3fa8
spacing, remove non html5 elements
2019-01-25 09:22:08 -05:00
Matt N
8c5687ca30
Fix name/protocol XSS in controlcaps.php. Fixes #2445 ( #2479 )
2019-01-25 08:35:07 -05:00
Matt N
fd6179d7c8
Enforce CSP on many more views ( #2480 )
2019-01-25 08:34:29 -05:00
Matthew Noorenberghe
a3e8fd4fd5
Fix zones.php self-xss. Fixes #2444
2019-01-24 23:40:41 -08:00
Matthew Noorenberghe
47d8c9b066
plugin.php: Remove undefined onclick function reference and enforce CSP
...
Also fix tag closing.
2019-01-23 19:47:58 -08:00
Matthew Noorenberghe
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
Isaac Connor
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
Isaac Connor
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
montagdude
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 4937a68650
. This
change implements the method here:
http://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
Isaac Connor
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
Isaac Connor
cc8de69eba
Merge branch 'master' into storageareas
2019-01-22 11:44:42 -05:00
Isaac Connor
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
Isaac Connor
e712cedbde
spacing and quotes
2019-01-22 09:14:44 -05:00
Isaac Connor
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
Matt N
0619a4a161
Validate cnj, obr, and cbr arguments in parseFilter ( #2434 )
2019-01-22 08:03:25 -05:00
Matt N
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
Isaac Connor
7260f823cb
Merge branch 'master' into storageareas
2019-01-21 13:52:38 -05:00
Isaac Connor
785c208ecf
Fixes #2426 . Ca should have been endTime
2019-01-21 12:01:46 -05:00
Isaac Connor
326ac60ae4
add missing braces to fix logic
2019-01-21 11:20:56 -05:00
Isaac Connor
a2d4dc974b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-21 11:19:07 -05:00
Isaac Connor
e663397816
spacing
2019-01-21 11:17:21 -05:00
Isaac Connor
c6311b7079
When logging in, stay on the login view
2019-01-21 11:17:09 -05:00
Isaac Connor
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
Isaac Connor
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
Matt N
19c272061a
Replace MooTools usage for adding window event listeners ( #2429 )
2019-01-21 11:14:32 -05:00
Matt N
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
Matt N
f0b33145f5
Log CSP violations in ZM logs in supported browsers ( #2431 )
2019-01-21 11:12:17 -05:00
Matt N
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
Isaac Connor
f69b77e38f
fix eslint complaints
2019-01-19 12:40:17 -05:00
Matt N
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
Matt N
35fb4366b6
Fix recaptcha support with the CSP ( #2420 )
2019-01-19 09:47:04 -05:00
Matt N
c0a6e54d60
skins/classic/views/control.php second order sqli ( #2422 )
2019-01-19 09:46:21 -05:00
Matt N
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
Matt N
34e2e47993
controlcap.php: Reflected xss fix with validHtmlStr ( #2423 )
2019-01-19 09:43:28 -05:00
Matt N
d3f8037e58
Replace onclick='submitTab(...' with a click listener ( #2424 )
2019-01-19 09:42:12 -05:00
Matt N
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
Isaac Connor
552e14a971
Merge branch 'master' into storageareas
2019-01-18 10:36:59 -05:00
Matt N
43a1725060
Fix duplicate 'class' attribute in options ( #2418 )
2019-01-18 10:05:44 -05:00
Matt N
eef113b6a7
Convert some characters to HTML entities ( #2417 )
2019-01-18 10:02:48 -05:00
Matt N
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
Matt N
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
Isaac Connor
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
Isaac Connor
87d1390fed
Merge branch 'storageareas' into h265
2019-01-16 15:20:17 -05:00
Isaac Connor
f49dd93b6a
Merge branch 'master' into storageareas
2019-01-16 14:39:56 -05:00
Isaac Connor
1f3da476b8
switch to single quotes
2019-01-16 14:04:24 -05:00
Isaac Connor
b1cc0c2b82
add CSP nonce to CSRF rewriting
2019-01-16 14:04:07 -05:00
Isaac Connor
a7db6f08f5
single vs double quotes
2019-01-16 13:47:50 -05:00
Isaac Connor
42076ad09b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-16 13:46:01 -05:00
Isaac Connor
a2c23d3263
Need nonce in inline script setting display css
2019-01-16 13:45:26 -05:00
Isaac Connor
d8ef33396a
If multi-port is on, we need to output CORS headers
2019-01-16 13:44:57 -05:00
Isaac Connor
e156a6cda0
logout view should go to logout view
2019-01-16 12:23:18 -05:00
Isaac Connor
ba21820fd0
fix typo
2019-01-16 12:10:34 -05:00
Isaac Connor
eee1d871e0
get rid of default value for PathToIndex so that it will use PHP_SELF instead
2019-01-16 12:09:26 -05:00
Matt N
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
Isaac Connor
fd696bc066
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-15 11:38:56 -05:00
Isaac Connor
ac27005944
remove debug
2019-01-15 11:38:43 -05:00
Isaac Connor
07c7c271a6
prevent error when event has no frames. Fix PathToIndex() -> PathToIndex. Fixes #2411
2019-01-15 11:38:19 -05:00
Isaac Connor
3182d8bab7
implement to_json method so that defaults get included
2019-01-15 11:36:56 -05:00
Andrew Bauer
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
Matt N
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
Isaac Connor
f726666f54
Merge branch 'master' into h265
2019-01-14 12:36:11 -05:00
Isaac Connor
fc7403fe3d
Merge branch 'master' into storageareas
2019-01-13 14:53:34 -05:00
Isaac Connor
c834fbe462
the filter action should singular filter, not filters
2019-01-13 14:52:39 -05:00
Isaac Connor
a282b487d1
load Help from Config as it is not longer always loaded into ram.
2019-01-11 13:55:03 -05:00
Isaac Connor
b373577589
fix function view after actions cleanup
2019-01-10 12:08:25 -05:00
Isaac Connor
1d54216e80
spacing
2019-01-09 16:23:58 -05:00
Isaac Connor
c1e4fbac6a
extend input path and options to the full width of the popup
2019-01-09 12:37:42 -05:00
Isaac Connor
2d03583b78
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-08 13:12:42 -05:00
Isaac Connor
ffa37d8c10
Fix margins on replayControl
2019-01-08 13:12:35 -05:00
Isaac Connor
3f5a2a2aa6
disable delete button when event is archived.
2019-01-07 15:56:23 -05:00
Isaac Connor
f3a807f1f8
Merge branch 'master' into storageareas
2019-01-07 09:21:25 -05:00
Isaac Connor
b4f8500cb5
Merge branch 'split_actions'
2019-01-05 18:33:04 -05:00
Isaac Connor
3f10553464
Fix include path to Monitors.php
2019-01-05 18:32:53 -05:00
Isaac Connor
1a75cf333e
Merge branch 'master' into storageareas
2019-01-05 11:12:38 -05:00
Isaac Connor
e34a5e972a
fix missing }
2019-01-05 11:12:26 -05:00
Isaac Connor
cf0d55d3db
Merge branch 'master' into storageareas
2019-01-05 10:59:01 -05:00
David Beitey
e6ba8e58ef
Fix #2391 by defining monitor variable ( #2392 )
2019-01-05 10:20:34 -05:00
Isaac Connor
8eb61b1c11
Merge branch 'master' into storageareas
2019-01-05 10:16:38 -05:00
Isaac Connor
5b5905c83a
We always use markEids[] now
2019-01-04 16:29:16 -05:00
Isaac Connor
de0ef6ce43
Merge branch 'master' into split_actions
2019-01-04 15:55:54 -05:00
Isaac Connor
e72e4e7ce4
Spacing, remove some html4 stuff, clean up duplicated hidden form elements.
2019-01-04 15:52:36 -05:00
Isaac Connor
dea64320f0
Fix a + that should be a .
2019-01-04 15:52:14 -05:00
Isaac Connor
0e20666992
fix eventdetail actions being in events
2019-01-04 15:43:31 -05:00
Isaac Connor
ab198bfd75
remove master version of actions.php
2019-01-04 15:29:21 -05:00
Isaac Connor
52466c398b
Merge branch 'split_actions' into storageareas
2019-01-04 15:28:55 -05:00
Isaac Connor
b8d065275b
Merge branch 'master' into storageareas
2019-01-04 15:22:18 -05:00
Isaac Connor
e2f32ab091
Upgrade config saving
2019-01-04 09:43:36 -05:00
Isaac Connor
7ec96655c3
fix missing ! when testing for permission on editing config
2019-01-04 09:37:26 -05:00
Isaac Connor
5b9bf48945
Merge branch 'master' into split_actions
2019-01-04 09:35:54 -05:00
Isaac Connor
46adcbb66b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-04 09:34:51 -05:00
Isaac Connor
edeaa07c12
Fix no quotes around Id
2019-01-04 09:34:42 -05:00
Isaac Connor
6cad852e11
fix path to MontageLayout
2019-01-04 09:34:18 -05:00
Isaac Connor
dbe9817bc8
Split actions.php into individual files per view
2019-01-04 09:26:34 -05:00
Andrew Bauer
225fca08e3
Merge pull request #2379 from connortechnology/improve_config_efficiency
...
Improve config efficiency
2019-01-02 19:34:34 -06:00
Isaac Connor
874930d8fc
Merge branch 'master' into improve_config_efficiency
2019-01-02 13:07:53 -05:00
Isaac Connor
99471836b7
Use monitor's serverId when loading server object so that images load from recording server.
2019-01-02 11:28:12 -05:00
Isaac Connor
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
Isaac Connor
79113a6869
Add a default Server object to handle non-multi-server case
2019-01-02 10:56:40 -05:00
Isaac Connor
5060358870
Merge branch 'master' into storageareas
2018-12-29 09:56:53 -05:00
Andrew Bauer
d14e9ecf74
force overloadframes and ExtendAlarmFrames to int ( #2373 )
2018-12-29 09:53:31 -05:00
Andrew Bauer
3258d8e590
remove ZM_DIR_IMAGES ( #2374 )
2018-12-29 09:52:58 -05:00
Isaac Connor
1a1231fdaa
Merge branch 'master' into storageareas
2018-12-28 10:47:27 -05:00
Andrew Bauer
a029909972
fix path to thumb and anal images ( #2367 )
2018-12-28 10:46:13 -05:00
Andrew Bauer
fb37fc48e1
update viewImagePatch ( #2370 )
2018-12-28 10:38:39 -05:00
Isaac Connor
101f24feb5
Update area when editing x and y coords ( #2366 )
2018-12-27 14:28:14 -05:00
Isaac Connor
3e06bbcef8
Merge branch 'master' into storageareas
2018-12-27 13:50:29 -05:00
Andrew Bauer
5f9a113da1
redirect to montage rather than montagereview
2018-12-26 10:34:01 -06:00
Andrew Bauer
27dd8166ea
Merge pull request #2362 from connortechnology/small_groups_fixes
...
Small groups fixes
2018-12-24 11:30:57 -06:00
Isaac Connor
e0a9c4a21e
fix event popup detection
2018-12-24 11:23:58 -05:00
Isaac Connor
2b8fa653ed
Merge branch 'small_groups_fixes' into storageareas
2018-12-24 09:48:36 -05:00
Isaac Connor
27826b4aca
Merge branch 'master' into storageareas
2018-12-24 09:48:29 -05:00
Isaac Connor
68adc289fe
Fix colspan count now that depth is zero-based
2018-12-24 09:40:23 -05:00
Isaac Connor
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
Isaac Connor
63199289ad
Change depth function to be 0-based.
2018-12-24 09:38:55 -05:00
Isaac Connor
0cce0a642b
Update chosen library to 1.8.7
2018-12-24 09:37:49 -05:00
Andrew Bauer
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
Isaac Connor
1130d6650a
Fix spacing and pass popup to previous/next event so that popups stay as popups
2018-12-21 10:50:19 -05:00
Isaac Connor
47465260d1
Update permissions checking for Groups to not use session. Fixes #2353
2018-12-21 10:01:48 -05:00
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
e626049f6b
Merge branch 'swresample' into storageareas
2018-12-20 14:08:40 -05:00
Isaac Connor
d4fb85a9aa
Merge branch 'master' into swresample
2018-12-20 09:16:27 -05:00
Isaac Connor
3a068ae6a3
Merge branch 'master' into swresample
2018-12-16 16:15:28 -05:00
Pliable Pixels
622c17f628
make sure auth is regenerated each time we call this API ( #2347 )
2018-12-16 11:02:07 -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
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
Isaac Connor
278abbc201
Merge branch 'master' into remove_default_view
2018-12-11 10:37:26 -05:00
Andrew Bauer
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
Andrew Bauer
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
Andrew Bauer
4d7e98475f
Merge pull request #2297 from connortechnology/introduce_getBodyTopHTML
...
Introduce get body top html
2018-12-11 09:35:54 -06:00
Andrew Bauer
22460f580b
Merge pull request #2305 from pliablepixels/save-first-alarm
...
Save first alarm
2018-12-11 09:35:40 -06:00
Andrew Bauer
c530337c50
Merge pull request #2331 from connortechnology/fix_ios9
...
Fix ios9
2018-12-11 09:29:50 -06:00
Isaac Connor
c8c34d3f95
Merge branch 'master' into storageareas
2018-12-11 10:21:22 -05:00
Isaac Connor
b3bed9a28a
fix whitespace
2018-12-11 10:20:02 -05:00
Isaac Connor
e1ecd47bff
Fix missing use of UrlToApi
2018-12-11 09:40:40 -05:00
Isaac Connor
1e8c4276bb
fix #2319 some more. This is fixing rate sticking across gapless events and reload
2018-12-10 17:32:17 -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
50017057de
Merge branch 'master' into storageareas
2018-12-05 09:05:27 -05:00
Isaac Connor
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
Isaac Connor
bc5f8d0d8d
rework pts/dts of audio stream. Spacing. Fix crash
2018-12-04 18:23:08 -05:00
Isaac Connor
a9290759a5
Merge branch 'fix_ios9' into storageareas
2018-12-03 16:25:34 -05:00
Isaac Connor
18ce7c9ea0
Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead.
2018-12-03 15:17:16 -05:00
Isaac Connor
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
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
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
Isaac Connor
7d90a56561
Merge branch 'master' into storageareas
2018-11-30 14:46:42 -05:00
Isaac Connor
9bb4f1804e
Merge branch 'server_path_prefix'
2018-11-30 14:46:20 -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
945770c819
Merge branch 'server_path_prefix'
2018-11-29 15:53:35 -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
17551eacee
Merge branch 'server_path_prefix'
2018-11-29 14:27:32 -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
d83fb2e985
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-29 14:08:03 -05:00
Isaac Connor
5e0d742e26
Use history.go(-1) which works on safari
2018-11-29 14:04:35 -05:00
Andrew Bauer
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
Andrew Bauer
5a88cbcddb
Merge pull request #2329 from connortechnology/fix_2319
...
Fix rate resetting
2018-11-29 09:57:13 -06:00
Andrew Bauer
be07e4413f
Merge pull request #2152 from connortechnology/server_path_prefix
...
Server path prefix
2018-11-29 09:56:25 -06:00
Isaac Connor
df0b600431
Merge branch 'master' into storageareas
2018-11-29 10:49:06 -05:00
Isaac Connor
c0a9fae01f
Merge branch 'fix_2319' into storageareas
2018-11-29 09:57:41 -05:00
Isaac Connor
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
Pliable Pixels
e6b8a7bc66
resolves #2327
2018-11-29 09:21:10 -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
a89dd83565
Update to use object instead of db row
2018-11-28 09:55:34 -05:00
Isaac Connor
cd13dda294
fix use of instead of
2018-11-28 09:54:22 -05:00
Isaac Connor
2b48b09ef5
Add entries for PathToIndex and PathToZMS
2018-11-28 09:53:35 -05:00
Isaac Connor
f5328265ef
fix missing daemons definition
2018-11-28 09:12:22 -05:00
Elmar Pruesse
94d8e043ce
Fix unreadable input text when OS theme dark ( #2324 )
...
* Update skin.css
* Update skin.css
2018-11-27 18:25:05 -05:00
Isaac Connor
f8b2ff5c77
rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()
2018-11-27 17:35:25 -05:00
Isaac Connor
10ce55c396
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-26 16:20:22 -05:00
Isaac Connor
17c1933913
remove an extra l
2018-11-26 16:20:15 -05:00
Isaac Connor
b5430a1927
Merge branch 'fix_2317' into storageareas
2018-11-23 15:35:55 -05:00
Isaac Connor
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
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
62e511cfd1
Merge branch 'master' into h265
2018-11-17 10:41:20 -05:00
Isaac Connor
d8d9544497
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-17 10:39:52 -05:00
Isaac Connor
87140ecdb5
white space and quiet warning
2018-11-17 10:39:42 -05:00
Andrew Bauer
5c2e5d89ed
fix gpl mailing address
...
This makes rpmlint & lintian complain less
2018-11-15 19:53:45 -06: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
f72651da5a
Add auth hash to ajax fps and status calls in zone edit
2018-11-15 12:22:35 -05:00
Isaac Connor
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
Isaac Connor
d89c0bc737
Merge branch 'master' into storageareas
2018-11-14 15:55:00 -05:00
Isaac Connor
aa8ac9c31c
spaces and quotes
2018-11-14 15:54:45 -05:00
Isaac Connor
3a409b26aa
Use buttons instead of anchor tags for Prev/Next/FIrst/Last buttons
2018-11-14 15:54:34 -05:00
Isaac Connor
3be31020b7
Automatically add width to frames view when thumbnails are turned on.
2018-11-14 15:54:01 -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
51d8c0ea73
add back daemon parameter, but make it actually work
2018-11-14 12:59:44 -05:00
Isaac Connor
9d8f0fef0c
add templates for daemonControl to api
2018-11-14 12:54:40 -05:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
Isaac Connor
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
Isaac Connor
d76d6bb9d1
include overlay.js when viewing the log, so that export works
2018-11-12 15:09:15 -05:00
Pliable Pixels
01a57222d3
keep track if we have written alarmed frame incase savejpeg is off
2018-11-12 12:43:20 -05:00
Isaac Connor
246765ced9
Add tooltip for sorting monitors
2018-11-11 16:23:19 -05:00
Isaac Connor
82abd04f36
Add type=button to buttons so they don't act like submit buttons
2018-11-07 13:19:42 -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
Andrew Bauer
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
Andrew Bauer
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
Andrew Bauer
a50c2bae35
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg
...
Audio only with ffmpeg
2018-11-03 20:39:18 -05:00
Isaac Connor
89c3de432f
fix crud version
2018-11-01 17:50:51 -04:00
Isaac Connor
1dac088000
Merge branch 'audio_only_with_ffmpeg' into storageareas
2018-10-31 14:48:24 -04:00
Isaac Connor
48c9c2b6c0
Merge branch 'add_monitor_status_to_api' into storageareas
2018-10-31 14:47:52 -04:00
Isaac Connor
eb6d978927
Merge branch 'master' into storageareas
2018-10-31 14:47:43 -04:00
Isaac Connor
fb25c0c4eb
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-31 11:56:19 -04:00
Isaac Connor
bdb50567df
fix disk_event_space to event_disk_space
2018-10-31 11:56:08 -04:00
Isaac Connor
589b6f3eef
add further note about needing h264 passthrough
2018-10-31 11:35:06 -04:00
Isaac Connor
69f7d36729
Make it clear that audio recording is only for ffmpeg input type
2018-10-31 11:34:30 -04:00
Isaac Connor
e87ded35f1
rough in adding Monitor_Status to Monitors
2018-10-31 11:08:44 -04:00
ratmole
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
Isaac Connor
80cfb02570
Merge branch 'warn_colour_when_disabled' into storageareas
2018-10-30 12:05:47 -04:00
Isaac Connor
f95379742b
Use a warning colour when motion detection is disabled.
2018-10-30 12:04:05 -04:00
Andrew Bauer
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
Andrew Bauer
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
Isaac Connor
39061038fb
Don't include related models in Storage index
2018-10-29 14:40:05 -04:00
Isaac Connor
34d6ec40a1
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-10-29 12:52:40 -04:00
Isaac Connor
bc4fada34c
Merge branch 'fix_2279_delete_camera_through_api' into storageareas
2018-10-29 12:52:27 -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
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
Isaac Connor
95a6d0666a
Improve behaviour and reduce extra logging when db goes away
2018-10-29 09:59:26 -04:00
Isaac Connor
33235a19ba
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:11:32 -04:00
Isaac Connor
9e999294df
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:09:32 -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
Damir Merdan
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
Isaac Connor
9148d3f7c4
Merge branch 'zone_point_buttons' into storageareas
2018-10-24 12:44:21 -04:00
Isaac Connor
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
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
6488122862
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-24 10:03:11 -04:00