Merge pull request #278 from itk-dev/feature/LOOP-1132-video-fields

Anna-itk · web-flow · commit e965afdb3e52 · 2021-12-02T15:00:21.000+01:00
LOOP-1132: Updated video field names and stuff
diff --git a/config/sync/field.field.paragraph.os2loop_video.os2loop_video_iframe.yml b/config/sync/field.field.paragraph.os2loop_video.os2loop_video_iframe.yml
@@ -9,8 +9,8 @@ id: paragraph.os2loop_video.os2loop_video_iframe
 field_name: os2loop_video_iframe
 entity_type: paragraph
 bundle: os2loop_video
-label: 'Iframe embed kode'
-description: ''
+label: 'iframe embed kode'
+description: 'Insert full iframe embed code. Supported video providers: skyfish.com and videotool.dk'
 required: false
 translatable: false
 default_value: {  }
diff --git a/config/sync/field.field.paragraph.os2loop_video.os2loop_video_url.yml b/config/sync/field.field.paragraph.os2loop_video.os2loop_video_url.yml
@@ -12,7 +12,7 @@ field_name: os2loop_video_url
 entity_type: paragraph
 bundle: os2loop_video
 label: 'Share link'
-description: ''
+description: 'Insert link to video. Supported video providers: vimeo.com and microsoftstream.com'
 required: false
 translatable: false
 default_value: {  }
diff --git a/config/sync/field.field.paragraph.os2loop_video.os2loop_video_width.yml b/config/sync/field.field.paragraph.os2loop_video.os2loop_video_width.yml
@@ -11,7 +11,7 @@ id: paragraph.os2loop_video.os2loop_video_width
 field_name: os2loop_video_width
 entity_type: paragraph
 bundle: os2loop_video
-label: WIdth
+label: Width
 description: ''
 required: true
 translatable: false
diff --git a/config/sync/field.storage.paragraph.os2loop_video_source_type.yml b/config/sync/field.storage.paragraph.os2loop_video_source_type.yml
@@ -13,10 +13,10 @@ settings:
   allowed_values:
     -
       value: iframe
-      label: 'Skyfish iframe'
+      label: 'Iframe embed code'
     -
       value: url
-      label: Other
+      label: 'Share link'
   allowed_values_function: ''
 module: options
 locked: false
