[4.3] Replace Factory::getUser() by $this->getCurrentUser() in components models

administrator/components/com_associations/src/Model/AssociationsModel.php

@@ -179,7 +179,7 @@ protected function getListQuery()
 		}
 
 		// Create a new query object.
-		$user     = Factory::getUser();
+		$user     = $this->getCurrentUser();
 		$db       = $this->getDatabase();
 		$query    = $db->getQuery(true);
 

administrator/components/com_banners/src/Model/BannerModel.php

@@ -75,7 +75,7 @@ class BannerModel extends AdminModel
 	protected function batchClient($value, $pks, $contexts)
 	{
 		// Set the variables
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		/** @var \Joomla\Component\Banners\Administrator\Table\BannerTable $table */
 		$table = $this->getTable();
@@ -125,7 +125,7 @@ protected function canDelete($record)
 
 		if (!empty($record->catid))
 		{
-			return Factory::getUser()->authorise('core.delete', 'com_banners.category.' . (int) $record->catid);
+			return $this->getCurrentUser()->authorise('core.delete', 'com_banners.category.' . (int) $record->catid);
 		}
 
 		return parent::canDelete($record);
@@ -164,7 +164,7 @@ protected function canEditState($record)
 		// Check against the category.
 		if (!empty($record->catid))
 		{
-			return Factory::getUser()->authorise('core.edit.state', 'com_banners.category.' . (int) $record->catid);
+			return $this->getCurrentUser()->authorise('core.edit.state', 'com_banners.category.' . (int) $record->catid);
 		}
 
 		// Default to component settings if category not known.
@@ -211,7 +211,7 @@ public function getForm($data = array(), $loadData = true)
 		}
 
 		// Don't allow to change the created_by user if not allowed to access com_users.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		if (!$this->getCurrentUser()->authorise('core.manage', 'com_users'))
 		{
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
@@ -282,7 +282,7 @@ public function stick(&$pks, $value = 1)
 		}
 
 		// Attempt to change the state of the records.
