Isaac Connor
|
227e5794fa
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-09-08 18:32:46 -04:00 |
Isaac Connor
|
b2415643f6
|
Add missing Importance member
|
2021-09-08 13:57:46 -04:00 |
Peter Keresztes Schmidt
|
6e96cbe14a
|
Misc: Merge ZM_HAS_V4L with ZM_HAS_V4L2
|
2021-09-08 00:19:08 +02:00 |
r01k
|
79e041d0f0
|
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-08-20 22:42:57 -04:00 |
|
Isaac Connor
|
eb1124c406
|
Spacing and quotes
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
b9efe627f3
|
implement Event->canView
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
301d8fa5fa
|
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-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
a311455526
|
clean up code logic so that if we are executing an unchanged filter we don't do the unecessary save.
|
2021-08-12 13:42:36 -04:00 |
|
Isaac Connor
|
cd3359c3eb
|
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-08-12 12:53:46 -04:00 |
|
Isaac Connor
|
672de6e84f
|
event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it.
|
2021-08-06 19:15:22 -04:00 |
|
Isaac Connor
|
500ced2dc5
|
When locking, use the results to reload the object fields fresh as they may have changed since the object was loaded
|
2021-08-06 19:14:43 -04:00 |
|
Isaac Connor
|
105851b70c
|
Actually delete the snapshot record, not just the event connection
|
2021-08-06 13:17:02 -04:00 |
|
Isaac Connor
|
c6209ce460
|
Store new Model and Manufacturer when saving Monitor
|
2021-07-07 09:47:00 -04:00 |
|
Isaac Connor
|
3bb2b804b3
|
Include Model and Manufacturer to includes in Monitor.php
|
2021-07-07 09:46:36 -04:00 |
|
Isaac Connor
|
24a77d7fb3
|
Add ManufacturerId to Model
|
2021-07-07 09:46:12 -04:00 |
|
Peter Keresztes Schmidt
|
f2bee0704a
|
LocalCamera: Remove support for V4L1
Kernel support for Video4Linux 1 was removed in 2.6.38 (March 2011). It's time to drop support on our side.
|
2021-05-31 23:29:29 +02:00 |
|
Isaac Connor
|
096581b7f1
|
add getMonitorStatuses function to return string values for status numbers
|
2021-05-28 12:29:30 -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
|
0b4c35c58e
|
Merge pull request #3241 from connortechnology/fix_3239
Fix 3239
|
2021-05-19 20:39:42 -04:00 |
|
Isaac Connor
|
da8128aba1
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-05-07 19:16:35 -04:00 |
|
Isaac Connor
|
44e8107cac
|
Fix AlarmedZoneId filter term not working because I wrote AlarmZoneId instead
|
2021-05-02 13:38:06 -04:00 |
|
Isaac Connor
|
7901950c48
|
spacing
|
2021-04-26 09:40:08 -04:00 |
|
Isaac Connor
|
9254c99ab8
|
Add ModectDuringPTZ
|
2021-04-23 14:52:29 -04:00 |
|
Isaac Connor
|
37e0f010e3
|
Require session to be instantiated
|
2021-04-23 09:08:48 -04:00 |
|
Isaac Connor
|
95249d5eb4
|
Merge branch 'release-1.34'
|
2021-04-12 16:32:57 -04:00 |
|
Isaac Connor
|
3335976cba
|
implement remote api Trigger support.
|
2021-04-12 15:59:31 -04:00 |
|
Isaac Connor
|
1b50314f9e
|
Add DisableAlarms function
|
2021-04-12 15:59:31 -04:00 |
|
Isaac Connor
|
7e579fd851
|
Implement Snapshots user permission
|
2021-04-12 15:59:31 -04:00 |
|
Isaac Connor
|
3dcb71933e
|
Add event summary fields to Monitor Object
|
2021-04-09 19:46:25 -04:00 |
|
Isaac Connor
|
2e22cd5c3b
|
Mark snapshot events as Archived
|
2021-04-08 15:20:44 -04:00 |
|
Isaac Connor
|
7e3d6f867e
|
Set the default crf so that encoding works
|
2021-04-01 11:53:57 -04:00 |
|
Isaac Connor
|
6c4e423a8b
|
Spacing
|
2021-03-30 18:20:31 -04:00 |
|
Isaac Connor
|
cbd8b22efb
|
Fix setting value when not empty
|
2021-03-30 14:28:17 -04:00 |
|
Isaac Connor
|
8582c1a652
|
Once again fix saving string value to '' so that we can empty LabelFormat
|
2021-03-30 13:31:26 -04:00 |
|
Isaac Connor
|
beb7a75d5a
|
Implement canView for Monitors
|
2021-03-30 11:52:04 -04:00 |
|
Isaac Connor
|
aeb98ec790
|
Implement canView for Groups. Implement Monitors() and Children() functions. Use canView when populating Group dropdown
|
2021-03-30 11:51:52 -04:00 |
|
Isaac Connor
|
8e1b2ccbc7
|
Add MaxImageBufferCount
|
2021-03-26 17:02:17 -04:00 |
|
Isaac Connor
|
be0841832e
|
enable reporting saving errors back to web ui.
|
2021-03-22 12:59:41 -04:00 |
|
Isaac Connor
|
3fdd2bff7f
|
Have to use === because apparently null == NOW() according to php.
|
2021-03-22 12:59:18 -04:00 |
|
Isaac Connor
|
fa08240a4d
|
Fix set() and __call to use the default value when set value is ''. Fixes issues in monitor view when changing type
|
2021-03-22 12:06:25 -04:00 |
|
Isaac Connor
|
c347261e19
|
Change default of ImageBufferCount to 3
|
2021-03-22 12:05:36 -04:00 |
|
Isaac Connor
|
d0adaeaabe
|
rework user saving action to use User object. Implement a duplicate username check. Deprecate php < 5.3 due to lack of bcrypt password hashing functions. Hence deprecate the use of mysql PASSWORD()
|
2021-03-21 09:18:12 -04:00 |
|
Isaac Connor
|
68f9c7c9e6
|
introduce a _last_error member to the object for reporting errors saving.
|
2021-03-20 19:27:53 -04:00 |
|
Isaac Connor
|
4cb38a119e
|
Fix saving Filters and other objects. Apparently comparing 0 to NOW() doesn't work.
|
2021-03-18 14:09:15 -04:00 |
|
Isaac Connor
|
28700fd56b
|
Implement saving DecodingEnabled from function view
|
2021-03-16 12:09:14 -04:00 |
|
Isaac Connor
|
5eae1c0a9f
|
spacing, add code comment
|
2021-03-13 12:10:55 -05:00 |
|
Isaac Connor
|
b50916e02a
|
Allow unknown columns in filters. Allow specifying the table name in FilterTerm.
|
2021-03-12 10:52:10 -05:00 |
|
Isaac Connor
|
11c2318a05
|
Rough in the ui for Snapshots
|
2021-03-12 09:28:05 -05:00 |
|
Isaac Connor
|
6682ec7da5
|
Add Snapshots and Snapshot_Events Tables. Add HomeView to Users.
|
2021-03-12 09:26:23 -05:00 |
|
Isaac Connor
|
de0bbf7e04
|
Instead of fatal error triggering, turn off file logging and log the error elsewhere
|
2021-03-03 14:31:43 -05:00 |
|
Isaac Connor
|
ce4e133c94
|
Add loading SecondPath in monitor
|
2021-03-03 09:56:33 -05:00 |
|
Isaac Connor
|
4cfe777e93
|
Fix path to Monitor.php
|
2021-02-16 11:16:06 -05:00 |
|
Isaac Connor
|
bb747bfc6d
|
Add RTSPStreamName fields
|
2021-03-01 16:46:48 -05:00 |
|
Isaac Connor
|
5d826fd558
|
Don't try to addup/update DIskSpace used by incomplete events.
|
2021-02-20 17:11:20 -05:00 |
|
Isaac Connor
|
4d739f35ef
|
Fix parseTree when using iS or ISNOT. Add strtoupper comparisons for NULL values.
|
2021-02-20 17:07:07 -05:00 |
|
Isaac Connor
|
0fc4b00ac1
|
Allow null as well as NULL infilter values
|
2021-02-20 12:32:38 -05:00 |
|
Isaac Connor
|
c99f43205d
|
add parenthesis for safety
|
2021-02-18 13:47:27 -05:00 |
|
Isaac Connor
|
c608af4df7
|
Correct timeline when using Weekday
|
2021-02-17 13:11:02 -05:00 |
|
Isaac Connor
|
b58ecca040
|
Allow RTSPServer to be unselected
|
2021-02-17 12:07:55 -05:00 |
|
Peter Keresztes Schmidt
|
687ba03eb4
|
Drop relicts of zma
|
2021-02-10 13:26:25 +01:00 |
|
Isaac Connor
|
c2ac171811
|
truncate file when logging to 255 chars so it gets into the db
|
2021-02-09 14:23:15 -05:00 |
|
Isaac Connor
|
c8af90fd24
|
Add RTSP Server checkbox
|
2021-02-02 23:19:52 -05:00 |
|
Isaac Connor
|
105eff7a21
|
Remove references to zma
|
2021-02-01 17:29:16 -05:00 |
|
Isaac Connor
|
0dc6b60985
|
Use new insert function to allow re-use of monitor Ids
|
2021-02-01 16:44:41 -05:00 |
|
Isaac Connor
|
50e5f84df2
|
introduce insert function to be used when we want specifically to insert a db record instead of being smart about update/insert.
|
2021-02-01 16:44:04 -05:00 |
|
Isaac Connor
|
da7d9c3756
|
Add default for Monitor Name
|
2021-02-01 16:43:24 -05:00 |
|
Isaac Connor
|
e4c6709eca
|
ensure options always has width and height set
|
2021-01-27 13:07:31 -05:00 |
|
Isaac Connor
|
973533c809
|
Use method to handle case where Event wasn't found
|
2021-01-25 18:39:57 -05:00 |
|
Isaac Connor
|
f2fea95f4b
|
Merge branch 'master' into zma_to_thread
|
2021-01-14 13:02:52 -05:00 |
|
Isaac Connor
|
9a824716b5
|
Fix clicking on pills committing the form. Remove hidden inputs and use pills to toggle visibility of divs instead. rename newControl to Control. Use button as the action input
|
2021-01-12 18:41:24 -05:00 |
Andrew Bauer
|
70f73f5475
|
modernize monitors view
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
6dcedb584d
|
modernize monitors view
|
2021-01-05 10:16:51 -06:00 |
|
Isaac Connor
|
284b9f963f
|
Merge branch 'master' into zma_to_thread
|
2020-12-29 12:18:26 -05:00 |
|
Isaac Connor
|
a1917d83d0
|
Merge branch 'master' into zma_to_thread
|
2020-12-22 19:52:09 -05:00 |
|
Isaac Connor
|
381cc30e5d
|
Set default value for DefaultScale to 0 which is ScaleToFit
|
2020-12-18 10:54:08 -05:00 |
|
Isaac Connor
|
0702b64cc4
|
Merge branch 'master' into zma_to_thread
|
2020-12-15 10:51:40 -05:00 |
|
Isaac Connor
|
bfd16db34b
|
add format padding so that right align file size strings will line up nicely.
|
2020-12-11 09:33:36 -05:00 |
|
Isaac Connor
|
f89da79c27
|
Fix comparing empty arrays. explode on an empty string returns an array with a single element '' instead of an empty array
|
2020-12-10 16:25:24 -05:00 |
|
Isaac Connor
|
da8d96ddda
|
Don't pass types to changes, it doesn't do anything. Add DecodingEnabled to request
|
2020-12-10 16:24:09 -05:00 |
|
Isaac Connor
|
ced396e437
|
Add DecodingEnabled to Monitors
|
2020-12-10 14:06:26 -05:00 |
|
Isaac Connor
|
5482d3b3d5
|
Quiet error when calling logout when already logged out
|
2020-12-09 17:56:27 -05:00 |
|
Isaac Connor
|
eb4b7f248d
|
handle sort_field and limit not existing in _REQUEST
|
2020-12-09 17:56:27 -05:00 |
|
Isaac Connor
|
63e36340c6
|
Remove extra }
|
2020-12-08 11:26:52 -05:00 |
|
Isaac Connor
|
bfe5bb0249
|
Include code to handle when we are already logged in but trying to auth with a mismatched auth_hash
|
2020-12-08 11:19:22 -05:00 |
|
Isaac Connor
|
b261fbb397
|
Merge branch 'master' into zma_to_thread
|
2020-12-07 16:26:26 -05:00 |
|
Isaac Connor
|
4d33667a85
|
Merge branch 'release-1.34'
|
2020-12-05 16:51:42 -05:00 |
|
Isaac Connor
|
fdbca4760f
|
dbFetchAll should always return an array. Not null on error
|
2020-12-05 16:38:25 -05:00 |
|
Isaac Connor
|
3a7571dd63
|
undo bogus cache use in Object constructor
|
2020-12-04 15:16:43 -05:00 |
|
Isaac Connor
|
8397ec3b9d
|
Merge branch 'release-1.34'
|
2020-12-01 14:28:10 -05:00 |
|
Isaac Connor
|
baeb1dbd5b
|
Take an optional debug param in dbQuery
|
2020-12-01 14:07:23 -05:00 |
|
Isaac Connor
|
cf08010ebe
|
Fix redirect on zone editing
|
2020-11-18 13:04:56 -05:00 |
|
Andrew Bauer
|
0ffb5e153c
|
modify FilterTerm to support Frames view searches
|
2020-11-14 17:33:18 -06:00 |
|
Isaac Connor
|
3cf31435a7
|
fix next/prev buttons by correcting the sort_field when it is StartTime or EndTime
|
2020-11-13 09:51:54 -05:00 |
|
Isaac Connor
|
df783f4835
|
Merge branch 'master' into zma_to_thread
|
2020-11-12 12:53:55 -05:00 |
|
Isaac Connor
|
fe733fe1e6
|
Must use & instead of & in filter redirect
|
2020-11-11 17:39:37 -05:00 |
|
Isaac Connor
|
73e8c04b6f
|
Fix encoding of = in filter['Id']. Fixes redirect after saving
|
2020-11-11 17:39:20 -05:00 |
|
Isaac Connor
|
b4aacde5bf
|
Remove debug. Auth is pretty solid these days
|
2020-11-10 13:15:46 -05:00 |
|
Isaac Connor
|
5b10fff2a0
|
Use cached objects when using new instead of only find_one
|
2020-11-10 13:14:36 -05:00 |
|
Isaac Connor
|
59403dc11b
|
Move event stat totals to Monitor_Status.
|
2020-11-06 14:00:18 -05:00 |
|
Isaac Connor
|
8029f59eac
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:52:50 -05:00 |