Merge pull request #8939 from MrPetovan/task/8906-frio-viewas-redesign

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

diff --git a/src/Model/Register.php b/src/Model/Register.php
index 88e424309e692fb4bca121cb0c59ea2775ffd0db..f4d409bc328fda3931dda68c961555a79d8626a2 100644 (file)
--- a/src/Model/Register.php
+++ b/src/Model/Register.php
@@ -21,6 +21,7 @@
 
 namespace Friendica\Model;
 
+use Friendica\Content\Pager;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -33,19 +34,15 @@ class Register
        /**
         * Return the list of pending registrations
         *
+        * @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
         * @throws \Exception
         */
-       public static function getPending()
+       public static function getPending($start = 0, $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]]);
        }
 
        /**
@@ -59,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]);
        }
 
        /**
@@ -77,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]);
        }
 
        /**