ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,042 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

44 Commits

Author SHA1 Message Date
r01k 02d896abe2 Fixed in export.php "Class 'Filter' not found" and construction of SQL query with wrong syntax 2022-02-04 22:19:15 -05:00
Isaac Connor 6a9ed9c457 Use data-onclick instead of data-on-click-this. 2021-05-25 11:22:43 -04:00
Isaac Connor 51a862057f Fix a link missing a quote 2020-12-11 09:49:43 -05:00
Isaac Connor 3483ee8db1 clean up code a little by make an event_link string and using it. Fix the cause column not being a valid link. I think it used to popup an edit but it should just go to the event view 2020-12-11 09:34:50 -05:00
Isaac Connor 9e6a9cad80 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:53:17 -05:00
Andrew Bauer 699cbed6af add back and refresh buttons to export view 2020-09-27 12:43:12 -05:00
Isaac Connor bf29357455 Merge branch 'release-1.34' 2020-09-19 12:01:21 -04:00
Isaac Connor 9268db14a7 Fix xss reported by Noccolo Picca relating to not sanitizing connkey 2020-09-16 14:14:31 -04:00
Andrew Bauer 21d4773da9 fix badly formatted line 2020-09-15 13:08:44 -05:00
Andrew Bauer da73ecee08 delete commented line 2020-09-15 13:05:05 -05:00
Andrew Bauer 5f361094bb unpopup frames and alarmframes in export view 2020-09-15 13:01:35 -05:00
Andrew Bauer 40eb60f644 unpopup monitor config from export view 2020-09-15 12:52:13 -05:00
Andrew Bauer 121671327c call eventdetail modal rather than popup 2020-09-15 08:55:32 -05:00
Andrew Bauer 1d3ce1c916
must define sortQuery as a global in export view 2020-09-15 08:27:44 -05:00
Isaac Connor bc710bc826 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:33:09 -04:00
Isaac Connor dc451cbc85 Use filter class 2020-08-17 17:42:22 -04:00
Isaac Connor 6feffe2aa9 whitespace 2020-04-04 11:51:39 -04:00
Isaac Connor 1977e48ddd DefaultScale is a member of the Monitor, not the event 2019-12-26 15:21:27 -05:00
Isaac Connor 09a6e06132 change layout from a table to something more bootstrappy. Use the new html_radio function generate the radio buttons for Format and Compression. Remove the data-on-click from the export button because we added setting up the click event in the javascript already 2019-12-02 13:38:23 -05:00
Isaac Connor bce1a48b66 Fix another Monitorid. Fixes #2699 2019-09-05 10:31:22 -04:00
Isaac Connor a5366d522d Fixup exporting 2019-03-20 14:29:05 -04:00
Isaac Connor fd310c0f0a Merge branch 'master' into storageareas 2019-02-22 11:33:47 -05:00
Isaac Connor 8dd8888975
Php namespace (#2537) 
* experiment with namespaces on the Server class

* experiment with namespaces on the Server class

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects
 2019-02-22 09:19:07 -05:00
Isaac Connor 555cb4780d Merge branch 'master' into storageareas 2019-02-10 12:37:45 -05:00
Matthew Noorenberghe 99f1e23c5b Replace usage of PHP_SELF in views/. Fixes #2450 2019-02-09 21:39:19 -08:00
Matthew Noorenberghe 02f09aad7f view=export: Remove inline event handlers and fix arbitrary URL/XSS usage. Fixes #2443 2019-02-09 02:01:26 -08:00
Isaac Connor f49dd93b6a Merge branch 'master' into storageareas 2019-01-16 14:39:56 -05:00
Matt N d33fec9c3f Add a CSP script-src policy with nonce-source and convert more inline event handlers (#2413) 
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy

* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'

Only handle ones that don't return a value.

* Use @data-on-click to attach inline click event handlers with no args and no return value

* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument

* Enforce a script-src CSP on views without inline JS

* Convert some onchange attributes to data-on-change
 2019-01-16 09:59:58 -05:00
Isaac Connor 53f4276cb7 add thumbnails and an mp4 download in the events list 2018-09-25 16:00:01 -04:00
Isaac Connor 40292f3dad Add Compression flag 2018-09-07 09:08:33 -04:00
Isaac Connor d5cab088d6 Merge branch 'master' into add_export_to_filter 2018-09-05 10:33:10 -04:00
Isaac Connor a41ce9c9fe default to exporting all event data 2018-07-17 08:24:19 -04:00
Isaac Connor 05f0338219 use a unique connection key for downloads 2018-07-12 14:07:19 -04:00
Isaac Connor 24a5b78f4c Convert export from a popup to a full page. Add loading events by filter. 2018-07-09 11:59:08 -04:00
Isaac 77b144a13e must specify type=button or else some browsers treat it as a submit button 2018-05-18 16:07:58 +02:00
Isaac cc34a3c566 change button type 2018-01-24 23:08:12 +01:00
Isaac Connor 4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Andrew Bauer 3a94712db2 add translate function 2015-05-10 08:10:30 -05:00
Isaac Connor 01af58018b close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session. 2015-04-20 13:06:34 -04:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
stan ef8f7b85fd Continuing development and bugfixes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-26 09:47:20 +00:00
stan 106882c161 Updated copyright notices 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:48:16 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00