Rev 1316 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1316 | Rev 1350 | ||
|---|---|---|---|
| Line 392... | Line 392... | ||
| 392 | $severity_online = $severity[0]; |
392 | $severity_online = $severity[0]; |
| 393 | $severity_offline = $severity[1]; |
393 | $severity_offline = $severity[1]; |
| 394 | } |
394 | } |
| 395 | foreach (OIDplusRA::getAllRAs() as $ra) { |
395 | foreach (OIDplusRA::getAllRAs() as $ra) { |
| 396 | if ($obj->userHasWriteRights($ra)) { |
396 | if ($obj->userHasWriteRights($ra)) { |
| - | 397 | try { |
|
| 397 | if (OIDplus::authUtils()->isRaLoggedIn($ra)) { |
398 | $tmp = OIDplus::authUtils()->isRaLoggedIn($ra); |
| - | 399 | } catch (\Exception $e) { |
|
| - | 400 | $tmp = false; // avoid that logging fails if things like JWT signature verification fails |
|
| - | 401 | } |
|
| - | 402 | if ($tmp) { |
|
| 398 | if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) { |
403 | if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) { |
| 399 | $logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, $ra->raEmail())); |
404 | $logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, $ra->raEmail())); |
| 400 | } |
405 | } |
| 401 | } else { |
406 | } else { |
| 402 | if (($severity_offline_int = self::convertSeverity($severity_offline)) >= 0) { |
407 | if (($severity_offline_int = self::convertSeverity($severity_offline)) >= 0) { |
| Line 419... | Line 424... | ||
| 419 | $severity_online = $severity[0]; |
424 | $severity_online = $severity[0]; |
| 420 | $severity_offline = $severity[1]; |
425 | $severity_offline = $severity[1]; |
| 421 | } |
426 | } |
| 422 | foreach (OIDplusRA::getAllRAs() as $ra) { |
427 | foreach (OIDplusRA::getAllRAs() as $ra) { |
| 423 | if ($obj->userHasParentalWriteRights($ra)) { |
428 | if ($obj->userHasParentalWriteRights($ra)) { |
| - | 429 | try { |
|
| 424 | if (OIDplus::authUtils()->isRaLoggedIn($ra)) { |
430 | $tmp = OIDplus::authUtils()->isRaLoggedIn($ra); |
| - | 431 | } catch (\Exception $e) { |
|
| - | 432 | $tmp = false; // avoid that logging fails if things like JWT signature verification fails |
|
| - | 433 | } |
|
| - | 434 | if ($tmp) { |
|
| 425 | if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) { |
435 | if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) { |
| 426 | $logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, $ra->raEmail())); |
436 | $logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, $ra->raEmail())); |
| 427 | } |
437 | } |
| 428 | } else { |
438 | } else { |
| 429 | if (($severity_offline_int = self::convertSeverity($severity_offline)) >= 0) { |
439 | if (($severity_offline_int = self::convertSeverity($severity_offline)) >= 0) { |
| Line 442... | Line 452... | ||
| 442 | $severity_offline = $severity; |
452 | $severity_offline = $severity; |
| 443 | } else { |
453 | } else { |
| 444 | $severity_online = $severity[0]; |
454 | $severity_online = $severity[0]; |
| 445 | $severity_offline = $severity[1]; |
455 | $severity_offline = $severity[1]; |
| 446 | } |
456 | } |
| - | 457 | try { |
|
| 447 | if (OIDplus::authUtils()->isRaLoggedIn($ra_email)) { |
458 | $tmp = OIDplus::authUtils()->isRaLoggedIn($ra_email); |
| - | 459 | } catch (\Exception $e) { |
|
| - | 460 | $tmp = false; // avoid that logging fails if things like JWT signature verification fails |
|
| - | 461 | } |
|
| - | 462 | if ($tmp) { |
|
| 448 | if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) { |
463 | if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) { |
| 449 | $logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, $ra_email)); |
464 | $logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, $ra_email)); |
| 450 | } |
465 | } |
| 451 | } else { |
466 | } else { |
| 452 | if (($severity_offline_int = self::convertSeverity($severity_offline)) >= 0) { |
467 | if (($severity_offline_int = self::convertSeverity($severity_offline)) >= 0) { |
| Line 462... | Line 477... | ||
| 462 | $severity_offline = $severity; |
477 | $severity_offline = $severity; |
| 463 | } else { |
478 | } else { |
| 464 | $severity_online = $severity[0]; |
479 | $severity_online = $severity[0]; |
| 465 | $severity_offline = $severity[1]; |
480 | $severity_offline = $severity[1]; |
| 466 | } |
481 | } |
| - | 482 | try { |
|
| 467 | if (OIDplus::authUtils()->isAdminLoggedIn()) { |
483 | $tmp = OIDplus::authUtils()->isAdminLoggedIn(); |
| - | 484 | } catch (\Exception $e) { |
|
| - | 485 | $tmp = false; // avoid that logging fails if things like JWT signature verification fails |
|
| - | 486 | } |
|
| - | 487 | if ($tmp) { |
|
| 468 | if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) { |
488 | if (($severity_online_int = self::convertSeverity($severity_online)) >= 0) { |
| 469 | $logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, 'admin')); |
489 | $logEvent->addTarget(new OIDplusLogTargetUser($severity_online_int, 'admin')); |
| 470 | } |
490 | } |
| 471 | } else { |
491 | } else { |
| 472 | if (($severity_offline_int = self::convertSeverity($severity_offline)) >= 0) { |
492 | if (($severity_offline_int = self::convertSeverity($severity_offline)) >= 0) { |