Skip to content

Commit f805657

Browse files
committed
Merge branch 'nc31'
2 parents e82b343 + f44591b commit f805657

File tree

9 files changed

+219
-129
lines changed

9 files changed

+219
-129
lines changed

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc)
4242
<database>pgsql</database>
4343
<database min-version="5.5">mysql</database>
4444
<lib>openssl</lib>
45-
<nextcloud min-version="26" max-version="30"/>
45+
<nextcloud min-version="26" max-version="31"/>
4646
</dependencies>
4747

4848
<background-jobs>

css/public-page.css

Lines changed: 86 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/public-page.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/templates.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Controller/PageController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function bookmarklet($url='', $title='') {
5353
* @PublicPage
5454
*/
5555
public function publicSharePage() {
56-
return new TemplateResponse($this->appName, 'public_share');
56+
return new TemplateResponse($this->appName, 'public_share', [], TemplateResponse::RENDER_AS_PUBLIC);
5757
}
5858

5959
}

lib/Service/NotificationService.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,15 @@ function hasCredentialExpirationNotification($credential): bool {
109109
->from('notifications')
110110
->where($qb->expr()->eq('object_id', $qb->createNamedParameter($credential->getId(), IQueryBuilder::PARAM_INT)))
111111
->andWhere($qb->expr()->eq('subject', $qb->createNamedParameter('credential_expired', IQueryBuilder::PARAM_STR)));
112-
return $qb->execute()->rowCount() !== 0;
112+
return $qb->executeQuery()->rowCount() !== 0;
113113
}
114114

115115
function deleteNotificationsOfCredential($credential) {
116116
$qb = $this->db->getQueryBuilder();
117-
$qb->delete()
118-
->from('notifications')
117+
$qb->delete('notifications')
119118
->where($qb->expr()->eq('object_id', $qb->createNamedParameter($credential->getId(), IQueryBuilder::PARAM_INT)))
120-
->andWhere($qb->expr()->eq('object_type', 'credential'));
121-
return $qb->execute();
119+
->andWhere($qb->expr()->eq('object_type', $qb->createNamedParameter('credential', IQueryBuilder::PARAM_STR)));
120+
return $qb->executeStatement();
122121
}
123122

124123
function markNotificationOfCredentialAsProcessed(int $credential_id, string $user_id): void {

0 commit comments

Comments
 (0)