From 01bc443bc00b0007d769eda3f24e5f4ca60dccdf Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Sat, 17 Jul 2021 11:49:07 +0700 Subject: [PATCH] Replace Factory::getUser() with Factory::getApplication()->getIdentity() --- .../components/com_weblinks/src/Model/WeblinkModel.php | 8 ++++---- .../components/com_weblinks/src/Model/WeblinksModel.php | 2 +- src/components/com_weblinks/src/Model/CategoryModel.php | 4 ++-- src/components/com_weblinks/src/Model/FormModel.php | 2 +- src/components/com_weblinks/src/Model/WeblinkModel.php | 2 +- src/components/com_weblinks/src/View/Form/HtmlView.php | 2 +- .../com_weblinks/tmpl/category/default_items.php | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/administrator/components/com_weblinks/src/Model/WeblinkModel.php b/src/administrator/components/com_weblinks/src/Model/WeblinkModel.php index 8047726..600b7f5 100644 --- a/src/administrator/components/com_weblinks/src/Model/WeblinkModel.php +++ b/src/administrator/components/com_weblinks/src/Model/WeblinkModel.php @@ -71,7 +71,7 @@ class WeblinkModel extends AdminModel return false; } - return Factory::getUser()->authorise('core.delete', 'com_weblinks.category.' . (int) $record->catid); + return Factory::getApplication()->getIdentity()->authorise('core.delete', 'com_weblinks.category.' . (int) $record->catid); } /** @@ -87,7 +87,7 @@ class WeblinkModel extends AdminModel { if (!empty($record->catid)) { - return Factory::getUser()->authorise('core.edit.state', 'com_weblinks.category.' . (int) $record->catid); + return Factory::getApplication()->getIdentity()->authorise('core.edit.state', 'com_weblinks.category.' . (int) $record->catid); } return parent::canEditState($record); @@ -239,7 +239,7 @@ class WeblinkModel extends AdminModel protected function prepareTable($table) { $date = Factory::getDate(); - $user = Factory::getUser(); + $user = Factory::getApplication()->getIdentity(); $table->title = htmlspecialchars_decode($table->title, ENT_QUOTES); $table->alias = ApplicationHelper::stringURLSafe($table->alias); @@ -434,6 +434,6 @@ class WeblinkModel extends AdminModel */ private function canCreateCategory() { - return Factory::getUser()->authorise('core.create', 'com_weblinks'); + return Factory::getApplication()->getIdentity()->authorise('core.create', 'com_weblinks'); } } diff --git a/src/administrator/components/com_weblinks/src/Model/WeblinksModel.php b/src/administrator/components/com_weblinks/src/Model/WeblinksModel.php index 862a8fa..5fb0f64 100644 --- a/src/administrator/components/com_weblinks/src/Model/WeblinksModel.php +++ b/src/administrator/components/com_weblinks/src/Model/WeblinksModel.php @@ -156,7 +156,7 @@ class WeblinksModel extends ListModel // Create a new query object. $db = $this->getDbo(); $query = $db->getQuery(true); - $user = Factory::getUser(); + $user = Factory::getApplication()->getIdentity(); // Select the required fields from the table. $query->select( diff --git a/src/components/com_weblinks/src/Model/CategoryModel.php b/src/components/com_weblinks/src/Model/CategoryModel.php index 0ee4cc2..13026ed 100644 --- a/src/components/com_weblinks/src/Model/CategoryModel.php +++ b/src/components/com_weblinks/src/Model/CategoryModel.php @@ -111,7 +111,7 @@ class CategoryModel extends ListModel */ protected function getListQuery() { - $viewLevels = Factory::getUser()->getAuthorisedViewLevels(); + $viewLevels = Factory::getApplication()->getIdentity()->getAuthorisedViewLevels(); // Create a new query object. $db = $this->getDbo(); @@ -263,7 +263,7 @@ class CategoryModel extends ListModel $id = $app->input->get('id', 0, 'int'); $this->setState('category.id', $id); - $user = Factory::getUser(); + $user = Factory::getApplication()->getIdentity(); if (!$user->authorise('core.edit.state', 'com_weblinks') && !$user->authorise('core.edit', 'com_weblinks')) { diff --git a/src/components/com_weblinks/src/Model/FormModel.php b/src/components/com_weblinks/src/Model/FormModel.php index 0436b0b..1877dbc 100644 --- a/src/components/com_weblinks/src/Model/FormModel.php +++ b/src/components/com_weblinks/src/Model/FormModel.php @@ -97,7 +97,7 @@ class FormModel extends WeblinkModel $form = $this->loadForm('com_weblinks.form', 'weblink', array('control' => 'jform', 'load_data' => $loadData)); // Disable the buttons and just allow editor none for not authenticated users - if (Factory::getUser()->guest) + if (Factory::getApplication()->getIdentity()->guest) { $form->setFieldAttribute('description', 'editor', 'none'); $form->setFieldAttribute('description', 'buttons', 'no'); diff --git a/src/components/com_weblinks/src/Model/WeblinkModel.php b/src/components/com_weblinks/src/Model/WeblinkModel.php index 175e939..7ddf6d9 100644 --- a/src/components/com_weblinks/src/Model/WeblinkModel.php +++ b/src/components/com_weblinks/src/Model/WeblinkModel.php @@ -74,7 +74,7 @@ class WeblinkModel extends ItemModel */ public function getItem($pk = null) { - $user = Factory::getUser(); + $user = Factory::getApplication()->getIdentity(); $pk = (!empty($pk)) ? $pk : (int) $this->getState('weblink.id'); diff --git a/src/components/com_weblinks/src/View/Form/HtmlView.php b/src/components/com_weblinks/src/View/Form/HtmlView.php index ef29957..82844b9 100644 --- a/src/components/com_weblinks/src/View/Form/HtmlView.php +++ b/src/components/com_weblinks/src/View/Form/HtmlView.php @@ -68,7 +68,7 @@ class HtmlView extends BaseHtmlView */ public function display($tpl = null) { - $user = Factory::getUser(); + $user = Factory::getApplication()->getIdentity(); // Get model data. $this->state = $this->get('State'); diff --git a/src/components/com_weblinks/tmpl/category/default_items.php b/src/components/com_weblinks/tmpl/category/default_items.php index b2c7707..9f38c7d 100644 --- a/src/components/com_weblinks/tmpl/category/default_items.php +++ b/src/components/com_weblinks/tmpl/category/default_items.php @@ -21,7 +21,7 @@ use Joomla\CMS\Uri\Uri; $params = &$this->category->params; // Get the user object. -$user = Factory::getUser(); +$user = Factory::getApplication()->getIdentity(); // Check if user is allowed to add/edit based on weblinks permissinos. $canEdit = $user->authorise('core.edit', 'com_weblinks.category.' . $this->category->id);