Merge remote-tracking branch 'upstream/develop' into more-q

[friendica.git] / src / Model / Register.php

diff --git a/src/Model/Register.php b/src/Model/Register.php
index be00699bface1273fba86e0483de1062590761a6..d33d98904a00c02b4601507186f462bc2c6b45ab 100644 (file)
--- a/src/Model/Register.php
+++ b/src/Model/Register.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -42,15 +42,7 @@ class Register
         */
        public static function getPending($start = 0, $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]]);
        }
 
        /**
@@ -64,14 +56,7 @@ class Register
         */
        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]);
        }
 
        /**
@@ -82,13 +67,7 @@ class Register
         */
        public static function getPendingCount()
        {
-               $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]);
        }
 
        /**