From 4b8cd0c77913c8bf99be40e6aeec29cae6f664b5 Mon Sep 17 00:00:00 2001 From: Tuan Pham Ngoc Date: Sun, 4 Sep 2022 23:20:31 +0700 Subject: [PATCH] Use getCurrentUser() to get current user in models and views --- .../com_weblinks/src/Model/WeblinkModel.php | 12 ++++++------ .../com_weblinks/src/Model/WeblinksModel.php | 2 +- .../com_weblinks/src/View/Weblink/HtmlView.php | 2 +- .../com_weblinks/src/View/Weblinks/HtmlView.php | 2 +- .../com_weblinks/src/Model/CategoryModel.php | 4 ++-- src/components/com_weblinks/src/Model/FormModel.php | 2 +- .../com_weblinks/src/Model/WeblinkModel.php | 4 ++-- .../com_weblinks/src/View/Form/HtmlView.php | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/administrator/components/com_weblinks/src/Model/WeblinkModel.php b/src/administrator/components/com_weblinks/src/Model/WeblinkModel.php index 7fa868e..3bca6dd 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::getApplication()->getIdentity()->authorise('core.delete', 'com_weblinks.category.' . (int) $record->catid); + return $this->getCurrentUser()->authorise('core.delete', 'com_weblinks.category.' . (int) $record->catid); } /** @@ -87,7 +87,7 @@ class WeblinkModel extends AdminModel { if (!empty($record->catid)) { - return Factory::getApplication()->getIdentity()->authorise('core.edit.state', 'com_weblinks.category.' . (int) $record->catid); + return $this->getCurrentUser()->authorise('core.edit.state', 'com_weblinks.category.' . (int) $record->catid); } return parent::canEditState($record); @@ -143,7 +143,7 @@ class WeblinkModel extends AdminModel } // Don't allow to change the created_by user if not allowed to access com_users. - if (!Factory::getApplication()->getIdentity()->authorise('core.manage', 'com_users')) + if (!$this->getCurrentUser()->authorise('core.manage', 'com_users')) { $form->setFieldAttribute('created_by', 'filter', 'unset'); } @@ -243,7 +243,7 @@ class WeblinkModel extends AdminModel protected function prepareTable($table) { $date = Factory::getDate(); - $user = Factory::getApplication()->getIdentity(); + $user = $this->getCurrentUser(); $table->title = htmlspecialchars_decode($table->title, ENT_QUOTES); $table->alias = ApplicationHelper::stringURLSafe($table->alias); @@ -338,7 +338,7 @@ class WeblinkModel extends AdminModel // Alter the title for save as copy if ($app->input->get('task') == 'save2copy') { - list($name, $alias) = $this->generateNewTitle($data['catid'], $data['alias'], $data['title']); + [$name, $alias] = $this->generateNewTitle($data['catid'], $data['alias'], $data['title']); $data['title'] = $name; $data['alias'] = $alias; $data['state'] = 0; @@ -438,6 +438,6 @@ class WeblinkModel extends AdminModel */ private function canCreateCategory() { - return Factory::getApplication()->getIdentity()->authorise('core.create', 'com_weblinks'); + return $this->getCurrentUser()->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 b306158..6a127f6 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->getDatabase(); $query = $db->getQuery(true); - $user = Factory::getApplication()->getIdentity(); + $user = $this->getCurrentUser(); // Select the required fields from the table. $query->select( diff --git a/src/administrator/components/com_weblinks/src/View/Weblink/HtmlView.php b/src/administrator/components/com_weblinks/src/View/Weblink/HtmlView.php index f971b5d..0eb467c 100644 --- a/src/administrator/components/com_weblinks/src/View/Weblink/HtmlView.php +++ b/src/administrator/components/com_weblinks/src/View/Weblink/HtmlView.php @@ -98,7 +98,7 @@ class HtmlView extends BaseHtmlView $app = Factory::getApplication(); $app->input->set('hidemainmenu', true); - $user = $app->getIdentity(); + $user = $this->getCurrentUser(); $isNew = ($this->item->id == 0); $checkedOut = $this->item->checked_out && $this->item->checked_out !== $user->get('id'); diff --git a/src/administrator/components/com_weblinks/src/View/Weblinks/HtmlView.php b/src/administrator/components/com_weblinks/src/View/Weblinks/HtmlView.php index 37260db..ce87434 100644 --- a/src/administrator/components/com_weblinks/src/View/Weblinks/HtmlView.php +++ b/src/administrator/components/com_weblinks/src/View/Weblinks/HtmlView.php @@ -131,7 +131,7 @@ class HtmlView extends BaseHtmlView protected function addToolbar() { $canDo = ContentHelper::getActions('com_weblinks', 'category', $this->state->get('filter.category_id')); - $user = Factory::getApplication()->getIdentity(); + $user = $this->getCurrentUser(); // Get the toolbar object instance $toolbar = Toolbar::getInstance('toolbar'); diff --git a/src/components/com_weblinks/src/Model/CategoryModel.php b/src/components/com_weblinks/src/Model/CategoryModel.php index ff512ca..47a2a7d 100644 --- a/src/components/com_weblinks/src/Model/CategoryModel.php +++ b/src/components/com_weblinks/src/Model/CategoryModel.php @@ -139,7 +139,7 @@ class CategoryModel extends ListModel */ protected function getListQuery() { - $viewLevels = Factory::getApplication()->getIdentity()->getAuthorisedViewLevels(); + $viewLevels = $this->getCurrentUser()->getAuthorisedViewLevels(); // Create a new query object. $db = $this->getDatabase(); @@ -296,7 +296,7 @@ class CategoryModel extends ListModel $id = $app->input->get('id', 0, 'int'); $this->setState('category.id', $id); - $user = $app->getIdentity(); + $user = $this->getCurrentUser(); 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 d717254..6de943e 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::getApplication()->getIdentity()->guest) + if ($this->getCurrentUser()->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 75b2ae0..959cb5d 100644 --- a/src/components/com_weblinks/src/Model/WeblinkModel.php +++ b/src/components/com_weblinks/src/Model/WeblinkModel.php @@ -63,7 +63,7 @@ class WeblinkModel extends ItemModel $params = $app->getParams(); $this->setState('params', $params); - $user = $app->getIdentity(); + $user = $this->getCurrentUser(); if (!$user->authorise('core.edit.state', 'com_weblinks') && !$user->authorise('core.edit', 'com_weblinks')) { @@ -83,7 +83,7 @@ class WeblinkModel extends ItemModel */ public function getItem($pk = null) { - $user = Factory::getApplication()->getIdentity(); + $user = $this->getCurrentUser(); $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 878a018..00348d1 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::getApplication()->getIdentity(); + $user = $this->getCurrentUser(); // Get model data. $this->state = $this->get('State');