mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-02 05:06:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
21,670 Commits 80 Branches 104 Tags
46bb48e2c8012aeb8c030efea74b3a1c2ecff847
Commit Graph

1987 Commits

Author SHA1 Message Date
Martin Tiernan
68283c01eb Added length and frames getters 2022-11-21 09:06:38 -06:00
Isaac Connor
22df344880 Merge branch 'master' of ../imouse 2022-11-16 09:23:05 -05:00
Isaac Connor
97e464b342 Comment out debugging 2022-11-15 14:17:30 -05:00
Isaac Connor
a6856c4f94 Merge pull request #3630 from mispdev/fix_db_utf8_connection 
Set web backend DB connection to UTF8
 2022-11-12 15:34:03 -05:00
Isaac Connor
a712ad0605 Merge ../ZoneMinder.connortechnology 2022-11-10 18:10:08 -05:00
Isaac Connor
3e95134448 Remove Debug 2022-11-10 18:07:40 -05:00
Isaac Connor
7ac8a47f3e Fix 500 on saving user due to incorrect scope of g. Fixes #3629 2022-11-10 17:15:39 -05:00
Michael
0d6b8d1de3 Set web backend db connection to utf8 2022-11-10 18:57:35 +01:00
Isaac Connor
4d3dfd84f4 add includes/Monitor_Permission.php 2022-11-03 12:24:14 -04:00
Isaac Connor
24ac383f97 spacing 2022-11-02 17:44:42 -04:00
Isaac Connor
ea6d999654 Must use false === when using array_search because first element returns 0 2022-11-02 17:42:32 -04:00
Isaac Connor
135c52f3ec Fix Group_Permissions() 2022-11-02 15:53:13 -04:00
Isaac Connor
ab3e1811d3 fix canEdit, rough in effectPermission 2022-11-02 15:52:37 -04:00
Isaac Connor
63769a2082 Fix missing ) 2022-11-02 13:26:34 -04:00
Isaac Connor
3c36233dd8 Put in all the new logic for visibleMonitor and editableMonitor referencing Monitor_Permissions and Group_Permissions 2022-11-02 13:25:53 -04:00
Isaac Connor
68bf964eec Add saving of Monitor_Permissions 2022-11-02 13:25:53 -04:00
Isaac Connor
b7490c754b Rough in Group_Permission and Monitor Permissions loading functions. 2022-11-02 13:25:44 -04:00
Isaac Connor
24a83efa79 Improve Monitor canView and canEdit. If the user is not specified, use the cached auth routines in includs/auth.php. Otherwise replicate the logic for the specfied user. 2022-11-02 13:25:44 -04:00
Isaac Connor
16b5551a4a Always return a Group_Permission in Permission() 2022-11-02 13:25:44 -04:00
Isaac Connor
121e864dde Continue roughing in Group_Permission logic 2022-11-02 13:25:44 -04:00
Isaac Connor
a891b528d1 Use Monitor::canView in Event::canView 2022-11-02 13:25:44 -04:00
Isaac Connor
2ee142813e start to rough in an editable monitor function 2022-11-02 12:37:47 -04:00
Isaac Connor
79f5d77fab Add Permission saving to user view 2022-11-02 12:37:47 -04:00
Isaac Connor
3157510f23 Add Permission property 2022-11-02 12:37:47 -04:00
Isaac Connor
9df7283358 Rough in the boilerplate for retrieving Permissions on Groups 2022-11-02 12:37:46 -04:00
Isaac Connor
dd4869fb47 Add object for Group_Permission 2022-11-02 12:36:42 -04:00
Isaac Connor
a67f89ff9e We renamed newUser to user in form elements 2022-11-02 12:36:42 -04:00
Isaac Connor
5734e38f52 Add group permission checking to visibleMonitor 2022-11-02 12:36:42 -04:00
Isaac Connor
d00536915e Move getting time into the scope where it is used 2022-11-02 10:07:01 -04:00
Isaac Connor
52c865cfeb Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-11-01 12:40:51 -04:00
Isaac Connor
5bd50fe575 Add Access-Control-Allow-Credentials: true so that we can pass cookies along with xhr requests. 2022-11-01 08:21:59 -04:00
Isaac Connor
cd4a9fbb98 Merge ../ZoneMinder.connortechnology 2022-10-31 18:01:04 -04:00
Isaac Connor
25100cd592 Fix missed references to oldW and oldH 2022-10-31 09:27:53 -04:00
Isaac Connor
2fb631fa6e Clean up debug. Clone the entire monitor object into oldMonitor instead of cherry-picking properties. Fixes use of new name when deleting old symlink. Always check for existence of monitor dir and symlink after done saving. 2022-10-31 09:27:53 -04:00
Isaac Connor
33455cbad2 Remove left over references to REQUEST['newMonitor']. Add error reporting to creating monitor directory and symlinking when adding a new monitor 2022-10-31 09:27:53 -04:00
Isaac Connor
6b3768fdf6 When saving monitor, only turn off error reporting for symlink. Don't delete old symlink unless the name has changed. 2022-10-31 09:27:53 -04:00
Isaac Connor
586d43798f Rough in model and controller for Event_Data 2022-10-27 14:47:21 -04:00
Isaac Connor
d11bb88f94 rough in array_to_hash_by_key function to generate hashes of Id => Object 2022-10-25 12:56:38 -04:00
Isaac Connor
2e03d91ef7 Fix selecting 0 values in htmlSelect. Fixes not showing ZM_LOG_DATABASE_LEVEL==Info 2022-10-21 16:29:26 -04:00
Isaac Connor
bce8c6195a Don't display errors in Server.php 2022-10-20 16:45:52 -04:00
Isaac Connor
f1843528d0 Put back width and height setting on img tag. Needed for event viewing 2022-10-20 16:45:37 -04:00
Isaac Connor
082ffdf76e Fix SQL for when passing an empty array to find. Return false instead of trying weird sql. 2022-10-20 10:22:56 -04:00
Isaac Connor
84fd4b42d5 Fix test for null in Object::find 2022-10-20 10:22:56 -04:00
Isaac Connor
ff01d4d394 IN () being false could still result in a true result of used in an OR, so instead of just returning, use an always false sql equivalent 2022-10-20 10:22:56 -04:00
Isaac Connor
837d0ece7f return empty array when passing empty as SQLvalue 2022-10-20 10:22:56 -04:00
Isaac Connor
c40d251009 Add setting remoteAddr in session after regenerating 2022-10-17 19:09:24 -04:00
Isaac Connor
9adf5f662f Use REQUEST instead of SESSION to store the post login redirect because we clear the session on login. Fixes #3517 2022-10-17 17:25:56 -04:00
Isaac Connor
22a059d3bc Remove debug 2022-10-17 17:25:46 -04:00
Isaac Connor
9e257def8a Add debug, add validateId function to session handler. Change it to be a a subclass of SessionHandlerInterface so that we don't have to provide createId. Fixes session breakage in php8.2 2022-10-17 17:24:52 -04:00
Isaac Connor
5c8343f737 remoteAddr is set when session is opened. So no need to do it in auth. session_clear closes the session so no need to close it first 2022-10-17 17:23:45 -04:00