7060945e97
Use new ZM_PATH_IP and ZM_PATH_IFCONFIG instead of hard coded paths. Fixes #3670
2023-09-28 13:32:42 -04:00
82aeac076d
Fix incorrect var name frameid=>fid in find_virtual_frame
2023-09-26 12:10:36 -04:00
709d08c6c5
Only call jsonDecode when Query_json is non-empty
2023-09-25 16:56:06 -04:00
45bcb13045
Add backtrace to errors in json
2023-09-25 16:32:20 -04:00
24d6649e98
Log useful output when failure to write dnsmasq.conf and fail to restart dnsmasq
2023-09-21 12:51:37 -04:00
057159cde6
Make properties public so that they can be access in Storage object
2023-09-21 10:10:57 -04:00
f8c89a0405
Merge branch 'master' into tags
2023-09-14 16:42:06 -04:00
e11b700fbd
Add Id as a protected member, only lookup monitor status if Id has a value
2023-09-13 11:18:50 -07:00
6754fcb208
Make Filter properties protected
2023-09-13 11:18:28 -07:00
1c3206b781
Merge branch 'master' into openbsd
2023-09-13 10:15:06 -07:00
fccebee056
Add -a to arp, add ZM_PATH_OUI for path to ieee-oui.txt
2023-09-13 10:14:49 -07:00
c4302c27ac
Add code to test for existence of ip and support ifconfig
2023-09-13 10:14:21 -07:00
d9bf168066
Merge ../ZoneMinder.connortechnology
2023-09-13 13:10:14 -04:00
c6a7fe949a
Use different syntax for property access
2023-09-13 13:10:01 -04:00
d7090ce84a
Define properties
2023-09-13 13:08:12 -04:00
3767d815a5
Use different syntax for assigning object properties
2023-09-13 13:05:57 -04:00
ef402e7b99
Define tablename member
2023-09-13 13:05:39 -04:00
46ac2dba2f
Define tablename member
2023-09-13 13:05:25 -04:00
6a87f56ac2
Never display errors
2023-09-13 13:04:16 -04:00
b7ed7a4bd8
in detaintPath also strip :// because php:// is a way to inject code
2023-09-11 12:34:31 -04:00
82e972943e
Add frame loading including virtual frames
2023-09-08 14:18:11 -04:00
18d74ed7ac
(feat): Tags
...
fix(tag): Create tags on mobile
chore(tags): Change TagName to Name
chore(tags): eslint
chore(tags): dbFetchAll to dbQuery for removetag
chore(events): eslint (attempt 2)
feat(tags): Better handling of keyboard
fix(tags): Enter key for creating new tag
fix(tags): Don't allow space as a tag name
feat(tags): Delete tag if last assignment removed
fix(tags): Increase height of dropdown
in progress
fix(Tags): Use T.Id on the events page dropdown
fix(Tags): Remove $availableTags from events.php
chore(sql): Formatting sql statements
feat(Tags): Working OR on filters and events pages
fix(filter): Populate availableTags
chore(Tags): code formatting
fix(tag): Add tag on create tag
Fix(tags): Remove tag from available if last
feat(tags): Add zm_update.sql
fix(chosen): Undo css width
fix(chosen): tags dropdown width
fix(tags): dropdown over timeline
fix(tags): Full width input
fix(events): Refresh table on page show
chore(filter): Clean up availableTags
chore(event): Clean up available & selected Tags
fix(event): Update available tags on remove
fix(event): Remove hack for selected tags
feat(tags): Blur input after adding tag
doc(tags): Initial tags documentation
fix(tags): Dark theme dropdown
fix(tags): Dark theme for tags on input
fix(tags): Dark theme for highlight in dropdown
fix(tags): Populate filter tags droplist
chore(): Bump zm_update to 1.37.42
chore(tags): Move mobile check to skin.js
chore(tags): Comment debug statements
fix(tags): Enter key to create tag on mobile Chome
chore(tags): Space in 'All Tags' for translation
Temporary commit to handle cookie expiration times
chore(tags): Remove unnecessary Tag(s) from en_gb
chore(): Cleanup unnecessary Error and Debug
chore(): Resolve merge conflicts
chore(): Address merge conflicts with master
2023-08-31 15:50:08 -04:00
9371c2775d
Use canEdit and canDelete to allow users without canEditEvents to create filters that don't act on events, only list them.
2023-08-18 16:57:51 -04:00
94ea51489b
Add canDelete and canEdit functions to Filter
2023-08-18 16:57:08 -04:00
8748d6a1cc
Handle unset _SESSION['remoteAddr']
2023-08-16 15:23:34 -04:00
91b4e299b9
Demote failed login to Warn instead of Error
2023-08-16 10:37:06 -04:00
9a229a78a5
Fix missing mac key on cameras array
2023-08-14 13:30:24 -04:00
889c809e0b
Add RTSP2WebEnabled to defaults
2023-08-09 18:55:36 -04:00
00bd2259a3
Midly improve dlink support. Fix for probing an undefined array
2023-08-08 18:34:44 -04:00
8f9a4dc825
Use User object to get Monitor_Permission and Group_Permissions hoping it will be cached there.
2023-08-02 18:07:35 -04:00
5233c402d3
Use User object to get Monitor_Permission and Group_Permissions hoping it will be cached there.
2023-08-02 18:07:28 -04:00
672ba114f4
Fix reversed defaults for RTSP2Web options
2023-08-02 13:48:15 -04:00
5c9588c012
Adds RTSP2Web support for live view
2023-07-29 23:46:31 -05:00
bd3aac1cf6
Fixup curl() and Axis probing
2023-07-25 12:32:35 -04:00
c0b5bbf8cc
Rough in Hanwha support. Fix results getting overwritten
2023-07-21 14:26:39 -07:00
75322142a4
Remove deprecated MonitorsIds. Replace it's use with looking for edit permission per monitor
2023-07-19 12:39:32 -04:00
cb7d954a87
Fix warning when creating new user
2023-07-17 17:29:16 -04:00
f46ef094dc
Merge envserv:sandbox/ZoneMinder
2023-07-17 15:37:12 -04:00
65d37e7a36
Rough in a Grandstream detector
2023-07-17 14:36:28 -05:00
64057eec95
ROugh in Foscam and DLink detections
2023-07-15 10:29:54 -04:00
e13a42aa46
Fix not saving Manufacturer and Model. Have to unset the text input if the ddm is populated
2023-07-12 14:30:49 -04:00
3714b38caa
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-06-27 11:47:03 -04:00
961f05b228
Don't show deleted monitors in group dropdowns
2023-06-27 10:45:13 -04:00
bc1214e8e5
Don't use empty because it tests for false, and 0 is false. Just check for empty string. Fixes #3732
2023-06-27 10:44:25 -04:00
93dc57401f
Remove duplicated ExistsInFileSystem label
2023-06-26 10:34:19 -04:00
ccdbb8edf6
Improve Avigilon detection
2023-06-22 13:31:01 -04:00
87fbc96609
Fix where error_log write to to include path
2023-06-09 19:37:47 -04:00
19128eee18
Do not allow directory names in ZM_LOG_DEBUG_FILE. Only log to ZM_LOG_DIR
2023-06-09 17:27:54 -04:00
81b9ac5efd
Ignore inherit on monitor permission. We were returning true instead
2023-06-07 16:00:27 -04:00
3dbd68886a
Reload user using zm\User object methods
2023-06-07 15:59:46 -04:00
c02cbd86f8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-31 09:16:32 -04:00
8bd3e5a3b1
Can't use ZM\Logger functions in config as it loads before logger.php.
2023-05-31 09:09:17 -04:00
b0e29c9be7
Fix downloading of Ffmpeg type monitors
2023-05-30 20:47:05 -04:00
eab4d95e81
Always return an array from process_configfile instead of false on failure
2023-05-30 20:47:05 -04:00
bc4d625ca4
Add systemd_isactive
2023-05-30 20:47:05 -04:00
febf424259
Fix returning link_to
2023-05-30 20:47:05 -04:00
6204dfdecc
Fix start/stop/restart dnsmasq
2023-05-30 20:47:05 -04:00
30495578c2
Add link_to function
2023-05-30 20:47:05 -04:00
66ef087a4d
ServerId and FilterServerId must have a value to be valid
2023-05-26 16:38:58 -04:00
51a1d511fb
Fix incorect merging of terms in sort. Fixes #3715 . Also always show text op in simple_widget
2023-05-26 16:36:40 -04:00
e14fc279e4
Handle empty set in IN/NOT IN better
2023-05-26 16:35:45 -04:00
4959d83751
Switch from utf8 to utf8mb4 so that collate works
2023-05-25 17:31:30 -04:00
704b3b2a80
Handle missing cnj on terms
2023-05-24 18:30:33 -04:00
d4a4bd6c8e
Add remove_invalid_terms
2023-05-23 16:53:52 -04:00
20b7624da0
Handle op not being specified
2023-05-23 15:51:35 -04:00
fa844e60cb
Don't remove cnj on first term in Query. We might reorder them later.
2023-05-19 12:44:08 -04:00
fbe954473a
Add support for placeholders, cookies, case insensitive search and Group as an attr.
2023-05-17 14:36:38 -04:00
91541aa6b7
Add support for placeholders, cookies, DateTime fitler, Notes, Group. Add sort_terms function.
2023-05-17 14:36:09 -04:00
485af42a0b
Fix more typos
2023-05-16 14:18:26 -04:00
030d6b9696
Fix undefined mid
2023-05-16 14:14:34 -04:00
3daee34d4d
Fix typo
2023-05-16 14:11:53 -04:00
c8c4b560af
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-16 14:11:21 -04:00
6eb166c938
Handle matches2 not being defined
2023-05-16 11:53:48 -04:00
22bd680e40
FIx ::
2023-05-16 10:23:39 -04:00
fc90d7bc2b
Remove debug
2023-05-15 16:08:51 -04:00
d189d820a8
Don't log errors from port_open, don't close the unopened fp
2023-05-15 10:47:54 -04:00
586fd5edb7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-15 10:05:13 -04:00
37e711d684
Add port_open function, improve Ubiquiti probing, check for open port on 554 before saying it's a camera
2023-05-15 10:03:34 -04:00
6046398981
Add event Name to the event detail modal
2023-05-12 15:15:55 -04:00
3009c4902d
Use User object find instead of raw sql
2023-05-12 15:11:40 -04:00
ef424a39b6
Improve Amcrest detection with snapshot image. Fix using auth from monitor overriding other cameras
2023-05-12 13:15:55 -04:00
d522ef677a
Add Avigilon, loading of arp-scan oui database and showing of all devices instead of just recognized cameras. Remove the : from mac addresses to match OUI dbs
2023-05-12 12:59:53 -04:00
51755b4f4e
Fix updating having Id in it
2023-05-12 12:56:36 -04:00
e1c3584462
Add support for HTTP_X_FORWARDED_FOR instead of REMOTE_ADDR. Comment out debugging
2023-05-12 12:53:26 -04:00
d0b8018d9c
Add setting of User Name
2023-05-12 12:52:51 -04:00
a8365d40b4
Fix array uses of user object. Include data-id in monitor div.
2023-05-10 11:03:10 -04:00
00113208bf
fix typo
2023-04-28 08:44:47 -04:00
bac1974974
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-04-26 14:54:09 -04:00
bf113217f2
Improve Axis detection
2023-04-26 14:15:08 -04:00
7825957114
Only set val from cookie if it is non-empty
2023-04-26 11:07:17 -04:00
d2fb365fa9
Add the ability to send a single summary email instead of individual emails per event
2023-04-24 17:53:16 -04:00
c87316d3a1
Handle not being logged in
2023-04-24 10:13:45 -04:00
4b417b8937
Fix other cases of user as an array
2023-04-23 15:35:26 -04:00
969baa3891
Convert user from an array to a User object
2023-04-23 12:57:29 -04:00
35cc9fa4cb
Apparently Default for Deleted needs to be zero, not false
2023-04-22 14:04:18 -04:00
665628720f
Improved setting of Manufacturer and Model, add Status to monitor view status, new defaults for Label, EncoderParamters, don't save analysis jpegs by default and only analyze on 2fps and set a reasonable MaxImageBuffer
2023-04-22 13:58:33 -04:00
5f8c80698e
Improve Ubiquiti snapshot jpeg support
2023-04-22 13:32:42 -04:00
68370a1f88
Add Group to filters, add Notes to widgets, other fixes to widget structure. Add cookie support for widgets.
2023-04-22 10:56:34 -04:00
d9f5d3c357
Implement StartDateTimeSecs
2023-04-22 10:48:41 -04:00
312d0ba841
Use objdetect as thumbnail if it exists.
2023-04-22 10:47:33 -04:00
4d8d4b6ee5
Update add_monitors to make it scan the network.
2023-04-21 17:52:14 -04:00
02046b9c88
Use object methods to load monitor and delete it
2023-04-19 18:56:52 -04:00
73548dda73
Add Deleted member
2023-04-19 18:56:29 -04:00
240333381a
Handle val and cnj not being specified. Add Notes to attr that must be non empty
2023-04-11 07:53:55 -04:00
ce0a83f904
Reduce minimum to .05% as that is what seems to be necessary these days
2023-04-05 17:47:03 -04:00
394cd6e0f8
AlarmRGB should be an actual hex value not a string
2023-04-05 17:46:29 -04:00
21f6bdae35
Change minimum percent to 50% instead of 3%
2023-04-05 14:46:13 -04:00
d170112ef7
Change minimum percent to 50% instead of 3%
2023-04-05 14:45:30 -04:00
b1df318491
Use ORM Zone Object for Zone insertion on new monitor
2023-04-05 14:43:50 -04:00
231b0ab631
Sync up default values with what gets added in actions/monitor
2023-04-05 14:42:44 -04:00
9284ae2908
Add Name,Email,Phone to User object
2023-04-03 12:45:09 -04:00
3a20ab64c7
Turn dropdowns into chosen multiple-selects
2023-04-02 16:27:14 -04:00
d5baadca84
Comment out debug
2023-04-02 16:10:24 -04:00
593c7ac902
Handle HomeView not being set, and default it so that it is set
2023-03-24 12:53:49 -04:00
16b74fc474
Add title of monitor id and name like we had in 1.36
2023-03-23 20:03:40 -04:00
6c8a2ad05a
add support for shortened user= pass= which is used in auth_relay=PLAIN
2023-03-22 08:06:02 -04:00
da87187f1d
Use explode instead of split
2023-03-22 08:06:02 -04:00
01ba5f59f9
Use dirname(__FILE__) instead of DOCUMENT_ROOT. Apparently many people have something wrong in DOCUMENT_ROOT. I don't understand it, but it seems like dirname(__FILE__) is a better solution anyways.
2023-03-21 18:22:53 -04:00
34e3e99c99
Rough in code for User_Preferences
2023-03-21 10:03:57 -04:00
e60586feee
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-03-21 09:54:40 -04:00
128b3d884a
Spacing
2023-03-21 09:54:37 -04:00
8bef309a86
Values in terms are comma separated, so split the val for Monitor selection
2023-03-16 08:43:01 -04:00
97879eab49
Fix missing s causing problems when Group permission set to None
2023-03-08 10:59:33 -05:00
06f750c42b
add in is_isnot_opTypes and booleanValues and use them in simple_widget
2023-03-05 13:26:08 -05:00
065464a7f8
Use new getHomeView function instead of view=console
2023-03-05 10:21:59 -05:00
3e86454fc6
implement getHomeView function
2023-03-05 10:21:18 -05:00
2e58ea1a42
return false if not logged in in canView. defaultUser is global, need to tell it so.
2023-02-27 17:01:58 -05:00
72652cfb64
Add Decoder options to monitor view
2023-02-26 16:04:32 -05:00
9ceb22db8f
Fix auth for monitor_permissions...
2023-02-25 16:00:34 -05:00
84383a0498
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-02-25 13:17:53 -05:00
a7af29c0c4
Add IN operator
2023-02-25 13:00:38 -05:00
39de76e989
add a db_version and a feature check function to determine if we support skip locks in the query. Use it to disable the feature in filter view.
2023-02-25 11:44:50 -05:00
82a28b78d8
Use function style of member access to prevent errors on unsaved monitor
2023-02-23 13:22:50 -05:00
6867b0c841
Correct the syntax of the CSP
2023-02-23 09:47:49 -05:00
32afb13b39
Sanitise attr input in FilterTerm to prefent SQL Injection. Fixes GHSA-222j-wh8m-xjrx
2023-02-23 09:25:03 -05:00
7b36027066
add in files actions, with delete
2023-02-22 05:59:16 -05:00
d6dc1d3e30
Add object-src CSP directive
2023-02-20 18:15:16 -05:00
44c7582003
Don't shorten analysis
2023-02-20 17:30:48 -05:00
4f66ab3503
Introduce check_datetime function to validate dates
2023-02-20 11:53:53 -05:00
82a9d6d444
Use validCardinal on Id to prevent executing other commands
2023-02-20 11:41:41 -05:00
f4a2925177
Test for valid monitor id in snapshot creation.
2023-02-20 10:30:34 -05:00
bf810ec8c4
test for existence of username in session to prevent error outputs
2023-02-20 10:20:59 -05:00
3268f95282
Fix detaintPath not stripping sequences like ..././
2023-02-20 09:18:51 -05:00
5090000cdd
Remove ZM\s that shouldn't be there
2023-02-19 17:29:32 -05:00
ee89169a7b
Use reload instead of restart on zone save
2023-02-16 14:10:30 -05:00
855ab6f141
Add reload to monitor zmcControl
2023-02-16 14:10:21 -05:00
1a8a84da96
Remove debug when relay not hashed
2023-02-15 15:02:22 -05:00
8ec5946791
Add backtrace to value not in values warning
2023-02-15 15:02:11 -05:00
c009ef1bbe
Fix AlarmFrames validity test
2023-02-15 15:00:23 -05:00
71265a8271
Define serversr, stats for simple widget
2023-02-15 15:00:13 -05:00
Isaac Connor
Isaac Connor
Charlie Root
Simpler1
Jonathan Bennett
IPC