diff --git a/libraries/src/Table/User.php b/libraries/src/Table/User.php index f3508ceb8fb93..826e5c112024f 100644 --- a/libraries/src/Table/User.php +++ b/libraries/src/Table/User.php @@ -9,16 +9,7 @@ namespace Joomla\CMS\Table; -use Joomla\CMS\Factory; -use Joomla\CMS\Filter\InputFilter; -use Joomla\CMS\Language\Text; -use Joomla\CMS\Mail\MailHelper; -use Joomla\CMS\String\PunycodeHelper; -use Joomla\Database\DatabaseInterface; -use Joomla\Database\ParameterType; -use Joomla\Event\DispatcherInterface; use Joomla\Registry\Registry; -use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; // phpcs:disable PSR1.Files.SideEffects @@ -32,14 +23,6 @@ */ class User extends Table { - /** - * Indicates that columns fully support the NULL value in the database - * - * @var boolean - * @since 4.0.0 - */ - protected $_supportNullValue = true; - /** * Associative array of group ids => group ids for the user * @@ -51,14 +34,13 @@ class User extends Table /** * Constructor * - * @param DatabaseInterface $db Database connector object - * @param ?DispatcherInterface $dispatcher Event dispatcher for this table + * @param \JDatabaseDriver $db Database driver object. * * @since 1.7.0 */ - public function __construct(DatabaseInterface $db, ?DispatcherInterface $dispatcher = null) + public function __construct($db) { - parent::__construct('#__users', 'id', $db, $dispatcher); + parent::__construct('#__users', 'id', $db); // Initialise. $this->id = 0; @@ -94,24 +76,20 @@ public function load($userId = null, $reset = true) // Reset the table. $this->reset(); - $userId = (int) $userId; - // Load the user data. - $db = $this->getDatabase(); - $query = $db->getQuery(true) + $query = $this->_db->getQuery(true) ->select('*') - ->from($db->quoteName('#__users')) - ->where($db->quoteName('id') . ' = :userid') - ->bind(':userid', $userId, ParameterType::INTEGER); - $db->setQuery($query); - $data = (array) $db->loadAssoc(); + ->from($this->_db->quoteName('#__users')) + ->where($this->_db->quoteName('id') . ' = ' . (int) $userId); + $this->_db->setQuery($query); + $data = (array) $this->_db->loadAssoc(); if (!\count($data)) { return false; } // Convert email from punycode - $data['email'] = PunycodeHelper::emailToUTF8($data['email']); + $data['email'] = \JStringPunycode::emailToUTF8($data['email']); // Bind the data to the table. $return = $this->bind($data); @@ -119,20 +97,15 @@ public function load($userId = null, $reset = true) if ($return !== false) { // Load the user groups. $query->clear() - ->select($db->quoteName('g.id')) - ->select($db->quoteName('g.title')) - ->from($db->quoteName('#__usergroups', 'g')) - ->join( - 'INNER', - $db->quoteName('#__user_usergroup_map', 'm'), - $db->quoteName('m.group_id') . ' = ' . $db->quoteName('g.id') - ) - ->where($db->quoteName('m.user_id') . ' = :muserid') - ->bind(':muserid', $userId, ParameterType::INTEGER); - $db->setQuery($query); + ->select($this->_db->quoteName('g.id')) + ->select($this->_db->quoteName('g.title')) + ->from($this->_db->quoteName('#__usergroups') . ' AS g') + ->join('INNER', $this->_db->quoteName('#__user_usergroup_map') . ' AS m ON m.group_id = g.id') + ->where($this->_db->quoteName('m.user_id') . ' = ' . (int) $userId); + $this->_db->setQuery($query); // Add the groups to the user data. - $this->groups = $db->loadAssocList('id', 'id'); + $this->groups = $this->_db->loadAssocList('id', 'id'); } return $return; @@ -164,16 +137,15 @@ public function bind($array, $ignore = '') $this->groups = ArrayHelper::toInteger($this->groups); // Get the titles for the user groups. - $db = $this->getDatabase(); - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->select($db->quoteName('title')) - ->from($db->quoteName('#__usergroups')) - ->whereIn($db->quoteName('id'), array_values($this->groups)); - $db->setQuery($query); + $query = $this->_db->getQuery(true) + ->select($this->_db->quoteName('id')) + ->select($this->_db->quoteName('title')) + ->from($this->_db->quoteName('#__usergroups')) + ->where($this->_db->quoteName('id') . ' = ' . implode(' OR ' . $this->_db->quoteName('id') . ' = ', $this->groups)); + $this->_db->setQuery($query); // Set the titles for the user groups. - $this->groups = $db->loadAssocList('id', 'id'); + $this->groups = $this->_db->loadAssocList('id', 'id'); } return $return; @@ -188,134 +160,108 @@ public function bind($array, $ignore = '') */ public function check() { - try { - parent::check(); - } catch (\Exception $e) { - $this->setError($e->getMessage()); - - return false; - } - - // Set user id to null instead of 0, if needed + // Set user id to null istead of 0, if needed if ($this->id === 0) { $this->id = null; } - $filterInput = InputFilter::getInstance(); + $filterInput = \JFilterInput::getInstance(); // Validate user information if ($filterInput->clean($this->name, 'TRIM') == '') { - $this->setError(Text::_('JLIB_DATABASE_ERROR_PLEASE_ENTER_YOUR_NAME')); + $this->setError(\JText::_('JLIB_DATABASE_ERROR_PLEASE_ENTER_YOUR_NAME')); return false; } if ($filterInput->clean($this->username, 'TRIM') == '') { - $this->setError(Text::_('JLIB_DATABASE_ERROR_PLEASE_ENTER_A_USER_NAME')); + $this->setError(\JText::_('JLIB_DATABASE_ERROR_PLEASE_ENTER_A_USER_NAME')); return false; } - if ( - preg_match('#[<>"\'%;()&\\\\]|\\.\\./#', $this->username) || StringHelper::strlen($this->username) < 2 - || $filterInput->clean($this->username, 'TRIM') !== $this->username || StringHelper::strlen($this->username) > 150 - ) { - $this->setError(Text::sprintf('JLIB_DATABASE_ERROR_VALID_AZ09', 2)); + if (preg_match('#[\s<>"\'%;()&\\\\]|\\.\\./#', $this->username) || \strlen(utf8_decode($this->username)) < 2 + || $filterInput->clean($this->username, 'TRIM') !== $this->username) { + $this->setError(\JText::sprintf('JLIB_DATABASE_ERROR_VALID_AZ09', 2)); return false; } - if ( - ($filterInput->clean($this->email, 'TRIM') == '') || !MailHelper::isEmailAddress($this->email) - || StringHelper::strlen($this->email) > 100 - ) { - $this->setError(Text::_('JLIB_DATABASE_ERROR_VALID_MAIL')); + if (($filterInput->clean($this->email, 'TRIM') == '') || !\JMailHelper::isEmailAddress($this->email)) { + $this->setError(\JText::_('JLIB_DATABASE_ERROR_VALID_MAIL')); return false; } // Convert email to punycode for storage - $this->email = PunycodeHelper::emailToPunycode($this->email); + $this->email = \JStringPunycode::emailToPunycode($this->email); // Set the registration timestamp - if (empty($this->registerDate)) { - $this->registerDate = Factory::getDate()->toSql(); + if (empty($this->registerDate) || $this->registerDate == $this->_db->getNullDate()) { + $this->registerDate = \JFactory::getDate()->toSql(); } // Set the lastvisitDate timestamp if (empty($this->lastvisitDate)) { - $this->lastvisitDate = null; + $this->lastvisitDate = $this->_db->getNullDate(); } // Set the lastResetTime timestamp if (empty($this->lastResetTime)) { - $this->lastResetTime = null; + $this->lastResetTime = $this->_db->getNullDate(); } - $uid = (int) $this->id; - // Check for existing username - $db = $this->getDatabase(); - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__users')) - ->where($db->quoteName('username') . ' = :username') - ->where($db->quoteName('id') . ' != :userid') - ->bind(':username', $this->username) - ->bind(':userid', $uid, ParameterType::INTEGER); - $db->setQuery($query); + $query = $this->_db->getQuery(true) + ->select($this->_db->quoteName('id')) + ->from($this->_db->quoteName('#__users')) + ->where($this->_db->quoteName('username') . ' = ' . $this->_db->quote($this->username)) + ->where($this->_db->quoteName('id') . ' != ' . (int) $this->id); + $this->_db->setQuery($query); - $xid = (int) $db->loadResult(); + $xid = (int) $this->_db->loadResult(); if ($xid && $xid != (int) $this->id) { - $this->setError(Text::_('JLIB_DATABASE_ERROR_USERNAME_INUSE')); + $this->setError(\JText::_('JLIB_DATABASE_ERROR_USERNAME_INUSE')); return false; } // Check for existing email $query->clear() - ->select($db->quoteName('id')) - ->from($db->quoteName('#__users')) - ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:mail)') - ->where($db->quoteName('id') . ' != :muserid') - ->bind(':mail', $this->email) - ->bind(':muserid', $uid, ParameterType::INTEGER); - $db->setQuery($query); - $xid = (int) $db->loadResult(); + ->select($this->_db->quoteName('id')) + ->from($this->_db->quoteName('#__users')) + ->where($this->_db->quoteName('email') . ' = ' . $this->_db->quote($this->email)) + ->where($this->_db->quoteName('id') . ' != ' . (int) $this->id); + $this->_db->setQuery($query); + $xid = (int) $this->_db->loadResult(); if ($xid && $xid != (int) $this->id) { - $this->setError(Text::_('JLIB_DATABASE_ERROR_EMAIL_INUSE')); + $this->setError(\JText::_('JLIB_DATABASE_ERROR_EMAIL_INUSE')); return false; } // Check for root_user != username - $rootUser = Factory::getApplication()->get('root_user'); + $config = \JFactory::getConfig(); + $rootUser = $config->get('root_user'); if (!is_numeric($rootUser)) { $query->clear() - ->select($db->quoteName('id')) - ->from($db->quoteName('#__users')) - ->where($db->quoteName('username') . ' = :username') - ->bind(':username', $rootUser); - $db->setQuery($query); - $xid = (int) $db->loadResult(); - - if ( - $rootUser == $this->username && (!$xid || $xid && $xid != (int) $this->id) - || $xid && $xid == (int) $this->id && $rootUser != $this->username - ) { - $this->setError(Text::_('JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE')); + ->select($this->_db->quoteName('id')) + ->from($this->_db->quoteName('#__users')) + ->where($this->_db->quoteName('username') . ' = ' . $this->_db->quote($rootUser)); + $this->_db->setQuery($query); + $xid = (int) $this->_db->loadResult(); + + if ($rootUser == $this->username && (!$xid || $xid && $xid != (int) $this->id) + || $xid && $xid == (int) $this->id && $rootUser != $this->username) { + $this->setError(\JText::_('JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE')); return false; } } - // Set an empty string value to the legacy otpKey and otep columns if empty - $this->otpKey = $this->otpKey ?: ''; - $this->otep = $this->otep ?: ''; - return true; } @@ -331,106 +277,87 @@ public function check() * * @since 1.7.0 */ - public function store($updateNulls = true) + public function store($updateNulls = false) { // Get the table key and key value. $k = $this->_tbl_key; $key = $this->$k; - // @todo: This is a dumb way to handle the groups. + // TODO: This is a dumb way to handle the groups. // Store groups locally so as to not update directly. $groups = $this->groups; unset($this->groups); // Insert or update the object based on presence of a key value. - $db = $this->getDatabase(); - if ($key) { // Already have a table key, update the row. - $db->updateObject($this->_tbl, $this, $this->_tbl_key, $updateNulls); + $this->_db->updateObject($this->_tbl, $this, $this->_tbl_key, $updateNulls); } else { // Don't have a table key, insert the row. - $db->insertObject($this->_tbl, $this, $this->_tbl_key); + $this->_db->insertObject($this->_tbl, $this, $this->_tbl_key); } // Reset groups to the local object. $this->groups = $groups; - $query = $db->getQuery(true); + $query = $this->_db->getQuery(true); // Store the group data if the user data was saved. if (\is_array($this->groups) && \count($this->groups)) { - $uid = (int) $this->id; - // Grab all usergroup entries for the user - $query->clear() - ->select($db->quoteName('group_id')) - ->from($db->quoteName('#__user_usergroup_map')) - ->where($db->quoteName('user_id') . ' = :userid') - ->bind(':userid', $uid, ParameterType::INTEGER); + $query -> clear() + -> select($this->_db->quoteName('group_id')) + -> from($this->_db->quoteName('#__user_usergroup_map')) + -> where($this->_db->quoteName('user_id') . ' = ' . (int) $this->id); - $db->setQuery($query); - $result = $db->loadObjectList(); + $this->_db->setQuery($query); + $result = $this->_db->loadObjectList(); // Loop through them and check if database contains something $this->groups does not if (\count($result)) { - $mapGroupId = []; - foreach ($result as $map) { if (\array_key_exists($map->group_id, $this->groups)) { // It already exists, no action required unset($groups[$map->group_id]); } else { - $mapGroupId[] = (int) $map->group_id; + // It should be removed + $query -> clear() + -> delete($this->_db->quoteName('#__user_usergroup_map')) + -> where($this->_db->quoteName('user_id') . ' = ' . (int) $this->id) + -> where($this->_db->quoteName('group_id') . ' = ' . (int) $map->group_id); + + $this->_db->setQuery($query); + $this->_db->execute(); } } - - if (\count($mapGroupId)) { - $query->clear() - ->delete($db->quoteName('#__user_usergroup_map')) - ->where($db->quoteName('user_id') . ' = :uid') - ->whereIn($db->quoteName('group_id'), $mapGroupId) - ->bind(':uid', $uid, ParameterType::INTEGER); - - $db->setQuery($query); - $db->execute(); - } } // If there is anything left in this->groups it needs to be inserted if (\count($groups)) { // Set the new user group maps. $query->clear() - ->insert($db->quoteName('#__user_usergroup_map')) - ->columns([$db->quoteName('user_id'), $db->quoteName('group_id')]); + ->insert($this->_db->quoteName('#__user_usergroup_map')) + ->columns([$this->_db->quoteName('user_id'), $this->_db->quoteName('group_id')]); + // Have to break this up into individual queries for cross-database support. foreach ($groups as $group) { - $query->values( - implode( - ',', - $query->bindArray( - [$this->id , $group], - [ParameterType::INTEGER, ParameterType::INTEGER] - ) - ) - ); + $query->clear('values') + ->values($this->id . ', ' . $group); + $this->_db->setQuery($query); + $this->_db->execute(); } - - $db->setQuery($query); - $db->execute(); } unset($groups); } // If a user is blocked, delete the cookie login rows - if ($this->block == 1) { + if ($this->block == (int) 1) { $query->clear() - ->delete($db->quoteName('#__user_keys')) - ->where($db->quoteName('user_id') . ' = :user_id') - ->bind(':user_id', $this->username); - $db->setQuery($query); - $db->execute(); + ->delete($this->_db->quoteName('#__user_keys')) + ->where($this->_db->quoteName('user_id') . ' = ' . $this->_db->quote($this->username)); + $this->_db->setQuery($query); + $this->_db->execute(); } return true; @@ -454,49 +381,41 @@ public function delete($userId = null) $this->$k = (int) $userId; } - $key = (int) $this->$k; - // Delete the user. - $db = $this->getDatabase(); - $query = $db->getQuery(true) - ->delete($db->quoteName($this->_tbl)) - ->where($db->quoteName($this->_tbl_key) . ' = :key') - ->bind(':key', $key, ParameterType::INTEGER); - $db->setQuery($query); - $db->execute(); + $query = $this->_db->getQuery(true) + ->delete($this->_db->quoteName($this->_tbl)) + ->where($this->_db->quoteName($this->_tbl_key) . ' = ' . (int) $this->$k); + $this->_db->setQuery($query); + $this->_db->execute(); // Delete the user group maps. $query->clear() - ->delete($db->quoteName('#__user_usergroup_map')) - ->where($db->quoteName('user_id') . ' = :key') - ->bind(':key', $key, ParameterType::INTEGER); - $db->setQuery($query); - $db->execute(); + ->delete($this->_db->quoteName('#__user_usergroup_map')) + ->where($this->_db->quoteName('user_id') . ' = ' . (int) $this->$k); + $this->_db->setQuery($query); + $this->_db->execute(); /* * Clean Up Related Data. */ $query->clear() - ->delete($db->quoteName('#__messages_cfg')) - ->where($db->quoteName('user_id') . ' = :key') - ->bind(':key', $key, ParameterType::INTEGER); - $db->setQuery($query); - $db->execute(); + ->delete($this->_db->quoteName('#__messages_cfg')) + ->where($this->_db->quoteName('user_id') . ' = ' . (int) $this->$k); + $this->_db->setQuery($query); + $this->_db->execute(); $query->clear() - ->delete($db->quoteName('#__messages')) - ->where($db->quoteName('user_id_to') . ' = :key') - ->bind(':key', $key, ParameterType::INTEGER); - $db->setQuery($query); - $db->execute(); + ->delete($this->_db->quoteName('#__messages')) + ->where($this->_db->quoteName('user_id_to') . ' = ' . (int) $this->$k); + $this->_db->setQuery($query); + $this->_db->execute(); $query->clear() - ->delete($db->quoteName('#__user_keys')) - ->where($db->quoteName('user_id') . ' = :username') - ->bind(':username', $this->username); - $db->setQuery($query); - $db->execute(); + ->delete($this->_db->quoteName('#__user_keys')) + ->where($this->_db->quoteName('user_id') . ' = ' . $this->_db->quote($this->username)); + $this->_db->setQuery($query); + $this->_db->execute(); return true; } @@ -522,23 +441,15 @@ public function setLastVisit($timeStamp = null, $userId = null) } } - // If no timestamp value is passed to function, then current time is used. - if ($timeStamp === null) { - $timeStamp = 'now'; - } - - $date = Factory::getDate($timeStamp); - $userId = (int) $userId; - $lastVisit = $date->toSql(); + // If no timestamp value is passed to function, than current time is used. + $date = \JFactory::getDate($timeStamp); // Update the database row for the user. - $db = $this->getDatabase(); + $db = $this->_db; $query = $db->getQuery(true) ->update($db->quoteName($this->_tbl)) - ->set($db->quoteName('lastvisitDate') . ' = :lastvisitDate') - ->where($db->quoteName('id') . ' = :id') - ->bind(':lastvisitDate', $lastVisit) - ->bind(':id', $userId, ParameterType::INTEGER); + ->set($db->quoteName('lastvisitDate') . '=' . $db->quote($date->toSql())) + ->where($db->quoteName('id') . '=' . (int) $userId); $db->setQuery($query); $db->execute();