Merge pull request #6989 from nupplaphil/task/basePath_baseUrl_fix

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

diff --git a/src/Model/User.php b/src/Model/User.php
index 3627333780883a88bbbddc7299292b4ab3aab9e0..472ed09247846ea8cf39a0131ca8c68969fcb68b 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -28,6 +28,55 @@ use LightOpenID;
  */
 class User
 {
+       /**
+        * Page/profile types
+        *
+        * PAGE_FLAGS_NORMAL is a typical personal profile account
+        * PAGE_FLAGS_SOAPBOX automatically approves all friend requests as Contact::SHARING, (readonly)
+        * PAGE_FLAGS_COMMUNITY automatically approves all friend requests as Contact::SHARING, but with
+        *      write access to wall and comments (no email and not included in page owner's ACL lists)
+        * PAGE_FLAGS_FREELOVE automatically approves all friend requests as full friends (Contact::FRIEND).
+        *
+        * @{
+        */
+       const PAGE_FLAGS_NORMAL    = 0;
+       const PAGE_FLAGS_SOAPBOX   = 1;
+       const PAGE_FLAGS_COMMUNITY = 2;
+       const PAGE_FLAGS_FREELOVE  = 3;
+       const PAGE_FLAGS_BLOG      = 4;
+       const PAGE_FLAGS_PRVGROUP  = 5;
+       /**
+        * @}
+        */
+
+       /**
+        * Account types
+        *
+        * ACCOUNT_TYPE_PERSON - the account belongs to a person
+        *      Associated page types: PAGE_FLAGS_NORMAL, PAGE_FLAGS_SOAPBOX, PAGE_FLAGS_FREELOVE
+        *
+        * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation
+        *      Associated page type: PAGE_FLAGS_SOAPBOX
+        *
+        * ACCOUNT_TYPE_NEWS - the account is a news reflector
+        *      Associated page type: PAGE_FLAGS_SOAPBOX
+        *
+        * ACCOUNT_TYPE_COMMUNITY - the account is community forum
+        *      Associated page types: PAGE_COMMUNITY, PAGE_FLAGS_PRVGROUP
+        *
+        * ACCOUNT_TYPE_RELAY - the account is a relay
+        *      This will only be assigned to contacts, not to user accounts
+        * @{
+        */
+       const ACCOUNT_TYPE_PERSON =       0;
+       const ACCOUNT_TYPE_ORGANISATION = 1;
+       const ACCOUNT_TYPE_NEWS =         2;
+       const ACCOUNT_TYPE_COMMUNITY =    3;
+       const ACCOUNT_TYPE_RELAY =        4;
+       /**
+        * @}
+        */
+
        /**
         * Returns true if a user record exists with the provided id
         *
@@ -85,7 +134,8 @@ class User
                        `user`.`spubkey`,
                        `user`.`page-flags`,
                        `user`.`account-type`,
-                       `user`.`prvnets`
+                       `user`.`prvnets`,
+                       `user`.`account_removed`
                        FROM `contact`
                        INNER JOIN `user`
                                ON `user`.`uid` = `contact`.`uid`
@@ -438,7 +488,6 @@ class User
                $return = ['user' => null, 'password' => ''];
 
                $using_invites = Config::get('system', 'invitation_only');
-               $num_invites   = Config::get('system', 'number_invites');
 
                $invite_id  = !empty($data['invite_id'])  ? Strings::escapeTags(trim($data['invite_id']))  : '';
                $username   = !empty($data['username'])   ? Strings::escapeTags(trim($data['username']))   : '';
@@ -501,8 +550,6 @@ class User
                        $openid_url = '';
                }
 
-               $err = '';
-
                // collapse multiple spaces in name
                $username = preg_replace('/ +/', ' ', $username);
 
@@ -826,8 +873,6 @@ class User
                        return false;
                }
 
-               $a = \get_app();
-
                Logger::log('Removing user: ' . $uid);
 
                $user = DBA::selectFirst('user', [], ['uid' => $uid]);
@@ -847,7 +892,7 @@ class User
                Worker::add(PRIORITY_LOW, 'Directory', $self['url']);
 
                // Remove the user relevant data
-               Worker::add(PRIORITY_LOW, 'RemoveUser', $uid);
+               Worker::add(PRIORITY_NEGLIGIBLE, 'RemoveUser', $uid);
 
                return true;
        }