Commit Graph
2352 Commits
Author SHA1 Message Date
Isaac Connor 3b379e99c0 Introduce detaintPathAllowAbsolute. Use it to protect against Path Traversal in files view. Fixes GHSA-8fw2-wh82-vv4h 2024-09-30 06:42:10 -04:00
Isaac Connor 7aabf146ba Try to do something useful with error messages from SQL, but since storage isn't a real view, it won't be shown. 2024-09-30 06:34:15 -04:00
Isaac Connor 07fcb72e3b Use the same filter on Storage Name as we use in Monitor Name. 2024-09-30 06:33:09 -04:00
Isaac Connor d216c4cf47 Remove STATE_TAPE 2024-09-24 17:26:55 -04:00
Isaac Connor 328ce9fc0c Make no Status record found a debug instead of warning 2024-09-17 11:17:50 -04:00
Isaac Connor c45a2af08b Revert lack of src tag on event image 2024-09-05 09:18:41 -04:00
Isaac Connor 08d2f44613 Allow further query parameters after view in HomeView 2024-09-04 16:52:59 -04:00
Isaac Connor b64461d518 Merge branch 'master' into only_stream_visible 2024-09-03 14:51:36 -04:00
Isaac Connor b66e04024f Test for Path being empty to avoid warnings about passing null being deprecated 2024-09-03 09:39:03 -04:00
Isaac Connor 802a0854b5 Add getAnalysingStrings and getRecordingStrings and fix getStatusStrings, removing Tape 2024-08-18 12:18:44 -04:00
Isaac Connor 32fcfa4559 Add default for EmailServer in Filter 2024-07-18 16:05:34 -04:00
IgorA100 93e03952f7 Added identifiers "filterArchived", "filterTags", "filterNotes" (Filter.php)
This is necessary for working with cookies, and will also be used on the updated Montage page
2024-07-16 16:26:54 +03:00
Isaac Connor caeb65233e Fix not being able to unset use WallClockTimestamps 2024-07-08 08:36:55 -04:00
Isaac Connor a3c73b414f Add WallCLockTimestamps to Monitor model 2024-07-06 08:51:37 -04:00
IgorA100 14604520bc Merge branch 'ZoneMinder:master' into patch-135 2024-06-05 17:07:51 +03:00
IgorA100 53d057d7aa After the monitor name, display its ID (Monitor.php) 2024-06-05 15:21:09 +03:00
Isaac Connor 8a496f5d17 Remove extra comma that now breaks php 2024-06-04 09:39:22 -04:00
IgorA100 ba5cb4adcd Added $this->streamSrc = $streamSrc (Monitor.php)
Required to switch without reloading the page between monitors on the Watch page
2024-06-04 15:22:59 +03:00
Isaac Connor 6e9c69300b Handle no rows return from Server_Stats 2024-06-02 16:04:15 -04:00
Isaac Connor 3c389e7f7f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-06-02 12:51:52 -04:00
IgorA100 eb1a38c74c Changed attr "title" for "#monitor" (Monitor.php)
Made in two lines and added capital letters.
2024-06-02 00:07:37 +03:00
Isaac Connor 414b28d42a Update style of variable embeddeding in string. php complains now 2024-05-31 14:53:45 -04:00
Isaac Connor f81d6fb823 Sanitise filter[Id] 2024-05-30 12:12:02 -04:00
Isaac Connor 7543e513fa Replace useless title on image stream with a useful one describing zoom controls. 2024-05-28 10:10:30 -04:00
Isaac Connor ae5b73bf90 Resolve conflicts 2024-05-23 14:30:44 -04:00
Isaac Connor b3c90c3216 Merge branch 'master' into only_stream_visible 2024-05-23 14:18:47 -04:00
Isaac Connor 02ccb5f12b Remove unused zms url parameters 2024-05-23 13:31:30 -04:00
IgorA100 bd93a8e329 When setting cookies via PHP, add handling of the "path" value in the options (session.php)
Otherwise, cookies set via PHP will not be able to be changed in JS.
Because JS saves cookies with path="/"
Closed: #4024
2024-05-22 10:32:10 +03:00
IgorA100 41a92e11ad Fix: block "Ratio Control" is created only for Montage page (Monitor.php)
Otherwise there will be an error in the browser console that the "changeRatio" function was not found
2024-05-21 19:34:06 +03:00
Isaac Connor 7a8f9a603d Remove debug 2024-05-21 09:39:53 -04:00
Isaac Connor 9cc8ec7048 Santisize zmMontageLayout when passing to constructor 2024-05-21 09:22:55 -04:00
Isaac Connor 9dd58855d1 Santisize zmMontageLayout when passing to constructor 2024-05-21 09:21:54 -04:00
IgorA100 cb4481353b Added "action" for the "delete" button (montage.php) 2024-05-21 12:07:35 +03:00
Isaac Connor 582f594b0f Merge branch 'IgorA100-patch-6' 2024-05-15 11:46:26 -04:00
Isaac Connor 7bfd94b9d2 Merge branch 'patch-6' of github.com:IgorA100/zoneminder into IgorA100-patch-6 2024-05-15 11:45:49 -04:00
IgorA100 e995166dab Added <select> for Ratio control & more (Monitor.php)
- Added <select> for Ratio control
- Reduced the size of the "Open watch page", "Edit monitor" buttons
- Added a button "Open full screen"
2024-05-14 13:14:43 +03:00
IgorA100 3648bfd56f Merge branch 'ZoneMinder:master' into patch-6 2024-05-08 01:15:45 +03:00
IgorA100 4e7d774667 Added support for GridStack & PanZoom on Montage page (Monitor.php) 2024-05-07 19:31:25 +03:00
Isaac Connor 5047a18d4f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-04-30 08:57:51 -04:00
Isaac Connor 36ab6380cb Include backtrace when complaining about lack of term in FilterTerm 2024-04-30 08:57:09 -04:00
Isaac Connor f5333d2cfd Fix redirect from controlcap to options=>control 2024-04-30 06:52:40 -04:00
Simpler1 ebf1e8b1cc Fix(filter): Set tags operator to = instead of LIKE 2024-04-10 15:14:36 -04:00
IgorA100 c046c2ddc5 Merge branch 'ZoneMinder:master' into patch-6 2024-04-09 14:40:38 +03:00
IgorA100 51bf4bcbb8 Chore: Replace Tabs to Space 2024-04-08 19:21:30 +03:00
IgorA100 a720292025 Merge branch 'ZoneMinder:master' into patch-6 2024-04-07 20:45:21 +03:00
Isaac Connor bec19f39e6 Fix comparison to True instead of true. Fixes #3952 2024-04-07 10:12:12 -04:00
IgorA100 49704656b8 Merge branch 'ZoneMinder:master' into patch-6 2024-04-05 22:58:55 +03:00
Isaac Connor 972a9e03af Merge pull request #3920 from IgorA100/patch-45
Feat: Ability to download videos on Event view page with a multiport configuration
2024-04-05 09:47:16 -04:00
IgorA100 f2aed5fc21 Chore: Adjust spaces, tabs, newlines 2024-04-03 22:58:21 +03:00
Simpler1 1184ecf567 fix(events): Allow changing weekday after using filter 2024-04-01 08:24:31 -04:00