diff --git a/administrator/components/com_banners/models/fields/clicks.php b/administrator/components/com_banners/models/fields/clicks.php index f993ffa7150c5..c377f0d2ee2aa 100644 --- a/administrator/components/com_banners/models/fields/clicks.php +++ b/administrator/components/com_banners/models/fields/clicks.php @@ -37,7 +37,7 @@ protected function getInput() return ' ' + . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly" /> ' . JText::_('COM_BANNERS_RESET_CLICKS') . ''; } } diff --git a/administrator/components/com_banners/models/fields/impmade.php b/administrator/components/com_banners/models/fields/impmade.php index aeba9870beac7..a3809a249a5dc 100644 --- a/administrator/components/com_banners/models/fields/impmade.php +++ b/administrator/components/com_banners/models/fields/impmade.php @@ -37,7 +37,7 @@ protected function getInput() return ' ' + . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly" /> ' . JText::_('COM_BANNERS_RESET_IMPMADE') . ''; } } diff --git a/administrator/components/com_categories/models/fields/modal/category.php b/administrator/components/com_categories/models/fields/modal/category.php index 6ac1d02c46622..1aa82963c5174 100644 --- a/administrator/components/com_categories/models/fields/modal/category.php +++ b/administrator/components/com_categories/models/fields/modal/category.php @@ -148,7 +148,7 @@ protected function getInput() . ' title="' . JHtml::tooltipText('COM_CATEGORIES_CHANGE_CATEGORY') . '"' . ' href="' . $link . '&' . JSession::getFormToken() . '=1"' . ' rel="{handler: \'iframe\', size: {x: 800, y: 450}}">' - . ' ' . JText::_('JSELECT') + . '' . JText::_('JSELECT') . ''; // Edit category button @@ -159,7 +159,7 @@ protected function getInput() . ' href="index.php?option=com_categories&layout=modal&tmpl=component&task=category.edit&id=' . $value . '"' . ' target="_blank"' . ' title="' . JHtml::tooltipText('COM_CATEGORIES_EDIT_CATEGORY') . '" >' - . ' ' . JText::_('JACTION_EDIT') + . '' . JText::__('JACTION_EDIT') . ''; } @@ -170,7 +170,7 @@ protected function getInput() . ' id="' . $this->id . '_clear"' . ' class="btn' . ($value ? '' : ' hidden') . '"' . ' onclick="return jClearCategory(\'' . $this->id . '\')">' - . ' ' . JText::_('JCLEAR') + . '' . JText::__('JCLEAR') . ''; } diff --git a/administrator/components/com_categories/views/categories/tmpl/modal.php b/administrator/components/com_categories/views/categories/tmpl/modal.php index 21e420741e5b5..24477b5bd7ac9 100644 --- a/administrator/components/com_categories/views/categories/tmpl/modal.php +++ b/administrator/components/com_categories/views/categories/tmpl/modal.php @@ -1,4 +1,166 @@ isSite()) +{ + JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); +} + +require_once JPATH_ROOT . '/components/com_content/helpers/route.php'; + +// Include the component HTML helpers. +JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); +JHtml::_('bootstrap.tooltip'); +JHtml::_('formbehavior.chosen', 'select'); + +$extension = $this->escape($this->state->get('filter.extension')); +$function = $app->input->getCmd('function', 'jSelectCategory'); +$listOrder = $this->escape($this->state->get('list.ordering')); +$listDirn = $this->escape($this->state->get('list.direction')); +?> + +
/** * @package Joomla.Administrator * @subpackage com_categories diff --git a/administrator/components/com_contact/models/fields/modal/contact.php b/administrator/components/com_contact/models/fields/modal/contact.php index b293fbf05ffb9..aa8611ab2b22e 100644 --- a/administrator/components/com_contact/models/fields/modal/contact.php +++ b/administrator/components/com_contact/models/fields/modal/contact.php @@ -141,7 +141,7 @@ protected function getInput() . ' title="' . JHtml::tooltipText('COM_CONTACT_CHANGE_CONTACT') . '"' . ' href="' . $link . '&' . JSession::getFormToken() . '=1"' . ' rel="{handler: \'iframe\', size: {x: 800, y: 450}}">' - . ' ' . JText::_('JSELECT') + . '' . JText::_('JSELECT') . ''; // Edit contact button. @@ -152,7 +152,7 @@ protected function getInput() . ' href="index.php?option=com_contact&layout=modal&tmpl=component&task=contact.edit&id=' . $value . '"' . ' target="_blank"' . ' title="' . JHtml::tooltipText('COM_CONTACT_EDIT_CONTACT') . '" >' - . ' ' . JText::_('JACTION_EDIT') + . '' . JText::__('JACTION_EDIT') . ''; } @@ -163,7 +163,7 @@ protected function getInput() . ' id="' . $this->id . '_clear"' . ' class="btn' . ($value ? '' : ' hidden') . '"' . ' onclick="return jClearContact(\'' . $this->id . '\')">' - . ' ' . JText::_('JCLEAR') + . '' . JText::__('JCLEAR') . ''; } diff --git a/administrator/components/com_content/models/fields/modal/article.php b/administrator/components/com_content/models/fields/modal/article.php index 8c97292d7ec08..3c50cd1fb4819 100644 --- a/administrator/components/com_content/models/fields/modal/article.php +++ b/administrator/components/com_content/models/fields/modal/article.php @@ -133,19 +133,19 @@ protected function getInput() $html[] = ''; $html[] = ''; $html[] = ' ' . JText::_('JSELECT') . ''; + '=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}">' . JText::_('JSELECT') . ''; // Edit article button if ($allowEdit) { - $html[] = ' ' . JText::_('JACTION_EDIT') . ''; + $html[] = '' . JText::__('JACTION_EDIT') . ''; } // Clear article button if ($allowClear) { $html[] = ''; + $this->id . '\')">' . JText::__('JCLEAR') . ''; } $html[] = ''; diff --git a/administrator/components/com_content/views/articles/tmpl/modal.php b/administrator/components/com_content/views/articles/tmpl/modal.php index d326db0a66af1..8782e0b747960 100644 --- a/administrator/components/com_content/views/articles/tmpl/modal.php +++ b/administrator/components/com_content/views/articles/tmpl/modal.php @@ -1,4 +1,174 @@ isSite()) +{ + JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); +} + +require_once JPATH_ROOT . '/components/com_content/helpers/route.php'; + +JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); +JHtml::_('bootstrap.tooltip'); +JHtml::_('behavior.framework', true); +JHtml::_('formbehavior.chosen', 'select'); + +$function = $app->input->getCmd('function', 'jSelectArticle'); +$listOrder = $this->escape($this->state->get('list.ordering')); +$listDirn = $this->escape($this->state->get('list.direction')); +?> + /** * @package Joomla.Administrator * @subpackage com_content diff --git a/administrator/components/com_contenthistory/views/history/tmpl/modal.php b/administrator/components/com_contenthistory/views/history/tmpl/modal.php index 5a1c168e285ca..df0f28fa6b5b8 100644 --- a/administrator/components/com_contenthistory/views/history/tmpl/modal.php +++ b/administrator/components/com_contenthistory/views/history/tmpl/modal.php @@ -91,19 +91,19 @@