Skip to content

[stable22] small edit #1003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2022
Merged

[stable22] small edit #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions lib/Model/Circle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ class Circle extends ManagedModel implements
4 => 'Email Address',
8 => 'Contact',
16 => 'Circle',
10000 => 'Nextcloud App',
10001 => 'Circles App',
10002 => 'Admin Command Line',
11000 => '3rd party app',
Expand Down Expand Up @@ -630,6 +631,15 @@ public function getInstance(): string {
}


/**
* @return bool
* @throws OwnerNotFoundException
*/
public function isLocal(): bool {
return $this->getManager()->isLocalInstance($this->getInstance());
}


/**
* @param int $population
*
Expand Down
7 changes: 7 additions & 0 deletions lib/Service/FederatedUserService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,13 @@ public function bypassCurrentUserCondition(bool $bypass): void {
$this->bypass = $bypass;
}

/**
* @return bool
*/
public function canBypassCurrentUserCondition(): bool {
return $this->bypass;
}


/**
* @throws SuperSessionException
Expand Down