Feat(Core): handle multiple configuration by stonebuzz · Pull Request #169 · pluginsGLPI/sccm

stonebuzz · 2026-05-19T09:55:19Z

Checklist before requesting a review

Please delete options that are not relevant.

I have performed a self-review of my code.
I have added tests (when available) that prove my fix is effective or that my feature works.
I have updated the CHANGELOG with a short functional description of the fix or new feature.
This change requires a documentation update.

Description

Add the ability to handle multiple SCCM configurations.

Suggested replacement for #120

Screenshots (if appropriate):

Rom1-B

Please rebase

tolemac · 2026-05-20T11:29:10Z

Hi!

In the edit form the fields Name and comment are duplicated.

I'm currently running collect action from a big database, tell you how this end in a little.

tolemac · 2026-05-20T11:39:06Z

I have too many devices in database ... I think I have to stop it ...

At the moment I'm looking the log, it is collecting devices, I have advised that It seems slower that before,
This is the log of this morning:

2026-05-20 08:00:01 [@SUInventario]
Getting devices ... 
2026-05-20 08:00:17 [@SUInventario]
getDevices OK 
2026-05-20 08:00:17 [@SUInventario]
Generate XML start : 274 files
2026-05-20 08:00:18 [@SUInventario]
Collect OK for device - 16784352 
2026-05-20 08:00:18 [@SUInventario]
Collect OK for device - 16784363 
2026-05-20 08:00:18 [@SUInventario]
Collect OK for device - 16784374 
2026-05-20 08:00:19 [@SUInventario]
Collect OK for device - 16784381 
2026-05-20 08:00:19 [@SUInventario]
Collect OK for device - 16784383 
2026-05-20 08:00:20 [@SUInventario]
Collect OK for device - 16784385 
2026-05-20 08:00:20 [@SUInventario]
Collect OK for device - 16784474 
2026-05-20 08:00:21 [@SUInventario]
Collect OK for device - 16784513 
2026-05-20 08:00:22 [@SUInventario]
Collect OK for device - 16784519 
2026-05-20 08:00:22 [@SUInventario]
Collect OK for device - 16784520 
2026-05-20 08:00:22 [@SUInventario]
Collect OK for device - 16784522 
2026-05-20 08:00:23 [@SUInventario]
Collect OK for device - 16784525 
2026-05-20 08:00:23 [@SUInventario]

You can see how to collect several devices by second, however now:

2026-05-20 13:25:44 [473@SUInventario]
[Config 1] getDevices OK - 8280 files
2026-05-20 13:25:47 [473@SUInventario]
[Config 1] Collect OK for device - 16777658
2026-05-20 13:25:49 [473@SUInventario]
[Config 1] Collect OK for device - 16777924
2026-05-20 13:25:52 [473@SUInventario]
[Config 1] Collect OK for device - 16784352
2026-05-20 13:25:55 [473@SUInventario]
[Config 1] Collect OK for device - 16784363
2026-05-20 13:25:57 [473@SUInventario]
[Config 1] Collect OK for device - 16784374
2026-05-20 13:26:00 [473@SUInventario]
[Config 1] Collect OK for device - 16784381
2026-05-20 13:26:02 [473@SUInventario]
[Config 1] Collect OK for device - 16784383
2026-05-20 13:26:05 [473@SUInventario]
[Config 1] Collect OK for device - 16784385
2026-05-20 13:26:07 [473@SUInventario]
[Config 1] Collect OK for device - 16784474
2026-05-20 13:26:10 [473@SUInventario]
[Config 1] Collect OK for device - 16784513
2026-05-20 13:26:13 [473@SUInventario]
[Config 1] Collect OK for device - 16784519

Each device take more than 2 or 3 seconds ...

I'm not sure why ...

tolemac · 2026-05-20T11:42:17Z

I have stop it ... only 319 devices on 15 minutes ...

I can't run it for all devices in database, there are thousands, I need collection name filter...

stonebuzz · 2026-05-20T12:17:14Z

@tolemac

I fixed the issue with the duplicate fields in the form.

Regarding the collection timing, I’d prefer to handle that in a dedicated PR.

