Move Authentication::setAuthenticatedSessionForUser to Session::setAuthenticatedForUser

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

diff --git a/src/Model/Register.php b/src/Model/Register.php
index e54db87a6b7fee15643a02e62fe4f4fe052566d0..8a03f379a604daca027233e31b8503d8a7fee0b0 100644 (file)
--- a/src/Model/Register.php
+++ b/src/Model/Register.php
@@ -7,6 +7,7 @@ namespace Friendica\Model;
 
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
 
 /**
  * Class interacting with the register database table
@@ -19,11 +20,12 @@ class Register
         * Return the list of pending registrations
         *
         * @return array
+        * @throws \Exception
         */
        public static function getPending()
        {
                $stmt = DBA::p(
-                       "SELECT `register`.*, `contact`.`name`, `user`.`email`
+                       "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`"
@@ -36,6 +38,7 @@ class Register
         * Returns the pending registration count
         *
         * @return int
+        * @throws \Exception
         */
        public static function getPendingCount()
        {
@@ -53,6 +56,7 @@ class Register
         *
         * @param  string $hash
         * @return array
+        * @throws \Exception
         */
        public static function getByHash($hash)
        {
@@ -62,8 +66,9 @@ class Register
        /**
         * Returns true if a register record exists with the provided hash
         *
-        * @param  string  $hash
+        * @param  string $hash
         * @return boolean
+        * @throws \Exception
         */
        public static function existsByHash($hash)
        {
@@ -74,10 +79,11 @@ class Register
         * Creates a register record for an invitation and returns the auto-generated code for it
         *
         * @return string
+        * @throws \Exception
         */
        public static function createForInvitation()
        {
-               $code = autoname(8) . srand(1000, 9999);
+               $code = Strings::getRandomName(8) . srand(1000, 9999);
 
                $fields = [
                        'hash' => $code,
@@ -97,10 +103,11 @@ class Register
         * @param  string  $language The registration language
         * @param  string  $note     An additional message from the user
         * @return boolean
+        * @throws \Exception
         */
        public static function createForApproval($uid, $language, $note = '')
        {
-               $hash = random_string();
+               $hash = Strings::getRandomHex();
 
                if (!User::exists($uid)) {
                        return false;
@@ -121,8 +128,9 @@ class Register
        /**
         * Deletes a register record by the provided hash and returns the success of the database deletion
         *
-        * @param  string  $hash
+        * @param  string $hash
         * @return boolean
+        * @throws \Exception
         */
        public static function deleteByHash($hash)
        {