Isaac Connor
|
3c91a2bcaf
|
Add px-3 to the flex container for stats and view to handle scroll bar
|
2024-02-07 10:37:31 -05:00 |
|
Isaac Connor
|
e6eff5903f
|
Add container to params for scaleToFit. The container we want to fit width into might not be #content.
|
2024-02-07 10:37:08 -05:00 |
|
Isaac Connor
|
57e9cc2b16
|
In the case where locale = System... properly set locale for the Date*FOrmatter classes
|
2024-02-05 19:06:16 -05:00 |
|
Isaac Connor
|
5a866aee0e
|
Add id's to selects to appease label for= attributes
|
2024-02-05 18:42:25 -05:00 |
|
Isaac Connor
|
4107058000
|
FIx units on warning about timeout
|
2024-02-05 18:42:05 -05:00 |
|
Isaac Connor
|
43c3937b87
|
Fix image proxy broken due to imagecreatefromstream=>imagecreatefromstring
|
2024-02-02 11:50:03 -05:00 |
|
Isaac Connor
|
48015e6efd
|
Remove extra / and urlencode password for Amcrest
|
2024-02-02 11:49:44 -05:00 |
|
Isaac Connor
|
aa67e5f6f3
|
Add range limits to lat&long and don't do anything if empty
|
2024-02-01 18:01:26 -05:00 |
|
Isaac Connor
|
314236dea8
|
Add inputs and code to display and convert to and from decimal degress and dhms for lat&long. Update marker on map when values change.
|
2024-02-01 17:58:20 -05:00 |
|
Isaac Connor
|
4987ea1b21
|
Define user before using for viewableMonitorIds
|
2024-02-01 11:39:09 -05:00 |
|
Isaac Connor
|
d47f78b354
|
Fix for use strict defining monitor_ids
|
2024-02-01 11:38:38 -05:00 |
|
Isaac Connor
|
da2744749d
|
fix vertical alignment and stretching of images on snapshot
|
2024-02-01 11:38:24 -05:00 |
|
Isaac Connor
|
9bb9f733a4
|
Reference the tab that the bad Path or Port is on
|
2024-01-31 18:24:22 -05:00 |
|
Isaac Connor
|
8e035f61ac
|
Use viewableMonitorsIds instead of canView(Monitors) when deciding to show the Console or Montage Links
|
2024-01-31 16:09:33 -05:00 |
|
Isaac Connor
|
05d605fe55
|
change Map to zmMap to prevent name collision with luxor. Add a haversine function to get distance between two lat&long. Start to rough in grouping locations into 1 pin.
|
2024-01-30 19:57:18 -05:00 |
|
Isaac Connor
|
18606e78ad
|
Remove width on p element on monitors view as it is too short for Recording and doesn't seem to be needed
|
2024-01-30 14:29:41 -05:00 |
|
Isaac Connor
|
0e88d764f0
|
Use object methods to load montiors
|
2024-01-28 16:53:30 -05:00 |
|
Isaac Connor
|
2c7c928fa6
|
Use object methods when loading monitors and zones and filter them by Deleted status
|
2024-01-28 16:53:06 -05:00 |
|
Isaac Connor
|
b7bc7cef7e
|
Only load non deleted Monitors
|
2024-01-28 16:52:36 -05:00 |
|
Isaac Connor
|
c84e7d4563
|
Include Monitor.php
|
2024-01-28 16:52:16 -05:00 |
|
Isaac Connor
|
512b1ec76d
|
Only list viewable monitors and zones
|
2024-01-28 16:51:49 -05:00 |
|
Isaac Connor
|
ac2cfa5ccb
|
Add children groups to MonitorIds
|
2024-01-28 16:32:31 -05:00 |
|
Isaac Connor
|
648bd77b21
|
Apply validCardinal to all eids. Remove dead delete code
|
2024-01-27 18:33:19 -05:00 |
|
Isaac Connor
|
a5916f01d1
|
Protect against XSS in server db values
|
2024-01-25 19:34:46 -05:00 |
|
Isaac Connor
|
39b2014c2d
|
Prevent XSS from COOKIE poisoning
|
2024-01-25 19:31:28 -05:00 |
|
Isaac Connor
|
b1aeb319f7
|
Prevent XSS from COOKIE poisoning
|
2024-01-25 19:27:18 -05:00 |
|
Isaac Connor
|
35396aad55
|
Prevent XSS from COOKIE poisoning
|
2024-01-25 19:25:15 -05:00 |
|
Isaac Connor
|
d8f36e4ef9
|
Prevent XSS from COOKIE poisoning
|
2024-01-25 19:23:28 -05:00 |
|
Isaac Connor
|
bf32bd6926
|
Prevent XSS throu mids
|
2024-01-25 19:12:37 -05:00 |
|
Isaac Connor
|
f1a26b90b6
|
Prevent against CSS in dupId
|
2024-01-25 19:05:59 -05:00 |
|
Isaac Connor
|
bc1fb8eef2
|
Protect against XSS from User field
|
2024-01-25 19:04:15 -05:00 |
|
Isaac Connor
|
9505910847
|
Prevent XSS via uid and prev
|
2024-01-25 19:01:44 -05:00 |
|
Isaac Connor
|
59b77df7f1
|
Prevent XSS through scale parameter
|
2024-01-25 18:57:01 -05:00 |
|
Isaac Connor
|
6f595385d7
|
Protect filter loading from injection
|
2024-01-25 18:56:42 -05:00 |
|
Isaac Connor
|
d45b05ec8a
|
XSS protect from server id and storage id
|
2024-01-25 18:50:35 -05:00 |
|
Isaac Connor
|
bac2705051
|
XSS protect from monitor id and name
|
2024-01-25 18:49:22 -05:00 |
|
Isaac Connor
|
c138984fc9
|
XSS prevent on sort_asc and eid. Still need to protect filter
|
2024-01-25 18:48:39 -05:00 |
|
Isaac Connor
|
b5757a2d05
|
Use validCardinal on Id's cuz we don't trust the db or Object
|
2024-01-25 18:38:44 -05:00 |
|
Isaac Connor
|
559d6edc70
|
Don't apply timezone when formatting datetimes
|
2024-01-25 11:57:29 -05:00 |
|
Isaac Connor
|
cfd8e3418e
|
Don't apply timezone when formatting datetimes
|
2024-01-25 11:57:19 -05:00 |
|
Isaac Connor
|
ee13034384
|
Use validInt on DefaultScale coming from Monitor object. Database shouldn't be trusted either.
|
2024-01-25 11:24:13 -05:00 |
|
Isaac Connor
|
5a498878b8
|
Protect mid with validCardinal. Return early if it is invalid or monitor is not found
|
2024-01-24 19:28:59 -05:00 |
|
Isaac Connor
|
914f7e0ae2
|
APply validCardinal to sid so that arrays don't get passed to new Server() which then prevents XSS
|
2024-01-24 19:25:15 -05:00 |
|
Isaac Connor
|
9669f1e3ef
|
Sanitize entity before outputting it preventing XSS
|
2024-01-24 19:22:47 -05:00 |
|
Isaac Connor
|
f62f1529f5
|
Try to prevent XSS by verifying valid image data
|
2024-01-24 19:18:22 -05:00 |
|
Isaac Connor
|
0fb71e35f2
|
Add luxor.js and use it to format datetimes
|
2024-01-24 16:10:20 -05:00 |
|
Isaac Connor
|
fb8b4af3f8
|
Revert "Remove unneeded bootstrap classes"
This reverts commit 00f52704a5.
|
2024-01-24 13:17:52 -05:00 |
|
Isaac Connor
|
00f52704a5
|
Remove unneeded bootstrap classes
|
2024-01-24 13:00:31 -05:00 |
|
Isaac Connor
|
1255ae4bc7
|
Change Tags to be concated and add GROUP BY to fix SQL. Populate event object with db row instead of reloading by Id. Remove datetime formatting as it is screwing up and formatting should happen in js
|
2024-01-24 13:00:31 -05:00 |
|
Isaac Connor
|
8ca1436224
|
If img has a fix width set, clear it when we change scale
|
2024-01-24 12:54:13 -05:00 |
|
Isaac Connor
|
6ba09c6f0d
|
Finish switch to using Intervals instead of Timeouts
|
2024-01-24 09:28:12 -05:00 |
|
Isaac Connor
|
ceb81e13d6
|
Quiet warning about MonitorIds not exisitng in newGroup array when no MonitorIds are selected for that group
|
2024-01-23 16:14:21 -05:00 |
|
Isaac Connor
|
1ffc10ca83
|
Add recursive adding of monitors from children groups
|
2024-01-23 16:13:33 -05:00 |
|
Isaac Connor
|
3d2fa3172f
|
Fix im => i. Typo in variable name.
|
2024-01-22 15:41:00 -05:00 |
|
Isaac Connor
|
bd90711aa6
|
Use an interval instead of calling Timeout from callback
|
2024-01-22 14:25:57 -05:00 |
|
Isaac Connor
|
ad168ca23a
|
Allow monitor creation if Monitors()==Create
|
2024-01-22 14:25:57 -05:00 |
|
Isaac Connor
|
552069cd64
|
Makes zones view use getBodyTopHTML so that it display error messages. Rename deleteBtn to action.
|
2024-01-21 11:31:44 -05:00 |
|
Isaac Connor
|
4df4f5146a
|
Log error_message if set
|
2024-01-21 11:31:06 -05:00 |
|
Isaac Connor
|
580aefdfee
|
Handle the deleteBtn having an id instead of name == deleteBtn
|
2024-01-21 11:30:49 -05:00 |
|
Isaac Connor
|
da700a621a
|
Make EventStartCommand and EventEndCOmmand wider
|
2024-01-21 11:30:25 -05:00 |
|
Isaac Connor
|
e47fd8f661
|
Recamp zones actions, adding a redirect after finishing deletion and fixing CanEdit=>canEdit
|
2024-01-21 11:30:01 -05:00 |
|
Isaac Connor
|
0d6e7bc082
|
Add debugging to editableMonitor and handle when permission is set to Create.
|
2024-01-21 11:28:34 -05:00 |
|
Isaac Connor
|
4d1ffb258a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-01-18 14:17:02 -05:00 |
|
Isaac Connor
|
69383316aa
|
If the video file doesn't exist, don't try ffmpeg etc and log all those errors.
|
2024-01-18 13:16:22 -05:00 |
|
Isaac Connor
|
c26548d182
|
Alert any returned error messages when deleting events
|
2024-01-18 13:15:59 -05:00 |
|
Isaac Connor
|
ef926f4437
|
Return an array of string error messages instead of an array of arrays of arrays in deleting events.
|
2024-01-18 13:15:25 -05:00 |
|
Isaac Connor
|
04239c128c
|
Fix regular expression search of Source
|
2024-01-18 12:44:55 -05:00 |
|
Isaac Connor
|
adc784e767
|
Move maxfit2 to montage_common.js. Clean it up and apply strict
|
2024-01-17 17:04:49 -05:00 |
|
Isaac Connor
|
ceb60dd606
|
Remove unused compSize
|
2024-01-17 16:54:49 -05:00 |
|
Isaac Connor
|
422dda62dc
|
Remove important from navbar colour so that it is easier to override
|
2024-01-17 10:23:17 -05:00 |
|
Isaac Connor
|
839ef9ce67
|
Add a Component filter to logs
|
2024-01-16 16:35:52 -05:00 |
|
Isaac Connor
|
6812f2efe7
|
Fix eslint
|
2024-01-16 09:56:28 -05:00 |
|
Isaac Connor
|
1ab66b10b1
|
Don't assume findByEventidAndType actually returns a frame. If we are only recoridng, then there will be no alarm frames in the db
|
2024-01-16 09:50:19 -05:00 |
|
Isaac Connor
|
ebadc7a07b
|
GIve default user the create permission
|
2024-01-14 08:41:12 -05:00 |
|
Isaac Connor
|
a402217456
|
Correct state values so that Unknown starts at 0
|
2024-01-11 17:19:29 -05:00 |
|
Isaac Connor
|
36bdc3f8a9
|
Revert "Remove STATE_UNKNOWN"
This reverts commit 66e7179242.
|
2024-01-11 17:16:58 -05:00 |
|
Isaac Connor
|
66e7179242
|
Remove STATE_UNKNOWN
|
2024-01-11 17:13:09 -05:00 |
|
Isaac Connor
|
63def6b82e
|
Add a function to_string that handles nulls, arrays, etc
|
2024-01-11 10:30:36 -05:00 |
|
Isaac Connor
|
6684f73694
|
Add export to users
|
2024-01-09 17:14:31 -05:00 |
|
Isaac Connor
|
7694d1aa86
|
Add End Date Time as an option for sorting in filters
|
2024-01-09 17:13:27 -05:00 |
|
Isaac Connor
|
c954214b03
|
If success when saving monitors, do a redirect so that a reload doesn't repeat the request and ask to resubmit data
|
2024-01-09 17:12:45 -05:00 |
|
Isaac Connor
|
db2691bf60
|
Only show PTZ button if camera has ptz enabled
|
2024-01-09 17:10:44 -05:00 |
|
Isaac Connor
|
0d3953bd9e
|
Fix collapsed version of navbar
|
2024-01-09 10:48:52 -05:00 |
|
Isaac Connor
|
c456960254
|
Add tags_opTypes and use it to limit operators for tags in a filter
|
2024-01-08 17:24:19 -05:00 |
|
Isaac Connor
|
ad54ad787a
|
Fix missing WHERE on monitor select.
|
2024-01-08 10:01:29 -05:00 |
|
Isaac Connor
|
da37e27431
|
Only do the console refresh if there is a value for REFRESH_MAIN
|
2024-01-04 15:17:09 -05:00 |
|
Isaac Connor
|
5887a1e853
|
State Unknown starts at -1
|
2024-01-03 16:52:44 -05:00 |
|
Isaac Connor
|
31036ae9dd
|
Users with Create permission should be able to view console
|
2024-01-03 16:41:56 -05:00 |
|
Isaac Connor
|
2747a97168
|
Disable range support to fix chrome playback.
|
2024-01-02 17:07:34 -05:00 |
|
Isaac Connor
|
2cc47557df
|
Remove bogus adding RTSP2WEB to CSP and CORS
|
2024-01-02 16:44:05 -05:00 |
|
Isaac Connor
|
ee9e03a7c1
|
Fix FPS values when getting status from web instead of ZMS.
|
2024-01-02 16:28:49 -05:00 |
|
Isaac Connor
|
e9362f1a10
|
Fix duplicated Capturing in monitor status elements. Add Recording. Fix MinEventId, MaxEventId, TotalEvents. Ad CaptureFPS, AnalysisFPS and CaptureBandwidth
|
2024-01-02 16:28:49 -05:00 |
|
Isaac Connor
|
f064887451
|
Add ZM_RTSP2WEB_PATH to CSP_Headers
|
2024-01-02 16:25:28 -05:00 |
|
Isaac Connor
|
85006269f7
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-01-02 14:07:16 -05:00 |
|
Isaac Connor
|
3603aca21c
|
Put navbar brand separate from navbars, remove explicit padding. Increase text size of ZoneMinder in brand, hide Branding on portrait mobile
|
2024-01-02 14:06:52 -05:00 |
|
Isaac Connor
|
2d49e93405
|
Introduce a Create permission for Monitors, so that a given user may Edit existing monitors, but not create new ones.
|
2024-01-02 12:18:09 -05:00 |
|
Isaac Connor
|
2b10d02271
|
Don't include Deleted Monitor Names when checking for duplicates
|
2023-12-30 11:46:04 -05:00 |
|
Isaac Connor
|
deb880e99b
|
TRun off SSL verification when restarting remote filters.
|
2023-12-29 12:27:18 -05:00 |
|
Isaac Connor
|
7d5b91949c
|
Remove duplicate .cherry-picked commit wasn't needed.
|
2023-12-29 11:25:10 -05:00 |
|
Isaac Connor
|
d2a264b79f
|
define count. Fixes #3799
|
2023-12-29 11:06:46 -05:00 |
|
Isaac Connor
|
72e8ee0e5e
|
Move session inclusion down to where it is first used.
|
2023-12-29 11:06:46 -05:00 |
|
Isaac Connor
|
326a4ca201
|
Clean out old unused debugging code. The code further down is more useful
|
2023-12-29 11:06:46 -05:00 |
|
Isaac Connor
|
6e93e3df4c
|
Allow untrsuted ssl certs when sending commands to other servers
|
2023-12-24 12:17:08 -05:00 |
|
Isaac Connor
|
ac1c6203c2
|
Remove really old utility scripts for changing php tags
|
2023-12-20 09:20:11 -05:00 |
|
Isaac Connor
|
4e2dd31cdc
|
Use ZM_PATH_API instead of hard coded /zm/api
|
2023-12-15 09:18:04 -05:00 |
|
Isaac Connor
|
4193de1f00
|
Add functionality to undelete a Monitor
|
2023-12-14 13:55:16 -05:00 |
|
Isaac Connor
|
ea3d91b46f
|
Actually fix problem by not putting () on an integer has-post_sql_conditions
|
2023-12-14 09:32:32 -05:00 |
|
Isaac Connor
|
d910585ed9
|
Be a little more specific about what we are int'ing. https://forums.zoneminder.com/viewtopic.php?t=32942 has a weird error report that this might address
|
2023-12-13 19:39:11 -05:00 |
|
Isaac Connor
|
f9b82ca037
|
Always append username to zmu command line so that auth is more efficient
|
2023-12-12 11:14:29 -05:00 |
|
Isaac Connor
|
af3f380692
|
set defaults on properties of user object to fix neew user creation.
|
2023-12-09 18:01:04 -05:00 |
|
Isaac Connor
|
88db0e9854
|
Handle when ZM_RTSP2WEB_PATH hasn't been filled, but RTSP2Web has been turned on for a monitor.
|
2023-12-07 13:17:08 -05:00 |
|
Isaac Connor
|
2514b3533a
|
Fix spacing between monitor filters
|
2023-12-07 10:31:33 -05:00 |
|
Isaac Connor
|
ffc111f1e7
|
Need to a () so that ModelId is called as a function and so it doesn't complain about lack of property
|
2023-12-06 09:37:45 -05:00 |
|
Isaac Connor
|
ccfcd33855
|
modal requests require csrf-magic.
|
2023-12-05 09:47:35 -05:00 |
|
Isaac Connor
|
aafd4067e0
|
Dont' restart a monitor if it has been deleted
|
2023-12-04 14:50:37 -05:00 |
|
Isaac Connor
|
d51c99ce44
|
Fix groups not being shown when monitors not specifically selected.
|
2023-12-04 14:11:57 -05:00 |
|
Isaac Connor
|
03858ba1a2
|
Code style, using ->Id() instead of checking for property existence.
|
2023-12-04 14:06:49 -05:00 |
|
Isaac Connor
|
5e9f53b41a
|
Fixup issues with label for's
|
2023-12-03 17:57:22 -05:00 |
|
Isaac Connor
|
379028123e
|
add wrap to monitor filters
|
2023-12-03 10:25:30 -05:00 |
|
Isaac Connor
|
be61184faf
|
Add defaults to GenerateVideo, don't chdir, fix other code
|
2023-12-01 13:05:36 -05:00 |
|
Isaac Connor
|
70b1432c1f
|
Have to check for property_exists instead of empty. empty includes a valid value of 0
|
2023-12-01 12:46:49 -05:00 |
|
Isaac Connor
|
49af487746
|
port over generateVideo from perl side and stick into Event.
|
2023-12-01 12:46:26 -05:00 |
|
Isaac Connor
|
44a3a7a6a8
|
Fix loading event due to missing GROUP BY. Fixes event video generation.
|
2023-12-01 12:46:05 -05:00 |
|
Isaac Connor
|
99c9eb5e0e
|
Fix missing )
|
2023-11-30 14:23:17 -05:00 |
|
Isaac Connor
|
bb94d02019
|
Make sure groups is always defined else we get error from user.js.php
|
2023-11-30 10:00:40 -05:00 |
|
Isaac Connor
|
02f922d4b7
|
Don't include csrf on ajax requests. We only return json for ajax and the csrf kills the json parsing.
|
2023-11-28 10:16:58 -05:00 |
|
Isaac Connor
|
065bed894c
|
Use empty array instead of null for allowedMonitors
|
2023-11-24 08:57:35 -05:00 |
|
Isaac Connor
|
420a5a5ea5
|
Load events using post so that we can send a large request
|
2023-11-23 16:59:59 -05:00 |
|
Isaac Connor
|
39a0ee1230
|
Add loading speed from COOKIES
|
2023-11-23 14:27:04 -05:00 |
|
Isaac Connor
|
bde6870a21
|
Add support for Notes as a filter, setup for altering the terms later. Add CASE so that incomplete events have and EndTimeSecs
|
2023-11-23 14:25:52 -05:00 |
|
Isaac Connor
|
b0a6ef5624
|
Add Sorting monitors by user preference.
|
2023-11-23 14:10:29 -05:00 |
|
Isaac Connor
|
a7885a4c04
|
Make montagereview default to history mode
|
2023-11-23 14:00:19 -05:00 |
|
Isaac Connor
|
2fb0e40503
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-11-23 13:00:51 -05:00 |
|
Isaac Connor
|
164ec3667e
|
Fix eslint
|
2023-11-23 13:00:44 -05:00 |
|
Isaac Connor
|
b08c44172a
|
Add back a little padding to mfbpanel in montage
|
2023-11-23 13:00:30 -05:00 |
|
Isaac Connor
|
1fa3e18e5c
|
Remove extra padding in headers
|
2023-11-23 13:00:13 -05:00 |
adhamiamirhossein
|
27977acdd4
|
fix: php 8.3 deprecated get_class method call without argument
|
2023-11-22 10:48:04 +03:30 |
|
Isaac Connor
|
07d4fb2099
|
Set default delay, add starting statusCmdTimer when using rtsp2web
|
2023-11-21 11:35:04 -05:00 |
|
Isaac Connor
|
23a0e561eb
|
Remove depth of nested if's by returning early.
|
2023-11-21 10:49:09 -05:00 |
|
Isaac Connor
|
092f8df115
|
Handle scale=0 in getImageSrc
|
2023-11-20 17:23:51 -05:00 |
|
Isaac Connor
|
5be0ce5704
|
Fix eslint
|
2023-11-20 14:34:03 -05:00 |
|
Isaac Connor
|
e1b17590fa
|
Handle Config table not being updated for ZM_WEB_VIEWING_TIMEOUT
|
2023-11-20 14:29:25 -05:00 |
|
Isaac Connor
|
9a271e8960
|
Add are you still watching modal
|
2023-11-20 14:23:57 -05:00 |
|
Isaac Connor
|
5fd00ef7a5
|
Use a modal instead of confirm for are you still watching popup
|
2023-11-20 14:23:45 -05:00 |
|
Isaac Connor
|
1df3dc4c8c
|
Return the added modal
|
2023-11-20 14:23:24 -05:00 |
|
Isaac Connor
|
2c776523e9
|
Fix eslint
|
2023-11-20 14:04:03 -05:00 |
|
Isaac Connor
|
195a353bda
|
Add Viewing idle timeout code to watch.js and montage.js
|
2023-11-20 13:42:19 -05:00 |
|
Isaac Connor
|
d3cb7774b0
|
Add ZM_WEB_VIEWING_TIMEOUT, and remove quotes around config integer values so that they are integers instead of strings.
|
2023-11-20 13:38:22 -05:00 |
|
Isaac Connor
|
3ce96005af
|
Load Type when loading Config
|
2023-11-20 13:26:28 -05:00 |
|
Isaac Connor
|
c7bd2adb11
|
add ZM_WEB_VIEWING_TIMEOUT
|
2023-11-20 13:25:53 -05:00 |
|
Isaac Connor
|
d06264624a
|
Refresh events list when filters at top change or close in the case of datetimepicker
|
2023-11-17 12:06:03 -05:00 |
|
Isaac Connor
|
936cefb41a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-11-17 09:33:22 -05:00 |
|
Isaac Connor
|
56095bec9d
|
Must use MIN_STREAMING_PORT in monitor Url because 80/443 might not go to the same host as MIN_STREAMING_PORT (think reverse proxy)
|
2023-11-17 09:33:17 -05:00 |
|
Isaac Connor
|
6232cfb8b1
|
Remove 100 limit on response to events index. Handle there not being a next or prev neighbour.
|
2023-11-16 18:00:30 -05:00 |
|
Isaac Connor
|
0d6df970d3
|
Enforce max length of 64k for log entries. Use HTTP_X_FORWARDED_FOR in logging so we log actual remote addr
|
2023-11-16 10:34:44 -05:00 |
|
Isaac Connor
|
afb594aa19
|
Don't load Servers, they are loaded globally in config. Enforce int instead of string for range because fseek can't handle strings
|
2023-11-16 10:34:44 -05:00 |
|
Isaac Connor
|
a1693c34b9
|
Add HTTP_FRONT_END_HTTPS as a signal to use https in urls. Mainly for when using a reverse proxy
|
2023-11-16 10:34:44 -05:00 |
|
Isaac Connor
|
ee0ef4b6e4
|
Handle when there are no cueFrames populated
|
2023-11-16 10:34:43 -05:00 |
|
Isaac Connor
|
d9ae4f8e04
|
Do not need to make servers global in this context. They are by default.|
|
2023-11-16 10:34:43 -05:00 |
|
Isaac Connor
|
40975184e0
|
Return the found term instead of true in has_term.
|
2023-11-16 10:34:43 -05:00 |
|
Isaac Connor
|
8e0793f5e7
|
Do not format StartDateTime and EndDateTime in ajax events results. Do the formatting in js.
|
2023-11-16 10:34:43 -05:00 |
|
Isaac Connor
|
c23ee28fe6
|
Take expires setting off setCookie so it defaults to 2038 like everywhere else.
|
2023-11-15 11:34:05 -05:00 |
efranzwa
|
cf906e86c8
|
Added missing table tags
|
2023-11-15 04:55:18 -08:00 |
|
efranzwa
|
83af15329a
|
Fixed Monitor->WebSite Source Refresh html
|
2023-11-14 04:13:04 -08:00 |
|
Isaac Connor
|
c1b32b79a2
|
Code style clceanup in server action
|
2023-11-13 11:38:03 -05:00 |
|
Isaac Connor
|
abb4230f86
|
Use ajax error when specified storage not found.
|
2023-11-13 11:37:47 -05:00 |
|
Isaac Connor
|
aaebd725bb
|
Set default values on members, fixing bad defaults on nwe storage.
|
2023-11-13 11:37:31 -05:00 |
|
Isaac Connor
|
9f04d90a27
|
When ZM_AUTH_HASH_IPS is off, don't use remote ip in storing auth hash in session. If ips are constantly changing it breaks.
|
2023-11-13 11:31:45 -05:00 |
|
Isaac Connor
|
aaaa321464
|
fix eslint
|
2023-11-09 11:55:17 -05:00 |
|
Isaac Connor
|
542803848d
|
Prevent non-number inputs when filter attr is DiskPercent
|
2023-11-09 10:33:25 -05:00 |
|
Isaac Connor
|
6a68e5577a
|
If view does not exist, redirect to console instead of just dying
|
2023-11-09 09:57:27 -05:00 |
|
Isaac Connor
|
7bc126abe1
|
Use User->Id() instead of Request['uid'] because when adding a new user Request['uid'] isn't populated so a warning is generated.
|
2023-11-08 14:23:49 -05:00 |
|
Isaac Connor
|
5486fc6327
|
Include username in url when using auth_hash so that the authenting sql can be more efficient
|
2023-11-08 10:55:39 -05:00 |
|
Isaac Connor
|
46b27d9f78
|
Add Tags support to API
|
2023-11-03 13:33:28 -04:00 |
|
Isaac Connor
|
46fcb27a3b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-11-02 12:21:59 -04:00 |
|
Isaac Connor
|
9537492f1c
|
Handle invalid codec and fix video_tag boolean assignment causing video tag to be false
|
2023-11-02 12:21:30 -04:00 |
|
Isaac Connor
|
e6632ade43
|
Use echo instead of print which is apparently faster.
|
2023-11-01 17:27:56 -04:00 |
|
Isaac Connor
|
f26617af71
|
Fix not allowing html5 video tag when h265.
|
2023-11-01 17:27:56 -04:00 |
|
Isaac Connor
|
859baf6f8f
|
Remove padding from navbars to condense them a bit. Fix 1 pixel extra padding on state button
|
2023-11-01 11:31:18 -04:00 |
|
Isaac Connor
|
13ec02d5f1
|
Fix Auto Unarchive not deselecting
|
2023-10-31 10:02:58 -04:00 |
|
Isaac Connor
|
f76046af3f
|
Always stop a filter. Otherwise we won't stop it when switching from background to not background.
|
2023-10-30 17:16:06 -04:00 |
|
Isaac Connor
|
e2f8553b48
|
Fix lack of scroll on groups view.
|
2023-10-30 15:51:39 -04:00 |
|
Isaac Connor
|
36936001a4
|
Remove trailing spaces. Remove extra comma causing SQL-ERR
|
2023-10-30 10:22:04 -04:00 |
|
Isaac Connor
|
6aa7901066
|
Use same logic as in LogHTML to apply success class, and hence make the word Log green when there are no errors.
|
2023-10-30 10:03:17 -04:00 |
|
Isaac Connor
|
db252ce191
|
Dont' log warning when no user preference set. Inlcude more info in log message.
|
2023-10-30 09:40:03 -04:00 |
|
Isaac Connor
|
29be822e99
|
Add required GROUP BY Id to fix SQL queries
|
2023-10-27 10:43:27 -04:00 |
|
Isaac Connor
|
1545210b12
|
Add php8.1+ members support for multiple and chosen flags for filter terms
|
2023-10-26 18:43:05 -04:00 |
|
Isaac Connor
|
d54171c21c
|
Be a little more verbose and robust when things like permission errors break config loading
|
2023-10-26 18:37:15 -04:00 |
|
Isaac Connor
|
e8a866e504
|
Add named parameters support to ServerStatsController.
|
2023-10-26 18:26:51 -04:00 |
|
Isaac Connor
|
d7bb9674e3
|
Add newline to fix SQL err due to Tags
|
2023-10-26 11:11:50 -04:00 |
|
Isaac Connor
|
ecfc39aa87
|
Set new defaults for ENabled, API Enabled and HomeView in user Object. php's new need to declare every property breaks the old default system. Only load Group Permissions and Monitor Permissions if we have an Id.
|
2023-10-26 09:39:26 -04:00 |
|
Isaac Connor
|
f1f553dd98
|
Don't give a default value to Username it is not useful. Replace it with a placeholder.
|
2023-10-26 09:26:35 -04:00 |
|
Isaac Connor
|
50ece0ae57
|
Turn off debugging of status ajax results. Can be a lot of info and can be gotten from browser dev tools
|
2023-10-26 09:25:45 -04:00 |
|
Isaac Connor
|
f4d69d524a
|
Undo the extreme splitting up of the SQL so that it is a little less multiple-liney. Hopefully may fix the lack of white space issue reported in forums.
|
2023-10-25 09:40:14 -04:00 |
|
Isaac Connor
|
b01908e93c
|
Don't include the third nav element for nav banner when there is no banner set so as to take up less space
|
2023-10-23 17:06:28 -04:00 |
|
Isaac Connor
|
ab979c8f42
|
Fix typo in getHomeView
|
2023-10-23 16:49:34 -04:00 |
|
Isaac Connor
|
717f644087
|
Define ->savedErrorReporting to prevent php errors in logs
|
2023-10-23 16:39:43 -04:00 |
|
Isaac Connor
|
1411c47c99
|
Correct case of value in User_Perference
|
2023-10-20 14:51:18 -04:00 |
|
Isaac Connor
|
84ca405749
|
Rename a variable due to cutnpsating
|
2023-10-20 14:51:07 -04:00 |
|
Isaac Connor
|
0ab7a755ba
|
Event::Tags returns an array of Tags objects, so turn them into a string.
|
2023-10-20 14:02:48 -04:00 |
|
Isaac Connor
|
c287b7f645
|
Add Tags() and Event_Tags() functions to Event
|
2023-10-20 14:02:25 -04:00 |
|
Isaac Connor
|
d303927ad0
|
Rough in ORM for Tags
|
2023-10-20 14:02:10 -04:00 |
|
Isaac Connor
|
7824613e53
|
Allow Objects with no Id, they can't be cached but can be used.
|
2023-10-20 14:01:55 -04:00 |
|
Isaac Connor
|
f650d300d4
|
BUmp jquery to 3.7.1
|
2023-10-20 10:53:24 -04:00 |
|
Isaac Connor
|
f5107b5743
|
Default to showing PTZ if it is enabled
|
2023-10-20 09:05:03 -04:00 |
|
Isaac Connor
|
7c2ec7f404
|
Improve replayMode loading, adding support for User Preference default value
|
2023-10-19 13:02:39 -04:00 |
|
Isaac Connor
|
876d76ef1d
|
Only do thumbnail animations if not on mobile.
|
2023-10-18 12:03:56 -04:00 |
|
Isaac Connor
|
48b5960fac
|
Can't copy by ref, the limit will affect unfiltered as well
|
2023-10-17 14:57:57 -04:00 |
|
Isaac Connor
|
41c156918e
|
aviableTags must be defined
|
2023-10-17 14:13:44 -04:00 |
|
Isaac Connor
|
3cd6b78b85
|
OutputCodec cannot be null
|
2023-10-17 12:33:27 -04:00 |
|
Isaac Connor
|
eaf43daa5c
|
Fix missing date init
|
2023-10-16 14:13:07 -04:00 |
|
Isaac Connor
|
621e9e68d0
|
Must use floats when calculating width of progress bar segments.
|
2023-10-16 14:07:21 -04:00 |
|
Isaac Connor
|
e9d51731e8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-10-16 12:23:37 -04:00 |
|
Isaac Connor
|
db7a25ab3b
|
Remove event rename button functionality, as that exists in eventdetail/event edit.
|
2023-10-16 12:23:29 -04:00 |
|
Isaac Connor
|
c6d9c7731d
|
Add aborting in transit events loading before sending another.
|
2023-10-16 12:15:55 -04:00 |
|
Isaac Connor
|
1658943097
|
Use playClicked instead of vjsPlay as it has additional functionality
|
2023-10-16 12:15:28 -04:00 |
|
Isaac Connor
|
c06f32fd67
|
Only load event OBject and test post_sql_conditions if the filter has any. Save a little processing. Copy unfiltered rows by reference.
|
2023-10-16 12:04:14 -04:00 |
|
Isaac Connor
|
ea76a03043
|
Rename startRTSPtoWebRTSPPaly to startRTSPtoWebPlay
|
2023-10-15 17:55:44 -04:00 |
|
Isaac Connor
|
93f5378f4e
|
Fix undefined reference to startPlay
|
2023-10-15 17:55:44 -04:00 |
|
Isaac Connor
|
8fd33b7f77
|
Handle case when Alarm frame or MaxScore frame don't exist.
|
2023-10-15 17:55:44 -04:00 |
|
Isaac Connor
|
71ff61b05f
|
Use parseInt around quoted number values so that we can trust that they are integers. Fixes an issue with StreamReplayBuffer
|
2023-10-15 17:55:44 -04:00 |
|
Isaac Connor
|
4fe61d60ca
|
Add Email as a column in user list
|
2023-10-13 09:01:56 -04:00 |
|
Isaac Connor
|
fdc500304b
|
Add test to see if php-curl is installed instead of crashing.
|
2023-10-12 11:04:55 -04:00 |
|
Isaac Connor
|
0ba0e6d27b
|
Control form elements were renamed from newControl to just Control. Update validateForm to match.
|
2023-10-11 14:58:54 -04:00 |
|
Isaac Connor
|
ad35eba013
|
Use bootstrap table for user list, giving us sortable columns and we can use mobile table/card
|
2023-10-11 13:34:38 -04:00 |
|
Isaac Connor
|
7762e882b1
|
Remove debug
|
2023-10-11 13:34:09 -04:00 |
|
Isaac Connor
|
69e601d286
|
Fix failure to save new user due to Snapshots not getting a default value.
|
2023-10-11 13:34:00 -04:00 |
|
Isaac Connor
|
bdc6bb58d6
|
Add a redirect after user delete so that we don't have form resubmission
|
2023-10-11 13:33:31 -04:00 |
|
Isaac Connor
|
0fe6dc2997
|
Fix the second Offline test. Fixes #3766
|
2023-10-11 11:34:27 -04:00 |
|
Isaac Connor
|
feb3d91e8b
|
Remove Tags from Event Data defaults. I don't think it is meant to be there
|
2023-10-06 14:54:17 -04:00 |
|
Isaac Connor
|
72d021dae9
|
Remove Tags from Event Data defaults. I don't think it is meant to be there
|
2023-10-06 14:49:57 -04:00 |
|
Isaac Connor
|
16db44193f
|
Test for data.response being defined and do some logging if not
|
2023-10-06 14:32:55 -04:00 |
|
Isaac Connor
|
9ff31ab4f5
|
Only print logged in user name if we are actually logged in, in order to avoid errors in logs
|
2023-10-05 17:03:42 -04:00 |
|
Isaac Connor
|
38be4feeb8
|
Servers is a global, don't need to hit the db again
|
2023-10-05 11:51:33 -04:00 |
|
Isaac Connor
|
58ef8fe509
|
IF operator is LIKE and there is no %, automatically add them to front and back so that we get a match.
|
2023-10-05 11:50:29 -04:00 |
|
Isaac Connor
|
c78063abd1
|
If we can edit we should still be able to do view actions
|
2023-10-04 15:11:14 -04:00 |
|
Isaac Connor
|
44c5c3c70c
|
Introduce new download mode that concats event videos into 1 file per monitor
|
2023-10-04 12:04:11 -04:00 |
|
Isaac Connor
|
f864a29eac
|
Always return an array in getCredentialsDeprecated
|
2023-10-04 11:12:37 -04:00 |
|
Isaac Connor
|
9b1e98997c
|
fix eslint
|
2023-10-01 10:28:36 -04:00 |
Simpler1
|
2547376c27
|
fix(php8): AllowDynamicProperties
|
2023-09-30 19:56:57 -04:00 |
|
Isaac Connor
|
db390a4861
|
Merge branch 'fix_hardcoded'
|
2023-09-29 12:18:23 -04:00 |
|
Isaac Connor
|
10cf26fa7b
|
Take FPSReportInterval into account when determining if a monitor is dead. Fixes #3766
|
2023-09-29 12:09:23 -04:00 |
|
Isaac Connor
|
2d46fc350a
|
Spacing, test for setting of ZM_PATH_IP
|
2023-09-29 12:07:50 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
5a7bd74521
|
Remove commented out code
|
2023-09-28 12:59:51 -04:00 |
|
Isaac Connor
|
91c44a4f9a
|
Fix semi colon
|
2023-09-26 15:17:26 -04:00 |
|
Isaac Connor
|
23b58a2709
|
Move delteclick and download click into separate functions. Only load delconfirm modal when delete is clicked.
|
2023-09-26 15:17:01 -04:00 |
|
Isaac Connor
|
51500d494f
|
Add group by when doing advnaced search
|
2023-09-26 15:15:47 -04:00 |
|
Isaac Connor
|
82aeac076d
|
Fix incorrect var name frameid=>fid in find_virtual_frame
|
2023-09-26 12:10:36 -04:00 |
|
Isaac Connor
|
709d08c6c5
|
Only call jsonDecode when Query_json is non-empty
|
2023-09-25 16:56:06 -04:00 |