Skip to content

[stable20] fix sharer flag on ldap:show-remnants when user owned more than a single share #23702

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
skjnldsv merged 3 commits into from
Oct 27, 2020
Merged

[stable20] fix sharer flag on ldap:show-remnants when user owned more than a single share #23702

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a1e5d8
add test for active shares flag
blizzz Oct 26, 2020
71c3487
split instantiation from business logic in OfflineUser
blizzz Oct 26, 2020
37301a5
fixes determining whether former user is a share owner
blizzz Oct 26, 2020
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
Prev Previous commit
fixes determining whether former user is a share owner 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Oct 26, 2020
commit 37301a5378fb59323fa8d1c49a2a2df619422198
15 changes: 4 additions & 11 deletions apps/user_ldap/lib/User/OfflineUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,29 +243,22 @@ protected function fetchDetails() {
*/
protected function determineShares() {
$query = $this->db->prepare('
SELECT COUNT(`uid_owner`)
SELECT `uid_owner`
FROM `*PREFIX*share`
WHERE `uid_owner` = ?
', 1);
$query->execute([$this->ocName]);
$sResult = $query->fetchColumn(0);
if ((int)$sResult === 1) {
if ($query->rowCount() > 0) {
$this->hasActiveShares = true;
return;
}

$query = $this->db->prepare('
SELECT COUNT(`owner`)
SELECT `owner`
FROM `*PREFIX*share_external`
WHERE `owner` = ?
', 1);
$query->execute([$this->ocName]);
$sResult = $query->fetchColumn(0);
if ((int)$sResult === 1) {
$this->hasActiveShares = true;
return;
}

$this->hasActiveShares = false;
$this->hasActiveShares = $query->rowCount() > 0;
}
}
8 changes: 5 additions & 3 deletions apps/user_ldap/tests/User/OfflineUserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,12 @@ public function shareOwnerProvider(): array {
public function testHasActiveShares(int $internalOwnerships, int $externalOwnerships, bool $expected) {
$queryMock = $this->createMock(Statement::class);
$queryMock->expects($this->atLeastOnce())
->method('fetchColumn')
->method('execute');
$queryMock->expects($this->atLeastOnce())
->method('rowCount')
->willReturnOnConsecutiveCalls(
(string)$internalOwnerships,
(string)$externalOwnerships
$internalOwnerships > 0 ? 1 : 0,
$externalOwnerships > 0 ? 1 : 0
);

$this->dbc->expects($this->atLeastOnce())
Expand Down