Skip to content

Glpi key use exceptions not errors #21623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Glpi key use exceptions not errors #21623

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4954318
update \GLPIKey::get() to throw exceptions instead of triggering errors
SebSept Oct 23, 2025
daeb167
\GLPIKey::decrypt() to throw exceptions instead of triggering errors
SebSept Oct 23, 2025
61a22d9
wip, fix some usages.
SebSept Oct 23, 2025
2288a88
wip, changelog
SebSept Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
wip, fix some usages.
  • Loading branch information
@SebSept
SebSept committed Oct 23, 2025
commit 61a22d98fb026c9b40f4dce99206537f8538d84e
10 changes: 9 additions & 1 deletion src/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,15 @@ public function prepareInputForUpdate($input)

$input = array_filter($input, fn($key) => !in_array($key, $values_to_filter), ARRAY_FILTER_USE_KEY);

static::setConfigurationValues('core', $input);
try {
static::setConfigurationValues('core', $input);
} catch (Exception $e) {
Session::addMessageAfterRedirect(
'Error saving configuration: ' . htmlentities($e->getMessage()),
false,
ERROR
);
}

return false;
}
Expand Down
19 changes: 16 additions & 3 deletions src/GLPINetwork.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,23 @@ public static function getIcon()

public static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0)
{
if ($item::class === Config::class) {
self::showForConfig();
try {
if ($item->getType() == 'Config') {
$glpiNetwork = new self();
$glpiNetwork->showForConfig();
Comment on lines +57 to +58
Copy link
Contributor

@cconard96 cconard96 Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$glpiNetwork = new self();
$glpiNetwork->showForConfig();
self::showForConfig();

Copy link
Contributor Author

@SebSept SebSept Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intented to have the less possible changes, but I can change it if it hurt your eyes 😆

Copy link
Contributor

@cconard96 cconard96 Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's only just because it is a static method and should be called statically.

}
return true;
} catch (Exception $e) {
TemplateRenderer::getInstance()->display(
'/central/messages.html.twig',
[
'messages' => [
'errors' => [$e->getMessage()],
],
]
);
return false;
}
return true;
}

public static function showForConfig()
Expand Down