' . t('The following tokens are available. If you would like to have the characters \'[\' and \']\' please use the html entity codes \'%5B\' or \'%5D\' or they will get replaced with empty space.') . '
', + ); + foreach (array_keys($options) as $type) { + if (!empty($options[$type])) { + $items = array(); + foreach ($options[$type] as $key => $value) { + $items[] = $key . ' == ' . $value; + } + $form['token_help']['tokens'] = array( + '#theme' => 'item_list', + '#items' => $items, + ); + } + } + } + } + + /** * Don't run a query */ public function query() { } diff --git a/lib/Drupal/views/Plugin/views/area/Text.php b/lib/Drupal/views/Plugin/views/area/Text.php index b696414..0671ec4 100644 --- a/lib/Drupal/views/Plugin/views/area/Text.php +++ b/lib/Drupal/views/Plugin/views/area/Text.php @@ -39,55 +39,8 @@ class Text extends AreaPluginBase { '#wysiwyg' => FALSE, ); - - $form['tokenize'] = array( - '#type' => 'checkbox', - '#title' => t('Use replacement tokens from the first row'), - '#default_value' => $this->options['tokenize'], - ); - - // Get a list of the available fields and arguments for token replacement. - $options = array(); - foreach ($this->view->display_handler->getHandlers('field') as $field => $handler) { - $options[t('Fields')]["[$field]"] = $handler->adminLabel(); - } - - $count = 0; // This lets us prepare the key as we want it printed. - foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) { - $options[t('Arguments')]['%' . ++$count] = t('@argument title', array('@argument' => $handler->adminLabel())); - $options[t('Arguments')]['!' . $count] = t('@argument input', array('@argument' => $handler->adminLabel())); - } - - if (!empty($options)) { - $output = '' . t('The following tokens are available. If you would like to have the characters \'[\' and \']\' please use the html entity codes \'%5B\' or \'%5D\' or they will get replaced with empty space.' . '
'); - foreach (array_keys($options) as $type) { - if (!empty($options[$type])) { - $items = array(); - foreach ($options[$type] as $key => $value) { - $items[] = $key . ' == ' . $value; - } - $output .= theme('item_list', - array( - 'items' => $items, - 'type' => $type - )); - } - } - - $form['token_help'] = array( - '#type' => 'fieldset', - '#title' => t('Replacement patterns'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#value' => $output, - '#id' => 'edit-options-token-help', - '#states' => array( - 'visible' => array( - ':input[name="options[tokenize]"]' => array('checked' => TRUE), - ), - ), - ); - } + // Add tokenization form elements. + $this->tokenForm($form, $form_state); } public function submitOptionsForm(&$form, &$form_state) { diff --git a/lib/Drupal/views/Plugin/views/area/TextCustom.php b/lib/Drupal/views/Plugin/views/area/TextCustom.php index 9e7c172..a270006 100644 --- a/lib/Drupal/views/Plugin/views/area/TextCustom.php +++ b/lib/Drupal/views/Plugin/views/area/TextCustom.php @@ -18,21 +18,26 @@ use Drupal\Core\Annotation\Plugin; * id = "text_custom" * ) */ -class TextCustom extends Text { +class TextCustom extends AreaPluginBase { protected function defineOptions() { $options = parent::defineOptions(); - unset($options['format']); + $options['content'] = array('default' => '', 'translatable' => TRUE); + $options['tokenize'] = array('default' => FALSE, 'bool' => TRUE); return $options; } public function buildOptionsForm(&$form, &$form_state) { parent::buildOptionsForm($form, $form_state); - // Alter the form element, to be a regular text area. - $form['content']['#type'] = 'textarea'; - unset($form['content']['#format']); - unset($form['content']['#wysiwyg']); + $form['content'] = array( + '#type' => 'textarea', + '#default_value' => $this->options['content'], + '#rows' => 6, + ); + + // Add tokenization form elements. + $this->tokenForm($form, $form_state); } // Empty, so we don't inherit submitOptionsForm from the parent. @@ -41,7 +46,7 @@ class TextCustom extends Text { function render($empty = FALSE) { if (!$empty || !empty($this->options['empty'])) { - return $this->render_textarea_custom($this->options['content']); + return $this->render_textarea($this->options['content']); } return ''; @@ -50,7 +55,7 @@ class TextCustom extends Text { /** * Render a text area with filter_xss_admin. */ - function render_textarea_custom($value) { + function render_textarea($value) { if ($value) { if ($this->options['tokenize']) { $value = $this->view->style_plugin->tokenize_value($value, 0); diff --git a/lib/Drupal/views/Plugin/views/area/Title.php b/lib/Drupal/views/Plugin/views/area/Title.php index e9185a0..b0402c4 100644 --- a/lib/Drupal/views/Plugin/views/area/Title.php +++ b/lib/Drupal/views/Plugin/views/area/Title.php @@ -26,7 +26,6 @@ class Title extends AreaPluginBase { protected function defineOptions() { $options = parent::defineOptions(); $options['title'] = array('default' => '', 'translatable' => TRUE); - return $options; } @@ -42,7 +41,6 @@ class Title extends AreaPluginBase { '#default_value' => $this->options['title'], '#description' => t('Override the title of this view when it is empty.'), ); - } /** @@ -50,7 +48,7 @@ class Title extends AreaPluginBase { */ function render($empty = FALSE) { if (!empty($this->options['title'])) { - $this->view->setTitle(filter_xss_admin($this->options['title']), PASS_THROUGH); + $this->view->setTitle($this->sanitizeValue($this->options['title'], 'xss_admin'), PASS_THROUGH); } return '';