diff --git a/administrator/components/com_finder/Controller/DisplayController.php b/administrator/components/com_finder/Controller/DisplayController.php index 36db39810a1f8..5ead7cdb119f5 100644 --- a/administrator/components/com_finder/Controller/DisplayController.php +++ b/administrator/components/com_finder/Controller/DisplayController.php @@ -11,7 +11,9 @@ defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\BaseController; +use Joomla\CMS\Router\Route; /** * Base controller class for Finder. @@ -48,8 +50,8 @@ public function display($cachable = false, $urlparams = array()) if ($view === 'filter' && $layout === 'edit' && !$this->checkEditId('com_finder.edit.filter', $filterId)) { // Somehow the person just went to the form - we don't allow that. - $this->setMessage(\JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $f_id), 'error'); - $this->setRedirect(\JRoute::_('index.php?option=com_finder&view=filters', false)); + $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $f_id), 'error'); + $this->setRedirect(Route::_('index.php?option=com_finder&view=filters', false)); return false; } diff --git a/administrator/components/com_finder/Controller/FilterController.php b/administrator/components/com_finder/Controller/FilterController.php index 5a2c34d94f22b..178522ae9b5ff 100644 --- a/administrator/components/com_finder/Controller/FilterController.php +++ b/administrator/components/com_finder/Controller/FilterController.php @@ -12,7 +12,9 @@ defined('_JEXEC') or die; use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\FormController; +use Joomla\CMS\Router\Route; use Joomla\Utilities\ArrayHelper; /** @@ -65,8 +67,8 @@ public function save($key = null, $urlVar = null) if (!$this->checkEditId($context, $recordId)) { // Somehow the person just went to the form and tried to save it. We don't allow that. - $this->setMessage(\JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $recordId), 'error'); - $this->setRedirect(\JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false)); + $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $recordId), 'error'); + $this->setRedirect(Route::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false)); return false; } @@ -81,7 +83,7 @@ public function save($key = null, $urlVar = null) if ($checkin && $model->checkin($data[$key]) === false) { // Check-in failed. Go back to the item and display a notice. - $this->setMessage(\JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'error'); + $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'error'); $this->setRedirect('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $urlVar)); return false; @@ -95,8 +97,8 @@ public function save($key = null, $urlVar = null) // Access check. if (!$this->allowSave($data, $key)) { - $this->setMessage(\JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'), 'error'); - $this->setRedirect(\JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false)); + $this->setMessage(Text::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'), 'error'); + $this->setRedirect(Route::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false)); return false; } @@ -139,7 +141,7 @@ public function save($key = null, $urlVar = null) // Redirect back to the edit screen. $this->setRedirect( - \JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $key), false) + Route::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $key), false) ); return false; @@ -163,9 +165,9 @@ public function save($key = null, $urlVar = null) $app->setUserState($context . '.data', $validData); // Redirect back to the edit screen. - $this->setMessage(\JText::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()), 'error'); + $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()), 'error'); $this->setRedirect( - \JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $key), false) + Route::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $key), false) ); return false; @@ -178,14 +180,14 @@ public function save($key = null, $urlVar = null) $app->setUserState($context . '.data', $validData); // Check-in failed, so go back to the record and display a notice. - $this->setMessage(\JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'error'); + $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'error'); $this->setRedirect('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $key)); return false; } $this->setMessage( - \JText::_( + Text::_( (Factory::getLanguage()->hasKey($this->text_prefix . ($recordId === 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS') ? $this->text_prefix : 'JLIB_APPLICATION') . ($recordId === 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS' ) @@ -203,7 +205,7 @@ public function save($key = null, $urlVar = null) // Redirect back to the edit screen. $this->setRedirect( - \JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $key), false) + Route::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $key), false) ); break; @@ -215,7 +217,7 @@ public function save($key = null, $urlVar = null) // Redirect back to the edit screen. $this->setRedirect( - \JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend(null, $key), false) + Route::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend(null, $key), false) ); break; @@ -227,7 +229,7 @@ public function save($key = null, $urlVar = null) // Redirect to the list screen. $this->setRedirect( - \JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false) + Route::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false) ); break; diff --git a/administrator/components/com_finder/Controller/IndexController.php b/administrator/components/com_finder/Controller/IndexController.php index d64bc8933cfd6..3d63ef97bb53c 100644 --- a/administrator/components/com_finder/Controller/IndexController.php +++ b/administrator/components/com_finder/Controller/IndexController.php @@ -11,6 +11,7 @@ defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\AdminController; /** @@ -58,14 +59,14 @@ public function purge() if (!$return) { - $message = \JText::_('COM_FINDER_INDEX_PURGE_FAILED', $model->getError()); + $message = Text::_('COM_FINDER_INDEX_PURGE_FAILED', $model->getError()); $this->setRedirect('index.php?option=com_finder&view=index', $message); return false; } else { - $message = \JText::_('COM_FINDER_INDEX_PURGE_SUCCESS'); + $message = Text::_('COM_FINDER_INDEX_PURGE_SUCCESS'); $this->setRedirect('index.php?option=com_finder&view=index', $message); return true; diff --git a/administrator/components/com_finder/Controller/IndexerController.php b/administrator/components/com_finder/Controller/IndexerController.php index 4e86871aeb688..91db9cce03d67 100644 --- a/administrator/components/com_finder/Controller/IndexerController.php +++ b/administrator/components/com_finder/Controller/IndexerController.php @@ -15,6 +15,7 @@ use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Document\FactoryInterface; use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\Plugin\PluginHelper; @@ -62,7 +63,7 @@ public function start() $this->app->allowCache(false); // Check for a valid token. If invalid, send a 403 with the error message. - Session::checkToken('request') or static::sendResponse(new \Exception(\JText::_('JINVALID_TOKEN_NOTICE'), 403)); + Session::checkToken('request') or static::sendResponse(new \Exception(Text::_('JINVALID_TOKEN_NOTICE'), 403)); // Put in a buffer to silence noise. ob_start(); @@ -74,8 +75,8 @@ public function start() PluginHelper::importPlugin('finder'); // Add the indexer language to \JS - \JText::script('COM_FINDER_AN_ERROR_HAS_OCCURRED'); - \JText::script('COM_FINDER_NO_ERROR_RETURNED'); + Text::script('COM_FINDER_AN_ERROR_HAS_OCCURRED'); + Text::script('COM_FINDER_NO_ERROR_RETURNED'); // Start the indexer. try @@ -130,7 +131,7 @@ public function batch() $this->app->allowCache(false); // Check for a valid token. If invalid, send a 403 with the error message. - Session::checkToken('request') or static::sendResponse(new \Exception(\JText::_('JINVALID_TOKEN_NOTICE'), 403)); + Session::checkToken('request') or static::sendResponse(new \Exception(Text::_('JINVALID_TOKEN_NOTICE'), 403)); // Put in a buffer to silence noise. ob_start(); @@ -246,7 +247,7 @@ public function optimize() $this->app->allowCache(false); // Check for a valid token. If invalid, send a 403 with the error message. - Session::checkToken('request') or static::sendResponse(new \Exception(\JText::_('JINVALID_TOKEN_NOTICE'), 403)); + Session::checkToken('request') or static::sendResponse(new \Exception(Text::_('JINVALID_TOKEN_NOTICE'), 403)); // Put in a buffer to silence noise. ob_start(); @@ -368,7 +369,7 @@ public function __construct($state) // Prepare the error response. $this->error = true; - $this->header = \JText::_('COM_FINDER_INDEXER_HEADER_ERROR'); + $this->header = Text::_('COM_FINDER_INDEXER_HEADER_ERROR'); $this->message = $state->getMessage(); } else @@ -388,18 +389,18 @@ public function __construct($state) // Set the appropriate messages. if ($this->totalItems <= 0 && $this->complete) { - $this->header = \JText::_('COM_FINDER_INDEXER_HEADER_COMPLETE'); - $this->message = \JText::_('COM_FINDER_INDEXER_MESSAGE_COMPLETE'); + $this->header = Text::_('COM_FINDER_INDEXER_HEADER_COMPLETE'); + $this->message = Text::_('COM_FINDER_INDEXER_MESSAGE_COMPLETE'); } elseif ($this->totalItems <= 0) { - $this->header = \JText::_('COM_FINDER_INDEXER_HEADER_OPTIMIZE'); - $this->message = \JText::_('COM_FINDER_INDEXER_MESSAGE_OPTIMIZE'); + $this->header = Text::_('COM_FINDER_INDEXER_HEADER_OPTIMIZE'); + $this->message = Text::_('COM_FINDER_INDEXER_MESSAGE_OPTIMIZE'); } else { - $this->header = \JText::_('COM_FINDER_INDEXER_HEADER_RUNNING'); - $this->message = \JText::_('COM_FINDER_INDEXER_MESSAGE_RUNNING'); + $this->header = Text::_('COM_FINDER_INDEXER_HEADER_RUNNING'); + $this->message = Text::_('COM_FINDER_INDEXER_MESSAGE_RUNNING'); } } } diff --git a/administrator/components/com_finder/Controller/SearchesController.php b/administrator/components/com_finder/Controller/SearchesController.php index 34bfe9f4b151d..a3a44fa27db44 100644 --- a/administrator/components/com_finder/Controller/SearchesController.php +++ b/administrator/components/com_finder/Controller/SearchesController.php @@ -11,7 +11,9 @@ defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Controller\BaseController; +use Joomla\CMS\Session\Session; /** * Methods supporting a list of search terms. @@ -28,7 +30,7 @@ class SearchesController extends BaseController public function reset() { // Check for request forgeries. - \JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN')); + Session::checkToken() or jexit(Text::_('JINVALID_TOKEN')); $model = $this->getModel('Searches'); diff --git a/administrator/components/com_finder/Field/ContentmapField.php b/administrator/components/com_finder/Field/ContentmapField.php index 32735c6efc0b0..67dab8791eaf2 100644 --- a/administrator/components/com_finder/Field/ContentmapField.php +++ b/administrator/components/com_finder/Field/ContentmapField.php @@ -13,6 +13,8 @@ use Joomla\CMS\Factory; use Joomla\CMS\Form\Field\GroupedlistField; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; use Joomla\Component\Finder\Administrator\Helper\FinderHelperLanguage; /** @@ -102,7 +104,7 @@ protected function getGroups() else { $key = FinderHelperLanguage::branchSingular($branch->text); - $text = $lang->hasKey($key) ? \JText::_($key) : $branch->text; + $text = $lang->hasKey($key) ? Text::_($key) : $branch->text; } // Initialize the group if necessary. @@ -111,7 +113,7 @@ protected function getGroups() $groups[$name] = array(); } - $groups[$name][] = \JHtml::_('select.option', $branch->value, $levelPrefix . $text); + $groups[$name][] = HTMLHelper::_('select.option', $branch->value, $levelPrefix . $text); } } } diff --git a/administrator/components/com_finder/Field/ContenttypesField.php b/administrator/components/com_finder/Field/ContenttypesField.php index e19fbbd36d3a2..829e9890a597e 100644 --- a/administrator/components/com_finder/Field/ContenttypesField.php +++ b/administrator/components/com_finder/Field/ContenttypesField.php @@ -13,6 +13,8 @@ use Joomla\CMS\Factory; use Joomla\CMS\Form\Field\ListField; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; use Joomla\Component\Finder\Administrator\Helper\FinderHelperLanguage; use Joomla\Utilities\ArrayHelper; @@ -65,7 +67,7 @@ public function getOptions() foreach ($contentTypes as $contentType) { $key = FinderHelperLanguage::branchSingular($contentType->text); - $contentType->translatedText = $lang->hasKey($key) ? \JText::_($key) : $contentType->text; + $contentType->translatedText = $lang->hasKey($key) ? Text::_($key) : $contentType->text; } // Order by title. @@ -74,7 +76,7 @@ public function getOptions() // Convert the values to options. foreach ($contentTypes as $contentType) { - $options[] = \JHtml::_('select.option', $contentType->value, $contentType->translatedText); + $options[] = HTMLHelper::_('select.option', $contentType->value, $contentType->translatedText); } // Merge any additional options in the XML definition. diff --git a/administrator/components/com_finder/Field/SearchfilterField.php b/administrator/components/com_finder/Field/SearchfilterField.php index 2e24e83cac051..6e00f09c2fe87 100644 --- a/administrator/components/com_finder/Field/SearchfilterField.php +++ b/administrator/components/com_finder/Field/SearchfilterField.php @@ -13,6 +13,8 @@ use Joomla\CMS\Factory; use Joomla\CMS\Form\Field\ListField; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; /** * Search Filter field for the Finder package. @@ -48,7 +50,7 @@ public function getOptions() $db->setQuery($query); $options = $db->loadObjectList(); - array_unshift($options, \JHtml::_('select.option', '', \JText::_('COM_FINDER_SELECT_SEARCH_FILTER'), 'value', 'text')); + array_unshift($options, HTMLHelper::_('select.option', '', Text::_('COM_FINDER_SELECT_SEARCH_FILTER'), 'value', 'text')); return $options; } diff --git a/administrator/components/com_finder/Helper/FinderHelper.php b/administrator/components/com_finder/Helper/FinderHelper.php index 104751a39ac5a..7f6f3e5e8abcb 100644 --- a/administrator/components/com_finder/Helper/FinderHelper.php +++ b/administrator/components/com_finder/Helper/FinderHelper.php @@ -11,6 +11,9 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; + /** * Helper class for Finder. * @@ -38,22 +41,22 @@ class FinderHelper public static function addSubmenu($vName) { \JHtmlSidebar::addEntry( - \JText::_('COM_FINDER_SUBMENU_INDEX'), + Text::_('COM_FINDER_SUBMENU_INDEX'), 'index.php?option=com_finder&view=index', $vName === 'index' ); \JHtmlSidebar::addEntry( - \JText::_('COM_FINDER_SUBMENU_MAPS'), + Text::_('COM_FINDER_SUBMENU_MAPS'), 'index.php?option=com_finder&view=maps', $vName === 'maps' ); \JHtmlSidebar::addEntry( - \JText::_('COM_FINDER_SUBMENU_FILTERS'), + Text::_('COM_FINDER_SUBMENU_FILTERS'), 'index.php?option=com_finder&view=filters', $vName === 'filters' ); \JHtmlSidebar::addEntry( - \JText::_('COM_FINDER_SUBMENU_SEARCHES'), + Text::_('COM_FINDER_SUBMENU_SEARCHES'), 'index.php?option=com_finder&view=searches', $vName === 'searches' ); @@ -68,7 +71,7 @@ public static function addSubmenu($vName) */ public static function getFinderPluginId() { - $db = \JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true) ->select($db->quoteName('extension_id')) ->from($db->quoteName('#__extensions')) @@ -82,7 +85,7 @@ public static function getFinderPluginId() } catch (\RuntimeException $e) { - \JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error'); + Factory::getApplication()->enqueueMessage($e->getMessage(), 'error'); } return $result; diff --git a/administrator/components/com_finder/Helper/FinderHelperLanguage.php b/administrator/components/com_finder/Helper/FinderHelperLanguage.php index 99cef9bdc4e66..f43445fb3f76a 100644 --- a/administrator/components/com_finder/Helper/FinderHelperLanguage.php +++ b/administrator/components/com_finder/Helper/FinderHelperLanguage.php @@ -9,10 +9,12 @@ namespace Joomla\Component\Finder\Administrator\Helper; -use Joomla\CMS\Language\LanguageHelper; - defined('_JEXEC') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\Language\LanguageHelper; +use Joomla\CMS\Language\Text; + /** * Finder language helper class. * @@ -72,7 +74,7 @@ public static function branchLanguageTitle($branchName) if ($branchName === '*') { - $title = \JText::_('JALL_LANGUAGE'); + $title = Text::_('JALL_LANGUAGE'); } else { @@ -96,7 +98,7 @@ public static function branchLanguageTitle($branchName) */ public static function loadComponentLanguage() { - \JFactory::getLanguage()->load('com_finder', JPATH_SITE); + Factory::getLanguage()->load('com_finder', JPATH_SITE); } /** @@ -119,7 +121,7 @@ public static function loadPluginLanguage() $loaded = true; // Get array of all the enabled Smart Search plugin names. - $db = \JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true) ->select(array($db->quoteName('name'), $db->quoteName('element'))) ->from($db->quoteName('#__extensions')) @@ -135,7 +137,7 @@ public static function loadPluginLanguage() } // Load generic language strings. - $lang = \JFactory::getLanguage(); + $lang = Factory::getLanguage(); $lang->load('plg_content_finder', JPATH_ADMINISTRATOR); // Load language file for each plugin. diff --git a/administrator/components/com_finder/Model/FilterModel.php b/administrator/components/com_finder/Model/FilterModel.php index 58e6eef79d3a5..d9d01cace71d2 100644 --- a/administrator/components/com_finder/Model/FilterModel.php +++ b/administrator/components/com_finder/Model/FilterModel.php @@ -11,6 +11,7 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; use Joomla\CMS\MVC\Model\AdminModel; /** @@ -122,7 +123,7 @@ public function getForm($data = array(), $loadData = true) protected function loadFormData() { // Check the session for previously entered form data. - $data = \JFactory::getApplication()->getUserState('com_finder.edit.filter.data', array()); + $data = Factory::getApplication()->getUserState('com_finder.edit.filter.data', array()); if (empty($data)) { @@ -143,7 +144,7 @@ protected function loadFormData() */ public function getTotal() { - $db = \JFactory::getDbo(); + $db = Factory::getDbo(); $query = $db->getQuery(true) ->select('MAX(link_id)') ->from('#__finder_links'); diff --git a/administrator/components/com_finder/Model/IndexModel.php b/administrator/components/com_finder/Model/IndexModel.php index 5a0e0e6a1bf8e..608bb0f2195cf 100644 --- a/administrator/components/com_finder/Model/IndexModel.php +++ b/administrator/components/com_finder/Model/IndexModel.php @@ -12,6 +12,8 @@ defined('_JEXEC') or die; use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\MVC\Model\ListModel; use Joomla\CMS\Plugin\PluginHelper; @@ -77,7 +79,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu */ protected function canDelete($record) { - return \JFactory::getUser()->authorise('core.delete', $this->option); + return Factory::getUser()->authorise('core.delete', $this->option); } /** @@ -91,7 +93,7 @@ protected function canDelete($record) */ protected function canEditState($record) { - return \JFactory::getUser()->authorise('core.edit.state', $this->option); + return Factory::getUser()->authorise('core.edit.state', $this->option); } /** @@ -121,7 +123,7 @@ public function delete(&$pks) $context = $this->option . '.' . $this->name; // Trigger the onContentBeforeDelete event. - $result = \JFactory::getApplication()->triggerEvent($this->event_before_delete, array($context, $table)); + $result = Factory::getApplication()->triggerEvent($this->event_before_delete, array($context, $table)); if (in_array(false, $result, true)) { @@ -138,7 +140,7 @@ public function delete(&$pks) } // Trigger the onContentAfterDelete event. - \JFactory::getApplication()->triggerEvent($this->event_after_delete, array($context, $table)); + Factory::getApplication()->triggerEvent($this->event_after_delete, array($context, $table)); } else { @@ -152,7 +154,7 @@ public function delete(&$pks) } else { - $this->setError(\JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED')); + $this->setError(Text::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED')); } } } @@ -415,7 +417,7 @@ protected function populateState($ordering = 'l.title', $direction = 'asc') */ public function publish(&$pks, $value = 1) { - $user = \JFactory::getUser(); + $user = Factory::getUser(); $table = $this->getTable(); $pks = (array) $pks; @@ -431,7 +433,7 @@ public function publish(&$pks, $value = 1) { // Prune items that you can't change. unset($pks[$i]); - $this->setError(\JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED')); + $this->setError(Text::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED')); return false; } @@ -448,7 +450,7 @@ public function publish(&$pks, $value = 1) $context = $this->option . '.' . $this->name; // Trigger the onContentChangeState event. - $result = \JFactory::getApplication()->triggerEvent('onContentChangeState', array($context, $pks, $value)); + $result = Factory::getApplication()->triggerEvent('onContentChangeState', array($context, $pks, $value)); if (in_array(false, $result, true)) { diff --git a/administrator/components/com_finder/Model/MapsModel.php b/administrator/components/com_finder/Model/MapsModel.php index b33d586ac0cfe..6839ea5d58137 100644 --- a/administrator/components/com_finder/Model/MapsModel.php +++ b/administrator/components/com_finder/Model/MapsModel.php @@ -12,6 +12,8 @@ defined('_JEXEC') or die(); use Joomla\CMS\Component\ComponentHelper; +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\MVC\Model\ListModel; use Joomla\CMS\Plugin\PluginHelper; @@ -59,7 +61,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu */ protected function canDelete($record) { - return \JFactory::getUser()->authorise('core.delete', $this->option); + return Factory::getUser()->authorise('core.delete', $this->option); } /** @@ -73,7 +75,7 @@ protected function canDelete($record) */ protected function canEditState($record) { - return \JFactory::getUser()->authorise('core.edit.state', $this->option); + return Factory::getUser()->authorise('core.edit.state', $this->option); } /** @@ -103,7 +105,7 @@ public function delete(&$pks) $context = $this->option . '.' . $this->name; // Trigger the onContentBeforeDelete event. - $result = \JFactory::getApplication()->triggerEvent('onContentBeforeDelete', array($context, $table)); + $result = Factory::getApplication()->triggerEvent('onContentBeforeDelete', array($context, $table)); if (in_array(false, $result, true)) { @@ -120,7 +122,7 @@ public function delete(&$pks) } // Trigger the onContentAfterDelete event. - \JFactory::getApplication()->triggerEvent('onContentAfterDelete', array($context, $table)); + Factory::getApplication()->triggerEvent('onContentAfterDelete', array($context, $table)); } else { @@ -134,7 +136,7 @@ public function delete(&$pks) } else { - $this->setError(\JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED')); + $this->setError(Text::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED')); } } } @@ -328,7 +330,7 @@ protected function populateState($ordering = 'a.lft', $direction = 'ASC') */ public function publish(&$pks, $value = 1) { - $user = \JFactory::getUser(); + $user = Factory::getUser(); $table = $this->getTable(); $pks = (array) $pks; @@ -344,7 +346,7 @@ public function publish(&$pks, $value = 1) { // Prune items that you can't change. unset($pks[$i]); - $this->setError(\JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED')); + $this->setError(Text::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED')); return false; } @@ -361,7 +363,7 @@ public function publish(&$pks, $value = 1) $context = $this->option . '.' . $this->name; // Trigger the onContentChangeState event. - $result = \JFactory::getApplication()->triggerEvent('onContentChangeState', array($context, $pks, $value)); + $result = Factory::getApplication()->triggerEvent('onContentChangeState', array($context, $pks, $value)); if (in_array(false, $result, true)) { diff --git a/administrator/components/com_finder/Model/StatisticsModel.php b/administrator/components/com_finder/Model/StatisticsModel.php index f60efce80840d..f7c1e0279d7ca 100644 --- a/administrator/components/com_finder/Model/StatisticsModel.php +++ b/administrator/components/com_finder/Model/StatisticsModel.php @@ -11,6 +11,7 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; use Joomla\CMS\MVC\Model\BaseDatabaseModel; use Joomla\CMS\Plugin\PluginHelper; @@ -69,7 +70,7 @@ public function getData() $db->setQuery($query); $data->type_list = $db->loadObjectList(); - $lang = \JFactory::getLanguage(); + $lang = Factory::getLanguage(); $plugins = PluginHelper::getPlugin('finder'); foreach ($plugins as $plugin) diff --git a/administrator/components/com_finder/Table/FilterTable.php b/administrator/components/com_finder/Table/FilterTable.php index 0eb548cfaf805..578a440473f8d 100644 --- a/administrator/components/com_finder/Table/FilterTable.php +++ b/administrator/components/com_finder/Table/FilterTable.php @@ -12,6 +12,8 @@ defined('_JEXEC') or die; use Joomla\CMS\Application\ApplicationHelper; +use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; use Joomla\CMS\Table\Table; use Joomla\Database\DatabaseDriver; use Joomla\Registry\Registry; @@ -92,7 +94,7 @@ public function check() if (trim(str_replace('-', '', $this->alias)) === '') { - $this->alias = \JFactory::getDate()->format('Y-m-d-H-i-s'); + $this->alias = Factory::getDate()->format('Y-m-d-H-i-s'); } $params = new Registry($this->params); @@ -151,7 +153,7 @@ public function publish($pks = null, $state = 1, $userId = 0) // Nothing to set publishing state on, return false. else { - $this->setError(\JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED')); + $this->setError(Text::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED')); return false; } @@ -224,8 +226,8 @@ public function publish($pks = null, $state = 1, $userId = 0) */ public function store($updateNulls = false) { - $date = \JFactory::getDate()->toSql(); - $userId = \JFactory::getUser()->id; + $date = Factory::getDate()->toSql(); + $userId = Factory::getUser()->id; if ($this->filter_id) { @@ -264,7 +266,7 @@ public function store($updateNulls = false) if ($table->load(array('alias' => $this->alias)) && ($table->filter_id != $this->filter_id || $this->filter_id == 0)) { - $this->setError(\JText::_('JLIB_DATABASE_ERROR_ARTICLE_UNIQUE_ALIAS')); + $this->setError(Text::_('JLIB_DATABASE_ERROR_ARTICLE_UNIQUE_ALIAS')); return false; } diff --git a/administrator/components/com_finder/Table/MapTable.php b/administrator/components/com_finder/Table/MapTable.php index 7a8a32eb9088d..e5946c77a21a6 100644 --- a/administrator/components/com_finder/Table/MapTable.php +++ b/administrator/components/com_finder/Table/MapTable.php @@ -13,6 +13,7 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; use Joomla\CMS\Table\Nested; use Joomla\Database\DatabaseDriver; use Joomla\Utilities\ArrayHelper; @@ -108,7 +109,7 @@ public function publish($pks = null, $state = 1, $userId = 0) // Nothing to set publishing state on, return false. else { - $this->setError(\JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED')); + $this->setError(Text::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED')); return false; } diff --git a/administrator/components/com_finder/View/Filter/HtmlView.php b/administrator/components/com_finder/View/Filter/HtmlView.php index 23b9376ebe499..9d0191887bc10 100644 --- a/administrator/components/com_finder/View/Filter/HtmlView.php +++ b/administrator/components/com_finder/View/Filter/HtmlView.php @@ -11,7 +11,10 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; @@ -87,8 +90,8 @@ public function display($tpl = null) throw new \JViewGenericdataexception(implode("\n", $errors), 500); } - \JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); - \JHtml::addIncludePath(JPATH_SITE . '/components/com_finder/helpers/html'); + HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html'); + HTMLHelper::addIncludePath(JPATH_SITE . '/components/com_finder/helpers/html'); // Configure the toolbar. $this->addToolbar(); @@ -105,15 +108,15 @@ public function display($tpl = null) */ protected function addToolbar() { - \JFactory::getApplication()->input->set('hidemainmenu', true); + Factory::getApplication()->input->set('hidemainmenu', true); $isNew = ($this->item->filter_id == 0); - $checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == \JFactory::getUser()->id); + $checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == Factory::getUser()->id); $canDo = ContentHelper::getActions('com_finder'); // Configure the toolbar. ToolbarHelper::title( - $isNew ? \JText::_('COM_FINDER_FILTER_NEW_TOOLBAR_TITLE') : \JText::_('COM_FINDER_FILTER_EDIT_TOOLBAR_TITLE'), + $isNew ? Text::_('COM_FINDER_FILTER_NEW_TOOLBAR_TITLE') : Text::_('COM_FINDER_FILTER_EDIT_TOOLBAR_TITLE'), 'zoom-in finder' ); diff --git a/administrator/components/com_finder/View/Filters/HtmlView.php b/administrator/components/com_finder/View/Filters/HtmlView.php index a4b698898fcba..61a95912a9aa4 100644 --- a/administrator/components/com_finder/View/Filters/HtmlView.php +++ b/administrator/components/com_finder/View/Filters/HtmlView.php @@ -12,6 +12,8 @@ defined('_JEXEC') or die; use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; @@ -112,7 +114,7 @@ public function display($tpl = null) throw new \JViewGenericdataexception(implode("\n", $errors), 500); } - \JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); + HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html'); // Configure the toolbar. $this->addToolbar(); @@ -132,7 +134,7 @@ protected function addToolbar() { $canDo = ContentHelper::getActions('com_finder'); - ToolbarHelper::title(\JText::_('COM_FINDER_FILTERS_TOOLBAR_TITLE'), 'zoom-in finder'); + ToolbarHelper::title(Text::_('COM_FINDER_FILTERS_TOOLBAR_TITLE'), 'zoom-in finder'); $toolbar = Toolbar::getInstance('toolbar'); if ($canDo->get('core.create')) diff --git a/administrator/components/com_finder/View/Index/HtmlView.php b/administrator/components/com_finder/View/Index/HtmlView.php index 9b338b0b0a796..30cacd6e48e03 100644 --- a/administrator/components/com_finder/View/Index/HtmlView.php +++ b/administrator/components/com_finder/View/Index/HtmlView.php @@ -11,8 +11,12 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; +use Joomla\CMS\Router\Route; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; use Joomla\Component\Finder\Administrator\Helper\FinderHelper; @@ -127,22 +131,22 @@ public function display($tpl = null) if (!$this->pluginState['plg_content_finder']->enabled) { - if (\JFactory::getUser()->authorise('core.manage', 'com_plugin')) + if (Factory::getUser()->authorise('core.manage', 'com_plugin')) { - $link = \JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . FinderHelper::getFinderPluginId()); - \JFactory::getApplication()->enqueueMessage(\JText::sprintf('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK', $link), 'warning'); + $link = Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . FinderHelper::getFinderPluginId()); + Factory::getApplication()->enqueueMessage(Text::sprintf('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED_LINK', $link), 'warning'); } else { - \JFactory::getApplication()->enqueueMessage(\JText::_('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED'), 'warning'); + Factory::getApplication()->enqueueMessage(Text::_('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED'), 'warning'); } } elseif ($this->get('TotalIndexed') === 0) { - \JFactory::getApplication()->enqueueMessage(\JText::_('COM_FINDER_INDEX_NO_DATA') . ' ' . \JText::_('COM_FINDER_INDEX_TIP'), 'notice'); + Factory::getApplication()->enqueueMessage(Text::_('COM_FINDER_INDEX_NO_DATA') . ' ' . Text::_('COM_FINDER_INDEX_TIP'), 'notice'); } - \JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); + HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html'); // Configure the toolbar. $this->addToolbar(); @@ -162,7 +166,7 @@ protected function addToolbar() { $canDo = ContentHelper::getActions('com_finder'); - ToolbarHelper::title(\JText::_('COM_FINDER_INDEX_TOOLBAR_TITLE'), 'zoom-in finder'); + ToolbarHelper::title(Text::_('COM_FINDER_INDEX_TOOLBAR_TITLE'), 'zoom-in finder'); $toolbar = Toolbar::getInstance('toolbar'); $toolbar->appendButton( diff --git a/administrator/components/com_finder/View/Maps/HtmlView.php b/administrator/components/com_finder/View/Maps/HtmlView.php index 85f06bee218f8..cd58c2cc22803 100644 --- a/administrator/components/com_finder/View/Maps/HtmlView.php +++ b/administrator/components/com_finder/View/Maps/HtmlView.php @@ -12,6 +12,8 @@ defined('_JEXEC') or die; use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\Toolbar; use Joomla\CMS\Toolbar\ToolbarHelper; @@ -116,7 +118,7 @@ public function display($tpl = null) throw new \JViewGenericdataexception(implode("\n", $errors), 500); } - \JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); + HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html'); // Prepare the view. $this->addToolbar(); @@ -136,7 +138,7 @@ protected function addToolbar() { $canDo = ContentHelper::getActions('com_finder'); - ToolbarHelper::title(\JText::_('COM_FINDER_MAPS_TOOLBAR_TITLE'), 'zoom-in finder'); + ToolbarHelper::title(Text::_('COM_FINDER_MAPS_TOOLBAR_TITLE'), 'zoom-in finder'); if ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_finder/View/Searches/HtmlView.php b/administrator/components/com_finder/View/Searches/HtmlView.php index 52b34c700e660..8bf42c49823a2 100644 --- a/administrator/components/com_finder/View/Searches/HtmlView.php +++ b/administrator/components/com_finder/View/Searches/HtmlView.php @@ -11,7 +11,9 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; use Joomla\CMS\Helper\ContentHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Toolbar\ToolbarHelper; use Joomla\Component\Finder\Administrator\Helper\FinderHelper; @@ -84,7 +86,7 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $app = \JFactory::getApplication(); + $app = Factory::getApplication(); $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); @@ -104,7 +106,7 @@ public function display($tpl = null) // Check if plugin is enabled if (!$this->enabled) { - $app->enqueueMessage(\JText::_('COM_FINDER_LOGGING_DISABLED'), 'warning'); + $app->enqueueMessage(Text::_('COM_FINDER_LOGGING_DISABLED'), 'warning'); } // Prepare the view. @@ -125,7 +127,7 @@ protected function addToolbar() { $canDo = $this->canDo; - ToolbarHelper::title(\JText::_('COM_FINDER_MANAGER_SEARCHES'), 'search'); + ToolbarHelper::title(Text::_('COM_FINDER_MANAGER_SEARCHES'), 'search'); if ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_finder/tmpl/filter/edit.php b/administrator/components/com_finder/tmpl/filter/edit.php index 678f56be2f5be..3b03f8aab054f 100644 --- a/administrator/components/com_finder/tmpl/filter/edit.php +++ b/administrator/components/com_finder/tmpl/filter/edit.php @@ -9,28 +9,32 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; -JHtml::_('behavior.formvalidator'); -JHtml::_('behavior.keepalive'); -JHtml::_('behavior.core'); -JHtml::_('behavior.tabstate'); +HTMLHelper::_('behavior.formvalidator'); +HTMLHelper::_('behavior.keepalive'); +HTMLHelper::_('behavior.core'); +HTMLHelper::_('behavior.tabstate'); -JText::script('COM_FINDER_FILTER_SHOW_ALL', true); -JText::script('COM_FINDER_FILTER_HIDE_ALL', true); +Text::script('COM_FINDER_FILTER_SHOW_ALL', true); +Text::script('COM_FINDER_FILTER_HIDE_ALL', true); $this->useCoreUI = true; -JHtml::_('script', 'com_finder/finder-edit.min.js', array('version' => 'auto', 'relative' => true)); +HTMLHelper::_('script', 'com_finder/finder-edit.min.js', array('version' => 'auto', 'relative' => true)); ?> -
+ - 'details')); ?> + 'details')); ?> - +
total > 0) : ?> @@ -38,13 +42,13 @@ form->renderField('map_count'); ?>
+ - +
- $this->filter->data)); ?> + $this->filter->data)); ?>
@@ -54,17 +58,17 @@
- + - + - + - + - - + +
diff --git a/administrator/components/com_finder/tmpl/index/default.php b/administrator/components/com_finder/tmpl/index/default.php index 6d239c982e5c6..b7fd1cf2cfb0a 100644 --- a/administrator/components/com_finder/tmpl/index/default.php +++ b/administrator/components/com_finder/tmpl/index/default.php @@ -9,22 +9,24 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; use Joomla\Component\Finder\Administrator\Helper\FinderHelperLanguage; -JHtml::_('bootstrap.popover'); +HTMLHelper::_('bootstrap.popover'); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); -$lang = JFactory::getLanguage(); +$lang = Factory::getLanguage(); -JText::script('COM_FINDER_INDEX_CONFIRM_PURGE_PROMPT'); -JText::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT'); +Text::script('COM_FINDER_INDEX_CONFIRM_PURGE_PROMPT'); +Text::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT'); HTMLHelper::_('script', 'com_finder/index.js', ['version' => 'auto', 'relative' => true]); ?> -
+
sidebar; ?> @@ -39,37 +41,37 @@ - + - + - + - + - + - + - + - authorise('core.manage', 'com_finder'); ?> + authorise('core.manage', 'com_finder'); ?> items as $i => $item) : ?> - link_id); ?> + link_id); ?> - published, $i, 'index.', $canChange, 'cb'); ?> + published, $i, 'index.', $canChange, 'cb'); ?>
diff --git a/administrator/components/com_finder/tmpl/indexer/default.php b/administrator/components/com_finder/tmpl/indexer/default.php index da945a7b07429..fbebfa7174b32 100644 --- a/administrator/components/com_finder/tmpl/indexer/default.php +++ b/administrator/components/com_finder/tmpl/indexer/default.php @@ -9,16 +9,18 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -JHtml::_('behavior.keepalive'); -JHtml::_('script', 'com_finder/indexer.min.js', array('version' => 'auto', 'relative' => true)); -JFactory::getDocument()->addScriptDeclaration('var msg = "' . Text::_('COM_FINDER_INDEXER_MESSAGE_COMPLETE') . '";'); +HTMLHelper::_('behavior.keepalive'); +HTMLHelper::_('script', 'com_finder/indexer.min.js', array('version' => 'auto', 'relative' => true)); +Factory::getDocument()->addScriptDeclaration('var msg = "' . Text::_('COM_FINDER_INDEXER_MESSAGE_COMPLETE') . '";'); ?>
-

