X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FRegister.php;h=c24e66d4d07dd67a33cfb7f1523289dd1cfadce5;hb=073695b33c5f9c5d89d91958b09259c59e12dd98;hp=be00699bface1273fba86e0483de1062590761a6;hpb=d6ed0068e6c8bf513e40a5d29b73d100f664261b;p=friendica.git

diff --git a/src/Model/Register.php b/src/Model/Register.php
index be00699bfa..c24e66d4d0 100644
--- a/src/Model/Register.php
+++ b/src/Model/Register.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -34,23 +34,14 @@ class Register
 	/**
 	 * Return the list of pending registrations
 	 *
-	 * @param int    $start Start count (Default is 0)
+	 * @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
+	 * @return array|bool Array on succes, false on failure
 	 * @throws \Exception
 	 */
-	public static function getPending($start = 0, $count = Pager::ITEMS_PER_PAGE)
+	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`, `contact`.`nick`
-			FROM `register`
-			INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid`
-			INNER JOIN `user` ON `register`.`uid` = `user`.`uid`
-			LIMIT ?, ?", $start, $count
-		);
-
-		return DBA::toArray($stmt);
+		return DBA::selectToArray('pending-view', [], [], ['limit' => [$start, $count]]);
 	}
 
 	/**
@@ -58,20 +49,12 @@ class Register
 	 *
 	 * @param int $uid The user id
 	 *
-	 * @return array The pending user information
-	 *
+	 * @return array|bool Array on succes, false on failure
 	 * @throws \Exception
 	 */
 	public static function getPendingForUser(int $uid)
 	{
-		return DBA::fetchFirst(
-			"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`
-			WHERE `register`.uid = ?",
-			$uid
-		);
+		return DBA::selectFirst('pending-view', [], ['uid' => $uid, 'self' => true]);
 	}
 
 	/**
@@ -80,25 +63,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]);
 	}
@@ -110,7 +87,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]);
 	}
@@ -121,7 +98,7 @@ class Register
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function createForInvitation()
+	public static function createForInvitation(): string
 	{
 		$code = Strings::getRandomName(8) . random_int(1000, 9999);
 
@@ -145,7 +122,7 @@ class Register
 	 * @return boolean
 	 * @throws \Exception
 	 */
-	public static function createForApproval($uid, $language, $note = '')
+	public static function createForApproval(int $uid, string $language, string $note = ''): bool
 	{
 		$hash = Strings::getRandomHex();
 
@@ -172,7 +149,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]);
 	}