For now, let’s finalize this one first, then implement the collection mechanism. After that, we’ll evaluate whether the collection times are acceptable and optimize them if needed.

Best regards

tolemac · 2026-05-20T12:19:00Z

@tolemac

I fixed the issue with the duplicate fields in the form.

Regarding the collection timing, I’d prefer to handle that in a dedicated PR.

For now, let’s finalize this one first, then implement the collection mechanism. After that, we’ll evaluate whether the collection times are acceptable and optimize them if needed.

Best regards

Totally agree!

Rom1-B · 2026-05-21T06:08:34Z

+Session::checkRight('config', UPDATE);
+
+Html::header(
+    PluginSccmConfig::getTypeName(Session::getPluralNumber()),
+    '',
+    'config',
+    'PluginSccmMenu',
+);
+
+$config = new PluginSccmConfig();
+if ($config->canView()) {
+    Search::show(PluginSccmConfig::class);
+} else {
+    throw new AccessDeniedHttpException();
+}


Maybe:

Suggested change

Session::checkRight('config', UPDATE);

Html::header(

PluginSccmConfig::getTypeName(Session::getPluralNumber()),

'',

'config',

'PluginSccmMenu',

);

$config = new PluginSccmConfig();

if ($config->canView()) {

Search::show(PluginSccmConfig::class);

} else {

throw new AccessDeniedHttpException();

}

Session::checkRight(PluginSccmConfig::$rightname, UPDATE);

Session::checkRight(PluginSccmConfig::$rightname, READ);

Html::header(

PluginSccmConfig::getTypeName(Session::getPluralNumber()),

'',

'config',

'PluginSccmMenu',

);

Search::show(PluginSccmConfig::class);

or create checkRightsAnd() in core

Rom1-B · 2026-05-21T06:31:38Z

+
    $sccm_db = new PluginSccmSccmdb();
