CDN - remove filetypes to replace if setting is disabled #800
Conversation
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
hi-hai
reviewed
Jan 30, 2025
src/admin-settings.cls.php
Outdated
| // Remove from MAPPING FILETYPE IMAGES/CSS/JS if settings are disabled | ||
| $remove_type = array(); | ||
| if (empty($data2[$k][self::CDN_MAPPING_INC_IMG])) { | ||
| $remove_type = array_merge($remove_type, array('jpg', 'jpeg', 'png', 'gif', 'svg', 'webp', 'avif')); |
There was a problem hiding this comment.
These types should be always removed, no matter if the option checked or not. Append them dynamically in cdn::init()
There was a problem hiding this comment.
Removed the conditions
Tymotey
force-pushed
the
CDN-filetype_remove
branch
from
9d2f0f8 to
5678ab8
Compare
|
@hi-hai added the rewrite to happen on content html |
hi-hai
reviewed
Jan 31, 2025
src/admin-settings.cls.php
Outdated
| @@ -117,6 +117,22 @@ public function save($raw_data) | |||
| foreach ($data as $k => $v) { | |||
| if ($child == self::CDN_MAPPING_FILETYPE) { | |||
| $v = Utility::sanitize_lines($v); | |||
|
|
|||
| // Remove from MAPPING FILETYPE extensions for IMAGES, CSS, JS | |||
| $remove_type = array('jpg', 'jpeg', 'png', 'gif', 'svg', 'webp', 'avif', 'css', 'js'); | |||
hi-hai
reviewed
Jan 31, 2025
src/admin-settings.cls.php
Outdated
|
|
||
| // Remove from MAPPING FILETYPE extensions for IMAGES, CSS, JS | ||
| $remove_type = array('jpg', 'jpeg', 'png', 'gif', 'svg', 'webp', 'avif', 'css', 'js'); | ||
| $temp = array_filter($v, function ($i_v) use ($remove_type) { |
There was a problem hiding this comment.
just a simple loop to unset it, easier to read.
hi-hai
reviewed
Jan 31, 2025
src/admin-settings.cls.php
Outdated
| $leave_value = true; | ||
|
|
||
| foreach ($remove_type as $remove) { | ||
| if (strpos($i_v, $remove) !== false) { |
There was a problem hiding this comment.
this is not correct. Need to full match
There was a problem hiding this comment.
fixed with above
hi-hai
reviewed
Jan 31, 2025
src/cdn.cls.php
Outdated
| @@ -209,9 +209,28 @@ private function _finalize() | |||
| $this->_replace_inline_css(); | |||
| } | |||
|
|
|||
| // Temporary add file types to mapping filetype rewrite | |||
There was a problem hiding this comment.
I think you should append them in init()
hi-hai
reviewed
Jan 31, 2025
| '.css', | ||
| '.js', | ||
| )); | ||
| $v = array_diff($v, $remove_type); |
Tymotey
force-pushed
the
CDN-filetype_remove
branch
from
1bed608 to
a692a9e
Compare
|
@hi-hai fixed the file types to include images. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In CDN, at mapping settings if Include Images/CSS/JS is disabled it removes the file types from "Include File Types" setting.
Before:
After save: