Merge branch 'release/2.1.0'

inc/sccm.class.php

@@ -391,7 +391,7 @@ function getStorages($deviceid, $limit = 99999999) {
          md.SystemName00,
          gld.ResourceID as \"gld-ResourceID\",
          gld.Description0 as \"gld-Description\",
-         gld.DeviceID0 as \"gld-Partition\", 
+         gld.DeviceID0 as \"gld-Partition\",
          gld.FileSystem0 as \"gld-FileSystem\",
          gld.Size0 as \"gld-TotalSize\",
          gld.FreeSpace0 as \"gld-FreeSpace\",
@@ -492,13 +492,11 @@ static function uninstall() {
    }
 
    static function cronSCCMCollect($task) {
-      self::executeCollect($task);
-      return true;
+      return self::executeCollect($task);
    }
 
    static function cronSCCMPush($task) {
-      self::executePush($task);
-      return true;
+      return self::executePush($task);
    }
 
    static function cronInfo($name) {
@@ -561,7 +559,8 @@ static function executeCollect($task) {
       } else {
          echo __("Collect is disabled by configuration.", "sccm");
       }
-      $task->end($retcode);
+
+      return $retcode;
    }
 
 
@@ -627,11 +626,11 @@ static function executePush($task) {
                   } else {
 
                      $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-                     if ($statusCode != 200) {
+                     if ($httpcode != 200) {
                         $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
                         $body = substr($ch_result, $header_size);
 
-                        Toolbox::logInFile('sccm', "Push KO - ".$tab['MachineID']." -> STATUS CODE : ".$statusCode." \n", true);
+                        Toolbox::logInFile('sccm', "Push KO - ".$tab['MachineID']." -> STATUS CODE : ".$httpcode." \n", true);
                         Toolbox::logInFile('sccm', "ERROR RETURNED : ".$body." \n", true);
                      } else {
                         $task->addVolume(1);
@@ -651,7 +650,8 @@ static function executePush($task) {
       } else {
          echo __("Push is disabled by configuration.", "sccm");
       }
-      $task->end($retcode);
+
+      return $retcode;
    }
 
 }

locales/fi_FI.po

@@ -0,0 +1,114 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# Markku Vepsä, 2018
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-21 14:05+0000\n"
+"PO-Revision-Date: 2018-08-21 14:04+0000\n"
+"Last-Translator: Markku Vepsä, 2018\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/teclib/teams/28042/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: front/showtable.php:81
+msgid "Synchronization is disabled by configuration."
+msgstr "Synkronointi on poistettu käytöstä asetusten perusteella."
+
+#: front/config.form.php:31 inc/config.class.php:47
+msgid "Setup - SCCM"
+msgstr "Asetukset - SCCM"
+
+#: front/test.php:32
+msgid "SCCM - TEST"
+msgstr "SCCM - Testi"
+
+#: inc/config.class.php:51 setup.php:58
+msgid "Interface - SCCM"
+msgstr "Liitäntä - SCCM"
+
+#: inc/config.class.php:99 inc/config.class.php:110
+msgid "Error when using glpi_plugin_sccm_configs table."
+msgstr "Virhe käytettäessä glpi_plugin_sccm_configs -taulukkoa."
+
+#: inc/config.class.php:164
+msgid "Enable SCCM synchronization"
+msgstr "Ota SCCM-synkronointi käyttöön"
+
+#: inc/config.class.php:169
+msgid "Server hostname (MSSQL)"
+msgstr "Palvelimen isäntänimi (MSSQL)"
+
+#: inc/config.class.php:174
+msgid "Database name"
+msgstr "Tietokannan nimi"
+
+#: inc/config.class.php:179
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
+#: inc/config.class.php:186
+msgid "Password"
+msgstr "Salasana"
+
+#: inc/config.class.php:191
+msgid "URL FusionInventory for injection"
+msgstr "URL FusionInventory injektiota varten"
+
+#: inc/config.class.php:196
+msgid "Verify SSL certificate"
+msgstr "Vahvista SSL-varmenne"
+
+#: inc/config.class.php:201
+msgid "Use NLTM authentication"
+msgstr "Käytä NLTM-todennusta"
+
+#: inc/config.class.php:206
+msgid "Send credentials to other hosts too"
+msgstr "Lähetä valtuutukset myös muille isännille"
+
+#: inc/config.class.php:211
+msgid "Use specific authentication information"
+msgstr "Käytä tiettyjä todennustietoja"
+
+#: inc/config.class.php:216
+msgid "Value for spécific authentication"
+msgstr "Todennustietojen arvo"
+
+#: inc/menu.class.php:29 inc/menu.class.php:33
+msgid "SCCM Connector"
+msgstr "SCCM-liitin"
+
+#: inc/sccm.class.php:35
+msgid "SCCM"
+msgstr "SCCM"
+
+#: inc/sccm.class.php:39
+msgid "Please, read the documentation before using that."
+msgstr "Lue käyttöohjeet ennen käyttöä."
+
+#: inc/sccm.class.php:506
+msgid "Interface - SCCMCollect"
+msgstr "Liitäntä - SCCMCollect"
+
+#: inc/sccm.class.php:509
+msgid "Interface - SCCMPush"
+msgstr "Liitäntä - SCCMPush"
+
+#: inc/sccm.class.php:562
+msgid "Collect is disabled by configuration."
+msgstr "\"Collect\" on poistettu käytöstä asetusten perusteella."
+
+#: inc/sccm.class.php:652
+msgid "Push is disabled by configuration."
+msgstr "\"Push\" on poistettu käytöstä asetusten perusteella."

sccm.xml

@@ -55,6 +55,12 @@ Prerequisite :
       <author>TECLIB'</author>
    </authors>
    <versions>
+      <version>
+         <num>2.1.0</num>
+         <compatibility>9.4</compatibility>
+         <compatibility>9.3</compatibility>
+         <compatibility>9.2</compatibility>
+      </version>
       <version>
          <num>2.0.4</num>
          <compatibility>9.2</compatibility>

setup.php

@@ -23,12 +23,12 @@
  * ------------------------------------------------------------------------
  */
 
-define("PLUGIN_SCCM_VERSION", "2.0.4");
+define("PLUGIN_SCCM_VERSION", "2.1.0");
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_SCCM_MIN_GLPI", "9.2");
 // Maximum GLPI version, exclusive
-define("PLUGIN_SCCM_MAX_GLPI", "9.4");
+define("PLUGIN_SCCM_MAX_GLPI", "9.5");
 
 function plugin_init_sccm() {
    global $PLUGIN_HOOKS,$CFG_GLPI;