Fix: #3973, Fix: #3814, Fix: #3827 - autolink URLs in PAGE fields.

fisharebest · Jul 28, 2021 · cef4fcc · cef4fcc
1 parent 110955c
commit cef4fcc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/app/Elements/AbstractElement.php b/app/Elements/AbstractElement.php
@@ -30,6 +30,8 @@
 use function is_numeric;
 use function preg_match;
 use function str_contains;
+use function str_starts_with;
+use function stream_copy_to_stream;
 use function strip_tags;
 use function trim;
 use function view;
@@ -283,7 +285,7 @@ public function values(): array
     }
 
     /**
-     * Display the value of this type of element - convert URLs to links
+     * Display the value of this type of element - convert URLs to links.
      *
      * @param string $value
      *
@@ -300,6 +302,24 @@ protected function valueAutoLink(string $value): string
         return e($canonical);
     }
 
+    /**
+     * Display the value of this type of element - convert to URL.
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    protected function valueLink(string $value): string
+    {
+        $canonical = $this->canonical($value);
+
+        if (str_starts_with($canonical, 'https://') || str_starts_with($canonical, 'http://')) {
+            return '<a dir="auto" href="' . e($canonical) . '">' . e($value) . '</a>';
+        }
+
+        return e($value);
+    }
+
     /**
      * Display the value of this type of element.
      *

diff --git a/app/Elements/AddressWebPage.php b/app/Elements/AddressWebPage.php
@@ -43,8 +43,6 @@ class AddressWebPage extends AbstractElement
      */
     public function value(string $value, Tree $tree): string
     {
-        $canonical = $this->canonical($value);
-
-        return '<a dir="auto" href="' . e($canonical) . '">' . e($canonical) . '</a>';
+        return $this->valueLink($value);
     }
 }
diff --git a/app/Elements/MultimediaFileReference.php b/app/Elements/MultimediaFileReference.php
@@ -57,6 +57,6 @@ public function canonical(string $value): string
      */
     public function value(string $value, Tree $tree): string
     {
-        return $this->valueAutoLink($value);
+        return $this->valueLink($value);
     }
 }
diff --git a/app/Elements/WhereWithinSource.php b/app/Elements/WhereWithinSource.php
@@ -20,6 +20,7 @@
 namespace Fisharebest\Webtrees\Elements;
 
 use Fisharebest\Webtrees\Http\RequestHandlers\AutoCompleteCitation;
+use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Tree;
 
 use function e;
@@ -63,6 +64,7 @@ public function edit(string $id, string $name, string $value, Tree $tree): strin
      */
     public function value(string $value, Tree $tree): string
     {
+        return strip_tags(Registry::markdownFactory()->autolink()->convertToHtml($value), ['a']);
         return $this->valueAutoLink($value);
     }
 }