@@ -43,12 +43,12 @@ public function getLogoutUrl(): string
43
43
}
44
44
45
45
/**
46
- * Vrátí stav přihlášení uživatele, každých 5 minut obnoví přihlášení.
46
+ * Vrátí stav přihlášení uživatele, každých 15 minut obnoví přihlášení.
47
47
*/
48
48
public function isLoggedIn (): bool
49
49
{
50
50
$ logoutTime = clone ($ this ->skautIs ->getUser ()->getLogoutDate ());
51
- $ hardCheck = $ logoutTime ->diff (new DateTimeImmutable ())->i < 25 ; // pokud od posledniho obnoveni prihlaseni ubehlo 5 minut
51
+ $ hardCheck = $ logoutTime ->diff (new DateTimeImmutable ())->i < 15 ; // pokud od posledniho obnoveni prihlaseni ubehlo 15 minut
52
52
53
53
return $ this ->skautIs ->getUser ()->isLoggedIn ($ hardCheck );
54
54
}
@@ -203,27 +203,31 @@ public function getUnitId(): int|null
203
203
*/
204
204
public function getValidMembership (int $ personId ): stdClass |null
205
205
{
206
- $ membership = $ this ->skautIs ->org ->MembershipAllPerson ([
206
+ $ memberships = $ this ->skautIs ->org ->MembershipAllPerson ([
207
207
'ID_Login ' => $ this ->skautIs ->getUser ()->getLoginId (),
208
208
'ID_Person ' => $ personId ,
209
- 'ID_MembershipType ' => 'radne ' ,
210
209
'IsValid ' => true ,
211
210
]);
212
211
213
- if (empty ($ membership )) {
214
- $ membership = $ this ->skautIs ->org ->MembershipAllPerson ([
215
- 'ID_Login ' => $ this ->skautIs ->getUser ()->getLoginId (),
216
- 'ID_Person ' => $ personId ,
217
- 'ID_MembershipType ' => 'cestne ' ,
218
- 'IsValid ' => true ,
219
- ]);
212
+ if (empty ($ memberships )) {
213
+ return null ;
214
+ }
215
+
216
+ $ membershipsArray = $ memberships ->MembershipAllOutput instanceof stdClass ? [$ memberships ->MembershipAllOutput ] : $ memberships ->MembershipAllOutput ;
217
+
218
+ foreach ($ membershipsArray as $ membership ) {
219
+ if ($ membership ->ID_MembershipType === 'radne ' ) {
220
+ return $ membership ;
221
+ }
222
+ }
220
223
221
- if (empty ($ membership )) {
222
- return null ;
224
+ foreach ($ membershipsArray as $ membership ) {
225
+ if ($ membership ->ID_MembershipType === 'cestne ' ) {
226
+ return $ membership ;
223
227
}
224
228
}
225
229
226
- return $ membership -> MembershipAllOutput ;
230
+ return null ;
227
231
}
228
232
229
233
/**
0 commit comments