Isaac Connor
|
c02cbd86f8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-05-31 09:16:32 -04:00 |
|
Isaac Connor
|
8bd3e5a3b1
|
Can't use ZM\Logger functions in config as it loads before logger.php.
|
2023-05-31 09:09:17 -04:00 |
Isaac Connor
|
b0e29c9be7
|
Fix downloading of Ffmpeg type monitors
|
2023-05-30 20:47:05 -04:00 |
|
Isaac Connor
|
eab4d95e81
|
Always return an array from process_configfile instead of false on failure
|
2023-05-30 20:47:05 -04:00 |
|
Isaac Connor
|
bc4d625ca4
|
Add systemd_isactive
|
2023-05-30 20:47:05 -04:00 |
|
Isaac Connor
|
febf424259
|
Fix returning link_to
|
2023-05-30 20:47:05 -04:00 |
|
Isaac Connor
|
6204dfdecc
|
Fix start/stop/restart dnsmasq
|
2023-05-30 20:47:05 -04:00 |
|
Isaac Connor
|
30495578c2
|
Add link_to function
|
2023-05-30 20:47:05 -04:00 |
|
Isaac Connor
|
66ef087a4d
|
ServerId and FilterServerId must have a value to be valid
|
2023-05-26 16:38:58 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
e14fc279e4
|
Handle empty set in IN/NOT IN better
|
2023-05-26 16:35:45 -04:00 |
|
Isaac Connor
|
4959d83751
|
Switch from utf8 to utf8mb4 so that collate works
|
2023-05-25 17:31:30 -04:00 |
|
Isaac Connor
|
704b3b2a80
|
Handle missing cnj on terms
|
2023-05-24 18:30:33 -04:00 |
|
Isaac Connor
|
d4a4bd6c8e
|
Add remove_invalid_terms
|
2023-05-23 16:53:52 -04:00 |
|
Isaac Connor
|
20b7624da0
|
Handle op not being specified
|
2023-05-23 15:51:35 -04:00 |
|
Isaac Connor
|
fa844e60cb
|
Don't remove cnj on first term in Query. We might reorder them later.
|
2023-05-19 12:44:08 -04:00 |
|
Isaac Connor
|
fbe954473a
|
Add support for placeholders, cookies, case insensitive search and Group as an attr.
|
2023-05-17 14:36:38 -04:00 |
|
Isaac Connor
|
91541aa6b7
|
Add support for placeholders, cookies, DateTime fitler, Notes, Group. Add sort_terms function.
|
2023-05-17 14:36:09 -04:00 |
|
Isaac Connor
|
485af42a0b
|
Fix more typos
|
2023-05-16 14:18:26 -04:00 |
|
Isaac Connor
|
030d6b9696
|
Fix undefined mid
|
2023-05-16 14:14:34 -04:00 |
|
Isaac Connor
|
3daee34d4d
|
Fix typo
|
2023-05-16 14:11:53 -04:00 |
|
Isaac Connor
|
c8c4b560af
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-05-16 14:11:21 -04:00 |
|
Isaac Connor
|
6eb166c938
|
Handle matches2 not being defined
|
2023-05-16 11:53:48 -04:00 |
|
Isaac Connor
|
22bd680e40
|
FIx ::
|
2023-05-16 10:23:39 -04:00 |
|
Isaac Connor
|
fc90d7bc2b
|
Remove debug
|
2023-05-15 16:08:51 -04:00 |
|
Isaac Connor
|
d189d820a8
|
Don't log errors from port_open, don't close the unopened fp
|
2023-05-15 10:47:54 -04:00 |
|
Isaac Connor
|
586fd5edb7
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-05-15 10:05:13 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
6046398981
|
Add event Name to the event detail modal
|
2023-05-12 15:15:55 -04:00 |
|
Isaac Connor
|
3009c4902d
|
Use User object find instead of raw sql
|
2023-05-12 15:11:40 -04:00 |
|
Isaac Connor
|
ef424a39b6
|
Improve Amcrest detection with snapshot image. Fix using auth from monitor overriding other cameras
|
2023-05-12 13:15:55 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
51755b4f4e
|
Fix updating having Id in it
|
2023-05-12 12:56:36 -04:00 |
|
Isaac Connor
|
e1c3584462
|
Add support for HTTP_X_FORWARDED_FOR instead of REMOTE_ADDR. Comment out debugging
|
2023-05-12 12:53:26 -04:00 |
|
Isaac Connor
|
d0b8018d9c
|
Add setting of User Name
|
2023-05-12 12:52:51 -04:00 |
|
Isaac Connor
|
a8365d40b4
|
Fix array uses of user object. Include data-id in monitor div.
|
2023-05-10 11:03:10 -04:00 |
|
Isaac Connor
|
00113208bf
|
fix typo
|
2023-04-28 08:44:47 -04:00 |
|
Isaac Connor
|
bac1974974
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-04-26 14:54:09 -04:00 |
|
Isaac Connor
|
bf113217f2
|
Improve Axis detection
|
2023-04-26 14:15:08 -04:00 |
|
Isaac Connor
|
7825957114
|
Only set val from cookie if it is non-empty
|
2023-04-26 11:07:17 -04:00 |
|
Isaac Connor
|
d2fb365fa9
|
Add the ability to send a single summary email instead of individual emails per event
|
2023-04-24 17:53:16 -04:00 |
|
Isaac Connor
|
c87316d3a1
|
Handle not being logged in
|
2023-04-24 10:13:45 -04:00 |
|
Isaac Connor
|
4b417b8937
|
Fix other cases of user as an array
|
2023-04-23 15:35:26 -04:00 |
|
Isaac Connor
|
969baa3891
|
Convert user from an array to a User object
|
2023-04-23 12:57:29 -04:00 |
|
Isaac Connor
|
35cc9fa4cb
|
Apparently Default for Deleted needs to be zero, not false
|
2023-04-22 14:04:18 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
5f8c80698e
|
Improve Ubiquiti snapshot jpeg support
|
2023-04-22 13:32:42 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
d9f5d3c357
|
Implement StartDateTimeSecs
|
2023-04-22 10:48:41 -04:00 |
|
Isaac Connor
|
312d0ba841
|
Use objdetect as thumbnail if it exists.
|
2023-04-22 10:47:33 -04:00 |
|
Isaac Connor
|
4d8d4b6ee5
|
Update add_monitors to make it scan the network.
|
2023-04-21 17:52:14 -04:00 |
|
Isaac Connor
|
02046b9c88
|
Use object methods to load monitor and delete it
|
2023-04-19 18:56:52 -04:00 |
|
Isaac Connor
|
73548dda73
|
Add Deleted member
|
2023-04-19 18:56:29 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
ce0a83f904
|
Reduce minimum to .05% as that is what seems to be necessary these days
|
2023-04-05 17:47:03 -04:00 |
|
Isaac Connor
|
394cd6e0f8
|
AlarmRGB should be an actual hex value not a string
|
2023-04-05 17:46:29 -04:00 |
|
Isaac Connor
|
21f6bdae35
|
Change minimum percent to 50% instead of 3%
|
2023-04-05 14:46:13 -04:00 |
|
Isaac Connor
|
d170112ef7
|
Change minimum percent to 50% instead of 3%
|
2023-04-05 14:45:30 -04:00 |
|
Isaac Connor
|
b1df318491
|
Use ORM Zone Object for Zone insertion on new monitor
|
2023-04-05 14:43:50 -04:00 |
|
Isaac Connor
|
231b0ab631
|
Sync up default values with what gets added in actions/monitor
|
2023-04-05 14:42:44 -04:00 |
|
Isaac Connor
|
9284ae2908
|
Add Name,Email,Phone to User object
|
2023-04-03 12:45:09 -04:00 |
|
Isaac Connor
|
3a20ab64c7
|
Turn dropdowns into chosen multiple-selects
|
2023-04-02 16:27:14 -04:00 |
|
Isaac Connor
|
d5baadca84
|
Comment out debug
|
2023-04-02 16:10:24 -04:00 |
|
Isaac Connor
|
593c7ac902
|
Handle HomeView not being set, and default it so that it is set
|
2023-03-24 12:53:49 -04:00 |
|
Isaac Connor
|
16b74fc474
|
Add title of monitor id and name like we had in 1.36
|
2023-03-23 20:03:40 -04:00 |
|
Isaac Connor
|
6c8a2ad05a
|
add support for shortened user= pass= which is used in auth_relay=PLAIN
|
2023-03-22 08:06:02 -04:00 |
|
Isaac Connor
|
da87187f1d
|
Use explode instead of split
|
2023-03-22 08:06:02 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
34e3e99c99
|
Rough in code for User_Preferences
|
2023-03-21 10:03:57 -04:00 |
|
Isaac Connor
|
e60586feee
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-03-21 09:54:40 -04:00 |
|
Isaac Connor
|
128b3d884a
|
Spacing
|
2023-03-21 09:54:37 -04:00 |
|
Isaac Connor
|
8bef309a86
|
Values in terms are comma separated, so split the val for Monitor selection
|
2023-03-16 08:43:01 -04:00 |
|
Isaac Connor
|
97879eab49
|
Fix missing s causing problems when Group permission set to None
|
2023-03-08 10:59:33 -05:00 |
|
Isaac Connor
|
06f750c42b
|
add in is_isnot_opTypes and booleanValues and use them in simple_widget
|
2023-03-05 13:26:08 -05:00 |
|
Isaac Connor
|
065464a7f8
|
Use new getHomeView function instead of view=console
|
2023-03-05 10:21:59 -05:00 |
|
Isaac Connor
|
3e86454fc6
|
implement getHomeView function
|
2023-03-05 10:21:18 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
72652cfb64
|
Add Decoder options to monitor view
|
2023-02-26 16:04:32 -05:00 |
|
Isaac Connor
|
9ceb22db8f
|
Fix auth for monitor_permissions...
|
2023-02-25 16:00:34 -05:00 |
|
Isaac Connor
|
84383a0498
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-02-25 13:17:53 -05:00 |
|
Isaac Connor
|
a7af29c0c4
|
Add IN operator
|
2023-02-25 13:00:38 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
82a28b78d8
|
Use function style of member access to prevent errors on unsaved monitor
|
2023-02-23 13:22:50 -05:00 |
|
Isaac Connor
|
6867b0c841
|
Correct the syntax of the CSP
|
2023-02-23 09:47:49 -05:00 |
|
Isaac Connor
|
32afb13b39
|
Sanitise attr input in FilterTerm to prefent SQL Injection. Fixes GHSA-222j-wh8m-xjrx
|
2023-02-23 09:25:03 -05:00 |
|
Isaac Connor
|
7b36027066
|
add in files actions, with delete
|
2023-02-22 05:59:16 -05:00 |
|
Isaac Connor
|
d6dc1d3e30
|
Add object-src CSP directive
|
2023-02-20 18:15:16 -05:00 |
|
Isaac Connor
|
44c7582003
|
Don't shorten analysis
|
2023-02-20 17:30:48 -05:00 |
|
Isaac Connor
|
4f66ab3503
|
Introduce check_datetime function to validate dates
|
2023-02-20 11:53:53 -05:00 |
|
Isaac Connor
|
82a9d6d444
|
Use validCardinal on Id to prevent executing other commands
|
2023-02-20 11:41:41 -05:00 |
|
Isaac Connor
|
f4a2925177
|
Test for valid monitor id in snapshot creation.
|
2023-02-20 10:30:34 -05:00 |
|
Isaac Connor
|
bf810ec8c4
|
test for existence of username in session to prevent error outputs
|
2023-02-20 10:20:59 -05:00 |
|
Isaac Connor
|
3268f95282
|
Fix detaintPath not stripping sequences like ..././
|
2023-02-20 09:18:51 -05:00 |
|
Isaac Connor
|
5090000cdd
|
Remove ZM\s that shouldn't be there
|
2023-02-19 17:29:32 -05:00 |
|
Isaac Connor
|
ee89169a7b
|
Use reload instead of restart on zone save
|
2023-02-16 14:10:30 -05:00 |
|
Isaac Connor
|
855ab6f141
|
Add reload to monitor zmcControl
|
2023-02-16 14:10:21 -05:00 |
|
Isaac Connor
|
1a8a84da96
|
Remove debug when relay not hashed
|
2023-02-15 15:02:22 -05:00 |
|
Isaac Connor
|
8ec5946791
|
Add backtrace to value not in values warning
|
2023-02-15 15:02:11 -05:00 |
|
Isaac Connor
|
c009ef1bbe
|
Fix AlarmFrames validity test
|
2023-02-15 15:00:23 -05:00 |
|
Isaac Connor
|
71265a8271
|
Define serversr, stats for simple widget
|
2023-02-15 15:00:13 -05:00 |
|
Isaac Connor
|
113171e5ee
|
username in session can also be unset
|
2023-02-15 13:46:34 -05:00 |
|
Isaac Connor
|
40e7f8a517
|
Handle SESSION[password] not being set which happens when you switch AUTH_RELAY to plain.
|
2023-02-14 17:10:58 -05:00 |
|
Isaac Connor
|
29b688a2a5
|
Fix storageareas not being defined.
|
2023-02-14 17:05:20 -05:00 |
|
Isaac Connor
|
1fa0253fa5
|
When switching from hashed to plain relay, the session won't have password. So prevent errors.
|
2023-02-14 17:04:32 -05:00 |
|
Isaac Connor
|
ebb37ebc98
|
Don't output errors from remote commands as it breaks ui
|
2023-02-09 18:46:01 -05:00 |
|
Isaac Connor
|
a2ab907c92
|
Spacing, parenthesis and use Id() instead to avoid warning when called on a non-existent monitor
|
2023-02-07 09:11:29 -05:00 |
|
Isaac Connor
|
d04b9891f1
|
Just do the symlink, there is a race between file_exists and symlink
|
2023-01-27 15:50:50 -05:00 |
|
Isaac Connor
|
c8e4dcbe51
|
Add valid case for Archived
|
2023-01-25 13:25:33 -05:00 |
|
Isaac Connor
|
1658164ee1
|
explode the val in term for Monitor rule type. It will be a comma separated value, not an array
|
2023-01-25 11:50:16 -05:00 |
|
Isaac Connor
|
774c963810
|
Merge branch 'master' of ../otherbranch
|
2023-01-25 11:41:52 -05:00 |
|
Isaac Connor
|
fe95e5b2bc
|
Add valid test case for AlarmFrames
|
2023-01-25 11:41:38 -05:00 |
|
Isaac Connor
|
d2a6c83056
|
Merge branch 'master' of ../otherbranch
|
2023-01-24 21:17:45 -05:00 |
|
Isaac Connor
|
1431eca868
|
Remove stripslashes when saving config values. The values in REQUEST have not been escaped, so stripslashes is not appropriate. Fixes #3655
|
2023-01-24 11:47:31 -05:00 |
|
Isaac Connor
|
5e71a8fb72
|
Add operator filtering to has_term
|
2023-01-21 18:41:11 -05:00 |
|
Isaac Connor
|
9789e02f2a
|
create archiveTypes static function. Use it. Add has_term function
|
2023-01-21 18:40:44 -05:00 |
|
Isaac Connor
|
1ee526444b
|
populate monitor_names array to we can output the dropdown
|
2023-01-10 12:07:35 -05:00 |
baudneo
|
aab62c5a7e
|
Add Janus RTSP session timeout to PHP (front end) ⚗️
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
|
2023-01-09 17:57:26 -07:00 |
|
Isaac Connor
|
f06e11a097
|
Add SectionLengthWarn, use it to disable warnings in logs about section length being exceeded.
|
2023-01-07 12:33:42 -05:00 |
|
Isaac Connor
|
cda2191f3e
|
Spacing, quotes, remove dead code
|
2023-01-03 13:57:14 -05:00 |
|
Isaac Connor
|
359c0c1b27
|
Don't know why we are turning off display errors in Server.php. Let's not.
|
2023-01-03 13:17:00 -05:00 |
|
Isaac Connor
|
e59687f437
|
Remove debug
|
2023-01-03 13:16:38 -05:00 |
|
Isaac Connor
|
f466e5b833
|
Use global Servers array instead of loading from db
|
2023-01-03 13:16:30 -05:00 |
|
Isaac Connor
|
8c35190b0a
|
Move loading of global Servers array into config.php.
|
2023-01-03 13:16:03 -05:00 |
|
Isaac Connor
|
63f1dbf8fd
|
Put the filter control commands into the POST data instead of get url. Also fixes auth relay
|
2022-12-27 14:34:20 -05:00 |
|
Isaac Connor
|
fd3640aca3
|
Fix op always being =
|
2022-12-13 16:44:02 -05:00 |
|
Isaac Connor
|
24b8a9118d
|
Merge branch 'master' of ../cloudmule
|
2022-12-12 13:01:38 -05:00 |
|
Isaac Connor
|
d7e95175b8
|
Fix html_input
|
2022-12-12 13:00:28 -05:00 |
|
Isaac Connor
|
e4d167b33e
|
Fix returning periods for sql when no attr
|
2022-12-12 13:00:19 -05:00 |
|
Isaac Connor
|
afbc495c45
|
Fixup filter hidden fields
|
2022-12-12 13:00:11 -05:00 |
|
Isaac Connor
|
08b06bd151
|
Include archiveTypes so that archive Status dropdown gets populated
|
2022-12-12 12:50:50 -05:00 |
|
Isaac Connor
|
de74497604
|
Merge branch 'master' of ../cloudmule
|
2022-12-07 15:54:39 -05:00 |
|
Isaac Connor
|
e30d151da7
|
prevent leading and when terms are invalid
|
2022-12-07 15:54:26 -05:00 |
|
Isaac Connor
|
031c573646
|
Rename Snapshot_Events to Snapshots_Events
|
2022-12-07 14:14:00 -05:00 |
|
Isaac Connor
|
0705bfa293
|
Check for term being null in FilterTerm constructor
|
2022-12-07 12:39:41 -05:00 |
|
Isaac Connor
|
fc7a6601f6
|
Check for validity of filterterm when building the parse tree
|
2022-12-07 12:39:26 -05:00 |
|
Isaac Connor
|
5d36739d0d
|
Add Monitor as an acceptable FilterTerm
|
2022-12-07 12:39:12 -05:00 |
|
Isaac Connor
|
2efed0418c
|
Move a bunch more filter widget stuff into Filter
|
2022-12-07 12:37:38 -05:00 |
|
Isaac Connor
|
6cd3e64bb8
|
Add NOW as a valid value for DateTime, rough in valid test function
|
2022-12-07 12:36:41 -05:00 |
|
Isaac Connor
|
07e188a25f
|
Add datetimepicker class to DateTime widgets and only include the sql if the term is valid
|
2022-12-07 12:36:23 -05:00 |
|
Isaac Connor
|
ff756591c9
|
Rough in html_input
|
2022-12-07 12:34:59 -05:00 |
|
Isaac Connor
|
1134954166
|
Add Monitor as a Filter Term
|
2022-12-07 12:34:31 -05:00 |
|
Isaac Connor
|
638e6b0e3b
|
Move attrTypes and opTypes into Filter and rough in a widget and simple_width functions
|
2022-12-07 12:34:18 -05:00 |
Martin Tiernan
|
68283c01eb
|
Added length and frames getters
|
2022-11-21 09:06:38 -06:00 |
|
Isaac Connor
|
22df344880
|
Merge branch 'master' of ../imouse
|
2022-11-16 09:23:05 -05:00 |
|
Isaac Connor
|
97e464b342
|
Comment out debugging
|
2022-11-15 14:17:30 -05:00 |
|
Isaac Connor
|
a6856c4f94
|
Merge pull request #3630 from mispdev/fix_db_utf8_connection
Set web backend DB connection to UTF8
|
2022-11-12 15:34:03 -05:00 |
|
Isaac Connor
|
a712ad0605
|
Merge ../ZoneMinder.connortechnology
|
2022-11-10 18:10:08 -05:00 |
|
Isaac Connor
|
3e95134448
|
Remove Debug
|
2022-11-10 18:07:40 -05:00 |
|
Isaac Connor
|
7ac8a47f3e
|
Fix 500 on saving user due to incorrect scope of g. Fixes #3629
|
2022-11-10 17:15:39 -05:00 |
Michael
|
0d6b8d1de3
|
Set web backend db connection to utf8
|
2022-11-10 18:57:35 +01:00 |
|
Isaac Connor
|
4d3dfd84f4
|
add includes/Monitor_Permission.php
|
2022-11-03 12:24:14 -04:00 |
|
Isaac Connor
|
24ac383f97
|
spacing
|
2022-11-02 17:44:42 -04:00 |
|
Isaac Connor
|
ea6d999654
|
Must use false === when using array_search because first element returns 0
|
2022-11-02 17:42:32 -04:00 |
|
Isaac Connor
|
135c52f3ec
|
Fix Group_Permissions()
|
2022-11-02 15:53:13 -04:00 |
|
Isaac Connor
|
ab3e1811d3
|
fix canEdit, rough in effectPermission
|
2022-11-02 15:52:37 -04:00 |
|
Isaac Connor
|
63769a2082
|
Fix missing )
|
2022-11-02 13:26:34 -04:00 |
|
Isaac Connor
|
3c36233dd8
|
Put in all the new logic for visibleMonitor and editableMonitor referencing Monitor_Permissions and Group_Permissions
|
2022-11-02 13:25:53 -04:00 |
|
Isaac Connor
|
68bf964eec
|
Add saving of Monitor_Permissions
|
2022-11-02 13:25:53 -04:00 |
|
Isaac Connor
|
b7490c754b
|
Rough in Group_Permission and Monitor Permissions loading functions.
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
24a83efa79
|
Improve Monitor canView and canEdit. If the user is not specified, use the cached auth routines in includs/auth.php. Otherwise replicate the logic for the specfied user.
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
16b5551a4a
|
Always return a Group_Permission in Permission()
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
121e864dde
|
Continue roughing in Group_Permission logic
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
a891b528d1
|
Use Monitor::canView in Event::canView
|
2022-11-02 13:25:44 -04:00 |
|
Isaac Connor
|
2ee142813e
|
start to rough in an editable monitor function
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
79f5d77fab
|
Add Permission saving to user view
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
3157510f23
|
Add Permission property
|
2022-11-02 12:37:47 -04:00 |
|
Isaac Connor
|
9df7283358
|
Rough in the boilerplate for retrieving Permissions on Groups
|
2022-11-02 12:37:46 -04:00 |
|
Isaac Connor
|
dd4869fb47
|
Add object for Group_Permission
|
2022-11-02 12:36:42 -04:00 |
|
Isaac Connor
|
a67f89ff9e
|
We renamed newUser to user in form elements
|
2022-11-02 12:36:42 -04:00 |
|
Isaac Connor
|
5734e38f52
|
Add group permission checking to visibleMonitor
|
2022-11-02 12:36:42 -04:00 |
|
Isaac Connor
|
d00536915e
|
Move getting time into the scope where it is used
|
2022-11-02 10:07:01 -04:00 |
|
Isaac Connor
|
52c865cfeb
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-11-01 12:40:51 -04:00 |
|
Isaac Connor
|
5bd50fe575
|
Add Access-Control-Allow-Credentials: true so that we can pass cookies along with xhr requests.
|
2022-11-01 08:21:59 -04:00 |
|
Isaac Connor
|
cd4a9fbb98
|
Merge ../ZoneMinder.connortechnology
|
2022-10-31 18:01:04 -04:00 |
|
Isaac Connor
|
25100cd592
|
Fix missed references to oldW and oldH
|
2022-10-31 09:27:53 -04:00 |
|
Isaac Connor
|
2fb631fa6e
|
Clean up debug. Clone the entire monitor object into oldMonitor instead of cherry-picking properties. Fixes use of new name when deleting old symlink. Always check for existence of monitor dir and symlink after done saving.
|
2022-10-31 09:27:53 -04:00 |
|
Isaac Connor
|
33455cbad2
|
Remove left over references to REQUEST['newMonitor']. Add error reporting to creating monitor directory and symlinking when adding a new monitor
|
2022-10-31 09:27:53 -04:00 |
|
Isaac Connor
|
6b3768fdf6
|
When saving monitor, only turn off error reporting for symlink. Don't delete old symlink unless the name has changed.
|
2022-10-31 09:27:53 -04:00 |
|
Isaac Connor
|
586d43798f
|
Rough in model and controller for Event_Data
|
2022-10-27 14:47:21 -04:00 |
|
Isaac Connor
|
d11bb88f94
|
rough in array_to_hash_by_key function to generate hashes of Id => Object
|
2022-10-25 12:56:38 -04:00 |
|
Isaac Connor
|
2e03d91ef7
|
Fix selecting 0 values in htmlSelect. Fixes not showing ZM_LOG_DATABASE_LEVEL==Info
|
2022-10-21 16:29:26 -04:00 |
|
Isaac Connor
|
bce8c6195a
|
Don't display errors in Server.php
|
2022-10-20 16:45:52 -04:00 |
|
Isaac Connor
|
f1843528d0
|
Put back width and height setting on img tag. Needed for event viewing
|
2022-10-20 16:45:37 -04:00 |
|
Isaac Connor
|
082ffdf76e
|
Fix SQL for when passing an empty array to find. Return false instead of trying weird sql.
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
84fd4b42d5
|
Fix test for null in Object::find
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
ff01d4d394
|
IN () being false could still result in a true result of used in an OR, so instead of just returning, use an always false sql equivalent
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
837d0ece7f
|
return empty array when passing empty as SQLvalue
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
c40d251009
|
Add setting remoteAddr in session after regenerating
|
2022-10-17 19:09:24 -04:00 |
|
Isaac Connor
|
9adf5f662f
|
Use REQUEST instead of SESSION to store the post login redirect because we clear the session on login. Fixes #3517
|
2022-10-17 17:25:56 -04:00 |
|
Isaac Connor
|
22a059d3bc
|
Remove debug
|
2022-10-17 17:25:46 -04:00 |
|
Isaac Connor
|
9e257def8a
|
Add debug, add validateId function to session handler. Change it to be a a subclass of SessionHandlerInterface so that we don't have to provide createId. Fixes session breakage in php8.2
|
2022-10-17 17:24:52 -04:00 |
|
Isaac Connor
|
5c8343f737
|
remoteAddr is set when session is opened. So no need to do it in auth. session_clear closes the session so no need to close it first
|
2022-10-17 17:23:45 -04:00 |
|
Isaac Connor
|
20ebbc3c58
|
Fix saving from the function modal. Put action in the post variables and change the action to save instead of function.
|
2022-10-14 14:10:46 -04:00 |
|
Isaac Connor
|
2329dda323
|
Merge pull request #3609 from connortechnology/fix_non_post_auth
Move relevant code out of includes/actions/auth.php into includs/auth…
|
2022-10-14 14:09:09 -04:00 |
|
Isaac Connor
|
e116c9ee48
|
Fix unable to unset LockRows on Filter
|
2022-10-12 16:57:53 -04:00 |
|
Isaac Connor
|
d64868a44b
|
Fix downloads due to chunkSize not being defined
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
f8eef392d3
|
Add output_file to includes/functions.php
|
2022-10-11 16:45:03 -04:00 |
|
Isaac Connor
|
371f1adbe7
|
update storage modal to fix buttons not being in form. Also remove duplicate view field and make button action be save instead of Save. Fixes #3605
|
2022-10-07 15:56:15 -04:00 |
|
Isaac Connor
|
072e94385b
|
Make the ajaxError logging be debug level. If the error was actually critical, we will have to log that separately. Most of the errors reported by ajaxError are transient.
|
2022-10-05 09:31:39 -04:00 |
|
Isaac Connor
|
2f295a2f55
|
Make Monitor::Server always return a Server object so we don't have to test for null
|
2022-09-30 09:57:21 -04:00 |