Internal: Remove show_conditions_to_user and gdpr/my_terms extra fields

Author: christianbeeznest

public/main/admin/user_edit.php

@@ -372,20 +372,6 @@ function confirmation(name) {
 });
 </script>';
 
-// Freeze user conditions, admin cannot updated them
-$extraConditions = api_get_setting('profile.show_conditions_to_user', true);
-
-if ($extraConditions && isset($extraConditions['conditions'])) {
-    $extraConditions = $extraConditions['conditions'];
-    foreach ($extraConditions as $condition) {
-        /** @var HTML_QuickForm_group $element */
-        $element = $form->getElement('extra_'.$condition['variable']);
-        if ($element) {
-            $element->freeze();
-        }
-    }
-}
-
 // Submit button
 $form->addButtonSave(get_lang('Save'));
 

public/main/auth/profile.php

@@ -353,19 +353,6 @@ function show_image(image,width,height) {
 }
 //    SUBMIT
 $form->addButtonUpdate(get_lang('Save settings'), 'apply_change');
-
-// Student cannot modified their user conditions
-$extraConditions = api_get_setting('profile.show_conditions_to_user', true);
-if ($extraConditions && isset($extraConditions['conditions'])) {
-    $extraConditions = $extraConditions['conditions'];
-    foreach ($extraConditions as $condition) {
-        $element = $form->getElement('extra_'.$condition['variable']);
-        if ($element) {
-            $element->freeze();
-        }
-    }
-}
-
 $form->setDefaults($user_data);
 
 $filtered_extension = false;

public/main/auth/registration.php

@@ -155,30 +155,6 @@
     );
 }
 
-$settingConditions = api_get_setting('profile.show_conditions_to_user', true);
-$extraConditions = 'false' !== $settingConditions ? $settingConditions : [];
-if ($extraConditions && isset($extraConditions['conditions'])) {
-    // Create user extra fields for the conditions
-    $userExtraField = new ExtraField('user');
-    $extraConditions = $extraConditions['conditions'];
-    foreach ($extraConditions as $condition) {
-        $exists = $userExtraField->get_handler_field_info_by_field_variable($condition['variable']);
-        if (false == $exists) {
-            $params = [
-                'value_type' => ExtraField::FIELD_TYPE_CHECKBOX,
-                'variable' => $condition['variable'],
-                'display_text' => $condition['display_text'],
-                'default_value' => '',
-                'visible_to_self' => 0,
-                'visible_to_others' => 0,
-                'changeable' => 0,
-                'filter' => 0,
-            ];
-            $userExtraField->save($params);
-        }
-    }
-}
-
 $form = new FormValidator('registration');
 $userAlreadyRegisteredShowTerms = false;
 $termRegistered = Session::read('term_and_condition');
@@ -697,33 +673,6 @@ function ($email) {
 
 $course_code_redirect = Session::read('course_redirect');
 $sessionToRedirect = Session::read('session_redirect');
-
-if ($extraConditions && $extraFieldsLoaded) {
-    // Set conditions as "required" and also change the labels
-    foreach ($extraConditions as $condition) {
-        /** @var HTML_QuickForm_group $element */
-        $element = $form->getElement('extra_'.$condition['variable']);
-        if ($element) {
-            $children = $element->getElements();
-            /** @var HTML_QuickForm_checkbox $child */
-            foreach ($children as $child) {
-                $child->setText(get_lang($condition['display_text']));
-            }
-            $form->setRequired($element);
-            if (!empty($condition['text_area'])) {
-                $element->setLabel(
-                    [
-                        '',
-                        '<div class="form-control" disabled=disabled style="height: 100px; overflow: auto;">'.
-                        get_lang(nl2br($condition['text_area'])).
-                        '</div>',
-                    ]
-                );
-            }
-        }
-    }
-}
-
 $tpl = new Template($toolName);
 $textAfterRegistration = '';
 if ($form->validate()) {

src/CoreBundle/DataFixtures/ExtraFieldFixtures.php

@@ -378,14 +378,6 @@ public static function getExtraFields(): array
                 'item_type' => ExtraField::USER_FIELD_TYPE,
                 'value_type' => ExtraField::FIELD_TYPE_DATETIME,
             ],
-            [
-                'variable' => 'gdpr',
-                'display_text' => 'GDPR compliance',
-                'item_type' => ExtraField::USER_FIELD_TYPE,
-                'value_type' => ExtraField::FIELD_TYPE_CHECKBOX,
-                'visible_to_self' => false,
-                'changeable' => true,
-            ],
             [
                 'variable' => 'isFromNewLogin',
                 'display_text' => 'Is from new login',
@@ -412,14 +404,6 @@ public static function getExtraFields(): array
                 'item_type' => ExtraField::USER_FIELD_TYPE,
                 'value_type' => ExtraField::FIELD_TYPE_TEXT,
             ],
-            [
-                'variable' => 'my_terms',
-                'display_text' => 'My terms',
-                'item_type' => ExtraField::USER_FIELD_TYPE,
-                'value_type' => ExtraField::FIELD_TYPE_TEXT,
-                'visible_to_self' => true,
-                'changeable' => true,
-            ],
             [
                 'variable' => 'new_tracking_system',
                 'display_text' => 'Use alternate tracking system',

src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php

@@ -3065,11 +3065,6 @@ public static function getNewConfigurationSettings(): array
                     'title' => 'Send mail to admin when user created',
                     'comment' => 'Send email notification to admin when a user is created.',
                 ],
-                [
-                    'name' => 'show_conditions_to_user',
-                    'title' => 'Show specific registration conditions',
-                    'comment' => "Show multiple conditions to user during sign up process. Provide an array with each element containing 'variable' (internal extra field name), 'display_text' (simple text for a checkbox), 'text_area' (long text of conditions).",
-                ],
                 [
                     'name' => 'user_import_settings',
                     'title' => 'Options for user import',

src/CoreBundle/DataFixtures/SettingsValueTemplateFixtures.php

@@ -519,23 +519,6 @@ public static function getTemplatesGrouped(): array
                         'admins' => [1],
                     ],
                 ],
-                [
-                    'variable' => 'show_conditions_to_user',
-                    'json_example' => [
-                        'conditions' => [
-                            [
-                                'variable' => 'gdpr',
-                                'display_text' => 'GDPRTitle',
-                                'text_area' => 'GDPRTextArea',
-                            ],
-                            [
-                                'variable' => 'my_terms',
-                                'display_text' => 'My test conditions',
-                                'text_area' => 'This is a long text area, with lot of terms and conditions ... ',
-                            ],
-                        ],
-                    ],
-                ],
                 [
                     'variable' => 'profile_fields_visibility',
                     'json_example' => [

src/CoreBundle/Settings/ProfileSettingsSchema.php

@@ -47,7 +47,6 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
                 'data_protection_officer_email' => '',
                 'hide_user_field_from_list' => '',
                 'send_notification_when_user_added' => '',
-                'show_conditions_to_user' => '',
                 'allow_teachers_to_classes' => 'false',
                 'profile_fields_visibility' => '',
                 'user_import_settings' => '',
@@ -131,7 +130,6 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('data_protection_officer_email', TextType::class)
             ->add('hide_user_field_from_list', TextareaType::class)
             ->add('send_notification_when_user_added', TextareaType::class)
-            ->add('show_conditions_to_user', TextareaType::class)
             ->add('allow_teachers_to_classes', YesNoType::class)
             ->add('profile_fields_visibility', TextareaType::class)
             ->add('user_import_settings', TextareaType::class)