X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FRegister.php;h=497d357b6d8b77c3441e6b4428d50aeb8821d18a;hb=7171441238f343d6f0b2c57cc120739f0675491e;hp=9f6d369744ec054d06da232f0becc373dc4b38d7;hpb=27eaffd7fb4713491dbb72410b0adc55d4c9a6aa;p=friendica.git diff --git a/src/Model/Register.php b/src/Model/Register.php index 9f6d369744..497d357b6d 100644 --- a/src/Model/Register.php +++ b/src/Model/Register.php @@ -1,38 +1,61 @@ . + * */ namespace Friendica\Model; +use Friendica\Content\Pager; use Friendica\Database\DBA; +use Friendica\Network\HTTPException; use Friendica\Util\DateTimeFormat; use Friendica\Util\Strings; /** * Class interacting with the register database table - * - * @author Hypolite Petovan */ class Register { /** * Return the list of pending registrations * - * @return array + * @param int $start Start count (Default is 0) + * @param int $count Count of the items per page (Default is @see Pager::ITEMS_PER_PAGE) + * @return array|bool Array on succes, false on failure * @throws \Exception */ - public static function getPending() + public static function getPending(int $start = 0, int $count = Pager::ITEMS_PER_PAGE) { - $stmt = DBA::p( - "SELECT `register`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`email` - FROM `register` - INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid` - INNER JOIN `user` ON `register`.`uid` = `user`.`uid`" - ); - - return DBA::toArray($stmt); + return DBA::selectToArray('pending-view', [], [], ['limit' => [$start, $count]]); + } + + /** + * Returns the pending user based on a given user id + * + * @param int $uid The user id + * + * @return array|bool Array on succes, false on failure + * @throws \Exception + */ + public static function getPendingForUser(int $uid) + { + return DBA::selectFirst('pending-view', [], ['uid' => $uid, 'self' => true]); } /** @@ -41,25 +64,19 @@ class Register * @return int * @throws \Exception */ - public static function getPendingCount() + public static function getPendingCount(): int { - $register = DBA::fetchFirst( - "SELECT COUNT(*) AS `count` - FROM `register` - INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid` AND `contact`.`self`" - ); - - return $register['count']; + return DBA::count('pending-view', ['self' => true]); } /** * Returns the register record associated with the provided hash * * @param string $hash - * @return array + * @return array|bool Array on succes, false on failure * @throws \Exception */ - public static function getByHash($hash) + public static function getByHash(string $hash) { return DBA::selectFirst('register', [], ['hash' => $hash]); } @@ -71,7 +88,7 @@ class Register * @return boolean * @throws \Exception */ - public static function existsByHash($hash) + public static function existsByHash(string $hash): bool { return DBA::exists('register', ['hash' => $hash]); } @@ -82,7 +99,7 @@ class Register * @return string * @throws \Exception */ - public static function createForInvitation() + public static function createForInvitation(): string { $code = Strings::getRandomName(8) . random_int(1000, 9999); @@ -97,21 +114,27 @@ class Register } /** - * Creates a register record for approval and returns the success of the database insert + * Creates a register record for approval * Checks for the existence of the provided user id * - * @param integer $uid The ID of the user needing approval - * @param string $language The registration language - * @param string $note An additional message from the user - * @return boolean - * @throws \Exception + * @param integer $uid The ID of the user needing approval + * @param string $language The registration language + * @param string $note An additional message from the user + * @return void + * @throws \OutOfBoundsException + * @throws HTTPException\InternalServerErrorException + * @throws HTTPException\NotFoundException */ - public static function createForApproval($uid, $language, $note = '') + public static function createForApproval(int $uid, string $language, string $note = ''): void { $hash = Strings::getRandomHex(); + if (!$uid) { + throw new \OutOfBoundsException("User ID can't be empty"); + } + if (!User::exists($uid)) { - return false; + throw new HTTPException\NotFoundException("User ID doesn't exist"); } $fields = [ @@ -123,7 +146,9 @@ class Register 'note' => $note ]; - return DBA::insert('register', $fields); + if (!DBA::insert('register', $fields)) { + throw new HTTPException\InternalServerErrorException('Unable to insert a `register` record'); + } } /** @@ -133,7 +158,7 @@ class Register * @return boolean * @throws \Exception */ - public static function deleteByHash($hash) + public static function deleteByHash(string $hash): bool { return DBA::delete('register', ['hash' => $hash]); }