Skip to content

Commit 0b9ef5c

Browse files
Use a list of users id in SQL IN().
1 parent ed3986c commit 0b9ef5c

File tree

1 file changed

+20
-30
lines changed

1 file changed

+20
-30
lines changed

sources/items.queries.php

+20-30
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,14 @@
183183
$filters
184184
);
185185

186+
// List of teampass users ids (and current user id).
187+
$tpUsersIDs = [
188+
OTV_USER_ID,
189+
SSH_USER_ID,
190+
API_USER_ID,
191+
$session->get('user-id'),
192+
];
193+
186194
// Do asked action
187195
switch ($inputData['type']) {
188196
/*
@@ -5355,12 +5363,9 @@
53555363
$users = DB::query(
53565364
'SELECT id, public_key
53575365
FROM ' . prefixTable('users') . '
5358-
WHERE id NOT IN (%i, %i, %i, %i)
5366+
WHERE id NOT IN %li
53595367
AND public_key != ""',
5360-
OTV_USER_ID,
5361-
SSH_USER_ID,
5362-
API_USER_ID,
5363-
$session->get('user-id')
5368+
$tpUsersIDs
53645369
);
53655370

53665371
foreach ($users as $user) {
@@ -5399,12 +5404,9 @@
53995404
$users = DB::query(
54005405
'SELECT id, public_key
54015406
FROM ' . prefixTable('users') . '
5402-
WHERE id NOT IN (%i, %i, %i, %i)
5407+
WHERE id NOT IN %li
54035408
AND public_key != ""',
5404-
OTV_USER_ID,
5405-
SSH_USER_ID,
5406-
API_USER_ID,
5407-
$session->get('user-id')
5409+
$tpUsersIDs
54085410
);
54095411
foreach ($users as $user) {
54105412
// Insert in DB the new object key for this item by user
@@ -5443,12 +5445,9 @@
54435445
$users = DB::query(
54445446
'SELECT id, public_key
54455447
FROM ' . prefixTable('users') . '
5446-
WHERE id NOT IN (%i, %i, %i, %i)
5448+
WHERE id NOT IN %li
54475449
AND public_key != ""',
5448-
OTV_USER_ID,
5449-
SSH_USER_ID,
5450-
API_USER_ID,
5451-
$session->get('user-id')
5450+
$tpUsersIDs
54525451
);
54535452

54545453
foreach ($users as $user) {
@@ -5694,12 +5693,9 @@
56945693
$users = DB::query(
56955694
'SELECT id, public_key
56965695
FROM ' . prefixTable('users') . '
5697-
WHERE id NOT IN (%i, %i, %i, %i)
5696+
WHERE id NOT IN %li
56985697
AND public_key != ""',
5699-
OTV_USER_ID,
5700-
SSH_USER_ID,
5701-
API_USER_ID,
5702-
$session->get('user-id')
5698+
$tpUsersIDs
57035699
);
57045700

57055701
foreach ($users as $user) {
@@ -5738,12 +5734,9 @@
57385734
$users = DB::query(
57395735
'SELECT id, public_key
57405736
FROM ' . prefixTable('users') . '
5741-
WHERE id NOT IN (%i, %i, %i, %i)
5737+
WHERE id NOT IN %li
57425738
AND public_key != ""',
5743-
OTV_USER_ID,
5744-
SSH_USER_ID,
5745-
API_USER_ID,
5746-
$session->get('user-id')
5739+
$tpUsersIDs
57475740
);
57485741

57495742
foreach ($users as $user) {
@@ -5783,12 +5776,9 @@
57835776
$users = DB::query(
57845777
'SELECT id, public_key
57855778
FROM ' . prefixTable('users') . '
5786-
WHERE id NOT IN (%i, %i, %i, %i)
5779+
WHERE id NOT IN %li
57875780
AND public_key != ""',
5788-
OTV_USER_ID,
5789-
SSH_USER_ID,
5790-
API_USER_ID,
5791-
$session->get('user-id')
5781+
$tpUsersIDs
57925782
);
57935783

57945784
foreach ($users as $user) {

0 commit comments

Comments
 (0)