Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added stream support for images (``) Added stream support for links (`[Download PDF](user://data/pdf/my.pdf)`)
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,9 +10,9 @@ | |
|
|
||
| use Grav\Common\Grav; | ||
| use Grav\Common\Uri; | ||
| use Grav\Common\Page\Medium\Medium; | ||
| use RocketTheme\Toolbox\Event\Event; | ||
| use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator; | ||
|
|
||
| class Excerpts | ||
| { | ||
|
|
@@ -115,11 +115,11 @@ public static function getHtmlFromExcerpt($excerpt) | |
| */ | ||
| public static function processLinkExcerpt($excerpt, $page, $type = 'link') | ||
| { | ||
| $url = htmlspecialchars_decode(urldecode($excerpt['element']['attributes']['href'])); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
mahagr
Author
Member
|
||
|
|
||
| $url_parts = static::parseUrl($url); | ||
|
|
||
| // If there is a query, then parse it and build action calls. | ||
| if (isset($url_parts['query'])) { | ||
| $actions = array_reduce(explode('&', $url_parts['query']), function ($carry, $item) { | ||
| $parts = explode('=', $item, 2); | ||
|
|
@@ -129,19 +129,19 @@ public static function processLinkExcerpt($excerpt, $page, $type = 'link') | |
| return $carry; | ||
| }, []); | ||
|
|
||
| // Valid attributes supported. | ||
| $valid_attributes = ['rel', 'target', 'id', 'class', 'classes']; | ||
|
|
||
| // Unless told to not process, go through actions. | ||
| if (array_key_exists('noprocess', $actions)) { | ||
| unset($actions['noprocess']); | ||
| } else { | ||
| // Loop through actions for the image and call them. | ||
| foreach ($actions as $attrib => $value) { | ||
| $key = $attrib; | ||
|
|
||
| if (in_array($attrib, $valid_attributes)) { | ||
| // support both class and classes. | ||
| if ($attrib == 'classes') { | ||
| $attrib = 'class'; | ||
| } | ||
|
|
@@ -154,25 +154,33 @@ public static function processLinkExcerpt($excerpt, $page, $type = 'link') | |
| $url_parts['query'] = http_build_query($actions, null, '&', PHP_QUERY_RFC3986); | ||
| } | ||
|
|
||
| // If no query elements left, unset query. | ||
| if (empty($url_parts['query'])) { | ||
| unset ($url_parts['query']); | ||
| } | ||
|
|
||
| // Set path to / if not set. | ||
| if (empty($url_parts['path'])) { | ||
| $url_parts['path'] = ''; | ||
| } | ||
|
|
||
| // If scheme isn't http(s).. | ||
| if (!empty($url_parts['scheme']) && !in_array($url_parts['scheme'], ['http', 'https'])) { | ||
| // Handle custom streams. | ||
| if ($type !== 'image' && !empty($url_parts['stream']) && !empty($url_parts['path'])) { | ||
| $url_parts['path'] = Grav::instance()['base_url_relative'] . '/' . static::resolveStream("{$url_parts['scheme']}://{$url_parts['path']}"); | ||
| unset($url_parts['stream'], $url_parts['scheme']); | ||
|
|
||
| $excerpt['element']['attributes']['href'] = Uri::buildUrl($url_parts); | ||
| } | ||
|
|
||
| return $excerpt; | ||
| } | ||
|
|
||
| // Handle paths and such. | ||
| $url_parts = Uri::convertUrl($page, $url_parts, $type); | ||
|
|
||
| // Build the URL from the component parts and set it on the element. | ||
| $excerpt['element']['attributes']['href'] = Uri::buildUrl($url_parts); | ||
|
|
||
| return $excerpt; | ||
|
|
@@ -187,62 +195,65 @@ public static function processLinkExcerpt($excerpt, $page, $type = 'link') | |
| */ | ||
| public static function processImageExcerpt($excerpt, $page) | ||
| { | ||
| $url = htmlspecialchars_decode(urldecode($excerpt['element']['attributes']['src'])); | ||
| $url_parts = static::parseUrl($url); | ||
|
|
||
| $media = null; | ||
| $filename = null; | ||
|
|
||
| if (!empty($url_parts['stream'])) { | ||
| $filename = $url_parts['scheme'] . '://' . (isset($url_parts['path']) ? $url_parts['path'] : ''); | ||
|
|
||
| $media = $page->media(); | ||
|
|
||
| } else { | ||
| // File is also local if scheme is http(s) and host matches. | ||
| $local_file = isset($url_parts['path']) | ||
| && (empty($url_parts['scheme']) || in_array($url_parts['scheme'], ['http', 'https'])) | ||
| && (empty($url_parts['host']) || $url_parts['host'] == Grav::instance()['uri']->host()); | ||
|
|
||
| if ($local_file) { | ||
| $filename = basename($url_parts['path']); | ||
| $folder = dirname($url_parts['path']); | ||
|
|
||
| // Get the local path to page media if possible. | ||
| if ($folder === $page->url(false, false, false)) { | ||
| // Get the media objects for this page. | ||
| $media = $page->media(); | ||
| } else { | ||
| // see if this is an external page to this one | ||
| $base_url = rtrim(Grav::instance()['base_url_relative'] . Grav::instance()['pages']->base(), '/'); | ||
| $page_route = '/' . ltrim(str_replace($base_url, '', $folder), '/'); | ||
|
|
||
| $ext_page = Grav::instance()['pages']->dispatch($page_route, true); | ||
| if ($ext_page) { | ||
| $media = $ext_page->media(); | ||
| } else { | ||
| Grav::instance()->fireEvent('onMediaLocate', new Event(['route' => $page_route, 'media' => &$media])); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // If there is a media file that matches the path referenced.. | ||
| if ($media && $filename && isset($media[$filename])) { | ||
| // Get the medium object. | ||
| /** @var Medium $medium */ | ||
| $medium = $media[$filename]; | ||
|
|
||
| // Process operations | ||
| $medium = static::processMediaActions($medium, $url_parts); | ||
|
|
||
| $alt = isset($excerpt['element']['attributes']['alt']) ? $excerpt['element']['attributes']['alt'] : ''; | ||
| $title = isset($excerpt['element']['attributes']['title']) ? $excerpt['element']['attributes']['title'] : ''; | ||
| $class = isset($excerpt['element']['attributes']['class']) ? $excerpt['element']['attributes']['class'] : ''; | ||
| $id = isset($excerpt['element']['attributes']['id']) ? $excerpt['element']['attributes']['id'] : ''; | ||
|
|
||
| $excerpt['element'] = $medium->parseDownElement($title, $alt, $class, $id, true); | ||
|
|
||
| } else { | ||
| // Not a current page media file, see if it needs converting to relative. | ||
| $excerpt['element']['attributes']['src'] = Uri::buildUrl($url_parts); | ||
| } | ||
|
|
||
| return $excerpt; | ||
|
|
@@ -300,4 +311,40 @@ public static function processMediaActions($medium, $url) | |
| return $medium; | ||
| } | ||
|
|
||
| /** | ||
| * Variation of parse_url() which works also with local streams. | ||
| * | ||
| * @param string $url | ||
| * @return array|bool | ||
| */ | ||
| protected static function parseUrl($url) | ||
| { | ||
| $url_parts = parse_url($url); | ||
|
|
||
| if (isset($url_parts['scheme'])) { | ||
| /** @var UniformResourceLocator $locator */ | ||
| $locator = Grav::instance()['locator']; | ||
|
|
||
| // Special handling for the streams. | ||
| if ($locator->schemeExists($url_parts['scheme'])) { | ||
| if (isset($url_parts['host'])) { | ||
| // Merge host and path into a path. | ||
| $url_parts['path'] = $url_parts['host'] . (isset($url_parts['path']) ? '/' . $url_parts['path'] : ''); | ||
| unset($url_parts['host']); | ||
| } | ||
|
|
||
| $url_parts['stream'] = true; | ||
| } | ||
| } | ||
|
|
||
| return $url_parts; | ||
| } | ||
|
|
||
| protected static function resolveStream($url) | ||
| { | ||
| /** @var UniformResourceLocator $locator */ | ||
| $locator = Grav::instance()['locator']; | ||
|
|
||
| return $locator->isStream($url) ? ($locator->findResource($url, false) ?: $locator->findResource($url, false, true)) : $url; | ||
| } | ||
| } | ||
Oops, something went wrong.
@mahagr this additional decoding is causing problems with URL encoding: #1749
Don't suppose you remember why this was added?