Commit Graph

7309 Commits

Author SHA1 Message Date
Isaac Connor 638a05b207 Fix totalrows in pagination. Still figuring this out. 2020-10-29 09:39:48 -04:00
Isaac Connor 368c1649fe Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-10-29 08:47:34 -04:00
Isaac Connor 858674c0b2 Merge branch 'master' into filter_locking 2020-10-28 12:52:52 -04:00
Isaac Connor 686f793d09 fix truth value for ZM_OPT_USE_GEOLOCATION 2020-10-28 12:49:39 -04:00
Isaac Connor b3a28b2ba2 fix confusion in syslog reporting web_php when the error was actually web_js 2020-10-28 12:49:03 -04:00
Isaac Connor df788f2810 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-28 12:40:00 -04:00
Isaac Connor c67b3c5a1f fix button disabled status. We now have checkboxes that aren't actions so we need to be more explicit 2020-10-26 18:49:41 -04:00
Isaac Connor 1690bcbd38 update auth_relay when we update auth_hash 2020-10-26 18:49:14 -04:00
Isaac Connor a5bb2365b5 update auth_relay when we update auth_hash 2020-10-26 18:49:03 -04:00
Isaac Connor ffc5249a66 add LockRows to Filters 2020-10-26 18:47:55 -04:00
Isaac Connor a2596505e9 add LockRows to Filters 2020-10-26 18:47:17 -04:00
Andrew Bauer 7b106e2522 don't use wildcards in advanced search 2020-10-26 12:20:26 -05:00
Andrew Bauer fad4339713 no need for full page reload with server pagination 2020-10-26 12:12:50 -05:00
Isaac Connor 5ed168bccd Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-26 13:07:18 -04:00
Isaac Connor 1f64a263eb give better log when jqxhr is empty 2020-10-26 13:06:41 -04:00
Isaac Connor 59cf5c33c2 reset search on events load 2020-10-26 13:06:22 -04:00
Isaac Connor da87b5b475 Make invalid sort field non-fatal. Fix column specification in search and advscearch and fix resulting sql due to = instead of .= 2020-10-26 13:06:05 -04:00
Andrew Bauer 97573122bc fix EndTime 2020-10-26 09:33:11 -05:00
Andrew Bauer 27b39a0258
comment out warning used for debug 2020-10-26 09:19:08 -05:00
Isaac Connor 4abfa61bbc Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-26 10:03:12 -04:00
Isaac Connor 4c791b390f fix warning due to undefined vars being used 2020-10-26 09:59:15 -04:00
Isaac Connor 706bf085f4 Add pre and post sql conditions and pre-populate the return 2020-10-26 09:58:47 -04:00
Andrew Bauer e5563dc901 remove unwanted # 2020-10-25 16:06:37 -05:00
Andrew Bauer 6d00924c9b deploy server pagination for events view 2020-10-25 12:11:34 -05:00
Andrew Bauer 8cf899efc5 remove commented line 2020-10-25 10:58:27 -05:00
Andrew Bauer e9b71b4ce1 events view server pagination - fix sorting name & monitor 2020-10-25 10:40:29 -05:00
Andrew Bauer cb073950b9 events view server pagination WIP 2020-10-25 10:28:22 -05:00
Andrew Bauer f87be2d289 specify the table name when we sort in events view 2020-10-25 08:24:56 -05:00
Isaac Connor a2dc4b5f08 handle params.daa not existing 2020-10-24 09:45:38 -04:00
Isaac Connor 90c5f63d6d Fix session.gc SQL issue. Don't need a * when deleting 2020-10-24 09:05:39 -04:00
Isaac Connor efaf95beda dirty hack to rename data.filter to data.advsearch 2020-10-24 08:51:26 -04:00
Isaac Connor 760e20bc0f Populate Monitor name and use event class DiskSpace to get DiskSpace when it hasn't been populated in the db yet 2020-10-24 08:50:59 -04:00
Isaac Connor 2178da387d pass desired object name into querystring() 2020-10-23 17:56:38 -04:00
Isaac Connor b6004012e9 implement passing the object name to use when constructing the querystring 2020-10-23 17:56:05 -04:00
Isaac Connor 2ebd686d19 Use a ZM\Filter for initial filtering. SELECT E.*,M.* to match how we do it in Filters and older event code. pass the row into new Event() so that it doesn't go back to the DB to get the Event property data. 2020-10-23 17:55:43 -04:00
Isaac Connor da080d44c1 rename filter from bootstrap-table to advsearch so as not to conflict with our existing filter 2020-10-23 16:44:50 -04:00
Isaac Connor 8a3e0e108c Put back filter query code 2020-10-23 14:02:27 -04:00
Isaac Connor ad137adb4c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-23 11:30:19 -04:00
Andrew Bauer d425d1006e push newevents.php to master 2020-10-23 10:21:32 -05:00
Isaac Connor 5d7e3b0510 handle no responseText in jqxhr 2020-10-23 11:12:57 -04:00
Isaac Connor d62a5caccd Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-23 09:35:13 -04:00
Isaac Connor 90e81c5774 Merge branch 'release-1.34' 2020-10-23 09:34:35 -04:00
Isaac Connor c8392feba3 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-10-22 16:35:44 -04:00
Andrew Bauer 235dd2a2fb don't use wildcards in event view advanced search fields 2020-10-22 15:06:06 -05:00
Andrew Bauer 29819d8044 fix copy/paste error with events.php 2020-10-22 13:27:47 -05:00
Andrew Bauer d117e993ad add create task to ajax/log.php 2020-10-22 10:17:34 -05:00
Andrew Bauer 230f35f0c0 comment out debug in events.js 2020-10-22 08:50:06 -05:00
Andrew Bauer 0d14dcfbfa WIP events view server pagination 2020-10-22 08:49:07 -05:00
Isaac Connor 9372b2ef8c remove debug 2020-10-22 08:53:05 -04:00
Isaac Connor 4a0ada5335 improve logging of invalid task in ajax/log 2020-10-22 08:52:54 -04:00
Isaac Connor e6f08959fa Fix use of result instead of NearEvents 2020-10-21 10:40:26 -04:00
Isaac Connor 8f8526c2f1 add some debug to session garbage collection 2020-10-21 10:38:42 -04:00
Isaac Connor 946a59ce8b add special case for sort_field being StartDateTime. This is not an event column and must be corrected to StartTime 2020-10-21 10:37:39 -04:00
Isaac Connor 1c5e161909 quotes 2020-10-21 10:37:06 -04:00
Isaac Connor 1dfebc24b0 Fix ZM\ 2020-10-21 10:36:58 -04:00
Isaac Connor 34ce3a1498 Use Filter::parse instead of parseFilter. Use Filter->addTerm to limit to User's monitor restrictions. Return early with better logging in the event of error. Introduce Filter->addTerm 2020-10-21 10:36:40 -04:00
Isaac Connor 452416e72a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-20 19:23:12 -04:00
Isaac Connor d88fd5e4e0 Revert WEB_EVENT_SORT_FIELD change from StartTime to StartDateTime back to StartTime. StartTime is the column name. 2020-10-20 19:23:03 -04:00
Andrew Bauer b5aa215e31 WIP events view server pagination 2020-10-20 12:59:30 -05:00
Andrew Bauer 6357c02ec9 WIP events view server pagination 2020-10-20 12:13:12 -05:00
Isaac Connor 41ed267b71 move view to the form action so that it is part of get request instead of post 2020-10-20 12:31:38 -04:00
Isaac Connor bb5646baac Load Logout modal content on click instead of every page load 2020-10-20 12:31:06 -04:00
Isaac Connor 5b27d77ea4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-20 11:52:25 -04:00
Isaac Connor 1a77958548 Make loading the function modal happen on click instead of every page load. 2020-10-20 11:52:18 -04:00
Andrew Bauer bfa45b0c43 continue work on event view server pagination 2020-10-20 08:10:43 -05:00
Andrew Bauer 4e391708f1 event view server pagination WIP 2020-10-19 14:18:21 -05:00
Isaac Connor 8a6aaa019f Bump version for release to 1.34.22 2020-10-19 14:29:18 -04:00
Isaac Connor 0e63874533 fix calling changeScale when scale is 0 instead of auto 2020-10-19 14:28:21 -04:00
Isaac Connor 127ef9a130 Fix scaling when using ScaleToFit 2020-10-19 14:28:02 -04:00
Isaac Connor 080557d580 add an id to buttons div so that we can use it when calling scaleToFit 2020-10-19 14:27:43 -04:00
Andrew Bauer 89f298771f server pagination backend improvements 2020-10-19 12:25:13 -05:00
Andrew Bauer 7ae7e05f14 roughin ajax call in event.js for server side pagination 2020-10-19 09:29:39 -05:00
Isaac Connor e2b76257eb Merge branch 'release-1.34' 2020-10-19 09:10:28 -04:00
Isaac Connor 14894dfb00 remove extra comma 2020-10-19 09:08:25 -04:00
Andrew Bauer 6f45de04f8 partial roughin ajax event view server side pagination 2020-10-19 07:50:11 -05:00
Andrew Bauer 97d05c2f88 move newlog ajax request to log 2020-10-18 07:20:59 -05:00
Isaac Connor 220a89b459 fix eslint 2020-10-17 16:17:30 -04:00
Andrew Bauer be63acdcc0 rollback bstable to 1.17.1git90f47e7 2020-10-17 11:49:17 -05:00
Andrew Bauer 5bf0524bdc chinese locale designation was backwards, fixing... 2020-10-17 07:29:32 -05:00
Andrew Bauer 442fadb585 link bstable locale to zoneminder's 2020-10-17 07:28:14 -05:00
Andrew Bauer 4044d60412 update bstable to 9fa4c82, add bstable locale extenstion 2020-10-17 07:23:26 -05:00
Andrew Bauer 1ed160866b add legacy watch view alarm buttons to toolbar 2020-10-16 15:47:42 -05:00
Isaac Connor 3fdbae7761 add 1440p to the resolution list 2020-10-16 14:54:54 -04:00
Isaac Connor c5cd617204 Load logoutModal on click instead of always 2020-10-16 14:51:47 -04:00
Isaac Connor d6dfde5630 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-16 12:21:22 -04:00
Isaac Connor 8c7c4c4b1b add a call to drawZonePoints to handle case where image doesn't load. Remove debug and dead code 2020-10-16 12:21:12 -04:00
Isaac Connor b9b45d8b9e definitionPanel shouldn't be floated, or relse should be set to 100% width 2020-10-16 12:14:58 -04:00
Isaac Connor c70493a43f Add clear: both to content div. In general the content div is 100% so should drop below floats 2020-10-16 12:14:31 -04:00
Andrew Bauer f98a885ed5 update the watch view header 2020-10-16 08:08:23 -05:00
Isaac Connor 4f56f9d82b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-15 17:20:10 -04:00
Isaac Connor 12b75e93b8 Merge branch 'release-1.34' 2020-10-15 17:19:56 -04:00
Isaac Connor 78cbacae2e When changing rates, if not using video.js, send CMD_VARPLAY to tell zms what to do 2020-10-15 17:18:38 -04:00
Isaac Connor 5869817e0d set playbackrates in video.js to match the ones offered by the zms player. Use the rates array set in includes/config.php 2020-10-15 17:17:20 -04:00
Isaac Connor 3c5dc8e8b3 Add line breaks in select options 2020-10-15 17:16:14 -04:00
Isaac Connor 7bb227283d Update rates in includes/config.php 2020-10-15 17:15:54 -04:00
Andrew Bauer 2fbbe11079 make the filter button style consistent 2020-10-15 08:01:32 -05:00
Andrew Bauer f32a7aaff5 deploy insertModalHtml 2020-10-14 15:58:39 -05:00
Andrew Bauer ec040b1bfd don't set popup flag in event view 2020-10-14 13:59:15 -05:00
Andrew Bauer e69b3800c7 set return status for cancel and restart commands 2020-10-14 12:22:21 -05:00
Andrew Bauer a60815a700 eslint 2020-10-14 11:20:37 -05:00
Andrew Bauer bea95bca68 use ZM\Debug 2020-10-14 10:33:40 -05:00
Isaac Connor 57a1a383ad Merge branch 'release-1.34' 2020-10-14 11:32:50 -04:00
Isaac Connor e9fb150880 Improve error message when a row doesn't exist in the Monitor_Status table 2020-10-14 11:32:33 -04:00
Andrew Bauer c3a98c1f44 replace shutdown form submit with ajax 2020-10-14 10:03:33 -05:00
Isaac Connor da948065bb Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-14 10:39:31 -04:00
Isaac Connor 10c0a6617c Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php. 2020-10-14 10:39:25 -04:00
Andrew Bauer ba82088b99 make all the data-on-xxx js bindings functions 2020-10-14 08:51:44 -05:00
Isaac Connor ff14d11fef Don't output the filter, just log it! 2020-10-13 10:07:27 -04:00
Isaac Connor e8c9845e08 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-13 09:02:47 -04:00
Isaac Connor e4fec8c5ea code style cleanups, most defaulting to 'Id' as the term attr so that we can use an empty filter as a quick jump to event feature 2020-10-13 09:02:38 -04:00
Andrew Bauer 031b41f78a remove the english word popup from lang files 2020-10-13 07:59:34 -05:00
Isaac Connor cd2e96eaec Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-13 08:42:28 -04:00
Isaac Connor 908c20e959 add ZM prefix to Warning 2020-10-13 08:42:22 -04:00
Andrew Bauer 89c76ec140 no need to clare $view as global 2020-10-12 14:52:57 -05:00
Andrew Bauer c4ea27db8d fix buttons in shutdown modal 2020-10-12 14:51:33 -05:00
Andrew Bauer 49fec5142c remove popup code form skin.js 2020-10-12 13:34:40 -05:00
Andrew Bauer e5e1455f7a replace embedded popuplinks in watch view 2020-10-12 13:26:20 -05:00
Andrew Bauer 332ec2032a replace createPopup with location.assign 2020-10-12 12:37:23 -05:00
Andrew Bauer 1db31ba574 remove makePopupLink function. Use makeLink instead 2020-10-12 12:20:21 -05:00
Andrew Bauer ed5f6b2625 convert shutdown popup to modal 2020-10-12 12:16:52 -05:00
Andrew Bauer 0f263407a5 make redirect conditional on previous view 2020-10-12 10:32:25 -05:00
Isaac Connor 66a8d3876d add caching of users by username to improve performance 2020-10-12 11:25:20 -04:00
Isaac Connor 3646a66168 translate unquoted literal Filter 2020-10-12 11:20:22 -04:00
Isaac Connor 1ffa1cc33b Add button update checks for AutoUnarchive 2020-10-12 10:56:01 -04:00
Isaac Connor 1854e02ab3 Accept both Id and filter[Id] when loading filters. 2020-10-12 10:55:42 -04:00
Isaac Connor 3fa0ef25f6 Add a link to the filter representing the events list 2020-10-12 10:55:03 -04:00
Isaac Connor 637551b7e7 Add english for FilterUnarchiveEvents 2020-10-12 10:54:38 -04:00
Isaac Connor 046124fe0e Add AutoUnarchive column, also add Id to querystring if this is a saved Filter 2020-10-12 10:54:22 -04:00
Isaac Connor 03c8e86908 update some quotes 2020-10-10 11:09:51 -04:00
Isaac Connor 9e6db17e68 Fix getting next event due to case of asc 2020-10-10 11:09:39 -04:00
Isaac Connor 630d9011f3 Fix redirect when saving users 2020-10-10 09:48:09 -04:00
Isaac Connor 9cc7f0d360 Merge branch 'release-1.34' 2020-10-08 09:28:25 -04:00
Isaac Connor c28ff1f2b4 Include loading EndTime when loading Events data so that we can determine if an event is in-progress
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
Isaac Connor 624006022c Use a redirect to get rid of post on reload 2020-10-07 11:59:11 -04:00
Isaac Connor 95b09ad182 Add samesite=strict to all Cookie setting 2020-10-07 11:26:18 -04:00
Isaac Connor b683d5326a Test for empty array in htmlOPtions when notifying about not selecting a value 2020-10-07 11:22:42 -04:00
Isaac Connor efd56a2e09 spacing 2020-10-07 11:16:02 -04:00
Isaac Connor 7f67d09749 test for monitorIds value before calling explode because explode will return an array with an empty first element instead of an empty array 2020-10-07 11:14:57 -04:00
Isaac Connor ae7ed5a342 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-06 16:51:24 -04:00
Isaac Connor 9abde9ee06 Merge branch 'release-1.34' 2020-10-06 16:51:12 -04:00
Isaac Connor 044ce61ddb Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be. 2020-10-06 16:47:51 -04:00
Isaac Connor d7429014b6 Convert progress to a double instead of int. 2020-10-06 16:36:56 -04:00
Isaac Connor 0e89d28c26 Send SEEK as two integers representing a float 2020-10-06 16:34:06 -04:00
Andrew Bauer 87fd316e5b makePopupButton removed, use makeButton instead 2020-10-05 16:40:14 -05:00
Andrew Bauer 76af02cc76 whitespace 2020-10-05 16:31:26 -05:00
Andrew Bauer 01596ec26c whitespace 2020-10-05 15:53:46 -05:00
Andrew Bauer 9c7ebf8c9e unpopup video view 2020-10-05 15:44:07 -05:00
Andrew Bauer f93450f9ea remove plugin support for viewing downloads 2020-10-05 14:44:45 -05:00
Andrew Bauer 321de3c604 only update changed elements in video view 2020-10-05 13:59:44 -05:00
Andrew Bauer 862f0ca732 add xmlfooter to video view, replace mootools 2020-10-05 09:37:00 -05:00
Isaac Connor 2faedc6248 Sort sessions by access time so that we list active users first 2020-10-05 10:34:52 -04:00
Isaac Connor 1cf181372f Only load users for logged in sessions 2020-10-05 10:30:57 -04:00
Isaac Connor fa641a0345 Convert progress to a double instead of int. 2020-10-05 10:30:38 -04:00
Isaac Connor 6d1e5330e3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-05 09:30:49 -04:00
Isaac Connor 93021f5806 Update getNearEvents to handle when event doesn't exist 2020-10-05 09:30:33 -04:00
Andrew Bauer 2852d14ca6 use data-on-change-this instead of inline js 2020-10-04 08:04:11 -05:00
Andrew Bauer 2e6efbb349 replace inlince onchange event in control view 2020-10-03 21:44:24 -05:00
Andrew Bauer d9b8a7ceb2 remove unused view 2020-10-03 21:35:38 -05:00
Andrew Bauer adb715c42c fix typo 2020-10-03 21:32:07 -05:00
Andrew Bauer a0ad52bac9 replace another inline onchange event 2020-10-03 21:30:48 -05:00
Andrew Bauer b4d2fa5e75 replace inline onchange event 2020-10-03 21:14:24 -05:00
Andrew Bauer 65b6dad48c eslint 2020-10-03 17:38:56 -05:00
Andrew Bauer 8d19cee811 unpopup the addnewuser button 2020-10-03 17:12:44 -05:00
Andrew Bauer aee5430bc8 only load preset and settings modals when needed 2020-10-03 17:00:20 -05:00
Andrew Bauer 1643fb686b convert settings popup to modal 2020-10-03 16:51:25 -05:00
Andrew Bauer 1ef1b48c71 remove warnings used for testing 2020-10-03 07:08:04 -05:00
Andrew Bauer 391ce88f05 eslint 2020-10-02 21:11:54 -05:00
Andrew Bauer a97e526298 fix save button in controlpreset modal 2020-10-02 16:10:32 -05:00
Andrew Bauer 802e439cb5 convert controlpreset view to a modal 2020-10-02 15:46:28 -05:00
Isaac Connor 311ba4ef69 use bootstrap styles on logged in user table. Include ip address 2020-10-02 16:04:56 -04:00
Isaac Connor 7261a7b1dd Merge branch 'sessions_in_db' 2020-10-02 15:57:11 -04:00
Isaac Connor e9d120f032 remove debug 2020-10-02 15:56:56 -04:00
Isaac Connor bc5002515e remove debug 2020-10-02 15:56:50 -04:00
Isaac Connor d97f8af215 Finish showing logged in users 2020-10-02 15:56:39 -04:00
Isaac Connor 23f2c1468f rough in a table of the logged in users 2020-10-02 15:21:58 -04:00
Isaac Connor 5d20dde85c Implement a Session class that takes over session functions and stores in the database 2020-10-02 14:50:22 -04:00
Andrew Bauer 7b5090ceab move newlog view to log view 2020-10-02 13:26:35 -05:00
Andrew Bauer c5f69b9441 eslint 2020-10-02 13:24:30 -05:00
Andrew Bauer 950b04c659 convert popuplink 2020-10-02 12:51:17 -05:00
Andrew Bauer 6c0f61ebbd rework devices view, remove inline onclick 2020-10-02 12:39:05 -05:00
Andrew Bauer 1691e4321b don't log ajax response text if it is empty 2020-10-02 10:28:50 -05:00
Andrew Bauer a80b4b91fb fix x10 device edit 2020-10-01 16:03:58 -05:00
Andrew Bauer 186b8ac947 convert x10 device view to a modal 2020-10-01 15:52:33 -05:00
Andrew Bauer c61c111d9e modernize devices view 2020-10-01 12:52:20 -05:00
Andrew Bauer ef958b1649 enable mgmt of x10 device permissions 2020-10-01 10:51:59 -05:00
Andrew Bauer 928fa67fce redirect to previous view after user perm changes 2020-10-01 10:45:44 -05:00
Andrew Bauer b8d95dfa05 fix array to string php warning 2020-10-01 09:13:50 -05:00
Andrew Bauer e26e36606f update version check logic in navbar 2020-10-01 08:46:58 -05:00
Andrew Bauer c4cf52c2bc new version notice is now part of the navbar 2020-10-01 08:15:20 -05:00
Andrew Bauer 591a30f1fe fix typo 2020-09-30 13:33:11 -05:00
Andrew Bauer 4bc373105d fix typo 2020-09-30 13:12:58 -05:00
Andrew Bauer 9b9138f113 replace popup calls in montagereview 2020-09-30 12:20:24 -05:00
Andrew Bauer d77b55d1d6 replace popup code in add_monitor 2020-09-30 10:40:13 -05:00
Andrew Bauer 9bb82f6e9a whitespace 2020-09-30 09:25:52 -05:00
Andrew Bauer 2d30d7aafa convert download view to modal 2020-09-30 09:12:54 -05:00
Isaac Connor aa7ba44ed9 Use ->zmaControl instead of invalid zmaControl(). the old zmaControl takes a mid, not a monitor object 2020-09-29 16:48:22 -04:00
Isaac Connor 24d8b99eea test for property_exists to quiet errors 2020-09-29 16:47:49 -04:00
Isaac Connor 3024c46dbb Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-29 14:50:13 -04:00
Andrew Bauer 6eaa8aa211 whitespace 2020-09-29 13:05:00 -05:00
Andrew Bauer 4694ce59bb export event function does not need element 2020-09-29 12:55:57 -05:00