Improve accuracy of User::getList with type = blocked

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

diff --git a/src/Model/User.php b/src/Model/User.php
index ee5c35af8470d4e8208b1c1ab38d4681b3a20376..39f9dc2a15109530f8892e68cdc6d39f8a0c7766 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -102,6 +102,29 @@ class User
 
        private static $owner;
 
+       /**
+        * Returns the numeric account type by their string
+        *
+        * @param string $accounttype as string constant
+        * @return int|null Numeric account type - or null when not set
+        */
+       public static function getAccountTypeByString(string $accounttype)
+       {
+               switch ($accounttype) {
+                       case 'person':
+                               return User::ACCOUNT_TYPE_PERSON;
+                       case 'organisation':
+                               return User::ACCOUNT_TYPE_ORGANISATION;
+                       case 'news':
+                               return User::ACCOUNT_TYPE_NEWS;
+                       case 'community':
+                               return User::ACCOUNT_TYPE_COMMUNITY;
+                       default:
+                               return null;
+                       break;
+               }
+       }
+
        /**
         * Fetch the system account
         *
@@ -979,7 +1002,7 @@ class User
                        $photo_failure = false;
 
                        $filename = basename($photo);
-                       $curlResult = DI::httpRequest()->get($photo, true);
+                       $curlResult = DI::httpRequest()->get($photo);
                        if ($curlResult->isSuccess()) {
                                $img_str = $curlResult->getBody();
                                $type = $curlResult->getContentType();
@@ -1488,7 +1511,9 @@ class User
                                $condition['blocked'] = false;
                                break;
                        case 'blocked':
+                               $condition['account_removed'] = false;
                                $condition['blocked'] = true;
+                               $condition['verified'] = true;
                                break;
                        case 'removed':
                                $condition['account_removed'] = true;