1c2f2657d2
We don't do automatic login when recaptcha is enabled, so add the login calls on successful recaptcha
2020-02-04 16:41:19 -05:00
df5bf788d9
Filtering by Alarmed Zone now only supports a single value using EXISTS as the operator. We now also support CURDATE() and NOW() as values for Date/StartDate/EndDate
2020-01-24 11:09:27 -05:00
29a04dc1b9
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
2020-01-24 09:50:53 -05:00
adf376e4a6
add Zone.php
2020-01-24 09:45:02 -05:00
8aa0fe665f
Add EmailTo,EmailSubjecet,EmailBody fields to Filter object
2020-01-22 14:04:42 -05:00
9d41334e8f
Merge branch 'master' into add_alarmed_zone_to_filters
2020-01-22 13:45:37 -05:00
a3754709e4
allow filters to not have terms specified. We can't pass an empty array in a url, so we will just have to handle it.
2020-01-18 16:09:33 -05:00
86a2523498
break up a long line, add some parenthesis to clarify logic
2020-01-17 12:30:26 -05:00
02e9096d2b
When saving an existing Filter and we are unchecking Background, need to stop the filter before saving. Remove dead code
2020-01-13 17:32:57 -05:00
e4ba1fd432
fix restarting zmcontrol on remote servers by passing object=filter as well
2020-01-13 17:16:15 -05:00
d7dc7cdc47
Add ServerId to database log entries in php
2020-01-13 16:18:01 -05:00
9036b6db77
fix typo
2020-01-13 16:17:39 -05:00
f3a9e608db
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-13 16:11:19 -05:00
b11815cfa9
Introduce Storage->EventCount to get the # of events per storage without actually loading all events.
2020-01-13 12:53:50 -05:00
6cd76ee2ff
Clear cache after loading Events so as to free ram.
2020-01-13 12:53:05 -05:00
f7e2359818
Implement a clear_cache function so that we can free up cached objects
2020-01-13 10:57:56 -05:00
398688550b
fixtypo
2020-01-10 20:15:52 -05:00
0c478c7962
fix Monitor->Server
2020-01-10 20:13:09 -05:00
5ee0158735
Set defaults for vars == ''
2020-01-10 16:42:41 -05:00
f61f6eaf7d
remove line cutnpasted erroneously
2020-01-10 12:45:47 -05:00
d433590f74
use find_one in stead of new to use Cached Server
2020-01-10 12:45:30 -05:00
ef4ecd40fb
Set defaults before saving Objects
2020-01-10 12:44:59 -05:00
0571909d05
add remote_IP to log entries on php side
2020-01-07 17:08:29 -05:00
c3641df531
spaces
2020-01-05 17:30:06 -05:00
e951b0af1c
add code to set default value for checkboxes
2020-01-03 16:35:04 -05:00
d42e9beddc
Add warnings when the type of movement is not selected
2020-01-02 17:03:52 -05:00
e9815bf9c7
add ZM Namespace to Error calls
2020-01-02 16:54:50 -05:00
714d304528
Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation
2019-12-31 19:10:29 -05:00
77cfb7c190
fix spacing
2019-12-31 12:42:49 -05:00
2301103da5
use small, non-zero values, for image buffer & pre & post buffers
2019-12-28 09:49:42 -06:00
9e43e06a55
Add empty array value for terms when there isn't any to get rid of warning when loading all events
2019-12-26 11:22:42 -05:00
958a6b8218
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-18 19:06:19 -05:00
e39a95d761
Add AlarmedZoned to filters, work on fixing filter behaviour in js. Enable viewing filter results in montagereview
2019-12-18 19:06:10 -05:00
d21fa5c48a
Do not set defaults in Object->set(). This allows us to set an empty timestamp.
2019-12-18 19:03:37 -05:00
34354f5871
Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab.
2019-12-18 12:13:00 -05:00
2a4d06f93b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-15 10:35:56 -05:00
4d9d4ba957
Do not allow deletion of archived events.
2019-12-15 10:35:43 -05:00
689956bba7
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-13 17:49:00 -05:00
b24e912050
Use ZM\Server::find_one for loading server so that it gets cached. Use a single regexp to determine config line validity instead of two for efficiency
2019-12-13 17:46:56 -05:00
d2a23e4822
add possing port to Monitor->UrlToIndex
2019-12-13 11:50:11 -05:00
bedc61a347
handle dbFetchNext on null result more gracefully
2019-12-13 11:49:55 -05:00
ea89ebf150
more mysql8 fixes
2019-12-08 21:33:29 -05:00
3bd0525e64
escape column names for mysql8
2019-12-08 14:27:07 -05:00
0de6396a5b
Test for null in user before testing for access in CanEdit et all
2019-12-07 12:39:28 -05:00
4632bbd124
Apply relevant changes to deal with php7,4 deprecations
2019-12-07 11:45:32 -05:00
cc6d40d67e
Missing ->
2019-12-07 10:38:51 -05:00
df9f6103e4
fix syntax error
2019-12-04 09:00:20 -05:00
78912584e1
re-arrange code to hopefully get rid of syntax error reported by some people
2019-12-04 07:10:33 -05:00
576dd23907
test for existence of filter in query
2019-12-02 12:30:15 -05:00
355fceccb4
test for existence of default
2019-12-02 12:30:03 -05:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
eedb31730e
fix saving Monitor values that don't get passed when empty, like Enabled
2019-11-29 14:49:43 -05:00
cab1056328
improve debugging in recursive_array_diff
2019-11-29 14:49:10 -05:00
d6a414a1a4
Merge pull request #2767 from connortechnology/fix_2692
...
Fix 2692
2019-11-29 14:24:00 -05:00
29572abef2
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
2019-11-29 13:56:02 -05:00
a9d8e73f68
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
2019-11-29 13:53:46 -05:00
7b99c89541
its not necessary the token is a refresh. Can also be empty
2019-11-26 20:57:25 -05:00
54a15573ad
Make 32bit the default for COlours
2019-11-26 15:06:24 -05:00
5ebf929598
Add Event counts, event disk usage to storage tab of options. Disable checkbox selection when there are events stored on the storage area.
2019-11-26 14:36:39 -05:00
1dc83700c0
Do a better job of handling the non-server, non-multiport case. Put the code in Url so that it works for other functions that call Url()
2019-11-21 13:32:27 -05:00
606c89962f
eliminate an extra db call
2019-11-20 16:30:26 -05:00
5494fdb087
When upgrading from a version that doesn't do DiskSpace storage, there can be a lot of events to update. Can't load them all or we run out of ram. Batch them in 1000's
2019-11-20 09:31:16 -05:00
59b9220ddd
if doing multiport still call Url(), as it requires a hostname
2019-11-11 13:33:54 -05:00
1c54f22627
Introduce CSP_REPORT_URI to config and use it when setting up CSP headers as to where to report unsafe inline js to.
2019-11-08 15:18:08 -05:00
014ce0afe8
improve error message regarding timezone differences
2019-11-05 12:40:11 -05:00
5b02bc76f4
Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly
2019-11-05 10:07:42 -05:00
d218d2ee9f
If the default server case, don't add the Url component. So this will return just the path, using whatever servername/port combo is currently in use. Fixes #2750
2019-11-04 12:04:23 -05:00
9d8a230252
Prevent deletion of entire events directory when monitor has empty name
2019-11-02 10:12:43 -04:00
968c28395d
close group popup when saving
2019-11-01 13:39:40 -04:00
988b2183c3
use new ViewWIdth and ViewHeight functions to generate video stream.
2019-10-29 17:42:48 -04:00
eb2269ea52
improve zone saving testing for value before doing math
2019-10-29 17:42:23 -04:00
f2300f2e8c
Add isPortrait and isLandscape functions. Rename Width and Height to ViewWidth and ViewHeight to return the rotated dimensions suitable for viewing
2019-10-29 17:39:12 -04:00
d036613776
Fix Server() not returning a ServerObject if not found when ServerId is null or 0
2019-10-21 13:45:27 -04:00
91651652c7
Only report an error for not finding the server if ServerId had a value
2019-10-21 13:41:32 -04:00
3244c8ab5b
spacing, quotes, remove debug
2019-10-21 13:18:09 -04:00
6a3fe1ef1f
actually set date.timezone from ZM_TIMEZONE
2019-10-18 14:37:09 -04:00
1a417952c3
AutoStopTimeOut is part of Monitor, not Control
2019-10-18 14:19:25 -04:00
13b02284fe
Merge branch 'master' into timezone_as_config
2019-10-18 13:58:22 -04:00
fdf48c4123
Merge pull request #2726 from externo6/more-filter-options
...
More filter options
2019-10-16 10:15:58 -04:00
ebebcad10d
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-10-16 10:13:31 -04:00
7146bdd59a
IN order to allow specifying a monitor Id that has been deleted, use monitor->Id instead of mid to test for monitor existence
2019-10-16 10:08:30 -04:00
d145adf9c6
set default for V4LCapturePerFrame to 1 instead of null.
2019-10-16 10:07:50 -04:00
4b71bc75ea
Change language to Contains / Not Contains and update perl filter.
2019-10-16 00:35:49 +01:00
ee1e12b938
Be more robust about returning a Server object when instantiating the default Storage area.
2019-10-11 17:29:47 -04:00
70396c5897
Don't warn about the spaces in the command
2019-10-09 13:10:43 -04:00
b15f7ad47d
handle ipv6 in Server->Hostname. Fixes #2713
2019-10-09 10:00:13 -04:00
4126554092
Move sendControlCommand out of includes/control_functions.php into Monitor.php. Make it smarted about talking to zmcontrol.pl. Fix sending the quit command
2019-10-08 18:07:33 -04:00
7328eb1979
be more robust when sending commands to zmcontrol. Of no commands given don't bother.
2019-10-03 17:30:10 -04:00
d02aee64e4
Add setting of timezone to Options/Config instead of php.ini
2019-10-02 09:07:18 -04:00
09efbfb4f1
Sort groups
2019-09-30 15:02:05 -04:00
85b16e89b7
Fix groups dropdown
2019-09-30 14:42:10 -04:00
3d6cab8360
Must force hash regeneration on login. Old hash may be from different user
2019-09-28 17:57:45 -04:00
0c1635b3b8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-09-28 14:23:33 -04:00
393f0a369c
Revamp timeline. Make it handle being full browser width. remove onclicks.
2019-09-28 14:23:23 -04:00
c24fc6c21f
Set Delta to 0 to avoid errors
2019-09-28 14:10:11 -04:00
7a3134ae5e
Fix restart login in functions. Only start zmc if function is not None and start zma if it isn't None or NoDect. Even if disabled, we still run zma so that we can send it a signal to enable motion detection.
2019-09-28 10:26:50 -04:00
7479d3f1f1
Add LIKE and NOT LIKE to filter options
...
This is useful for filtering notes.
EG filtering detected objects from zmeventnofification;
WHERE notes LIKE %detect%
WHERE notes NOT LIKE %car%
2019-09-28 13:03:16 +01:00
b1bcfe8a9b
fix backtrace
2019-09-26 16:26:28 -04:00
555f3e9c0d
Fix missing semi colon in Content-Security-Policy-Report-Only
2019-09-26 13:52:27 -04:00
4deea4c6ab
code doc
2019-09-25 10:35:57 -04:00
fe893a4a01
Add report-uri to out Content-Security-Policy-Report-Only header
2019-09-25 10:16:02 -04:00
5c80e098c5
Only save Group changes if there were changes
2019-09-25 10:14:12 -04:00
475432449f
Add default values for Status record
2019-09-25 10:13:56 -04:00
d16d77d6b3
quotes and spacing
2019-09-23 12:39:24 -04:00
a05c513643
Revert change breaking multiport when servers not defined.
2019-09-23 12:03:19 -04:00
538478ff1c
Need to -1 on the dimensions when comparing to points as they are 0-based
2019-09-23 11:48:58 -04:00
1dd09923eb
Add special case for just rotating the monitor dimensions and add out of bounds check for zone points
2019-09-23 11:42:49 -04:00
23b3ae5783
Remove debug
2019-09-22 21:06:54 -04:00
4c3ea7125d
Add defaults to Frame
2019-09-22 14:21:59 -04:00
6d16363f07
Restore monitor defaults
2019-09-21 10:40:24 -04:00
308236b4ad
Fix sending ptz controls
2019-09-20 10:35:39 -04:00
0a0bb1b326
Update Frame and Server Objects to use common methods
2019-09-19 16:24:05 -04:00
1539e34204
spacing
2019-09-19 14:57:28 -04:00
daa9f646fb
fix error printing
2019-09-19 14:56:34 -04:00
b9b52c964e
Upgrade monitor saving and viewing
2019-09-19 14:56:16 -04:00
73a5a8c8c5
Improve changes/set/etc to handle more complex defaults
2019-09-19 14:55:45 -04:00
b41e998a3a
Remove Control stuff from Monitor
2019-09-19 14:55:27 -04:00
4c206c2e9a
Upgrade Control Object to extend ZM\Object. Add commands function from skin specific control functions
2019-09-19 14:55:17 -04:00
458268d866
Merge branch 'master' into update_monitor_saving
2019-09-18 11:40:09 -04:00
1407d849e8
deprecate getStreamSrc in functions.php.
2019-09-18 11:10:25 -04:00
e0074692d1
Remove debug
2019-09-17 12:07:30 -04:00
ad84736cb4
spacing
2019-09-17 12:07:24 -04:00
deefa0754d
Backtick the fields when updating Monitors
2019-09-16 10:53:06 -04:00
63db128edf
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-09-15 17:54:29 -04:00
60cf4586da
Don't return a hostname when not in multi-server. Should prevent problems with reverse proxies
2019-09-15 17:54:23 -04:00
32a1ab58b5
remove use of userLogin which was removed recently
2019-09-15 12:19:35 -04:00
d5aa95e45f
cpplint fixes
2019-09-09 16:13:32 -04:00
8103156436
when deleting multiple events, each event has to be it's own transaction due to locking
2019-09-09 09:16:52 -04:00
056449590a
Update Monitor object, using Object methods for saving monitors
2019-09-08 12:26:11 -04:00
2993e52652
Fix auth timing out due to cookie timing out and getting deleted.
2019-09-04 12:14:32 -04:00
dde655950f
Use locking when deleting an event
2019-09-04 10:07:17 -04:00
26670c2df2
Add lock function to write lock an object
2019-09-04 10:07:08 -04:00
92bc1791f5
fix accidentally removed code
2019-09-03 11:33:13 -04:00
a384e978c8
don't load user from session if we have already gotten it from elsewhere
2019-09-03 11:19:42 -04:00
b84d005d8f
Load use from session when it exists
2019-09-03 10:54:34 -04:00
6b9e8bec69
Add logging of delete events
2019-08-29 11:26:32 -04:00
a4b057fa2b
Upgrade Event object to use the common Object methods. Add deleting files from Secondary storage
2019-08-29 11:25:37 -04:00
c80ef0e0ab
spacing
2019-08-28 12:20:03 -04:00
320bf823c5
Don't report errors when creating monitor symlink when it already exists
2019-08-28 09:18:33 -04:00
c482fa7d5d
Fix executing filter
2019-08-26 20:45:38 -04:00
f01bedb33e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-26 18:49:12 -04:00
231c9c3902
move executeFilter to Filter->execute. If no changes have been made, don't make a tempfilter.
2019-08-26 18:48:34 -04:00
82e8bde406
Fix SaveAs
2019-08-26 16:19:19 -04:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
7ef26275bc
use isset to get rid of warnings when eid is not in REQUEST
2019-08-20 10:28:19 -04:00
84492f29b1
Fix token auth sessions ( #2676 )
...
* If token is present do token based auth and do not do anything with session
* update HostController. Use config constants, don't use sessions
* Remove Session from the components list
* spacing
* Remove Session from App Components list.
* Move APIEnabled check to the api from auth.php
* Rework auth. login using username and password only occurs on login action now. Including auth.php should not touch the session. auth_hash logins no longer touch the session. replace userLogin with a function called validateUser which matches the semantics of validateToken.
* remove debugging
* Add session storage if stateful query param is on, but only for LEGACY_API_AUTH
* fix mUser to username, etc.
* shuffle lines
* use instead of session when generating auth hash.
* Add docs regarding the use of cookies and stateful query param
* Only open/close session if we are clearing a session var
* Use zm_session_start instead of session_start
* Should use zm_session_start instead of session_start
* document that zm_session_start should be called previously to session_regenerate_id
* Don't actually write out the session when generating auth hashes. Means they should never actually persist.
* More backticking of SQL
* add .. to fix #2686
* Use material icons for sort because they look nicer
* fix typo
* have to add authhash to session on login
* restore username&password login for all urls
* fix
* fixes
2019-08-20 09:46:53 -04:00
b344701dea
fixes
2019-08-19 12:15:58 -04:00
3b58da860f
fix
2019-08-19 12:08:41 -04:00
b1132087b8
restore username&password login for all urls
2019-08-19 12:07:38 -04:00
87e7ba0e50
have to add authhash to session on login
2019-08-19 11:38:56 -04:00
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac Connor
Pliable Pixels
externo6
Isaac Connor
Isaac Connor