Unverified Commit 9c5006c9 authored by Stefan Auditor's avatar Stefan Auditor Committed by Stefan Auditor
Browse files

Issue #3274843 by sanduhrs: Various minor code style issues

parent 498146fc

css/media_entity_consent.css

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
  display: inline-block;

}



.consent-denied .media-entity-consent--footer, .consent-given .media-entity-consent--form {

.consent-denied .media-entity-consent--footer,

.consent-given .media-entity-consent--form {

  display: none;

}
@@ -30,4 +31,3 @@ 
  display: inline;

  font-weight: bold;

}

src/Form/MediaEntityConsentSettingsForm.php

+6 −6
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class MediaEntityConsentSettingsForm extends ConfigFormBase { 
      $form['roles']['role_' . $role->id() . '_bypass'] = [

        '#type' => 'checkbox',

        '#title' => $role->label(),

        '#default_value' => isset($config->get('access_bypass')[$role->id()]) ? $config->get('access_bypass')[$role->id()] : null,

        '#default_value' => isset($config->get('access_bypass')[$role->id()]) ? $config->get('access_bypass')[$role->id()] : NULL,

      ];

    }
@@ -92,7 +92,7 @@ class MediaEntityConsentSettingsForm extends ConfigFormBase { 
      $form['media_types'][$media_type->id()][$media_type->id() . '_enable'] = [

        '#type' => 'checkbox',

        '#title' => $this->t('Enable media entity consent'),

        '#default_value' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['enabled'])) ? $config->get('media_types')[$media_type->id()]['enabled'] : null,

        '#default_value' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['enabled'])) ? $config->get('media_types')[$media_type->id()]['enabled'] : NULL,

      ];



      $states = [
@@ -107,7 +107,7 @@ class MediaEntityConsentSettingsForm extends ConfigFormBase { 
        '#type' => 'textfield',

        '#title' => $this->t('Consent question'),

        '#description' => $this->t('Question besides the checkbox, where the user is asked for consent on loading the media entiy.'),

        '#default_value' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['consent_question'])) ? $config->get('media_types')[$media_type->id()]['consent_question'] : null,

        '#default_value' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['consent_question'])) ? $config->get('media_types')[$media_type->id()]['consent_question'] : NULL,

        '#states' => $states,

      ];
@@ -117,7 +117,7 @@ class MediaEntityConsentSettingsForm extends ConfigFormBase { 
        '#rows' => 2,

        '#format' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['consent_footer']['format'])) ? $config->get('media_types')[$media_type->id()]['consent_footer']['format'] : 'full_html',

        '#description' => $this->t('Explanation to the user when the media entity is loaded. Normally it gives hints, which external service was used and links to the privacy policy page of your website, where the user can revoke his consent.'),

        '#default_value' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['consent_footer']['value'])) ? $config->get('media_types')[$media_type->id()]['consent_footer']['value'] : null,

        '#default_value' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['consent_footer']['value'])) ? $config->get('media_types')[$media_type->id()]['consent_footer']['value'] : NULL,

        '#states' => $states,

      ];
@@ -127,7 +127,7 @@ class MediaEntityConsentSettingsForm extends ConfigFormBase { 
        '#rows' => 2,

        '#format' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['consent_footer']['format'])) ? $config->get('media_types')[$media_type->id()]['consent_footer']['format'] : 'full_html',

        '#description' => $this->t('The description that will be displayed in the privacy policy block / token for that media entity type. There the user can change decisions made according to media entity consent types.'),

        '#default_value' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['privacy_policy']['value'])) ? $config->get('media_types')[$media_type->id()]['privacy_policy']['value'] : null,

        '#default_value' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['privacy_policy']['value'])) ? $config->get('media_types')[$media_type->id()]['privacy_policy']['value'] : NULL,

        '#states' => $states,

      ];
@@ -136,7 +136,7 @@ class MediaEntityConsentSettingsForm extends ConfigFormBase { 
        '#title' => $this->t('Excluded files from external Sources'),

        '#rows' => 3,

        '#description' => $this->t('<b>Since finding out which external JS files a media entity needs to load is tricky because of so many different implementations, you have to specify them by hand. </b><p>The defined files\' loading will be surpressed if the user did not give consent yet and will be injected, when the user gives consent.</p> <p>Please specify one file per line and use the exact same path style that gets rendered. </p><p>Also keep in mind, that it is possible, that a JS file from the media provider or field formatter may inject scripts dynamically. So it is recommended to look into those files to test it well after they were added to the above list.</p><p>F.e. for the module "media_entity_twitter" the excluded files would be "//platform.twitter.com/widgets.js" and "modules/contrib/media_entity_twitter/js/twitter.js". The file from media_entity_twitter is also adding the twitter script dynamically, so to exclude only the script from platform.twitter.com won\'t work.</p>'),

        '#default_value' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['excluded_files'])) ? $config->get('media_types')[$media_type->id()]['excluded_files'] : null,

        '#default_value' => (isset($config->get('media_types')[$media_type->id()]) && isset($config->get('media_types')[$media_type->id()]['excluded_files'])) ? $config->get('media_types')[$media_type->id()]['excluded_files'] : NULL,

        '#states' => $states,

      ];

    }

src/Form/MediaEntityConsentUserSettingsForm.php

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ class MediaEntityConsentUserSettingsForm extends FormBase { 
      $config_tags = $config->getCacheTags();

      if (!isset($form['#cache'])) {

        $form['#cache'] = [

          'tags' => []

          'tags' => [],

        ];

      }

      $form['#cache']['tags'] = array_merge($form['#cache']['tags'], $config_tags);

js/media_entity_consent.js

+5 −5

File changed.

Contains only whitespace changes.