Add Privacy Statement (#2194)
* initial implementation of privacy popup * split the privacy text and run it through translate * change style of toggle button, validate the form * fix copy/paste error * fix typos * display privacy view inline rather than popup * display privacy inline if show_privacy flag set * redirect to console after selection is made * typo * css formatting * update privacy verbiage * create and load default.php * fix typos * fix erroneous copy/paste
This commit is contained in:
Andrew Bauer
Isaac Connor
parent
718bb6bba3
commit
8f0fb0843a
|
|
@ -3882,6 +3882,15 @@ our @options = (
|
|||
readonly => 1,
|
||||
category => 'dynamic',
|
||||
},
|
||||
{
|
||||
name => 'ZM_SHOW_PRIVACY',
|
||||
default => 'yes',
|
||||
description => 'Present the privacy statment',
|
||||
help => '',
|
||||
type => $types{boolean},
|
||||
readonly => 1,
|
||||
category => 'dynamic',
|
||||
},
|
||||
{
|
||||
name => 'ZM_SSMTP_MAIL',
|
||||
default => 'no',
|
||||
|
|
|
|||
|
|
@ -922,6 +922,11 @@ if ( $version ) {
|
|||
zmDbDisconnect();
|
||||
die( "Can't find upgrade from version '$version'" );
|
||||
}
|
||||
# Re-enable the privacy popup after each upgrade
|
||||
my $sql = "update Config set Value = 1 where Name = 'ZM_SHOW_PRIVACY'";
|
||||
my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
|
||||
my $res = $sth->execute( ) or die( "Can't execute: ".$sth->errstr() );
|
||||
$sth->finish();
|
||||
print( "\nDatabase upgrade to version ".ZM_VERSION." successful.\n\n" );
|
||||
}
|
||||
zmDbDisconnect();
|
||||
|
|
|
|||
|
|
@ -863,6 +863,29 @@ if ( canEdit( 'System' ) ) {
|
|||
}
|
||||
} // end switch option
|
||||
}
|
||||
if ( $action == 'privacy' && isset($_REQUEST['option'] ) ) {
|
||||
$option = $_REQUEST['option'];
|
||||
switch( $option ) {
|
||||
case 'decline' :
|
||||
{
|
||||
dbQuery( "update Config set Value = '0' where Name = 'ZM_SHOW_PRIVACY'" );
|
||||
dbQuery( "update Config set Value = '0' where Name = 'ZM_TELEMETRY_DATA'" );
|
||||
$view = 'console';
|
||||
$redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=console';
|
||||
break;
|
||||
}
|
||||
case 'accept' :
|
||||
{
|
||||
dbQuery( "update Config set Value = '0' where Name = 'ZM_SHOW_PRIVACY'" );
|
||||
dbQuery( "update Config set Value = '1' where Name = 'ZM_TELEMETRY_DATA'" );
|
||||
$view = 'console';
|
||||
$redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=console';
|
||||
break;
|
||||
}
|
||||
default: # Enable the privacy statement if we somehow submit something other than accept or decline
|
||||
dbQuery( "update Config set Value = '1' where Name = 'ZM_SHOW_PRIVACY'" );
|
||||
} // end switch option
|
||||
}
|
||||
if ( $action == 'options' && isset($_REQUEST['tab']) ) {
|
||||
$configCat = $configCats[$_REQUEST['tab']];
|
||||
$changed = false;
|
||||
|
|
|
|||
|
|
@ -49,8 +49,14 @@ function loadLanguage( $prefix="" )
|
|||
return( false );
|
||||
}
|
||||
|
||||
if ( $langFile = loadLanguage() )
|
||||
if ( $langFile = loadLanguage() ) {
|
||||
require_once( $langFile );
|
||||
require_once( 'lang/default.php' );
|
||||
foreach ($DLANG as $key => $value) {
|
||||
if ( ! array_key_exists( $key, $SLANG ) )
|
||||
$SLANG[$key] = $DLANG[$key];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -221,6 +221,11 @@ if ( ZM_OPT_USE_AUTH and ! isset($user) ) {
|
|||
$request = null;
|
||||
}
|
||||
|
||||
if ( ZM_SHOW_PRIVACY && canEdit('System') ) {
|
||||
Logger::Debug("Redirecting to privacy" );
|
||||
$view = 'privacy';
|
||||
$request = null;
|
||||
}
|
||||
|
||||
if ( $redirect ) {
|
||||
header('Location: '.$redirect);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
<?php
|
||||
//
|
||||
// ZoneMinder DEFAULT English language file, $Date$, $Revision$
|
||||
// Copyright (C) 2001-2008 Philip Coombes
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; either version 2
|
||||
// of the License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
//
|
||||
|
||||
// The translate function will return the literal name of the key if the key
|
||||
// name does not exist in the language file.
|
||||
|
||||
// This file provides a means to return a result, other than the key name, if
|
||||
// it does not exist in the language file.
|
||||
|
||||
// Simple String Replacements
|
||||
$DLANG = array(
|
||||
'Privacy' => 'Privacy',
|
||||
'PrivacyAbout' => 'About',
|
||||
'PrivacyAboutText' => 'Since 2002, ZoneMinder has been the premier free and open-source Video Management System (VMS) solution for Linux platforms. ZoneMinder is supported by the community and is managed by those who choose to volunteer their spare time to the project. The best way to improve ZoneMinder is to get involved.',
|
||||
'PrivacyContact' => 'Contact',
|
||||
'PrivacyContactText' => 'Please contact us <a href="https://zoneminder.com/contact/">here</a> for any questions regarding our privacy policy or to have your information removed.<br><br>For support, there are three primary ways to engage with the community:<ul><li>The ZoneMinder <a href="https://forums.zoneminder.com/">user forum</a></li><li>The ZoneMinder <a href="https://zoneminder-chat.herokuapp.com/">Slack channel</a></li><li>The ZoneMinder <a href="https://github.com/ZoneMinder/zoneminder/issues">Github forum</a></li></ul><p>Our Github forum is only for bug reporting. Please use our user forum or slack channel for all other questions or comments.</p>',
|
||||
'PrivacyCookies' => 'Cookies',
|
||||
'PrivacyCookiesText' => 'Whether you use a web browser or a mobile app to communicate with the ZoneMinder server, a ZMSESSID cookie is created on the client to uniquely identify a session with the ZoneMinder server. ZmCSS and zmSkin cookies are created to remember your style and skin choices.',
|
||||
'PrivacyTelemetry' => 'Telemetry',
|
||||
'PrivacyTelemetryText' => 'Because ZoneMinder is open-source, anyone can install it without registering. This makes it difficult to answer questions such as: how many systems are out there, what is the largest system out there, what kind of systems are out there, or where are these systems located? Knowing the answers to these questions, helps users who ask us these questions, and it helps us set priorities based on the majority user base.',
|
||||
'PrivacyTelemetryList' => 'The ZoneMinder Telemetry daemon collects the following data about your system:<ul><li>A unique identifier (UUID) <li>City based location is gathered by querying <a href="https://ipinfo.io/geo">ipinfo.io</a>. City, region, country, latitude, and longitude parameters are saved. The latitude and longitude coordinates are accurate down to the city or town level only!<li>Current time<li>Total number of monitors<li>Total number of events<li>System architecture<li>Operating system kernel, distro, and distro version<li>Version of ZoneMinder<li>Total amount of memory<li>Number of cpu cores</ul>',
|
||||
'PrivacyMonitorList' => 'The following configuration parameters from each monitor are collected:<ul><li>Id<li>Name<li>Type<li>Function<li>Width<li>Height<li>Colours<li>MaxFPS<li>AlarmMaxFPS</ul>',
|
||||
'PrivacyConclusionText' => 'We are <u>NOT</u> collecting any image specific data from your cameras. We don’t know what your cameras are watching. This data will not be sold or used for any purpose not stated herein. By clicking accept, you agree to send us this data to help make ZoneMinder a better product. By clicking decline, you can still freely use ZoneMinder and all its features.',
|
||||
);
|
||||
|
||||
?>
|
||||
|
||||
|
|
@ -600,6 +600,18 @@ $SLANG = array(
|
|||
'Preset' => 'Preset',
|
||||
'Presets' => 'Presets',
|
||||
'Prev' => 'Prev',
|
||||
'Privacy' => 'Privacy',
|
||||
'PrivacyAbout' => 'About',
|
||||
'PrivacyAboutText' => 'Since 2002, ZoneMinder has been the premier free and open-source Video Management System (VMS) solution for Linux platforms. ZoneMinder is supported by the community and is managed by those who choose to volunteer their spare time to the project. The best way to improve ZoneMinder is to get involved.',
|
||||
'PrivacyContact' => 'Contact',
|
||||
'PrivacyContactText' => 'Please contact us <a href="https://zoneminder.com/contact/">here</a> for any questions regarding our privacy policy or to have your information removed.<br><br>For support, there are three primary ways to engage with the community:<ul><li>The ZoneMinder <a href="https://forums.zoneminder.com/">user forum</a></li><li>The ZoneMinder <a href="https://zoneminder-chat.herokuapp.com/">Slack channel</a></li><li>The ZoneMinder <a href="https://github.com/ZoneMinder/zoneminder/issues">Github forum</a></li></ul><p>Our Github forum is only for bug reporting. Please use our user forum or slack channel for all other questions or comments.</p>',
|
||||
'PrivacyCookies' => 'Cookies',
|
||||
'PrivacyCookiesText' => 'Whether you use a web browser or a mobile app to communicate with the ZoneMinder server, a ZMSESSID cookie is created on the client to uniquely identify a session with the ZoneMinder server. ZmCSS and zmSkin cookies are created to remember your style and skin choices.',
|
||||
'PrivacyTelemetry' => 'Telemetry',
|
||||
'PrivacyTelemetryText' => 'Because ZoneMinder is open-source, anyone can install it without registering. This makes it difficult to answer questions such as: how many systems are out there, what is the largest system out there, what kind of systems are out there, or where are these systems located? Knowing the answers to these questions, helps users who ask us these questions, and it helps us set priorities based on the majority user base.',
|
||||
'PrivacyTelemetryList' => 'The ZoneMinder Telemetry daemon collects the following data about your system:<ul><li>A unique identifier (UUID) <li>City based location is gathered by querying <a href="https://ipinfo.io/geo">ipinfo.io</a>. City, region, country, latitude, and longitude parameters are saved. The latitude and longitude coordinates are accurate down to the city or town level only!<li>Current time<li>Total number of monitors<li>Total number of events<li>System architecture<li>Operating system kernel, distro, and distro version<li>Version of ZoneMinder<li>Total amount of memory<li>Number of cpu cores</ul>',
|
||||
'PrivacyMonitorList' => 'The following configuration parameters from each monitor are collected:<ul><li>Id<li>Name<li>Type<li>Function<li>Width<li>Height<li>Colours<li>MaxFPS<li>AlarmMaxFPS</ul>',
|
||||
'PrivacyConclusionText' => 'We are <u>NOT</u> collecting any image specific data from your cameras. We don’t know what your cameras are watching. This data will not be sold or used for any purpose not stated herein. By clicking accept, you agree to send us this data to help make ZoneMinder a better product. By clicking decline, you can still freely use ZoneMinder and all its features.',
|
||||
'Probe' => 'Probe',
|
||||
'ProfileProbe' => 'Stream Probe',
|
||||
'ProfileProbeIntro' => 'The list below shows the existing stream profiles of the selected camera .<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that ZoneMinder cannot configure additional profiles and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
h6 {
|
||||
text-align: left;
|
||||
font-weight: bold;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
p {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
ul {
|
||||
text-align: left;
|
||||
list-style-type: disc;
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
function submitForm( element ) {
|
||||
var form = element.form;
|
||||
if ( form.option.selectedIndex == 0 )
|
||||
form.view.value = currentView;
|
||||
else
|
||||
form.view.value = 'none';
|
||||
form.submit();
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
<?php
|
||||
//
|
||||
// ZoneMinder privacy view file, $Date$, $Revision$
|
||||
// Copyright (C) 2001-2008 Philip Coombes
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; either version 2
|
||||
// of the License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
//
|
||||
|
||||
if ( !canEdit( 'System' ) )
|
||||
{
|
||||
$view = "error";
|
||||
return;
|
||||
}
|
||||
|
||||
$options = array(
|
||||
"accept" => translate('Accept'),
|
||||
"decline" => translate('Decline'),
|
||||
);
|
||||
|
||||
$focusWindow = true;
|
||||
|
||||
xhtmlHeaders(__FILE__, translate('Privacy') );
|
||||
?>
|
||||
<body>
|
||||
<div id="page">
|
||||
<div id="header">
|
||||
<h2><?php echo translate('Privacy') ?></h2>
|
||||
<h1>ZoneMinder - <?php echo translate('Privacy') ?></h1>
|
||||
</div>
|
||||
<div id="content">
|
||||
<form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
|
||||
<input type="hidden" name="view" value="none"/>
|
||||
<input type="hidden" name="action" value="privacy"/>
|
||||
<h6><?php echo translate('PrivacyAbout') ?></h6>
|
||||
<p><?php echo translate('PrivacyAboutText') ?></p>
|
||||
<br>
|
||||
|
||||
<h6><?php echo translate('PrivacyContact') ?></h6>
|
||||
<p><?php echo translate('PrivacyContactText') ?></p>
|
||||
<br>
|
||||
|
||||
<h6><?php echo translate('PrivacyCookies') ?></h6>
|
||||
<p><?php echo translate('PrivacyCookiesText') ?></p>
|
||||
<br>
|
||||
|
||||
<h6><?php echo translate('PrivacyTelemetry') ?></h6>
|
||||
<p><?php echo translate('PrivacyTelemetryText') ?></p>
|
||||
<br>
|
||||
|
||||
<p><?php echo translate('PrivacyTelemetryList') ?></p>
|
||||
<p><?php echo translate('PrivacyMonitorList') ?></p>
|
||||
<p><?php echo translate('PrivacyConclusionText') ?></p>
|
||||
<p><?php echo buildSelect( "option", $options ); ?></p>
|
||||
|
||||
<div id="contentButtons">
|
||||
<input type="submit" value="<?php echo translate('Apply') ?>" onclick="submitForm( this )">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue