Added user friendly layout naming #779
Merged
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
…les to default demo theme layouts.
| $file_contents = file_get_contents($themeDir.$filename); | ||
| preg_match_all("(@Layout Name:(.*)\n)siU", $file_contents, $file_layout); | ||
| if (isset($file_layout[1]) && isset($file_layout[1][0]) && !empty($file_layout[1][0])) { | ||
| $layout_name = preg_replace('/[^a-zA-Z0-9\s]/', '', $file_layout[1][0]); |
There was a problem hiding this comment.
I believe this preg_replace is redundant. I could imagine some russian agency building a custom template for their clients and willing to name the layout in cyrillic. In that case, layout name will become empty. I see no security or other reasons to restrict any characters in layout title. Would you mind if I remove this line?
There was a problem hiding this comment.
Maybe restring length and special characters would be better? Now it's whitelisting. Changing to blacklist for php/html safety could be better.
maskas
added a commit
that referenced
this pull request
Dec 22, 2016
Added user friendly layout naming
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.
Removed hardcoded layout name options array from layout select fields in page forms.
Added layout name parsing and page layout select field options array with names in page forms.
Added example layout names in demo themes.
Layout name can be added by adding
@Layout name: *chosen name*attribute to layout PHP file. This can either be done with PHP<?php // @Layout name: *chosen name* ?>or HTML<!-- @Layout name: *chosen name* -->. Need to remember that HTML way shows the layout name to public in rendered website DOM.Layout PHP files with underscore still ignored as being partials like in previous ImpressPages versions.