mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-18 12:31:17 +02:00
Code Issues Releases Wiki Activity

Attempt fix for issue processwire/processwire-issues#1536

Browse Source
This commit is contained in:
Ryan Cramer
2022-03-04 08:28:33 -05:00
parent fec9432a03
commit 439703abdf
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wire/modules/Process/ProcessField/ProcessField.module
View File

@@ -461,8 +461,8 @@ class ProcessField extends Process implements ConfigurableModule {
$this->breadcrumb('../', $labels['fields']); $this->breadcrumb('../', $labels['fields']);
$tags = $fields->getTags(); $tags = $fields->getTags();
$editTag = $input->get->name('edit_tag'); $editTag = $sanitizer->words($input->get->text('edit_tag'), array('separator' => '-'));
$saveTag = $input->post->name('save_tag'); $saveTag = $sanitizer->words($input->post->text('save_tag'), array('separator' => '-'));
$collapsedTags = $modules->getConfig($this, 'collapsedTags'); $collapsedTags = $modules->getConfig($this, 'collapsedTags');
if(!is_array($collapsedTags)) $collapsedTags = array(); if(!is_array($collapsedTags)) $collapsedTags = array();
@@ -473,8 +473,9 @@ class ProcessField extends Process implements ConfigurableModule {
$this->headline("$labels[tag] - " . (isset($tags[$editTag]) ? $tags[$editTag] : $editTag)); $this->headline("$labels[tag] - " . (isset($tags[$editTag]) ? $tags[$editTag] : $editTag));
/** @var InputfieldName $f */ /** @var InputfieldName $f */
$f = $modules->get('InputfieldName'); $f = $modules->get('InputfieldText');
$f->attr('name', 'rename_tag'); $f->attr('name', 'rename_tag');
$f->label = $this->_('Tag name');
$f->attr('value', isset($tags[$editTag]) ? $tags[$editTag] : $editTag); $f->attr('value', isset($tags[$editTag]) ? $tags[$editTag] : $editTag);
$f->collapsed = Inputfield::collapsedYes; $f->collapsed = Inputfield::collapsedYes;
$f->addClass('InputfieldIsSecondary', 'wrapClass'); $f->addClass('InputfieldIsSecondary', 'wrapClass');
@@ -515,8 +516,9 @@ class ProcessField extends Process implements ConfigurableModule {
} else if($saveTag) { } else if($saveTag) {
// save tag // save tag
$tagFields = $sanitizer->names($input->post('tag_fields')); $tagFields = $sanitizer->names($input->post('tag_fields'));
$renameTag = $input->post->templateName('rename_tag'); $renameTag = $sanitizer->words($input->post->text('rename_tag'), array('separator' => '-'));
$isCollapsed = (int) $input->post('tag_collapsed'); $isCollapsed = (int) $input->post('tag_collapsed');
$removeTag = ''; $removeTag = '';
if($renameTag && $renameTag != $saveTag) { if($renameTag && $renameTag != $saveTag) {
@@ -578,9 +580,10 @@ class ProcessField extends Process implements ConfigurableModule {
$form->attr('method', 'get'); $form->attr('method', 'get');
/** @var InputfieldName $f */ /** @var InputfieldName $f */
$f = $modules->get('InputfieldName'); $f = $modules->get('InputfieldText');
$f->attr('name', 'edit_tag'); $f->attr('name', 'edit_tag');
$f->label = $this->_('Add new tag'); $f->label = $this->_('Add new tag');
$f->description = $this->_('You may use letters, digits or underscore.');
$f->icon = 'tag'; $f->icon = 'tag';
$f->addClass('InputfieldIsSecondary', 'wrapClass'); $f->addClass('InputfieldIsSecondary', 'wrapClass');
$form->add($f); $form->add($f);
@@ -2217,6 +2220,7 @@ class ProcessField extends Process implements ConfigurableModule {
/** @var Languages $languages */ /** @var Languages $languages */
$languages = $this->wire('languages'); $languages = $this->wire('languages');
$sanitizer = $this->wire()->sanitizer;
foreach($wrapper->children() as $inputfield) { foreach($wrapper->children() as $inputfield) {
@@ -2272,6 +2276,10 @@ class ProcessField extends Process implements ConfigurableModule {
if(($name == 'showIf' || $name == 'requiredIf') && strlen($value)) { if(($name == 'showIf' || $name == 'requiredIf') && strlen($value)) {
$this->checkInputfieldDependencySetting($inputfield); $this->checkInputfieldDependencySetting($inputfield);
} }
if($name === 'tags') {
$value = $sanitizer->words($value);
}
$this->field->set($name, $value); $this->field->set($name, $value);
@@ -3025,7 +3033,7 @@ class ProcessField extends Process implements ConfigurableModule {
); );
} else if($segment === 'tags') { } else if($segment === 'tags') {
$data = array( $data = array(
'edit_tag' => $input->get->name('edit_tag'), 'edit_tag' => $sanitizer->word($input->get->text('edit_tag')),
); );
} else if($segment === 'edit') { } else if($segment === 'edit') {
$data = array( $data = array(
@@ -3057,6 +3065,7 @@ class ProcessField extends Process implements ConfigurableModule {
} else { } else {
$segment = ''; $segment = '';
} }
foreach($data as $key => $value) $data[$key] = urlencode($value);
return $page->url() . $segment . (count($data) ? '?' . implode('&', $data) : ''); return $page->url() . $segment . (count($data) ? '?' . implode('&', $data) : '');
} }

16
wire/modules/Process/ProcessTemplate/ProcessTemplate.module
View File

@@ -2803,7 +2803,7 @@ class ProcessTemplate extends Process implements ConfigurableModule {
'noPrependTemplateFile' => 'post-int', // field may not be present on all submissions 'noPrependTemplateFile' => 'post-int', // field may not be present on all submissions
'noAppendTemplateFile' => 'post-int', // field may not be present on all submissions 'noAppendTemplateFile' => 'post-int', // field may not be present on all submissions
'compile' => 'post-int', 'compile' => 'post-int',
'tags' => 'text', 'tags' => 'words',
'contentType' => 'none', 'contentType' => 'none',
'noShortcut' => 'post-1', 'noShortcut' => 'post-1',
'noMove' => 'int', 'noMove' => 'int',
@@ -2823,6 +2823,8 @@ class ProcessTemplate extends Process implements ConfigurableModule {
$value = (int) $value; $value = (int) $value;
} else if($sanitizerName = 'text') { } else if($sanitizerName = 'text') {
$value = $sanitizer->text($value); $value = $sanitizer->text($value);
} else if($sanitizerName = 'words') {
$value = $sanitizer->words($value);
} else { } else {
// use as-is // use as-is
} }
@@ -3648,8 +3650,8 @@ class ProcessTemplate extends Process implements ConfigurableModule {
$this->breadcrumb('../', $labels['templates']); $this->breadcrumb('../', $labels['templates']);
$templateNamesByTag = $templates->getTags(true); $templateNamesByTag = $templates->getTags(true);
$editTag = $input->get->name('edit_tag'); $editTag = $sanitizer->words($input->get->text('edit_tag'), array('separator' => '-'));
$saveTag = $input->post->name('save_tag'); $saveTag = $sanitizer->words($input->post->text('save_tag'), array('separator' => '-'));
$tags = array(); $tags = array();
foreach(array_keys($templateNamesByTag) as $tag) { foreach(array_keys($templateNamesByTag) as $tag) {
@@ -3665,8 +3667,9 @@ class ProcessTemplate extends Process implements ConfigurableModule {
$this->headline("$labels[tags] - " . (isset($tags[$editTag]) ? $tags[$editTag] : $editTag)); $this->headline("$labels[tags] - " . (isset($tags[$editTag]) ? $tags[$editTag] : $editTag));
/** @var InputfieldName $f */ /** @var InputfieldName $f */
$f = $modules->get('InputfieldName'); $f = $modules->get('InputfieldText');
$f->attr('name', 'rename_tag'); $f->attr('name', 'rename_tag');
$f->label = $this->_('Tag name');
$f->attr('value', isset($tags[$editTag]) ? $tags[$editTag] : $editTag); $f->attr('value', isset($tags[$editTag]) ? $tags[$editTag] : $editTag);
$f->collapsed = Inputfield::collapsedYes; $f->collapsed = Inputfield::collapsedYes;
$f->addClass('InputfieldIsSecondary', 'wrapClass'); $f->addClass('InputfieldIsSecondary', 'wrapClass');
@@ -3710,7 +3713,7 @@ class ProcessTemplate extends Process implements ConfigurableModule {
} else if($saveTag) { } else if($saveTag) {
// save tag // save tag
$tagTemplates = $sanitizer->names($input->post('tag_templates')); $tagTemplates = $sanitizer->names($input->post('tag_templates'));
$renameTag = $input->post->templateName('rename_tag'); $renameTag = $sanitizer->word($input->post->text('rename_tag'), array('separator' => '-'));
$isCollapsed = (int) $input->post('tag_collapsed'); $isCollapsed = (int) $input->post('tag_collapsed');
$removeTag = ''; $removeTag = '';
if($renameTag && $renameTag != $saveTag) { if($renameTag && $renameTag != $saveTag) {
@@ -3767,9 +3770,10 @@ class ProcessTemplate extends Process implements ConfigurableModule {
$form->attr('method', 'get'); $form->attr('method', 'get');
/** @var InputfieldName $f */ /** @var InputfieldName $f */
$f = $modules->get('InputfieldName'); $f = $modules->get('InputfieldText');
$f->attr('name', 'edit_tag'); $f->attr('name', 'edit_tag');
$f->label = $this->_('Add new tag'); $f->label = $this->_('Add new tag');
$f->description = $this->_('You may use letters, digits, hyphens, underscores.');
$f->icon = 'tag'; $f->icon = 'tag';
$f->addClass('InputfieldIsSecondary', 'wrapClass'); $f->addClass('InputfieldIsSecondary', 'wrapClass');
$form->add($f); $form->add($f);