-		if (!$table->stick($pks, $value, Factory::getUser()->id))
+		if (!$table->stick($pks, $value, $this->getCurrentUser()->id))
 		{
 			$this->setError($table->getError());
 
@@ -323,7 +323,7 @@ protected function getReorderConditions($table)
 	protected function prepareTable($table)
 	{
 		$date = Factory::getDate();
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		if (empty($table->id))
 		{
@@ -466,6 +466,6 @@ public function save($data)
 	 */
 	private function canCreateCategory()
 	{
-		return Factory::getUser()->authorise('core.create', 'com_banners');
+		return $this->getCurrentUser()->authorise('core.create', 'com_banners');
 	}
 }

administrator/components/com_banners/src/Model/ClientModel.php

@@ -51,7 +51,7 @@ protected function canDelete($record)
 
 		if (!empty($record->catid))
 		{
-			return Factory::getUser()->authorise('core.delete', 'com_banners.category.' . (int) $record->catid);
+			return $this->getCurrentUser()->authorise('core.delete', 'com_banners.category.' . (int) $record->catid);
 		}
 
 		return parent::canDelete($record);
@@ -69,7 +69,7 @@ protected function canDelete($record)
 	 */
 	protected function canEditState($record)
 	{
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		if (!empty($record->catid))
 		{

administrator/components/com_banners/src/Model/TracksModel.php

@@ -190,7 +190,7 @@ protected function getListQuery()
 	 */
 	public function delete()
 	{
-		$user       = Factory::getUser();
+		$user       = $this->getCurrentUser();
 		$categoryId = (int) $this->getState('category_id');
 
 		// Access checks.

administrator/components/com_categories/src/Model/CategoriesModel.php

@@ -165,7 +165,7 @@ protected function getListQuery()
 		// Create a new query object.
 		$db = $this->getDatabase();
 		$query = $db->getQuery(true);
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		// Select the required fields from the table.
 		$query->select(

administrator/components/com_categories/src/Model/CategoryModel.php

@@ -111,7 +111,7 @@ protected function canDelete($record)
 			return false;
 		}
 
-		return Factory::getUser()->authorise('core.delete', $record->extension . '.category.' . (int) $record->id);
+		return $this->getCurrentUser()->authorise('core.delete', $record->extension . '.category.' . (int) $record->id);
 	}
 
 	/**
@@ -125,7 +125,7 @@ protected function canDelete($record)
 	 */
 	protected function canEditState($record)
 	{
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		// Check for existing category.
 		if (!empty($record->id))
@@ -286,7 +286,7 @@ public function getForm($data = array(), $loadData = true)
 		$parts      = explode('.', $extension);
 		$assetKey   = $categoryId ? $extension . '.category.' . $categoryId : $parts[0];
 
-		if (!Factory::getUser()->authorise('core.edit.state', $assetKey))
+		if (!$this->getCurrentUser()->authorise('core.edit.state', $assetKey))
 		{
 			// Disable fields for display.
 			$form->setFieldAttribute('ordering', 'disabled', 'true');
@@ -299,7 +299,7 @@ public function getForm($data = array(), $loadData = true)
 		}
 
 		// Don't allow to change the created_user_id user if not allowed to access com_users.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		if (!$this->getCurrentUser()->authorise('core.manage', 'com_users'))
 		{
 			$form->setFieldAttribute('created_user_id', 'filter', 'unset');
 		}
@@ -385,7 +385,7 @@ protected function loadFormData()
 	 */
 	public function validate($form, $data, $group = null)
 	{
-		if (!Factory::getUser()->authorise('core.admin', $data['extension']))
+		if (!$this->getCurrentUser()->authorise('core.admin', $data['extension']))
 		{
 			if (isset($data['rules']))
 			{

administrator/components/com_config/src/Model/ApplicationModel.php

@@ -417,7 +417,7 @@ public function save($data)
 
 			// Check that we aren't removing our Super User permission
 			// Need to get groups from database, since they might have changed
-			$myGroups      = Access::getGroupsByUser(Factory::getUser()->get('id'));
+			$myGroups      = Access::getGroupsByUser($this->getCurrentUser()->get('id'));
 			$myRules       = $rules->getData();
 			$hasSuperAdmin = $myRules['core.admin']->allow($myGroups);
 
@@ -982,7 +982,7 @@ private function writeConfigFile(Registry $config)
 	public function storePermissions($permission = null)
 	{
 		$app  = Factory::getApplication();
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		if (is_null($permission))
 		{
@@ -1355,7 +1355,7 @@ public function sendTestMail()
 	{
 		// Set the new values to test with the current settings
 		$app = Factory::getApplication();
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 		$input = $app->input->json;
 		$smtppass = $input->get('smtppass', null, 'RAW');
 

administrator/components/com_config/src/Model/ComponentModel.php

@@ -164,7 +164,7 @@ public function save($data)
 		PluginHelper::importPlugin('extension');
 
 		// Check super user group.
-		if (isset($data['params']) && !Factory::getUser()->authorise('core.admin'))
+		if (isset($data['params']) && !$this->getCurrentUser()->authorise('core.admin'))
 		{
 			$form = $this->getForm(array(), false);
 
@@ -185,7 +185,7 @@ public function save($data)
 		// Save the rules.
 		if (isset($data['params']) && isset($data['params']['rules']))
 		{
-			if (!Factory::getUser()->authorise('core.admin', $data['option']))
+			if (!$this->getCurrentUser()->authorise('core.admin', $data['option']))
 			{
 				throw new \RuntimeException(Text::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'));
 			}

administrator/components/com_contact/src/Model/ContactModel.php

@@ -135,7 +135,7 @@ protected function canDelete($record)
 			return false;
 		}
 
-		return Factory::getUser()->authorise('core.delete', 'com_contact.category.' . (int) $record->catid);
+		return $this->getCurrentUser()->authorise('core.delete', 'com_contact.category.' . (int) $record->catid);
 	}
 
 	/**
@@ -152,7 +152,7 @@ protected function canEditState($record)
 		// Check against the category.
 		if (!empty($record->catid))
 		{
-			return Factory::getUser()->authorise('core.edit.state', 'com_contact.category.' . (int) $record->catid);
+			return $this->getCurrentUser()->authorise('core.edit.state', 'com_contact.category.' . (int) $record->catid);
 		}
 
 		// Default to component settings if category not known.
@@ -197,7 +197,7 @@ public function getForm($data = array(), $loadData = true)
 		}
 
 		// Don't allow to change the created_by user if not allowed to access com_users.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		if (!$this->getCurrentUser()->authorise('core.manage', 'com_users'))
 		{
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
@@ -406,7 +406,7 @@ protected function prepareTable($table)
 		{
 			// Set the values
 			$table->modified = $date;
-			$table->modified_by = Factory::getUser()->id;
+			$table->modified_by = $this->getCurrentUser()->id;
 		}
 
 		// Increment the content version number.
@@ -547,6 +547,6 @@ public function featured($pks, $value = 0)
 	 */
 	private function canCreateCategory()
 	{
-		return Factory::getUser()->authorise('core.create', 'com_contact');
+		return $this->getCurrentUser()->authorise('core.create', 'com_contact');
 	}
 }

administrator/components/com_contact/src/Model/ContactsModel.php

@@ -146,7 +146,7 @@ protected function getListQuery()
 		// Create a new query object.
 		$db = $this->getDatabase();
 		$query = $db->getQuery(true);
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		// Select the required fields from the table.
 		$query->select(

administrator/components/com_content/src/Model/ArticleModel.php

@@ -200,7 +200,7 @@ protected function batchMove($value, $pks, $contexts)
 		if (empty($this->batchSet))
 		{
 			// Set some needed variables.
-			$this->user = Factory::getUser();
+			$this->user = $this->getCurrentUser();
 			$this->table = $this->getTable();
 			$this->tableClassName = get_class($this->table);
 			$this->contentType = new UCMType;
@@ -309,7 +309,7 @@ protected function canDelete($record)
 			return false;
 		}
 
-		return Factory::getUser()->authorise('core.delete', 'com_content.article.' . (int) $record->id);
+		return $this->getCurrentUser()->authorise('core.delete', 'com_content.article.' . (int) $record->id);
 	}
 
 	/**
@@ -323,7 +323,7 @@ protected function canDelete($record)
 	 */
 	protected function canEditState($record)
 	{
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		// Check for existing article.
 		if (!empty($record->id))
@@ -591,7 +591,7 @@ public function getForm($data = array(), $loadData = true)
 		}
 
 		// Don't allow to change the created_by user if not allowed to access com_users.
-		if (!Factory::getUser()->authorise('core.manage', 'com_users'))
+		if (!$this->getCurrentUser()->authorise('core.manage', 'com_users'))
 		{
 			$form->setFieldAttribute('created_by', 'filter', 'unset');
 		}
@@ -666,7 +666,7 @@ protected function loadFormData()
 	 */
 	public function validate($form, $data, $group = null)
 	{
-		if (!Factory::getUser()->authorise('core.admin', 'com_content'))
+		if (!$this->getCurrentUser()->authorise('core.admin', 'com_content'))
 		{
 			if (isset($data['rules']))
 			{
@@ -1167,7 +1167,7 @@ public function hit()
 	 */
 	private function canCreateCategory()
 	{
-		return Factory::getUser()->authorise('core.create', 'com_content');
+		return $this->getCurrentUser()->authorise('core.create', 'com_content');
 	}
 
 	/**

administrator/components/com_content/src/Model/ArticlesModel.php

@@ -231,7 +231,7 @@ protected function getListQuery()
 		// Create a new query object.
 		$db    = $this->getDatabase();
 		$query = $db->getQuery(true);
-		$user  = Factory::getUser();
+		$user  = $this->getCurrentUser();
 
 		$params = ComponentHelper::getParams('com_content');
 
@@ -601,7 +601,7 @@ public function getTransitions()
 		}
 
 		$db   = $this->getDatabase();
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		$items = $this->getItems();
 

administrator/components/com_contenthistory/src/Model/CompareModel.php

@@ -82,7 +82,7 @@ public function getItems()
 			return false;
 		}
 
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		// Access check
 		if (!$user->authorise('core.edit', $table1->item_id) && !$this->canEdit($table1))
@@ -166,7 +166,7 @@ protected function canEdit($record)
 			 * Make sure user has edit privileges for this content item. Note that we use edit permissions
 			 * for the content item, not delete permissions for the content history row.
 			 */
-			$user   = Factory::getUser();
+			$user   = $this->getCurrentUser();
 			$result = $user->authorise('core.edit', $record->item_id);
 
 			// Finally try session (this catches edit.own case too)

administrator/components/com_contenthistory/src/Model/HistoryModel.php

@@ -79,7 +79,7 @@ protected function canEdit($record)
 		 * Make sure user has edit privileges for this content item. Note that we use edit permissions
 		 * for the content item, not delete permissions for the content history row.
 		 */
-		$user   = Factory::getUser();
+		$user   = $this->getCurrentUser();
 
 		if ($user->authorise('core.edit', $record->item_id))
 		{
@@ -209,7 +209,7 @@ public function delete(&$pks)
 	public function getItems()
 	{
 		$items = parent::getItems();
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		if ($items === false)
 		{

administrator/components/com_contenthistory/src/Model/PreviewModel.php

@@ -50,7 +50,7 @@ public function getItem($pk = null)
 			return false;
 		}
 
-		$user = Factory::getUser();
+		$user = $this->getCurrentUser();
 
 		// Access check
 		if (!$user->authorise('core.edit', $table->item_id) && !$this->canEdit($table))
@@ -129,7 +129,7 @@ protected function canEdit($record)
 			 * Make sure user has edit privileges for this content item. Note that we use edit permissions
 			 * for the content item, not delete permissions for the content history row.
 			 */
-			$user   = Factory::getUser();
+			$user   = $this->getCurrentUser();
 			$result = $user->authorise('core.edit', $record->item_id);
 
 			// Finally try session (this catches edit.own case too)