From 1f2e67ce6377bf484b86eee13e6b947c34593739 Mon Sep 17 00:00:00 2001 From: anis jrad Date: Thu, 26 Dec 2019 10:59:38 +0100 Subject: [PATCH 1/2] Show images after used url_prefix --- extension/ezjscore/classes/ezjscajaxcontent.php | 3 +++ .../ezoe/design/standard/javascript/ezoe/popup_utils.js | 2 +- .../design/standard/templates/ezoe/tag_embed_images.tpl | 6 +++--- extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/extension/ezjscore/classes/ezjscajaxcontent.php b/extension/ezjscore/classes/ezjscajaxcontent.php index 609aa0809af..23f443be260 100644 --- a/extension/ezjscore/classes/ezjscajaxcontent.php +++ b/extension/ezjscore/classes/ezjscajaxcontent.php @@ -478,6 +478,9 @@ function ( &$element, $key ) (string)$element, 'UTF-8' ); } + if($key === 'url') { + eZURI::transformURI( $element, true ); + } } ); diff --git a/extension/ezoe/design/standard/javascript/ezoe/popup_utils.js b/extension/ezoe/design/standard/javascript/ezoe/popup_utils.js index 8436e042e0f..56bda2096a3 100644 --- a/extension/ezoe/design/standard/javascript/ezoe/popup_utils.js +++ b/extension/ezoe/design/standard/javascript/ezoe/popup_utils.js @@ -843,7 +843,7 @@ var eZOEPopupUtils = { { tag = document.createElement("span"); tag.className = 'image_preview'; - var previewUrl = ed.settings.ez_root_url + encodeURI( n.data_map[ n.image_attributes[imageIndex] ].content[eZOEPopupUtils.settings.browseImageAlias].url ) + var previewUrl = encodeURI( n.data_map[ n.image_attributes[imageIndex] ].content[eZOEPopupUtils.settings.browseImageAlias].url ) tag.innerHTML += ' ' + ed.getLang('preview.preview_desc') + ''; td.appendChild( tag ); hasImage = true; diff --git a/extension/ezoe/design/standard/templates/ezoe/tag_embed_images.tpl b/extension/ezoe/design/standard/templates/ezoe/tag_embed_images.tpl index 26460de3644..181d49baffc 100644 --- a/extension/ezoe/design/standard/templates/ezoe/tag_embed_images.tpl +++ b/extension/ezoe/design/standard/templates/ezoe/tag_embed_images.tpl @@ -55,7 +55,7 @@ tinyMCEPopup.onInit.add( eZOEPopupUtils.BIND( eZOEPopupUtils.init, window, { else { var imageAtr = eZOEPopupUtils.embedObject['data_map'][ imageAttributes[0] ], imageSizeObj = imageAtr['content'][ args['alt'] ]; - args['src'] = ed.settings.ez_root_url + imageSizeObj['url']; + args['src'] = imageSizeObj['url']; args['title'] = eZOEPopupUtils.safeHtml( imageAtr['alternative_text'] || eZOEPopupUtils.embedObject['name'] ); args['width'] = imageSizeObj['width']; args['height'] = imageSizeObj['height']; @@ -153,7 +153,7 @@ function loadImageSize( e, el ) } else if ( attribObj[size] ) { - previewImageNode.attr( 'src', eds.ez_root_url + attribObj[size]['url'] ); + previewImageNode.attr( 'src', attribObj[size]['url'] ); tinyMCEPopup.resizeToInnerSize(); } else @@ -165,7 +165,7 @@ function loadImageSize( e, el ) { var size = jQuery('#embed_size_source').val(), imageAttributes = eZOEPopupUtils.embedObject['image_attributes']; eZOEPopupUtils.embedObject['data_map'][ imageAttributes[0] ]['content'][ size ] = data['content']['data_map'][ imageAttributes[0] ]['content'][ size ]; - previewImageNode.attr( 'src', eds.ez_root_url + eZOEPopupUtils.embedObject['data_map'][ imageAttributes[0] ]['content'][ size ]['url'] ); + previewImageNode.attr( 'src', eZOEPopupUtils.embedObject['data_map'][ imageAttributes[0] ]['content'][ size ]['url'] ); } }); } diff --git a/extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php b/extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php index 6f2de54d77d..19c4ce8384b 100644 --- a/extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php +++ b/extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php @@ -1208,7 +1208,8 @@ function inputTagXML( &$tag, $currentSectionLevel, $tdSectionLevel = null ) if ( $content->hasAttribute( $size ) ) { $imageAlias = $content->imageAlias( $size ); - $srcString = $URL . '/' . $imageAlias['url']; + eZURI::transformURI( $imageAlias['url'], true ); + $srcString = $imageAlias['url']; $imageWidth = $imageAlias['width']; $imageHeight = $imageAlias['height']; break; From 68f1b2c63faec5f2d190613b19ffc49682d52d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20R?= Date: Wed, 29 Jan 2020 10:30:41 +0100 Subject: [PATCH 2/2] CS --- extension/ezjscore/classes/ezjscajaxcontent.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extension/ezjscore/classes/ezjscajaxcontent.php b/extension/ezjscore/classes/ezjscajaxcontent.php index 23f443be260..ed119d4ffa2 100644 --- a/extension/ezjscore/classes/ezjscajaxcontent.php +++ b/extension/ezjscore/classes/ezjscajaxcontent.php @@ -478,7 +478,8 @@ function ( &$element, $key ) (string)$element, 'UTF-8' ); } - if($key === 'url') { + if( $key === 'url' ) + { eZURI::transformURI( $element, true ); } }