Make \OC\SubAdmin php-5.4 compatible
* Also close some cursors while we are at it
This commit is contained in:
parent
588a668455
commit
07fe1df8c1
|
@ -116,6 +116,7 @@ class SubAdmin extends PublicEmitter {
|
||||||
while($row = $result->fetch()) {
|
while($row = $result->fetch()) {
|
||||||
$groups[] = $this->groupManager->get($row['gid']);
|
$groups[] = $this->groupManager->get($row['gid']);
|
||||||
}
|
}
|
||||||
|
$result->closeCursor();
|
||||||
|
|
||||||
return $groups;
|
return $groups;
|
||||||
}
|
}
|
||||||
|
@ -137,6 +138,7 @@ class SubAdmin extends PublicEmitter {
|
||||||
while($row = $result->fetch()) {
|
while($row = $result->fetch()) {
|
||||||
$users[] = $this->userManager->get($row['uid']);
|
$users[] = $this->userManager->get($row['uid']);
|
||||||
}
|
}
|
||||||
|
$result->closeCursor();
|
||||||
|
|
||||||
return $users;
|
return $users;
|
||||||
}
|
}
|
||||||
|
@ -159,6 +161,8 @@ class SubAdmin extends PublicEmitter {
|
||||||
'group' => $this->groupManager->get($row['gid'])
|
'group' => $this->groupManager->get($row['gid'])
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
$result->closeCursor();
|
||||||
|
|
||||||
return $subadmins;
|
return $subadmins;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -171,13 +175,20 @@ class SubAdmin extends PublicEmitter {
|
||||||
public function isSubAdminofGroup(IUser $user, IGroup $group) {
|
public function isSubAdminofGroup(IUser $user, IGroup $group) {
|
||||||
$qb = $this->dbConn->getQueryBuilder();
|
$qb = $this->dbConn->getQueryBuilder();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Primary key is ('gid', 'uid') so max 1 result possible here
|
||||||
|
*/
|
||||||
$result = $qb->select('*')
|
$result = $qb->select('*')
|
||||||
->from('group_admin')
|
->from('group_admin')
|
||||||
->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
|
->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
|
||||||
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
|
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
|
||||||
->execute();
|
->execute();
|
||||||
|
|
||||||
return !empty($result->fetch()) ? true : false;
|
$fetch = $result->fetch();
|
||||||
|
$result->closeCursor();
|
||||||
|
$result = !empty($fetch) ? true : false;
|
||||||
|
|
||||||
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -197,10 +208,14 @@ class SubAdmin extends PublicEmitter {
|
||||||
->from('group_admin')
|
->from('group_admin')
|
||||||
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
|
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
|
||||||
->setMaxResults(1)
|
->setMaxResults(1)
|
||||||
->execute()
|
->execute();
|
||||||
->fetch();
|
|
||||||
|
|
||||||
return $result === false ? false : true;
|
$isSubAdmin = $result->fetch();
|
||||||
|
$result->closeCursor();
|
||||||
|
|
||||||
|
$result = $isSubAdmin === false ? false : true;
|
||||||
|
|
||||||
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue