a891b528d1
Use Monitor::canView in Event::canView
2022-11-02 13:25:44 -04:00
2ee142813e
start to rough in an editable monitor function
2022-11-02 12:37:47 -04:00
79f5d77fab
Add Permission saving to user view
2022-11-02 12:37:47 -04:00
3157510f23
Add Permission property
2022-11-02 12:37:47 -04:00
9df7283358
Rough in the boilerplate for retrieving Permissions on Groups
2022-11-02 12:37:46 -04:00
dd4869fb47
Add object for Group_Permission
2022-11-02 12:36:42 -04:00
a67f89ff9e
We renamed newUser to user in form elements
2022-11-02 12:36:42 -04:00
5734e38f52
Add group permission checking to visibleMonitor
2022-11-02 12:36:42 -04:00
d00536915e
Move getting time into the scope where it is used
2022-11-02 10:07:01 -04:00
52c865cfeb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-11-01 12:40:51 -04:00
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
cd4a9fbb98
Merge ../ZoneMinder.connortechnology
2022-10-31 18:01:04 -04:00
25100cd592
Fix missed references to oldW and oldH
2022-10-31 09:27:53 -04:00
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
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
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
586d43798f
Rough in model and controller for Event_Data
2022-10-27 14:47:21 -04:00
d11bb88f94
rough in array_to_hash_by_key function to generate hashes of Id => Object
2022-10-25 12:56:38 -04:00
2e03d91ef7
Fix selecting 0 values in htmlSelect. Fixes not showing ZM_LOG_DATABASE_LEVEL==Info
2022-10-21 16:29:26 -04:00
bce8c6195a
Don't display errors in Server.php
2022-10-20 16:45:52 -04:00
f1843528d0
Put back width and height setting on img tag. Needed for event viewing
2022-10-20 16:45:37 -04:00
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
84fd4b42d5
Fix test for null in Object::find
2022-10-20 10:22:56 -04:00
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
837d0ece7f
return empty array when passing empty as SQLvalue
2022-10-20 10:22:56 -04:00
c40d251009
Add setting remoteAddr in session after regenerating
2022-10-17 19:09:24 -04:00
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
22a059d3bc
Remove debug
2022-10-17 17:25:46 -04:00
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
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
20ebbc3c58
Fix saving from the function modal. Put action in the post variables and change the action to save instead of function.
2022-10-14 14:10:46 -04:00
2329dda323
Merge pull request #3609 from connortechnology/fix_non_post_auth
...
Move relevant code out of includes/actions/auth.php into includs/auth…
2022-10-14 14:09:09 -04:00
e116c9ee48
Fix unable to unset LockRows on Filter
2022-10-12 16:57:53 -04:00
d64868a44b
Fix downloads due to chunkSize not being defined
2022-10-11 16:45:03 -04:00
f8eef392d3
Add output_file to includes/functions.php
2022-10-11 16:45:03 -04:00
371f1adbe7
update storage modal to fix buttons not being in form. Also remove duplicate view field and make button action be save instead of Save. Fixes #3605
2022-10-07 15:56:15 -04:00
072e94385b
Make the ajaxError logging be debug level. If the error was actually critical, we will have to log that separately. Most of the errors reported by ajaxError are transient.
2022-10-05 09:31:39 -04:00
2f295a2f55
Make Monitor::Server always return a Server object so we don't have to test for null
2022-09-30 09:57:21 -04:00
340ed19c71
Handle filter[query] not being defined
2022-09-29 14:29:36 -04:00
e4fad02b43
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-09-28 18:37:20 -04:00
8d56949800
Deal with structure of json response from API when getting Janus_Pin
2022-09-28 18:36:47 -04:00
9fc0d26d32
If we don't have session, we can still generate an auth hash. We kinda need this for zmu calls from API
2022-09-28 18:35:59 -04:00
59db9c2d90
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-09-28 17:42:16 -04:00
f5bdbcf0bd
Use new Server::SendToApi to reduce duplicated code. If Janus Not enabled, then don't both with Janus_Pin. If Server is remote, use API to get Janus_Pin. Implementing the API side is left as an exercise.
2022-09-28 17:41:46 -04:00
2a9576371b
Introduce Server::SendToApi to reduce duplicated code.
2022-09-28 17:40:08 -04:00
0b37df3782
Fix scroll to top on option help modals by not having an href=#. Fix css so that the ? still is blue.
2022-09-23 09:34:29 -04:00
8fb6477820
Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516
2022-09-21 16:47:16 +01:00
7d9771e41c
Merge branch 'master' into add_janus_rtsp_user
2022-09-16 18:33:52 -04:00
62b6171934
Only try to set TIMEZONE when loading dateTimeFormatter if it is set. Handle the exception when any of TIMEZONE or LOCALE are invalid.
2022-09-15 14:04:31 -04:00
d1cd7d3f91
Merge branch 'master' into add_janus_rtsp_user
2022-09-14 18:34:07 -04:00
419a44f8ed
Merge branch 'iiot'
2022-09-13 18:23:44 -04:00
b4fc5abe95
Failure to auth by hash is common, the end result is a redirect to login page. Change the log level to INF
2022-09-13 17:59:53 -04:00
8fc60fef12
Moved case-insensitive username checks to SQL
2022-09-12 13:44:18 -04:00
143a00cccc
Fix typo
2022-09-12 13:44:18 -04:00
c90e2f7898
Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516
2022-09-12 13:44:18 -04:00
e9ab7f2f26
Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516
2022-09-12 13:44:18 -04:00
dbcf320808
For mp4, use video tag, with videojs instead of embed
2022-09-12 13:44:18 -04:00
4d2f956827
Move createVideo from functions to Event
2022-09-12 13:44:18 -04:00
eb9ac11d21
fix updating donation reminder. I would always be a month or more
2022-09-12 13:44:18 -04:00
813434e0f4
Fix saving monitor due to MQTT being empty
2022-09-12 13:44:18 -04:00
ce4dd065ff
Use y instead of Y for path generation when using Deep scheme. Fixes #3583
2022-09-12 13:44:18 -04:00
d32fe1cf55
Add Janus_RTSP_User and related UI code
2022-09-12 10:34:26 -04:00
8ba1bbc63c
Set new defaults: Only analysis jpegs, and passthrough on. Label Size => Default. Fix warnings when creating a new MOnitor because Path, User, Pass are unset.
2022-09-09 11:29:32 -04:00
9276ae7d67
calling trim on null is deprecated
2022-09-08 15:11:53 -04:00
c35bbc8c30
Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it
2022-09-07 15:49:47 -05:00
8aaa5e52b3
Merge pull request #3582 from megasaturnv/3516-CaseInsensitiveLogin
...
Issue #3516 case insensitive login
2022-09-06 16:39:53 -04:00
7059e5a1ea
For mp4, use video tag, with videojs instead of embed
2022-09-06 15:41:42 -04:00
3079438038
Move createVideo from functions to Event
2022-09-06 13:46:41 -04:00
ce2aea9615
fix updating donation reminder. I would always be a month or more
2022-09-06 11:22:47 -04:00
1f20b18100
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-09-06 11:22:28 -04:00
d76c425057
Fix saving monitor due to MQTT being empty
2022-09-06 11:22:04 -04:00
6c4fb3e2cd
Moved case-insensitive username checks to SQL
2022-09-05 15:43:53 +01:00
d80026cab1
Fix typo
2022-09-05 15:29:23 +01:00
b611a4fc08
Use y instead of Y for path generation when using Deep scheme. Fixes #3583
2022-09-04 13:53:19 -04:00
6c0f40f570
Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516
2022-09-02 12:03:47 +01:00
63e5b63eec
Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516
2022-09-02 11:58:02 +01:00
4c90bd0ac6
Add a title to the zone polygon
2022-09-01 07:08:39 -04:00
6c8819977e
Cache Group Monitors Ids so we don't query the database multiple times for them.
2022-09-01 07:08:04 -04:00
980e49b547
Don't query for Monitors if there are no Monitors in the Group.
2022-09-01 07:07:55 -04:00
3d1a9c5b2d
Add LIMIT 1 when filtering by AlarmZoneId to speed up
2022-09-01 07:06:46 -04:00
606fb108d5
Fix use of filter instead of this
2022-09-01 07:06:10 -04:00
4eeb49d09a
Merge branch 'master' into reports
2022-08-31 18:38:08 +02:00
1038e2d069
Cache Group Monitors Ids so we don't query the database multiple times for them.
2022-08-31 18:36:57 +02:00
683acbbc1d
Clear Manufacturer and Model so that they don't list as changes
2022-08-31 10:05:52 -04:00
e24432ee4d
Merge branch 'master' into reports
2022-08-30 19:40:14 +02:00
85c59970a6
Add a title to the zone polygon
2022-08-30 19:36:07 +02:00
4668534bf9
Don't query for Monitors if there are no Monitors in the Group.
2022-08-30 19:35:47 +02:00
54f87aa4cf
Add LIMIT 1 when filtering by AlarmZoneId to speed up
2022-08-30 19:34:51 +02:00
d6fea1c740
Don't specify return type as old php doesn't support it. maybe Fixes #3579
2022-08-30 10:40:00 -04:00
855dd6ac93
Use HTTP_X_FORWARDED_HOST or HTTP_X_FORWARDED_SERVER if present to get correct hostname to use when behind a reverse proxy.
2022-08-26 14:12:25 -04:00
29750a56e7
Merge branch 'master' into add_mqtt
2022-08-25 18:37:54 -04:00
6ae05d7009
Rework to not use strlen and strlen now complains if you pass it null
2022-08-22 11:46:57 -04:00
d51a2eb8a5
Merge pull request #3537 from parvit/issue-695
...
Added configuring of authentication for rstp cameras
2022-08-21 18:08:00 -04:00
442d7b1c89
integrated dynamic client and server update of path, user and password values
2022-08-18 05:05:18 -04:00
4bd7fc8fcf
Clear out width=auto and height=auto to prevent warnings in logs
2022-08-17 15:34:39 -04:00
9501da8a41
Remove debug
2022-08-15 17:59:25 -04:00
0078a6f639
Log entire backtrace when invalid value for width
2022-08-10 09:18:39 -04:00
d41792ae00
Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues
2022-08-09 00:54:41 -05:00
b01c75ab76
Modify config.php.in
...
Modifies config.php to use ZM_TIMEZONE if defined by user
2022-08-05 06:40:23 -06:00
6bc0ec6aab
Add Report ORM
2022-08-04 09:35:25 -04:00
ad764ca0bb
rough in major actions for reports
2022-08-04 09:11:24 -04:00
ca1ad2e2e4
Fix use of filter instead of this
2022-08-04 09:07:33 -04:00
e27e1c0991
Add backtrace to invalid value for width
2022-08-03 14:30:18 -04:00
f4b8066d00
Add backtrace to invalid value for width
2022-08-03 12:28:39 -04:00
45697c7da9
Merge branch 'master' into reports
2022-08-03 11:57:07 -04:00
cf3c194e21
Handle when there are no servers and hence no defined ServerId in newMonitor
2022-08-03 11:55:44 -04:00
5776a766e1
fixup logic inversion on test_post_sql_conditions. condense code.
2022-07-29 13:59:21 -04:00
c937169a6b
Fix logic inversion on test_pre_sql_conditions
2022-07-29 13:50:40 -04:00
d8dea37c88
When selecting AlarmedZone, must check for SCore > 0.
2022-07-28 16:33:38 -04:00
2ba7d4d0b5
Rough in a function Events() to return Event objects from a Filter.
2022-07-24 20:37:32 -04:00
bfeee1ed09
rename Onvif_Alarm_Txt to ONVIF_Alarm_Text
2022-07-23 16:08:27 -04:00
981769b9db
Allows users to set an specific "Onvif alarm text" for each monitor ( #3535 )
...
* Allows users to set an specific "Onvif alarm text" for each monitor
With this personalization the cameras that use strings different to "MotionAlarm"
such as Dahua, will be able to process their Onvif alarms. To make it easier, the change
sets a default "Alarm Text" value for it to work out of the box and then allows to
modify it according to the particular necessities of each brand. It consists of
a new column on table Monitors, changes on Monitors.h, Monitors.cpp and a change
on UI to manage the value of Alarm Text per camera.
Updated es_la.php language file.
Co-authored-by: ovargasp <ovargasp@hoitmail.com>
2022-07-20 12:51:13 -05:00
e84a1477ff
put back ?>
2022-07-14 13:19:10 -04:00
9ad7ce3823
Remove remaining locale stuff from language files
2022-07-14 13:16:49 -04:00
56828f4d48
Add Id=0 for default user
2022-07-12 17:31:41 -04:00
2988d49454
When saving a layout, check for System[edit] or ownership of the layout.
2022-07-12 17:31:30 -04:00
64ed7370b6
Add UserId field to MontageLayouts
2022-07-12 17:30:54 -04:00
4dbe66779a
Implement CMD_ZOOMSTOP
2022-06-17 15:11:27 -04:00
2141a5dd1c
Don't include 0 width in janus video tag
2022-06-15 13:08:48 -04:00
cf88497c77
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-06-15 12:42:07 -04:00
c189250a61
Add AnalysisImage and options to MOnitor object
2022-06-15 11:27:48 -04:00
a578370970
Add filter terms for snapshots
2022-06-09 12:13:58 -04:00
866ad4f5e2
Don't turn '0' into ''
2022-06-07 09:44:37 -04:00
af2f1cc6e6
Update config.php.in
2022-06-07 12:33:41 +03:00
4a6ad1f880
move dateFormatters to config. This is so that they get setup even if not using index.php. Like cakephp for example.
2022-06-02 20:13:37 -04:00
beec86fda2
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-06-02 20:09:33 -04:00
73977c518d
use zm_setcookie function with will set required cookie fields so that cookie actually gets set
2022-06-02 15:11:47 -04:00
7b5a0bc775
Use dateTimeFOrmatter to format the date/time on log entries
2022-06-01 15:49:09 -04:00
eaa94ce370
update format string to date() format instead of strftime format
2022-06-01 15:48:50 -04:00
eb5c1372c7
convert from strftime() to date() when forming sql
2022-06-01 15:47:19 -04:00
907cdcd952
convert from strftime() to date() when forming the event path
2022-06-01 15:46:53 -04:00
7c0dcfcefc
handle various functions no longer dealing with null
2022-06-01 13:01:40 -04:00
553c79d8f9
Put back ctype_digit and quoting of the sql to fix loading object in new
2022-06-01 12:59:09 -04:00
976de0606f
Add default value for Storage Path
2022-06-01 11:20:28 -04:00
c00fd25c30
Add default value for Username
2022-06-01 11:20:16 -04:00
7ef965c100
Test for values being trueish as passing null to strcmp is deprecated
2022-06-01 10:41:07 -04:00
8f2b8bf478
Test for is_array first, get rid of ctype_digit test as passing a null to it is deprecated
2022-06-01 10:40:31 -04:00
b47d036b89
Use date() instead of strftime() for date formatting now that strftime is deprecated
2022-06-01 10:37:04 -04:00
d97ef46b57
Add defaults for RecordingSource and AnalysisSource to prevent warnings when creating new monitor
2022-05-30 14:28:38 -04:00
e11030095c
Add mode=single option
2022-05-30 13:35:36 -04:00
1314295020
Don't update DiskSpace with a 0 value when listing events. This generally happens with missing events and causes too much contention on the Events and summaries tables
2022-05-30 10:26:04 -04:00
8254e12fa6
Fix password_type test on REQUEST['password'] instead of user['Password'] causing password migrations to not happen
2022-05-18 18:59:56 -04:00
acd63ee0d8
Don't assuming we want to communicate with zms if streaming.
2022-05-11 10:21:44 -04:00
e26aa6d0ae
Set samesite for session ZMSESSID cookie for php < 7.3
2022-05-10 20:22:44 -04:00
997c1197cf
Implement decoding=Keyframes + OnDemand
2022-05-10 14:25:34 -04:00
76f01647f1
define CMD_GET_IMAGE for completeness
2022-05-07 19:39:01 -04:00
2f25421cf0
Spacing
2022-05-07 19:39:01 -04:00
dff60e5a0b
Need a ; before report-uri
2022-05-04 13:02:34 -04:00
e3787d05e1
Use Content-Security-Policy: for all views instead of Report-Only
2022-05-04 12:08:17 -04:00
74fd90cfdd
Remove loading=lazy, it breaks ajax
2022-04-28 17:14:06 -04:00
84ae91fe24
Comment out width and height setting on the imageFrame
2022-04-28 15:45:35 -04:00
2a7217ec0d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-04-27 15:55:12 -04:00
0cb15d3418
Remove extra { breaking ptz
2022-04-23 19:29:04 -04:00
07e6ae931f
Add mid and zid to zone polygon so that we can use them in atached onclicks
2022-04-22 15:50:00 -04:00
91a5642edc
merge
2022-04-19 17:07:20 -04:00
1eaeccc564
Handle zones not being set in options
2022-04-19 12:31:43 -04:00
7b5ee86ee8
Move svg zone display into Monitor->getStreamHTML. Remove most of it because scaling is now automatic. Move styling to css
2022-04-10 18:54:01 -04:00
e8391ad0be
Move collapsed status to Monitor.php and put back setting width and height on the monitorStream container.
2022-04-10 17:28:38 -04:00
906951e450
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-04-06 10:37:10 -04:00
0e337cd8bf
Remove support for Cambozola which no longer works or is needed.
2022-04-06 10:37:02 -04:00
4fd027fbcc
Fix test for chrome version 7 by not including periods. We only care about the major and php is confused.
2022-04-04 17:03:36 -04:00
ed7c139fb3
Add backtrace to ajaxError
2022-04-04 15:00:33 -04:00
d0ee8dc6fd
remove duplicated factor code, define speed so that it doesn't generate an error if not HasSpeed in Control.
2022-03-29 17:19:31 -04:00
723c10ca19
Cleanup options, add DecodingOptions
2022-03-28 17:45:01 -04:00
0397c4f7e8
Add MQTT_Enabled and MQTT_Subscriptions to Monitor object
2022-03-21 16:08:13 -04:00
531793276f
Fix auth'd user information being saved to session before switching session id's leaving bogus authenticated user in previous session.
2022-03-21 15:31:44 -04:00
23aa41091f
Add Trigger/etc to onMotion recording option
2022-03-20 19:13:46 -04:00
f49601a173
Add filtering to Username to prevent XSS
2022-03-10 14:09:41 -05:00
0c31e35b4e
Add classes to fields of monitor status so we can style them as needed
2022-03-04 12:06:49 -05:00
e33b41745d
Merge branch 'master' into replace_function_concept
2022-02-27 14:04:01 -05:00
13251b133a
Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options
2022-02-27 14:03:37 -05:00
9b0714d20d
Fix use of value instead of val in filter term
2022-02-25 14:14:02 -05:00
b32164e992
Add handling of NOT IN and =\[\] and \!\[\]
2022-02-22 08:31:41 -05:00
ce267c7e3c
Most programmatic images are lazy.
2022-02-22 08:31:02 -05:00
cd2c977ed8
Merge branch 'master' into replace_function_concept
2022-02-16 14:25:38 -05:00
8b14885541
Add handling of NOT IN and =\[\] and \!\[\]
2022-02-15 18:52:46 -05:00
485cc26065
Merge branch 'master' into replace_function_concept
2022-02-12 22:17:47 -05:00
9fee64b62f
detaint language file.
2022-02-08 14:31:01 -05:00
2db781ed44
Test for valid language file when saving user.
2022-02-08 14:30:53 -05:00
8cdd96f286
Implement a check on change of language. Make sure that the specified language file exists. Reports errors to UI
2022-02-08 13:29:51 -05:00
f66a463574
Merge branch 'master' into replace_function_concept
2022-02-08 12:07:30 -05:00
390d77a924
Replace Function with Capturing
2022-02-08 11:21:36 -05:00
38c9ac1521
Update state action, replacing Function with Recording, Analysing, Capturing. Redirect to console instead of switching view.
2022-02-08 11:20:27 -05:00
aad79d3407
Rename MonitorAnalysingOptions => AnalysingOptions as they will have to be prefixed with module name anyways.
2022-02-08 11:19:36 -05:00
5078eecdfd
Add in get_networks and get_subnets as utilities to parse devices and networks in preparation for scanning/probing
2022-02-07 12:31:31 -05:00
69053424cd
When adding a new monitor, ModelId and ManufacturerId are not defined, so handle that
2022-02-06 19:06:35 -05:00
b3092f2f59
Add special handling for skip_locked, as it is a checkbox. Don't update REQUEST['Id'] on execute so we can redirect to the original filter.
2022-02-03 17:31:37 -05:00
a6dc7ba0fc
Add debugging, but commented out
2022-02-03 17:30:38 -05:00
7515711eb8
Implement Server function which figures out which Server likely has the video. Use it to remove duplicate logic
2022-02-03 14:45:17 -05:00
bd68b9e3af
Not ready for OutputSource yet
2022-02-02 17:10:05 -05:00
10e39b3b13
:wqMerge branch 'master' into replace_function_concept
2022-02-02 17:08:01 -05:00
1f9e654821
Default limit to 0 which means no limit
2022-02-02 12:28:58 -05:00
23bfbcd6ce
Merge branch 'master' into multistream
2022-01-26 10:13:20 -05:00
ec9403fb6f
Adds Amcrest On-camera Motion Detection
2022-01-25 22:38:00 -06:00
8125aa633b
Merge branch 'ZoneMinder:master' into master
2022-01-22 12:20:13 -06:00
ce2d605b3d
load Private as well as Name,Value from Config
2022-01-22 12:31:15 -05:00
52e48c02b6
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
2022-01-21 22:23:41 -06:00
4bf55b1af1
Use net zm_setcookie
2022-01-20 09:48:09 -05:00
3cd6fbdc12
Use net zm_setcookie
2022-01-20 09:48:02 -05:00
9395b7e47c
Use net zm_setcookie
2022-01-20 09:47:53 -05:00
a57206ef54
Implement getMonitorStateHTML to synchronize it between montage and live view, cycle etc. Reuseable code. Also the structure is required by MonitorStream.js
2022-01-20 09:47:36 -05:00
db866fa668
Implement zm_setcookie to simplify setting cookies, set samesite, deal with older php etc. Use it.
2022-01-20 09:46:38 -05:00
fb832e7d1b
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
2022-01-19 00:14:52 -06:00
d00aaa11e9
default JanusEnabled to 0 so that we can turn it off
2022-01-18 23:02:26 -05:00
3241fa59c5
Don't redirect if there was an error so that we display it
2022-01-18 23:02:26 -05:00
3835087c9d
Merge branch 'master' into multistream
2022-01-18 20:16:08 -05:00
9e9bdd183c
Merge branch 'ZoneMinder:master' into janus
2022-01-14 14:05:23 -06:00
7c1ba721aa
Preface Debug with ZM
2022-01-13 22:15:02 -05:00
a414506a5e
Preface Debug with ZM
2022-01-13 22:14:14 -05:00
3a9c16aeea
First working Janus build
2022-01-10 23:22:37 -06:00
fd3a70172d
Merge branch 'master' into multistream
2022-01-10 17:51:50 -05:00
a679455a0b
Merge branch 'master' into merge_work_on_zms
2022-01-07 16:22:51 -05:00
cfac99be4e
better debugging when the row has no Id
2022-01-07 16:21:49 -05:00
df0a0c7853
Add CMD_ANALYZE_ON and OFF
2022-01-07 13:50:40 -05:00
1333d8c751
Adds ONVIF Motion Detection Support
2022-01-06 16:45:15 -06:00
6bd04de5f6
Merge branch 'master' into multistream
2021-12-31 17:53:36 -05:00
4dd454325c
use options[maxfps] instead of always specifying 30fps.
2021-12-16 16:36:38 -05:00
30e4d72c1d
Implement CMD_MAXFPS
2021-12-16 16:36:12 -05:00
6b18b2889d
Add skip_locked and ExecuteInterval
2021-12-13 15:01:17 -05:00
a9ef5bf731
Add STATE_UNKNOWN and correct values of other states
2021-12-09 12:36:03 -05:00
45559123af
Add numCoords, Coords, Area, AlarmRGB to Zone object. Also add Points(), AreaCoords, svg_polygon utility functions to it.
2021-12-05 17:45:26 -05:00
1277e75278
Detect group hierarchy loops and break them.
2021-12-03 13:25:50 -05:00
21218491f7
Add EventStartCommand and EventEndCommand to monitors ui
2021-11-26 19:22:07 -05:00
836fe8c2b1
spacing
2021-11-17 18:57:44 -05:00
b1d881b118
Report more saving errors to ui
2021-11-17 18:57:36 -05:00
a0666e777a
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-11-17 17:45:47 -05:00
c37d8eeded
spacing and report save errors
2021-11-17 17:45:38 -05:00
71c29afa7b
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-11-15 09:47:34 -05:00
98e29e7ef6
implement UrlToZMS in Monitor
2021-11-12 15:11:48 -05:00
944c04e5b4
Whitespace
2021-11-12 15:11:48 -05:00
193f349e38
implement Event::canEdit
2021-11-12 13:37:01 -05:00
4c2d50c1f4
implement UrlToZMS in Monitor
2021-11-10 14:18:58 -05:00
e617eb8615
Whitespace
2021-11-09 13:59:14 -05:00
1fd99424bb
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-11-05 10:13:41 -04:00
fb67c6a3e7
Add defaults for Capturing, Analysing, Recording
2021-10-25 16:53:42 -04:00
0c222f66ee
Add sort_asc, sort_field and limit to the filter QueryString
2021-10-25 12:34:51 -04:00
16d0e269df
WHen saving v4l settings redirect back to watch instead of console.
2021-10-19 12:39:37 -04:00
8d1c45162d
Add functions to return options for Capturing, Analysing, AnalysisSource, Recording, RecordingSource
2021-10-16 20:35:11 -04:00
7bda103b99
WHen saving v4l settings redirect back to watch instead of console.
2021-10-16 18:30:55 -04:00
a465403c72
Handle when SERVER['HTTP_HOST'] is not set
2021-10-05 19:49:42 -04:00
c72d34f176
fix validInt to take negative integers. Introduce validCardinal to handle positive integers
2021-10-05 19:49:42 -04:00
1f04723f3a
dbError is supposed to take the sql that caused the error. So pass something to satisfy php
2021-10-05 19:49:42 -04:00
2f12615f08
assign REQUEST['newMonitor'] to a variable to simplify code. Fixup ModelId and ManufacturerId saving.
2021-09-25 10:33:16 -04:00
7ca7d40b6f
Add defaults for ModelId and ManufacturerId. Fixes the methods for loading them
2021-09-25 10:32:04 -04:00
227e5794fa
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-08 18:32:46 -04:00
b2415643f6
Add missing Importance member
2021-09-08 13:57:46 -04:00
6e96cbe14a
Misc: Merge ZM_HAS_V4L with ZM_HAS_V4L2
2021-09-08 00:19:08 +02:00
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
eb1124c406
Spacing and quotes
2021-08-18 10:53:59 -04:00
b9efe627f3
implement Event->canView
2021-08-18 10:53:59 -04:00
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
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
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
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
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
105851b70c
Actually delete the snapshot record, not just the event connection
2021-08-06 13:17:02 -04:00
c6209ce460
Store new Model and Manufacturer when saving Monitor
2021-07-07 09:47:00 -04:00
3bb2b804b3
Include Model and Manufacturer to includes in Monitor.php
2021-07-07 09:46:36 -04:00
24a77d7fb3
Add ManufacturerId to Model
2021-07-07 09:46:12 -04:00
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
096581b7f1
add getMonitorStatuses function to return string values for status numbers
2021-05-28 12:29:30 -04:00
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
0b4c35c58e
Merge pull request #3241 from connortechnology/fix_3239
...
Fix 3239
2021-05-19 20:39:42 -04:00
da8128aba1
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-05-07 19:16:35 -04:00
44e8107cac
Fix AlarmedZoneId filter term not working because I wrote AlarmZoneId instead
2021-05-02 13:38:06 -04:00
7901950c48
spacing
2021-04-26 09:40:08 -04:00
9254c99ab8
Add ModectDuringPTZ
2021-04-23 14:52:29 -04:00
37e0f010e3
Require session to be instantiated
2021-04-23 09:08:48 -04:00
95249d5eb4
Merge branch 'release-1.34'
2021-04-12 16:32:57 -04:00
3335976cba
implement remote api Trigger support.
2021-04-12 15:59:31 -04:00
1b50314f9e
Add DisableAlarms function
2021-04-12 15:59:31 -04:00
7e579fd851
Implement Snapshots user permission
2021-04-12 15:59:31 -04:00
3dcb71933e
Add event summary fields to Monitor Object
2021-04-09 19:46:25 -04:00
2e22cd5c3b
Mark snapshot events as Archived
2021-04-08 15:20:44 -04:00
7e3d6f867e
Set the default crf so that encoding works
2021-04-01 11:53:57 -04:00
6c4e423a8b
Spacing
2021-03-30 18:20:31 -04:00
cbd8b22efb
Fix setting value when not empty
2021-03-30 14:28:17 -04:00
8582c1a652
Once again fix saving string value to '' so that we can empty LabelFormat
2021-03-30 13:31:26 -04:00
beb7a75d5a
Implement canView for Monitors
2021-03-30 11:52:04 -04:00
aeb98ec790
Implement canView for Groups. Implement Monitors() and Children() functions. Use canView when populating Group dropdown
2021-03-30 11:51:52 -04:00
8e1b2ccbc7
Add MaxImageBufferCount
2021-03-26 17:02:17 -04:00
be0841832e
enable reporting saving errors back to web ui.
2021-03-22 12:59:41 -04:00
3fdd2bff7f
Have to use === because apparently null == NOW() according to php.
2021-03-22 12:59:18 -04:00
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
c347261e19
Change default of ImageBufferCount to 3
2021-03-22 12:05:36 -04:00
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
68f9c7c9e6
introduce a _last_error member to the object for reporting errors saving.
2021-03-20 19:27:53 -04:00
4cb38a119e
Fix saving Filters and other objects. Apparently comparing 0 to NOW() doesn't work.
2021-03-18 14:09:15 -04:00
28700fd56b
Implement saving DecodingEnabled from function view
2021-03-16 12:09:14 -04:00
5eae1c0a9f
spacing, add code comment
2021-03-13 12:10:55 -05:00
b50916e02a
Allow unknown columns in filters. Allow specifying the table name in FilterTerm.
2021-03-12 10:52:10 -05:00
11c2318a05
Rough in the ui for Snapshots
2021-03-12 09:28:05 -05:00
6682ec7da5
Add Snapshots and Snapshot_Events Tables. Add HomeView to Users.
2021-03-12 09:26:23 -05:00
de0bbf7e04
Instead of fatal error triggering, turn off file logging and log the error elsewhere
2021-03-03 14:31:43 -05:00
ce4e133c94
Add loading SecondPath in monitor
2021-03-03 09:56:33 -05:00
4cfe777e93
Fix path to Monitor.php
2021-02-16 11:16:06 -05:00
bb747bfc6d
Add RTSPStreamName fields
2021-03-01 16:46:48 -05:00
5d826fd558
Don't try to addup/update DIskSpace used by incomplete events.
2021-02-20 17:11:20 -05:00
4d739f35ef
Fix parseTree when using iS or ISNOT. Add strtoupper comparisons for NULL values.
2021-02-20 17:07:07 -05:00
0fc4b00ac1
Allow null as well as NULL infilter values
2021-02-20 12:32:38 -05:00
Isaac Connor
Isaac Connor
megasaturnv
Jonathan Bennett
parvit (Vittorio Parrella)
ovargasp
ovargasp
Ingemārs
tftadmin Appleton
Ben Dailey
Peter Keresztes Schmidt
r01k