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

Fix issue processwire/processwire-issues#1720

Browse Source
This commit is contained in:
Ryan Cramer
2023-04-25 10:46:06 -04:00
parent 665a462501
commit 28eb798c9c
4 changed files with 106 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wire/core/Process.php
View File

@@ -375,11 +375,11 @@ abstract class Process extends WireData implements Module {
// already have what we need
} else if(ctype_digit("$parent")) {
$parent = $pages->get((int) $parent);
} else if(strpos($parent, '/') !== false) {
} else if(strpos("$parent", '/') !== false) {
$parent = $pages->get($parent);
} else if($parent) {
$parent = $sanitizer->pageName($parent);
$parent = $adminPage->child("include=all, name=$parent");
if(strlen($parent)) $parent = $adminPage->child("include=all, name=$parent");
}
if(!$parent || !$parent->id) $parent = $adminPage; // default
$page = $parent->child("include=all, name=$name"); // does it already exist?

8
wire/modules/Process/ProcessPageEditLink/ProcessPageEditLink.js
View File

@@ -166,7 +166,7 @@ $(document).ready(function() {
}
var $linkRel = $("#link_rel");
if($linkRel.length && $linkRel.val().length) {
if($linkRel.length && $linkRel.val() && $linkRel.val().length) {
$link.attr('rel', $linkRel.val());
}
@@ -274,7 +274,11 @@ $(document).ready(function() {
}
var extLinkClass = cfg.extLinkClass;
if(extLinkClass.length > 0) {
extLinkClass = extLinkClass.split(' ');
if(extLinkClass.indexOf(' ') > -1) {
var extLinkClassAll = extLinkClass.replace(' ', '_');
$("#link_class_" + extLinkClassAll).prop('checked', true); // all classes in 1 option
extLinkClass = extLinkClass.split(' ');
}
for(n = 0; n < extLinkClass.length; n++) {
// $("#link_class_" + extLinkClass[n]).attr('checked', 'checked'); // JQM
$("#link_class_" + extLinkClass[n]).prop('checked', true);

2
wire/modules/Process/ProcessPageEditLink/ProcessPageEditLink.min.js vendored
View File

File diff suppressed because one or more lines are too long

104
wire/modules/Process/ProcessPageEditLink/ProcessPageEditLink.module
View File

@@ -152,8 +152,7 @@ class ProcessPageEditLink extends Process implements ConfigurableModule {
*/
public function set($key, $value) {
if($key === 'classOptions' || $key === 'relOptions' || $key === 'targetOptions') {
$value = $this->wire()->sanitizer->htmlClasses($value, true);
$value = implode("\n", $value);
$value = $this->sanitizeOptions($value);
} else if($key === 'extLinkRel' || $key === 'extLinkClass') {
$value = $this->wire()->sanitizer->htmlClasses($value);
} else if($key === 'extLinkTarget') {
@@ -162,6 +161,51 @@ class ProcessPageEditLink extends Process implements ConfigurableModule {
return parent::set($key, $value);
}
/**
* Sanitize single option 'value', 'value=label', or 'value="label"'
*
* @param string $value
* @return string
*
*/
protected function sanitizeOption($value) {
$sanitizer = $this->wire()->sanitizer;
$value = trim($value);
$plus = strpos($value, '+') === 0 ? '+' : '';
if($plus) $value = ltrim($value, '+');
if(strpos($value, '=') === false) return $plus . $sanitizer->htmlClasses($value);
// value=label or value="label"
list($value, $label) = explode('=', $value, 2);
$value = trim($value);
$label = trim($label);
$value = $sanitizer->htmlClasses($value);
if(!strlen($value)) return '';
$quote = strpos($label, '"') === 0 ? '"' : '';
$label = str_replace('"', '', $label);
$label = $sanitizer->text($label);
$value = strlen($label) ? "$plus$value=$quote$label$quote" : "$value";
return $value;
}
/**
* Sanitize multiple newline separated options
*
* @param string $value
* @return string
*
*/
protected function sanitizeOptions($value) {
$value = trim($value);
if(!strlen($value)) return '';
if(strpos($value, "\n") === false) return $this->sanitizeOption($value);
$lines = array();
foreach(explode("\n", $value) as $line) {
$line = $this->sanitizeOption($line);
if(strlen($line)) $lines[] = $line;
}
return implode("\n", $lines);
}
/**
* Primary execute
*
@@ -304,9 +348,13 @@ class ProcessPageEditLink extends Process implements ConfigurableModule {
$this->addSelectOptions($field, 'target', $this->targetOptions);
if($this->relOptions) $field->columnWidth = 50;
$fieldset->add($field);
if($this->extLinkTarget) {
$options = $field->getOptions();
if(!isset($options[$this->extLinkTarget])) $field->addOption($this->extLinkTarget);
}
}
if($this->relOptions) {
if($this->relOptions || $this->extLinkRel) {
/** @var InputfieldSelect $field */
$field = $modules->get('InputfieldSelect');
$field->attr('id+name', 'link_rel');
@@ -315,6 +363,10 @@ class ProcessPageEditLink extends Process implements ConfigurableModule {
if($this->targetOptions) $field->columnWidth = 50;
$this->addSelectOptions($field, 'rel', $this->relOptions);
$fieldset->add($field);
if($this->extLinkRel) {
$options = $field->getOptions();
if(!isset($options[$this->extLinkRel])) $field->addOption($this->extLinkRel);
}
}
$classOptions = $this->getClassOptions();
@@ -326,6 +378,10 @@ class ProcessPageEditLink extends Process implements ConfigurableModule {
$field->description = $this->_('Additional classes that can affect the look or behavior of the link.');
$field->optionColumns = 1;
$this->addSelectOptions($field, 'class', $classOptions);
if($this->extLinkClass) {
$options = $field->getOptions();
if(!isset($options[$this->extLinkClass])) $field->addOption($this->extLinkClass);
}
$fieldset->add($field);
}
@@ -350,12 +406,43 @@ class ProcessPageEditLink extends Process implements ConfigurableModule {
protected function getClassOptions() {
$sanitizer = $this->wire()->sanitizer;
$class = $this->wire()->input->get->text('class');
if(!$class) return $this->classOptions;
$inputClass = $this->wire()->input->get->text('class');
$classOptions = $this->classOptions ? explode("\n", trim("$this->classOptions")) : array();
$classOptions = array_merge($classOptions, explode(' ', $class));
$classOptions = $sanitizer->htmlClasses($classOptions, true);
if(empty($inputClass)) return $this->classOptions;
$inputClass = $sanitizer->htmlClasses($inputClass, true);
if(!count($inputClass)) return $this->classOptions;
sort($inputClass);
$inputClasses = $inputClass;
$inputClass = implode(' ', $inputClass);
$classOptions = array();
if($this->classOptions) {
foreach(explode("\n", $this->classOptions) as $line) {
$value = ltrim(trim($line), '+');
if(strpos($value, '=')) {
list($value, /*$label*/) = explode('=', $value, 2);
}
if(strpos($value, ' ')) {
$value = $sanitizer->htmlClasses($value, true);
sort($value);
$value = implode(' ', $value);
}
$classOptions[$value] = $line;
}
}
if(isset($classOptions[$inputClass])) {
// class already appears as-is, i.e. "uk-text-muted" or "uk-text-muted uk-text-small", etc.
} else {
// add new classes from input
foreach($inputClasses as $class) {
if(!isset($classOptions[$class])) $classOptions[$class] = $class;
}
}
return count($classOptions) ? implode("\n", $classOptions) : '';
}
@@ -616,4 +703,3 @@ class ProcessPageEditLink extends Process implements ConfigurableModule {
$inputfields->add($f);
}
}