Merge branch 'release/2.2.1'

pluginsGLPI · Aug 27, 2020 · 26d7087 · 26d7087
2 parents 5a0d5b9 + 2d9d7f6
commit 26d7087
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/inc/sccmdb.class.php b/inc/sccmdb.class.php
@@ -41,7 +41,7 @@ function connect() {
       $user = $PluginSccmConfig->getField('sccmdb_user');
 
       $password = $PluginSccmConfig->getField('sccmdb_password');
-      $password = Toolbox::decrypt($password, GLPIKEY);// TODO Use sodium encryption
+      $password = Toolbox::sodiumDecrypt($password);
 
       $connectionOptions = [
           "Database" => $dbname,

diff --git a/sccm.xml b/sccm.xml
@@ -5,11 +5,11 @@
    <logo>https://raw.githubusercontent.com/TECLIB/sccm/master/screenshots/iconmonstr-database-10-icon-128.png</logo>
    <description>
       <short>
-         <fr>Synchronisation des données avec l'outil Microsoft SCCM 2012 R2</fr>
-         <en>Data synchronization with Microsoft SCCM 2012 R2 tool</en>
+         <fr>Synchronisation des données avec l'outil Microsoft SCCM</fr>
+         <en>Data synchronization with Microsoft SCCM</en>
       </short>
       <long>
-         <fr>Synchronisation des données avec l'outil Microsoft SCCM 2012 R2
+         <fr>Synchronisation des données avec l'outil Microsoft SCCM
 
 Plugin permettant de synchroniser les ordinateurs présents dans SCCM avec GLPI.
 
@@ -26,8 +26,8 @@ Pré-requis :
 * Plugin FusionInventory for GLPI : http://www.fusioninventory.org/documentation/fi4g/installation/
 * PHP curl_init : http://php.net/manual/fr/function.curl-init.php
 * PHP mssql_connect : http://php.net/manual/fr/function.mssql-connect.php
-* Microsoft System Center 2012 R2 Configuration Manager : http://www.microsoft.com/fr-fr/server-cloud/products/system-center-2012-r2/default.aspx</fr>
-         <en>Data synchronization with Microsoft SCCM 2012 R2 tool
+* Microsoft System Center Configuration Manager</fr>
+         <en>Data synchronization with Microsoft SCCM
 
 Plugin to synchronize computers from SCCM to GLPI.
 
@@ -44,7 +44,7 @@ Prerequisite :
 * FusionInventory for GLPI : http://www.fusioninventory.org/documentation/fi4g/installation/
 * PHP curl_init : http://php.net/manual/en/function.curl-init.php
 * PHP mssql_connect : http://php.net/manual/en/function.mssql-connect.php
-* Microsoft System Center 2012 R2 Configuration Manager : http://www.microsoft.com/en-gb/server-cloud/products/system-center-2012-r2/default.aspx</en>
+* Microsoft System Center Configuration Manager</en>
       </long>
    </description>
    <homepage>https://pluginsglpi.github.io/sccm/</homepage>
@@ -55,6 +55,11 @@ Prerequisite :
       <author>TECLIB'</author>
    </authors>
    <versions>
+      <version>
+         <num>2.2.1</num>
+         <compatibility>~9.5.0</compatibility>
+         <download_url>https://github.com/pluginsGLPI/sccm/releases/download/2.2.1/glpi-sccm-2.2.1.tar.bz2</download_url>
+      </version>
       <version>
          <num>2.2.0</num>
          <compatibility>~9.5.0</compatibility>

diff --git a/setup.php b/setup.php
@@ -23,7 +23,7 @@
  * ------------------------------------------------------------------------
  */
 
-define("PLUGIN_SCCM_VERSION", "2.2.0");
+define("PLUGIN_SCCM_VERSION", "2.2.1");
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_SCCM_MIN_GLPI", "9.5");
@@ -45,6 +45,9 @@ function plugin_init_sccm() {
          $PLUGIN_HOOKS["menu_toadd"]['sccm'] = ['config' => 'PluginSccmMenu'];
       }
    }
+
+   // Encryption
+   $PLUGIN_HOOKS['secured_fields']['sccm'] = ['glpi_plugin_sccm_configs.sccmdb_password'];
 }
 
 /**