-    if ($sccm_db->connect()) {
+    if ($sccm_db->connect($_POST['id'])) {


Suggested change

if ($sccm_db->connect($_POST['id'])) {

if ($sccm_db->connect((int) $_POST['id'])) {

Rom1-B · 2026-05-21T06:33:40Z

+        mkdir($xml_root . '1', 0755, true);
+    }
+
+    foreach (glob($xml_root . '*.ocs') ?: [] as $file) {


safe\glob() never returns false

Suggested change

foreach (glob($xml_root . '*.ocs') ?: [] as $file) {

foreach (glob($xml_root . '*.ocs') as $file) {

Rom1-B · 2026-05-21T06:36:10Z

        mkdir(GLPI_PLUGIN_DOC_DIR . '/sccm/xml');
    }

+    // Migrate existing flat XML files to per-config subdirectory (config id=1)


The XML file migration occurs before the Migration object is created and before the PluginSccmConfig::install() method is called. If the database migration fails, the files will already have been moved and it will no longer be possible to undo the changes. Perhaps the order should be reversed: DB first, then files?

Rom1-B · 2026-05-21T06:40:24Z

+        $this->initForm($ID, $options);
+
+        $password = (new GLPIKey())->decrypt($this->fields['sccmdb_password'] ?? '');
+        $url = ($this->fields['inventory_server_url'] ?: "Ex : " . $CFG_GLPI['url_base']) . '/front/inventory.php';


Suggested change

$url = ($this->fields['inventory_server_url'] ?: "Ex : " . $CFG_GLPI['url_base']) . '/front/inventory.php';

$url = ($this->fields['inventory_server_url'] ?: __('Example:') . ' ' . $CFG_GLPI['url_base']) . '/front/inventory.php';

Rom1-B · 2026-05-21T06:40:54Z

+        return true;
+    }
+
+    public static function isIdAutoIncrement()


Suggested change

public static function isIdAutoIncrement()

public static function isIdAutoIncrement(): bool

Rom1-B · 2026-05-21T06:41:31Z

+        $fields = $DB->listFields('glpi_plugin_sccm_configs');
+        if (isset($fields['id'])) {
+            $fieldData = $fields['id'];
+            $extra = is_object($fieldData) ? ($fieldData->Extra ?? $fieldData->extra ?? '') : ($fieldData['Extra'] ?? $fieldData['extra'] ?? '');


Maybe:

Suggested change

$extra = is_object($fieldData) ? ($fieldData->Extra ?? $fieldData->extra ?? '') : ($fieldData['Extra'] ?? $fieldData['extra'] ?? '');

$extra = $fields['id']['Extra'] ?? '';

Rom1-B · 2026-05-21T06:43:38Z

+    {{ fields.checkboxField(
+        'use_auth_ntlm',
+        item.fields['use_auth_ntlm'],
+        __('Use NLTM authentication', 'sccm')


Suggested change

__('Use NLTM authentication', 'sccm')

__('Use NTLM authentication', 'sccm')

Rom1-B · 2026-05-21T06:44:01Z

+    {{ fields.textField(
+        'auth_info',
+        item.fields['auth_info'],
+        __('Value for spécific authentication', 'sccm')


Suggested change

__('Value for spécific authentication', 'sccm')

__('Value for specific authentication', 'sccm')

Rom1-B · 2026-05-21T06:45:09Z

+    {% if not item.isNewItem() %}
+        {{ fields.nullField() }}
+        {% set btn_test %}
+            <form method="post" action="{{ path('/plugins/sccm/front/config.form.php') }}">


Are we not already in a form?!

stonebuzz marked this pull request as draft May 19, 2026 09:57

stonebuzz mentioned this pull request May 19, 2026

feat(sccm): Works with multiple configurations #120

Open

stonebuzz requested a review from Rom1-B May 19, 2026 10:00

stonebuzz marked this pull request as ready for review May 19, 2026 10:00

stonebuzz force-pushed the multi_sccm branch from 2d360c3 to bb75aa1 Compare May 19, 2026 12:18

This comment was marked as duplicate.

Sign in to view

Feat(Core): handle multiple configuration

66a7ab7

stonebuzz force-pushed the multi_sccm branch from bb75aa1 to 66a7ab7 Compare May 20, 2026 09:59

This comment was marked as duplicate.

Sign in to view

Rom1-B requested changes May 20, 2026

View reviewed changes

Fix fields displayed twice

669faf4

stonebuzz self-assigned this May 20, 2026

stonebuzz added the enhancement label May 20, 2026

stonebuzz requested a review from Rom1-B May 20, 2026 12:17

stonebuzz added 3 commits May 20, 2026 14:20

fix CS

3c7d922

fix CS

ada514a

fix CS

d9f48fd

Rom1-B requested changes May 21, 2026

View reviewed changes

	if ($sccm_db->connect($_POST['id'])) {
	if ($sccm_db->connect((int) $_POST['id'])) {

	foreach (glob($xml_root . '*.ocs') ?: [] as $file) {
	foreach (glob($xml_root . '*.ocs') as $file) {

	$url = ($this->fields['inventory_server_url'] ?: "Ex : " . $CFG_GLPI['url_base']) . '/front/inventory.php';
	$url = ($this->fields['inventory_server_url'] ?: __('Example:') . ' ' . $CFG_GLPI['url_base']) . '/front/inventory.php';

	public static function isIdAutoIncrement()
	public static function isIdAutoIncrement(): bool

	$extra = is_object($fieldData) ? ($fieldData->Extra ?? $fieldData->extra ?? '') : ($fieldData['Extra'] ?? $fieldData['extra'] ?? '');
	$extra = $fields['id']['Extra'] ?? '';

	__('Use NLTM authentication', 'sccm')
	__('Use NTLM authentication', 'sccm')

	__('Value for spécific authentication', 'sccm')
	__('Value for specific authentication', 'sccm')

Conversation

stonebuzz commented May 19, 2026

Checklist before requesting a review

Description

Screenshots (if appropriate):

Uh oh!

This comment was marked as duplicate.

This comment was marked as duplicate.

Uh oh!

Rom1-B left a comment

Choose a reason for hiding this comment

Uh oh!

tolemac commented May 20, 2026

Uh oh!

tolemac commented May 20, 2026

Uh oh!

tolemac commented May 20, 2026

Uh oh!

stonebuzz commented May 20, 2026

Uh oh!

tolemac commented May 20, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants