X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FUser.php;h=7ecf4a576c5405fdd16ce22f8a657e82e3400fe4;hb=HEAD;hp=141ecf059802d88d7956801262b593e6ec8c925d;hpb=2d027d91d77fdd2cb895a96cf23d881829792a7a;p=friendica.git diff --git a/src/Model/User.php b/src/Model/User.php index 141ecf0598..7ecf4a576c 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -1,8 +1,10 @@ $uid]); } + /** + * Returns a user record based on it's GUID + * + * @param string $guid The guid of the user + * @param array $fields The fields to retrieve + * @param bool $active True, if only active records are searched + * + * @return array|boolean User record if it exists, false otherwise + * @throws Exception + */ + public static function getByGuid(string $guid, array $fields = [], bool $active = true) + { + if ($active) { + $cond = ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]; + } else { + $cond = ['guid' => $guid]; + } + + return DBA::selectFirst('user', $fields, $cond); + } + /** * @param string $nickname * @param array $fields @@ -155,8 +178,10 @@ class User * @return boolean|array * @throws Exception */ - public static function getOwnerDataById($uid, $check_valid = true) { - $r = DBA::fetchFirst("SELECT + public static function getOwnerDataById($uid, $check_valid = true) + { + $r = DBA::fetchFirst( + "SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`, `user`.`timezone`, @@ -166,7 +191,8 @@ class User `user`.`page-flags`, `user`.`account-type`, `user`.`prvnets`, - `user`.`account_removed` + `user`.`account_removed`, + `user`.`hidewall` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` @@ -355,7 +381,8 @@ class User $user = $user_info; } - if (!isset($user['uid']) + if ( + !isset($user['uid']) || !isset($user['password']) || !isset($user['legacy_password']) ) { @@ -363,7 +390,9 @@ class User } } elseif (is_int($user_info) || is_string($user_info)) { if (is_int($user_info)) { - $user = DBA::selectFirst('user', ['uid', 'password', 'legacy_password'], + $user = DBA::selectFirst( + 'user', + ['uid', 'password', 'legacy_password'], [ 'uid' => $user_info, 'blocked' => 0, @@ -374,9 +403,11 @@ class User ); } else { $fields = ['uid', 'password', 'legacy_password']; - $condition = ["(`email` = ? OR `username` = ? OR `nickname` = ?) + $condition = [ + "(`email` = ? OR `username` = ? OR `nickname` = ?) AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified`", - $user_info, $user_info, $user_info]; + $user_info, $user_info, $user_info + ]; $user = DBA::selectFirst('user', $fields, $condition); } @@ -395,7 +426,7 @@ class User */ public static function generateNewPassword() { - return ucfirst(Strings::getRandomName(8)) . mt_rand(1000, 9999); + return ucfirst(Strings::getRandomName(8)) . random_int(1000, 9999); } /** @@ -403,6 +434,7 @@ class User * * @param string $password * @return bool + * @throws Exception */ public static function isPasswordExposed($password) { @@ -411,9 +443,20 @@ class User 'cacheDirectory' => get_temppath() . '/password-exposed-cache/', ]); - $PasswordExposedCHecker = new PasswordExposed\PasswordExposedChecker(null, $cache); + try { + $passwordExposedChecker = new PasswordExposed\PasswordExposedChecker(null, $cache); + + return $passwordExposedChecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED; + } catch (\Exception $e) { + Logger::error('Password Exposed Exception: ' . $e->getMessage(), [ + 'code' => $e->getCode(), + 'file' => $e->getFile(), + 'line' => $e->getLine(), + 'trace' => $e->getTraceAsString() + ]); - return $PasswordExposedCHecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED; + return false; + } } /** @@ -581,6 +624,7 @@ class User } } + /// @todo Check if this part is really needed. We should have fetched all this data in advance if (empty($username) || empty($email) || empty($nickname)) { if ($openid_url) { if (!Network::isUrlValid($openid_url)) { @@ -671,7 +715,8 @@ class User } // Check existing and deleted accounts for this nickname. - if (DBA::exists('user', ['nickname' => $nickname]) + if ( + DBA::exists('user', ['nickname' => $nickname]) || DBA::exists('userd', ['username' => $nickname]) ) { throw new Exception(L10n::t('Nickname is already registered. Please choose another.')); @@ -785,15 +830,15 @@ class User $filename = basename($photo); $img_str = Network::fetchUrl($photo, true); // guess mimetype from headers or filename - $type = Image::guessType($photo, true); + $type = Images::guessType($photo, true); $Image = new Image($img_str, $type); if ($Image->isValid()) { $Image->scaleToSquare(300); - $hash = Photo::newResource(); + $resource_id = Photo::newResource(); - $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 4); + $r = Photo::store($Image, $uid, 0, $resource_id, $filename, L10n::t('Profile Photos'), 4); if ($r === false) { $photo_failure = true; @@ -801,7 +846,7 @@ class User $Image->scaleDown(80); - $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 5); + $r = Photo::store($Image, $uid, 0, $resource_id, $filename, L10n::t('Profile Photos'), 5); if ($r === false) { $photo_failure = true; @@ -809,14 +854,14 @@ class User $Image->scaleDown(48); - $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 6); + $r = Photo::store($Image, $uid, 0, $resource_id, $filename, L10n::t('Profile Photos'), 6); if ($r === false) { $photo_failure = true; } if (!$photo_failure) { - Photo::update(['profile' => 1], ['resource-id' => $hash]); + Photo::update(['profile' => 1], ['resource-id' => $resource_id]); } } } @@ -839,7 +884,8 @@ class User */ public static function sendRegisterPendingEmail($user, $sitename, $siteurl, $password) { - $body = Strings::deindent(L10n::t(' + $body = Strings::deindent(L10n::t( + ' Dear %1$s, Thank you for registering at %2$s. Your account is pending for approval by the administrator. @@ -849,7 +895,11 @@ class User Login Name: %4$s Password: %5$s ', - $user['username'], $sitename, $siteurl, $user['nickname'], $password + $user['username'], + $sitename, + $siteurl, + $user['nickname'], + $password )); return notification([ @@ -875,13 +925,16 @@ class User */ public static function sendRegisterOpenEmail($user, $sitename, $siteurl, $password) { - $preamble = Strings::deindent(L10n::t(' - Dear %1$s, + $preamble = Strings::deindent(L10n::t( + ' + Dear %1$s, Thank you for registering at %2$s. Your account has been created. - ', - $user['username'], $sitename + ', + $user['username'], + $sitename )); - $body = Strings::deindent(L10n::t(' + $body = Strings::deindent(L10n::t( + ' The login details are as follows: Site Location: %3$s @@ -908,7 +961,11 @@ class User If you ever want to delete your account, you can do so at %3$s/removeme Thank you and welcome to %2$s.', - $user['nickname'], $sitename, $siteurl, $user['username'], $password + $user['nickname'], + $sitename, + $siteurl, + $user['username'], + $password )); return notification([ @@ -989,33 +1046,45 @@ class User if ($user['parent-uid'] == 0) { // First add our own entry - $identities = [['uid' => $user['uid'], + $identities = [[ + 'uid' => $user['uid'], 'username' => $user['username'], - 'nickname' => $user['nickname']]]; + 'nickname' => $user['nickname'] + ]]; // Then add all the children - $r = DBA::select('user', ['uid', 'username', 'nickname'], - ['parent-uid' => $user['uid'], 'account_removed' => false]); + $r = DBA::select( + 'user', + ['uid', 'username', 'nickname'], + ['parent-uid' => $user['uid'], 'account_removed' => false] + ); if (DBA::isResult($r)) { $identities = array_merge($identities, DBA::toArray($r)); } } else { // First entry is our parent - $r = DBA::select('user', ['uid', 'username', 'nickname'], - ['uid' => $user['parent-uid'], 'account_removed' => false]); + $r = DBA::select( + 'user', + ['uid', 'username', 'nickname'], + ['uid' => $user['parent-uid'], 'account_removed' => false] + ); if (DBA::isResult($r)) { $identities = DBA::toArray($r); } // Then add all siblings - $r = DBA::select('user', ['uid', 'username', 'nickname'], - ['parent-uid' => $user['parent-uid'], 'account_removed' => false]); + $r = DBA::select( + 'user', + ['uid', 'username', 'nickname'], + ['parent-uid' => $user['parent-uid'], 'account_removed' => false] + ); if (DBA::isResult($r)) { $identities = array_merge($identities, DBA::toArray($r)); } } - $r = DBA::p("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname` + $r = DBA::p( + "SELECT `user`.`uid`, `user`.`username`, `user`.`nickname` FROM `manage` INNER JOIN `user` ON `manage`.`mid` = `user`.`uid` WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?", @@ -1061,13 +1130,13 @@ class User while ($user = DBA::fetch($userStmt)) { $statistics['total_users']++; - if ((strtotime($user['login_date']) > $halfyear) || - (strtotime($user['last-item']) > $halfyear)) { + if ((strtotime($user['login_date']) > $halfyear) || (strtotime($user['last-item']) > $halfyear) + ) { $statistics['active_users_halfyear']++; } - if ((strtotime($user['login_date']) > $month) || - (strtotime($user['last-item']) > $month)) { + if ((strtotime($user['login_date']) > $month) || (strtotime($user['last-item']) > $month) + ) { $statistics['active_users_monthly']++; } }