Commit Graph

8007 Commits

Author SHA1 Message Date
Isaac Connor 7517bdc6ec Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2021-10-25 16:44:01 -04:00
Isaac Connor b2e1f7ed56 Put actions and options in a div, remove hr's and style the resulting div have the borders and clearing required. Make email options 100% 2021-10-19 13:17:00 -04:00
Isaac Connor a1a8f4d09b remove debug hello 2021-10-19 13:11:50 -04:00
Isaac Connor f5b54caa61 Improvements to export. Fix tar -v, should be tar --version. make table width:100% and iframe height 100%. Always show thumbnail of video. Show Id of event if no other links. generate Images frame content event if no jpegs but there is an mp4. Set timeout to infinity for generating export. Provide more feedback if it breaks. Fix ticker. 2021-10-19 13:11:31 -04:00
Isaac Connor 41d193afe3 Fix removing uneeded checked 2021-10-17 19:07:55 -04:00
Isaac Connor ca1b7ebdc7 Test for existence of AutoEmail and AutoMessage. Fixes #3369 issue 2. 2021-10-13 11:57:58 -04:00
Isaac Connor ff87856951 Merge pull request #3366 from haade-administrator/patch-1
Update translation
2021-10-06 10:36:52 -04:00
Isaac Connor 1a27ac9ab3 Handle when SERVER['HTTP_HOST'] is not set 2021-10-06 10:36:35 -04:00
Isaac Connor d622ae9251 fix width=0px causing empty looking montage 2021-10-06 10:35:52 -04:00
Isaac Connor f299d57a39 Fix js error in montage review when using scaled mode. Fixes #3351 2021-09-14 10:27:05 -04:00
Isaac Connor 4553592caa Merge pull request #3352 from vezza/patch-3
Update it_it.php
2021-09-14 10:26:52 -04:00
Andrea Vezzali ded2c86858 Update it_it translation (#3350) 2021-09-13 09:31:00 -04:00
Isaac Connor 8c92fa5dc3 Fix version of Crud 2021-09-09 13:26:59 -04:00
Isaac Connor 12fcae7574 canView takes a user object, not a string 2021-09-08 19:08:08 -04:00
Isaac Connor a42786afd1 Add missing Importance member 2021-09-08 13:59:21 -04:00
Isaac Connor 4612f4ae75 add getMonitorStatuses function to return string values for status numbers 2021-09-04 09:57:56 -04:00
Isaac Connor e529d8fcd1 add autoplay tag. Fixes #3343 2021-09-03 22:29:45 -04:00
Isaac Connor 55080da9dc Don't use AUTH_HASH_IPS when talking to zmu as it doesn't support that at this time. 2021-09-03 22:29:16 -04:00
Isaac Connor be46b063c8 spacing 2021-09-03 22:28:59 -04:00
r01k 2d965e7d50 Fixed bug that caused 'Call to undefined function Error()' in control_functions.php. Exception was being raised due to logger.php not being included in control_functions.php. 2021-09-03 22:28:37 -04:00
Isaac Connor 4c213ab453 Only show thumbnail if Function is != None 2021-09-03 22:28:08 -04:00
Isaac Connor 706e2ff536 spacing. When the selected layout is not freeform, calculate the ratio of computed size to stream source size to calculate a value for scale. 2021-09-03 22:27:53 -04:00
Isaac Connor dab9bce8f4 spacing remove dead code 2021-09-03 22:27:26 -04:00
Isaac Connor 25f6935280 Allow snapshot downloading 2021-09-03 22:26:51 -04:00
Isaac Connor 4c261eb413 Use event->canView so that events in snapshots can be exported 2021-09-03 22:26:26 -04:00
Isaac Connor ca4ec91ef3 Move CSP stuff down to view parsing. ajax requests only output json, so CSP shouldn't be relevant. Only end output buffer if there is one. archive view for example clears all output buffers. 2021-09-03 22:26:09 -04:00
Isaac Connor 30aad6ab9a Spacing and quotes 2021-09-03 22:25:43 -04:00
Isaac Connor bed79039f3 implement Event->canView 2021-09-03 22:25:14 -04:00
Isaac Connor d884d86b38 Can export events if canView Snapshots. Event->canView will filter events that are not in a snapshot 2021-09-03 22:23:30 -04:00
Isaac Connor 391fc1fec8 Use canView.Snapshots for snapshot permissions instead of canView.Events 2021-09-03 22:23:09 -04:00
Isaac Connor a1fe4e2638 Change monitor->canView semantics so that a specified monitorId trumps the Monitors:None setting. This is so that the console can be hidden, but the group dropdown still gets populated. 2021-09-03 22:22:47 -04:00
Isaac Connor a2f3583481 turn Save, SaveAs and Execute into submit buttons. Put Id into the form action so that it shows up in the url bar. Disable putting the form contents into the url bar in parse_rows. 2021-09-03 22:22:16 -04:00
Isaac Connor 809183716a clean up code logic so that if we are executing an unchanged filter we don't do the unecessary save. 2021-09-03 22:21:40 -04:00
Isaac Connor 3ca920f1a9 spacing. Add defaults for AutoMoveTo and AutoCopyTo so that we don't get false changes. redirect is a global, so make it so. Re-null the Id of the filter object after temp execute so that we don't reference a no longer existing filter. 2021-09-03 22:21:21 -04:00
Isaac Connor 2e09334b9c Fix url to ajax endpoint for deleting snapshots. 2021-09-03 22:20:51 -04:00
Isaac Connor a69882ffaf Cleanup, split export and download functions in snapshot. 2021-09-03 22:20:27 -04:00
Isaac Connor b306f92116 event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it. 2021-09-03 22:19:57 -04:00
Isaac Connor ae1e3d88b2 When locking, use the results to reload the object fields fresh as they may have changed since the object was loaded 2021-09-03 22:19:39 -04:00
Isaac Connor cf87f2cc40 Snapshot exports are now flat, without frame images 2021-09-03 22:19:19 -04:00
Isaac Connor c089702fab Pass exportStructure around so that it can be used to put the right filename to the jpg in the html. Fix flat zips. Fix video files being included if exportMisc is true. 2021-09-03 22:19:02 -04:00
Isaac Connor 2c7af3886c Actually delete the snapshot record, not just the event connection 2021-09-03 22:18:38 -04:00
Isaac Connor 2f7c44dce2 Fix deleting snapshots 2021-09-03 22:18:24 -04:00
Isaac Connor ad9ce720fd Allow specifying export Structure to get a flat zip 2021-09-03 22:18:06 -04:00
Isaac Connor 50326cf80c zmu may still output results even if it encounters errors, so continue even if we have an error return status from zmu. 2021-09-03 22:17:15 -04:00
Isaac Connor c280279cf7 Continue to work even if opener isn't defined, which it isn't anymore because we got rid of popups. Fixes save button on monitorprobe. 2021-09-03 22:16:30 -04:00
Isaac Connor 6a6d6935e8 Merge script sections just to remove bytes per view. 2021-09-03 22:15:56 -04:00
Isaac Connor 814e8559aa output an error message image when we can't load a jpeg 2021-09-03 22:15:29 -04:00
Isaac Connor 8d5207636a Turn on export functionality for snapshots 2021-09-03 22:15:08 -04:00
Isaac Connor 2273deaf17 Support specifying the export filename by passing the export_root 2021-09-03 22:14:42 -04:00
Isaac Connor 06ff94de2f Fix styling of the shutdown button 2021-09-03 22:13:55 -04:00
Steven Gilvarry 59a03d6d59 Update Dark Skin to fix modal being light and some other issues
Fixed Modal style as per post to forums, then also fixed text area and select being white. Adjusted some other colours to work better. Console hover could be better still
2021-09-03 22:13:26 -04:00
Isaac Connor 17ec2f922e Remove some debug logging 2021-09-03 22:11:51 -04:00
Isaac Connor 6d9c582e13 Merge an old stash allowing passing an alternate buttonconfig parameter to show/get Modal 2021-09-03 22:11:14 -04:00
Isaac Connor 0b76892ddf Merge pull request #3307 from pliablepixels/optimize-event-api
API: allow option to not load the frames DB table
2021-07-05 12:49:58 -04:00
Andrew Bauer a423f2620e Allow cakephp cache engine to be set during build 2021-06-18 15:29:54 -05:00
Isaac Connor 0ca10fe7cd Add special handling of sorting by EndTime because it can be NULL. Fixes #3298 2021-06-15 10:34:15 -04:00
Isaac Connor bb67c27d3b It is okay to call daemonControl with function==None for command == stop. All others give a warning. Fixes monitors on other servers not stopping when set to None. 2021-06-12 12:22:42 -04:00
Isaac Connor 3141ec32fe Add a limit of 1000 when pulling sessions. Sessions table can contain hundreds of thousands of lines all relatively useless. Modals need to pop up fast. 2021-06-12 11:58:18 -04:00
Isaac Connor 2288d32928 Use getStat instead of other jquery code to update the event data. Don't refresh before rename ajax finishes. Deprecate the n/a handling in getStat. Not sure why it's needed. Sync update eventData with what is returned by ajax status call. Fixes #3265 2021-06-08 15:58:17 -04:00
Isaac Connor 131e57a99e StartTimeShort should be StartDateTimeShort. Leave StartTimeShort for backwards compatibility. Add Storage, DiskSpace in status=>event 2021-06-08 15:54:14 -04:00
Isaac Connor 16295598dc spacing 2021-06-08 15:53:35 -04:00
Isaac Connor 13da1aca14 Remove 25x and options. Browsers do not support them. Add 16x which is the max. Fixes #3284 2021-06-08 13:37:40 -04:00
Xulunix a5341beaa5 Fixed bug in onvifprobe
The arguments for "/usr/bin/zmonvif-probe.pl" was always `probe 1.1,1.2 1` with the last argument always being `1` instead of the network interface name selected in the menu.
This change fixes this issue by using the selected interface name instead of the boolean return value of the `isset()` function.
2021-06-08 13:12:35 -04:00
Isaac Connor 4f3552a3e9 fix missing namespace on warning 2021-06-08 13:11:40 -04:00
Isaac Connor 959107f318 Default to UTC when no timezone set so that montagereview continues working. Fixes #3274 2021-06-08 13:11:06 -04:00
Isaac Connor 74b48c9f21 Fix samsite support for php <= 7.2 2021-06-08 13:09:43 -04:00
Isaac Connor f85efc17b4 Add samesite when setting cookie for skin and css 2021-06-08 13:09:30 -04:00
Isaac Connor 9f6eec792c Fix Crud fork 2021-06-08 13:01:09 -04:00
Isaac Connor f723b39cf6 Apply height css to limit height of logout modal and apply overflow:auto to add a scrollbar if needed so that we don't have to scroll to logout. 2021-05-30 18:31:26 -04:00
Isaac Connor a4e4ebe3fd Restore api behaviour. Add zmu output to response 2021-05-28 12:29:02 -04:00
Isaac Connor 225123dd11 Allow [] characters in url to work with ipv6. Fixes #3261 2021-05-26 18:50:26 -04:00
Isaac Connor 3b5de40d05 Merge pull request #3259 from gerazo/master
Updated Hungarian translation
2021-05-25 13:16:35 -04:00
Isaac Connor 8d783d3cd5 Merge pull request #3254 from bestlong/add-lang
web ui add lang (Chinese Traditional)
2021-05-25 13:15:56 -04:00
Isaac Connor 80800785be Fix getting border width on firefox. Need to specify which border. Went a little further and split x and y axis borders in the maxfit2. Fixes #3249 2021-05-25 13:15:04 -04:00
Isaac Connor d59118fc47 Add redirect so that Yes I'd like to donate now goes to the zoneminder /donate website. This used to happen in javascript but got removed when it was turned into a modal. 2021-05-25 11:33:12 -04:00
Isaac Connor 6a9ed9c457 Use data-onclick instead of data-on-click-this. 2021-05-25 11:22:43 -04:00
Isaac Connor f6fcc2144f jquery.js doesn't exist, so link jquery.min.js instead 2021-05-22 13:59:32 -04:00
Isaac Connor 4c99baf725 Use data-onclick instead of data-on-click-this. Load form by id instead of passed in element. Fixes #3250 2021-05-22 13:59:10 -04:00
Isaac Connor 1caeb67a3e fix behaviour of reverse and fast forward buttons. Fixes #3251 2021-05-22 13:39:42 -04:00
Isaac Connor e16d71b9c6 spacing, code style, code comments 2021-05-22 13:39:42 -04:00
Andrew Bauer cb0a421d25 use latest rtspserver commit 2021-05-21 15:10:42 -05:00
Isaac Connor 0b4c35c58e Merge pull request #3241 from connortechnology/fix_3239
Fix 3239
2021-05-19 20:39:42 -04:00
Isaac Connor 1abbc187e9 Merge pull request #3242 from connortechnology/fix_3232_api_monitor_event_summaries
Add Event_Summary model so that it is included in monitor listing
2021-05-19 20:32:50 -04:00
Isaac Connor a4df8df5e5 Fix status of delete button when archived. Change title to say that you can't delete due to archived 2021-05-19 20:32:26 -04:00
Isaac Connor f6a271c90d Merge pull request #3240 from connortechnology/fix_3237
fix warnings not being displayed
2021-05-19 20:32:11 -04:00
Isaac Connor e246083be5 Add StartDateTime Attr in sort dropdown 2021-05-12 10:32:03 -04:00
Isaac Connor 363b017977 If error was unauthorized, do a reload. 2021-05-12 10:32:03 -04:00
Isaac Connor f3b4ccf758 Fix scaling when scale to fit 2021-05-10 11:08:16 -04:00
Isaac Connor b1ac0e61a9 put back upstream version 3.2.0 of Crud 2021-05-09 18:18:03 -04:00
Isaac Connor 2cf6ad8089 Switch ZMPacket * to a shared_ptr<ZMPacket>. This is so that in LockedPacket we can unlock and then notify and be confident that packet_ won't have been deleted. Change ZMPacket->timestamp to be a timeval instead of timeval *. This might not have been necessary but I like it. No longer cuse the ZMPacket object to wrap the shared image buffers and timestamps. Use a vector for image_buffers. 2021-05-08 21:14:20 -04:00
Isaac Connor bc11e6a95b Include pre event count in min estimated ram use 2021-05-08 15:47:29 -04:00
Isaac Connor ff0d6e8e0f remove duplicated getModal and pass fid=fid to getModal 2021-05-07 15:34:08 -04:00
Isaac Connor ea3bffb402 make getModal take additional query parameters 2021-05-07 15:33:49 -04:00
Isaac Connor 9e6367c7c3 look for 264 instead of x264 2021-05-06 17:33:04 -04:00
Isaac Connor 373fae2511 BadEncoder Params and PathNotEncoded are warnings, not errors 2021-05-06 11:05:05 -04:00
Isaac Connor b8f0d90000 Put back Estimated Ram Use. Rework it to provide min/max 2021-05-06 10:17:46 -04:00
Isaac Connor 0adc2d96d6 Revert "remove estimated ram use stuff as it is no longer possible"
This reverts commit 2e675a338b.
2021-05-06 09:54:06 -04:00
Isaac Connor f4bbacb3f4 add VideoWriter and Codec filters so that you can't select an h265 encoder for h264 etc 2021-05-05 16:48:49 -04:00
Isaac Connor ed97ff495b Unhide Codec, hide OutputContainer 2021-05-05 16:48:01 -04:00
Isaac Connor 09e5c47f3e Hide COntainer and OutputCodec options. I don't want people playing with them righ tnow. 2021-05-05 14:03:38 -04:00