Skip to content
Permalink
Browse files

Privacy: Make GDPR enabled by default and allow disabling it by setti…

…ng disable_gdpr in configuration.php - refs #2628
  • Loading branch information...
ywarnier committed Aug 10, 2018
1 parent ac9adc6 commit 223dcb92f0ff00916f391396b92d44549e911581
Showing with 25 additions and 23 deletions.
  1. +21 −19 main/admin/index.php
  2. +1 −1 main/inc/lib/social.lib.php
  3. +2 −2 main/install/configuration.dist.php
  4. +1 −1 main/social/personal_data.php
@@ -534,29 +534,31 @@
}
}
// Data protection
$blocks['data_privacy']['icon'] = Display::return_icon(
'platform.png',
get_lang('Platform'),
[],
ICON_SIZE_MEDIUM,
false
);
$blocks['data_privacy']['label'] = api_ucfirst(get_lang('PersonalDataPrivacy'));
$blocks['data_privacy']['class'] = 'block-admin-platform';
$blocks['data_privacy']['editable'] = false;
if (!api_get_configuration_value('disable_gdpr')) {
$items = [];
// Data protection
$blocks['data_privacy']['icon'] = Display::return_icon(
'platform.png',
get_lang('Platform'),
[],
ICON_SIZE_MEDIUM,
false
);
$blocks['data_privacy']['label'] = api_ucfirst(get_lang('PersonalDataPrivacy'));
$blocks['data_privacy']['class'] = 'block-admin-platform';
$blocks['data_privacy']['editable'] = false;
$items[] = [
'url' => api_get_path(WEB_CODE_PATH).'admin/user_list_consent.php',
'label' => get_lang('UserList'),
];
$items = [];
$blocks['data_privacy']['items'] = $items;
$blocks['data_privacy']['extra'] = null;
$blocks['data_privacy']['search_form'] = null;
$items[] = [
'url' => api_get_path(WEB_CODE_PATH).'admin/user_list_consent.php',
'label' => get_lang('UserList'),
];
$blocks['data_privacy']['items'] = $items;
$blocks['data_privacy']['extra'] = null;
$blocks['data_privacy']['search_form'] = null;
}
/* Chamilo.org */
$blocks['chamilo']['icon'] = Display::return_icon(
'platform.png',
@@ -1021,7 +1021,7 @@ public static function show_social_menu(
';
}
if (api_get_configuration_value('enable_gdpr')) {
if (!api_get_configuration_value('disable_gdpr')) {
$active = $show == 'personal-data' ? 'active' : null;
$personalData = '
<li class="personal-data-icon '.$active.'">
@@ -933,8 +933,8 @@
//$_configuration['allow_teachers_to_classes'] = false;
// GDPR: European's General Data Protection Rules activation option
// Set to true to automatically enable a new personal data page inside the social network menu
// $_configuration['enable_gdpr'] = false;
// Set to true to disable the new personal data page inside the social network menu
// $_configuration['disable_gdpr'] = true;
// GDPR requires users to be informed of the Data Protection Officer name and contact point
// These can only be defined here for now, but will be moved to web settings in the future.
@@ -12,7 +12,7 @@
api_block_anonymous_users();
if (!api_get_configuration_value('enable_gdpr')) {
if (api_get_configuration_value('disable_gdpr')) {
api_not_allowed(true);
}

0 comments on commit 223dcb9

Please sign in to comment.
You can’t perform that action at this time.