-

+

+

@@ -26,5 +28,5 @@
- +
diff --git a/administrator/components/com_finder/tmpl/maps/default.php b/administrator/components/com_finder/tmpl/maps/default.php index e04f3ead91b6a..655cbc295c99d 100644 --- a/administrator/components/com_finder/tmpl/maps/default.php +++ b/administrator/components/com_finder/tmpl/maps/default.php @@ -19,7 +19,7 @@ $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); -$lang = JFactory::getLanguage(); +$lang = Factory::getLanguage(); $branchFilter = $this->escape($this->state->get('filter.branch')); Text::script('COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT'); HTMLHelper::_('script', 'com_finder/maps.js', ['version' => 'auto', 'relative' => true]); @@ -77,10 +77,10 @@ items as $i => $item) : ?> - id); ?> + id); ?> - state, $i, 'maps.', $canChange, 'cb'); ?> + state, $i, 'maps.', $canChange, 'cb'); ?> - +
diff --git a/administrator/components/com_finder/tmpl/searches/default.php b/administrator/components/com_finder/tmpl/searches/default.php index cb823ce72110c..a5a297562b255 100644 --- a/administrator/components/com_finder/tmpl/searches/default.php +++ b/administrator/components/com_finder/tmpl/searches/default.php @@ -9,18 +9,20 @@ defined('_JEXEC') or die; +use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Router\Route; // Include the component HTML helpers. -JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); +HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html'); -JHtml::_('behavior.multiselect'); +HTMLHelper::_('behavior.multiselect'); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); ?> -
+
sidebar; ?> @@ -40,13 +42,13 @@ - + - + - + @@ -73,7 +75,7 @@ - +
diff --git a/administrator/components/com_finder/tmpl/statistics/default.php b/administrator/components/com_finder/tmpl/statistics/default.php index 7366f61d3b913..04a350778c489 100644 --- a/administrator/components/com_finder/tmpl/statistics/default.php +++ b/administrator/components/com_finder/tmpl/statistics/default.php @@ -8,22 +8,25 @@ */ defined('_JEXEC') or die; + +use Joomla\CMS\Language\Text; + ?>

- +

-

data->term_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')), number_format($this->data->link_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')), number_format($this->data->taxonomy_node_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')), number_format($this->data->taxonomy_branch_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR'))); ?>

+

data->term_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')), number_format($this->data->link_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')), number_format($this->data->taxonomy_node_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')), number_format($this->data->taxonomy_branch_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR'))); ?>

@@ -33,21 +36,21 @@
- + - +
type_title); - $lang_string = JText::_($lang_key); + $lang_string = Text::_($lang_key); echo $lang_string === $lang_key ? $type->type_title : $lang_string; ?> - link_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')); ?> + link_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')); ?>
- + - data->link_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')); ?> + data->link_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')); ?>