diff --git a/config/sync/language/da/field.field.paragraph.os2loop_video.os2loop_video_description.yml b/config/sync/language/da/field.field.paragraph.os2loop_video.os2loop_video_description.yml
@@ -0,0 +1 @@
+label: Beskrivelse
diff --git a/config/sync/language/da/field.field.paragraph.os2loop_video.os2loop_video_iframe.yml b/config/sync/language/da/field.field.paragraph.os2loop_video.os2loop_video_iframe.yml
@@ -0,0 +1,2 @@
+label: iframe-indlejringskode
+description: 'Indsæt den fulde iframe-indlejringskode. Understøttede videoudbydere: skyfish.com og videotool.dk'
diff --git a/config/sync/language/da/field.field.paragraph.os2loop_video.os2loop_video_source_type.yml b/config/sync/language/da/field.field.paragraph.os2loop_video.os2loop_video_source_type.yml
@@ -0,0 +1 @@
+label: Kildetype
diff --git a/config/sync/language/da/field.field.paragraph.os2loop_video.os2loop_video_url.yml b/config/sync/language/da/field.field.paragraph.os2loop_video.os2loop_video_url.yml
@@ -0,0 +1,2 @@
+label: Delingsurl
+description: 'Indsæt url til video. Understøttede videoudbydere: vimeo.com og microsoftstream.com'
diff --git a/config/sync/language/da/field.field.paragraph.os2loop_video.os2loop_video_width.yml b/config/sync/language/da/field.field.paragraph.os2loop_video.os2loop_video_width.yml
@@ -0,0 +1 @@
+label: Bredde
diff --git a/config/sync/language/da/field.storage.paragraph.os2loop_video_source_type.yml b/config/sync/language/da/field.storage.paragraph.os2loop_video_source_type.yml
@@ -0,0 +1,6 @@
+settings:
+  allowed_values:
+    -
+      label: Iframe-indlejringskode
+    -
+      label: Delingsurl
diff --git a/web/profiles/custom/os2loop/modules/os2loop_oembed/src/TwigExtension/TwigExtension.php b/web/profiles/custom/os2loop/modules/os2loop_oembed/src/TwigExtension/TwigExtension.php
@@ -79,15 +79,15 @@ public function getFilters(): array {
    * @param array $text
    *   The input text that the filter was applied to.
    *
-   * @return string
+   * @return string|null
    *   The rendered html.
    *
    * @throws \GuzzleHttp\Exception\GuzzleException
    *   An exception if guzzle fails.
    * @throws \Exception
    *   The general exception.
    */
-  public function createVideo(array $text): string {
+  public function createVideo(array $text): ?string {
     // Set string depending on field type.
     $string = isset($text['#plain_text']) ? $text['#plain_text'] : $text['#context']['value'];
     if (!empty($this->findIframe($string))) {
@@ -96,7 +96,7 @@ public function createVideo(array $text): string {
     $videoArray = $this->createVideoFromUrl($string);
     $videoArray = $this->applyCookieConsent($videoArray);
 
-    return $videoArray['iframe'];
+    return $videoArray['iframe'] ?? NULL;
   }
 
   /**
@@ -157,7 +157,7 @@ private function createVideoFromUrl($text): array {
     $video = [];
     if (filter_var($text, FILTER_VALIDATE_URL)) {
       $url = parse_url($text);
-      if (array_key_exists($url['host'], self::ALLOWED_PROVIDERS)) {
+      if (isset($url['host'], self::ALLOWED_PROVIDERS[$url['host']])) {
         $video['host'] = $url['host'];
         // Use oembed to create iframe if possible.
         if ('Oembed' === self::ALLOWED_PROVIDERS[$url['host']]['type']) {
@@ -194,12 +194,15 @@ private function createVideoFromUrl($text): array {
    * @param string $text
    *   The iframe code.
    *
-   * @return string
+   * @return string|null
    *   The iframe source.
    */
-  private function handleIframe(string $text): string {
-    preg_match('/src="([^"]+)"/', $text, $matches);
-    return $matches[1];
+  private function handleIframe(string $text): ?string {
+    // Get attribute value inclosed in either double or single quotes.
+    preg_match('/src=(?:"([^"]+)"|\'([^\']+)\')/', $text, $matches);
+
+    // Return first non-empty value found (if any).
+    return $matches[1] ?: $matches[2] ?: NULL;
   }
 
   /**
@@ -212,14 +215,17 @@ private function handleIframe(string $text): string {
    *   The altered array.
    */
   private function applyCookieConsent(array $videoArray): array {
-    $config = $this->settings->getConfig('os2loop_cookies.settings');
-    $cookieInformationScriptCode = $config->get('os2loop_cookie_information_script');
-    $requiredCookies = self::ALLOWED_PROVIDERS[$videoArray['host']]['requiredCookies'];
-    if (!empty($cookieInformationScriptCode) && !empty($requiredCookies)) {
-      if (isset($videoArray['iframe'])) {
-        $videoArray['iframe'] = str_replace(' src="', ' src="" data-category-consent="' . $requiredCookies . '" data-consent-src="', $videoArray['iframe']);
+    if (isset($videoArray['host'])) {
+      $config = $this->settings->getConfig('os2loop_cookies.settings');
+      $cookieInformationScriptCode = $config->get('os2loop_cookie_information_script');
+      $requiredCookies = self::ALLOWED_PROVIDERS[$videoArray['host']]['requiredCookies'];
+      if (!empty($cookieInformationScriptCode) && !empty($requiredCookies)) {
+        if (isset($videoArray['iframe'])) {
+          $videoArray['iframe'] = str_replace(' src="', ' src="" data-category-consent="' . $requiredCookies . '" data-consent-src="', $videoArray['iframe']);
+        }
       }
     }
+
     return $videoArray;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ settings:`
`13`	`13`	`allowed_values:`
`14`	`14`	`-`
`15`	`15`	`value: iframe`
`16`		`- label: 'Skyfish iframe'`
	`16`	`+ label: 'Iframe embed code'`
`17`	`17`	`-`
`18`	`18`	`value: url`
`19`		`- label: Other`
	`19`	`+ label: 'Share link'`
`20`	`20`	`allowed_values_function: ''`
`21`	`21`	`module: options`
`22`	`22`	`locked: false`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+label: iframe-indlejringskode`
	`2`	`+description: 'Indsæt den fulde iframe-indlejringskode. Understøttede videoudbydere: skyfish.com og videotool.dk'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+label: Delingsurl`
	`2`	`+description: 'Indsæt url til video. Understøttede videoudbydere: vimeo.com og microsoftstream.com'`