mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-15 10:04:37 -04:00
Code Issues Packages Projects Releases Wiki Activity
22,205 Commits 95 Branches 104 Tags
e2a99052d299ec32039dbcbe7dbbe9071f3045a9
Commit Graph

89 Commits

Author SHA1 Message Date
Isaac Connor
1c538a4bf0 Include Capturing, Analysing, Recording instead of Function 2022-12-14 08:28:21 -05:00
Isaac Connor
0a28a3e659 Add check for REQUEST['entity']. Add missing quotes around state word because it gets executed as code 2022-12-12 13:06:13 -05:00
Isaac Connor
df591a677e Handle when there is no filtering in getNearEvents 2022-12-07 12:27:12 -05:00
Isaac Connor
e08b826843 Add support for lambda functions as post processing. Use the to replace StartDateTimeShort with StartDateTimeFormatted so that dates on viewed events use the specified formatting. 2022-06-21 11:42:18 -04:00
Isaac Connor
909c0e903f Include EndDateTimeShort in event ajax response 2022-02-17 13:30:01 -05:00
Isaac Connor
cb80283398 Merge branch 'master' into timeline_multi_monitor 
update code to use jquery instead of mootools
when only viewing 1 monitor, split view in half
load first event image righ toff the bat
 2022-02-11 18:03:35 -05:00
Isaac Connor
d71a5932f5 Turn off useless shm display in header. Add ram and swap usage 2021-10-14 13:33:29 -04:00
Isaac Connor
4a40214f73 StartTimeShort should be StartDateTimeShort. Leave StartTimeShort for backwards compatibility. Add Storage, DiskSpace in status=>event 2021-06-08 16:58:50 -04:00
Isaac Connor
587cebecbb navbar requests don't pass an auth token so we never send an auth update. Just always send it. 2021-03-13 12:10:35 -05:00
Andrew Bauer
347c64eb7d remove warning 2020-12-01 13:30:57 -06:00
Andrew Bauer
6da826d79c fix typo 2020-12-01 13:29:43 -06:00
Isaac Connor
66f7cc55dc Spacing code comments, quotes 2020-11-13 17:05:23 -05:00
Isaac Connor
ee89eb45e6 Fix EndTime to EndDateTime 2020-11-04 18:39:02 -05:00
Isaac Connor
e085e08caa Fix missed StartTime to StartDateTime 2020-11-04 18:27:51 -05:00
Isaac Connor
1690bcbd38 update auth_relay when we update auth_hash 2020-10-26 18:49:14 -04:00
Isaac Connor
e6f08959fa Fix use of result instead of NearEvents 2020-10-21 10:40:26 -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
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
Isaac Connor
9e6db17e68 Fix getting next event due to case of asc 2020-10-10 11:09:39 -04:00
Isaac Connor
93021f5806 Update getNearEvents to handle when event doesn't exist 2020-10-05 09:30:33 -04:00
Isaac Connor
a19990f4d7 Merge branch 'release-1.34' 2020-08-06 11:57:35 -04:00
Isaac Connor
3242ce6ec9 Handle backticks in matches sort fields. Fixes regression in 1.34.17 2020-08-06 10:37:56 -04:00
Andrew Bauer
2b29a7983a clean up navbar background refresh 2020-08-02 13:01:20 -05:00
Isaac Connor
c2ac7ed4a9 spacing and escape sql fields 2020-07-30 17:07:43 -04:00
Isaac Connor
3f50277e1c Revert effort to escape column names. Not smart enough. 2020-05-12 09:21:05 -04:00
Isaac Connor
eadff23465 Fix missing ) 2020-05-12 09:16:37 -04:00
Isaac Connor
c5f082e7ac fix escaping column names 2020-05-12 09:06:57 -04:00
Isaac Connor
582102c2c6 Fix use of backticks for newer mysql 2020-05-11 09:19:16 -04:00
Isaac Connor
81cd338545 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-05-11 08:34:19 -04:00
Isaac Connor
d23258cb23 Allow for backticks in sort column 2020-05-11 08:34:07 -04:00
Isaac Connor
f1d794c11b spacing and escape sql fields 2020-05-07 13:57:37 -04:00
Isaac Connor
c3a80e7e40 Add MonitorId to event data returned for status request 2020-04-23 11:07:07 -04:00
Isaac Connor
a25c3dfb5c Add MonitorId to event data returned for status request 2020-04-10 11:11:24 -04:00
Isaac Connor
7c21f065bd Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different 2020-03-02 12:07:11 -05:00
Isaac Connor
5f16c10e0a Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different 2020-03-02 11:50:40 -05:00
Isaac Connor
e123e689ca fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in 2019-12-06 14:32:59 -05:00
Isaac Connor
ae7644370f quotes 2019-09-28 14:14:27 -04:00
Isaac Connor
afd10e49d6 spaces, quotes extra braces 2019-09-25 10:13:32 -04:00
Isaac Connor
4e51379087 spacing 2019-05-24 10:00:15 -04: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
e53678f869 Can't use a normal subsitution on the Order by field. So parse the sort param instead 2019-01-23 12:22:00 -05:00
Isaac Connor
326ac60ae4 add missing braces to fix logic 2019-01-21 11:20:56 -05:00
Matt N
02fd1e79b3 Fix ajax/status.php orderby sql injection (#2421) 
https://github.com/LoRexxar/CVE_Request/tree/master/zoneminder%20vul%20before%20v1.32.3#ajaxstatusphp-line-276-orderby-sql-injection
 2019-01-19 09:46:08 -05:00
Isaac Connor
613d885930 != E.id is not sufficient. Since we are enforcing chronological ordering, > and < work better than != 2018-09-30 10:15:04 -04:00
Isaac Connor
c88dc690a6 Make getNearEvents smarter. When Sorting by something other than Id, include Id in the sort so that events with identical starttime for example maintain the correct chronological order. 2018-09-28 13:24:50 -04:00
Isaac Connor
07e7ab1547 fix spacing 2018-04-20 14:21:41 -04:00
Isaac Connor
002f22f685 generateAuthHash is already called earlier in index.php, so it will always be up to date. Just include it in the response. 2018-02-14 13:15:22 -05:00
Isaac Connor
2774fded57 add debugging and put NavBarHTML back in message 2018-02-14 11:57:45 -05:00
Isaac Connor
4df8cdc685 add auth_hash updating to the navbar reload. 2018-02-14 10:44:48 -05:00
Isaac Connor
0d734a880c add hack to ensure that next and previous operate on time 2018-01-28 17:30:49 -05:00