From 481287e2646e2b4d157173dc048f2c8fa389550b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Thu, 8 Nov 2018 12:21:22 +0100 Subject: [PATCH 1/4] Add Finnish (Finland) locale --- locales/fi_FI.mo | Bin 0 -> 2254 bytes locales/fi_FI.po | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 locales/fi_FI.mo create mode 100644 locales/fi_FI.po diff --git a/locales/fi_FI.mo b/locales/fi_FI.mo new file mode 100644 index 0000000000000000000000000000000000000000..bf2ad603218677f27b922cfb5d78782b2dbf1f97 GIT binary patch literal 2254 zcmb7^%Wqpn6vhWA6wI^bDM0FJ0FkJ@enbHUmk5R6R8j5L#I9LJ_IFlu}5Ns*zlceCsj#M)sgP~&GXE6&di+O&z`y|P+r3K zD!$+Fy@BuR2k=8FJ~(fez$elE2z&)pU=jQjd3B2%- z5U0Sa;NxHedp87_BoLExeT)XI`{(U!EfNh z=iobNFF!KZ*#_B;2g~41@C^71$T7GLJ`er_vfVSMg?Jr&8GIXj4}?iE23g-HAp7wd z$U46Q&w)RK9GBbRyWn3S$F&Hf>|YCH9R}q6zW{mPZx{RtgnaQZJ}$f`LYT#h+pP7l zJcbI)-&LMPi_hU{d~Ba%!iCR}3v140wYeU+n-zpN^P9D>{=>q)p5?}tO%fFc(w;in z%XXqV)SggmO;`6)Cxf;oFFue#wxw5O`=L!@ap_Pq3J%yx1{8xvq>AMVZB89SeoW`s=Chi@Nmwz`Bm8 zCkpy5l2funp|7Z8<8-J@$YfDlb*)niNue)8Uhw*RxXm7l%*}|Jl}2-3-?GLaWY&p> zG98MY>R=x&6ZmAwVsl4*>jO6}=D6{qgM&xQwMOH^>I(WpIy&^Zad#B&A?x~Xm9`OG zYj(^STU$3FxJTOTLl?TmbsW{zYO_W%g&c^B=cmK{exzdE)$xDEuo^aoNAp~E)Ge8$ zDl_g!v+qt?CtAws?t~hRD#gkLHZ6k^b!S;kw9|<&gTn=>4?kqoyrWu70fDopMW!onv)Sc3+hHFj1sBMC5rpfc@;LUH@BnpJM(y}u5wYu#I}PsRi^c}4o8B^ zl_8eL4H-Su;#!c|!;O#%2FL_f0n^7TUBc;Fsx^h9**@K=7(bgS%PTDM0#nYsNx=H5+KU< z_mv8y@Q%$<=WLo6OT6a(V{%uXP(J7^QA7#EYa^<&X&BNu{40tKs*ov0y;~n!& NYE&ca3ipi?{{ntfj+_7h literal 0 HcmV?d00001 diff --git a/locales/fi_FI.po b/locales/fi_FI.po new file mode 100644 index 0000000..6553a70 --- /dev/null +++ b/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 , 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." From f7aaa4aef480ec17e503a2c52d188adfa3533484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 14 Sep 2018 13:34:17 +0200 Subject: [PATCH 2/4] Fix push status; fixes #68 --- inc/sccm.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/sccm.class.php b/inc/sccm.class.php index 0057d44..4e46f0e 100644 --- a/inc/sccm.class.php +++ b/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\", @@ -627,11 +627,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); From 4ae5e033f8faf0366667e84cfaced348d115dce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 27 Nov 2018 10:32:09 +0100 Subject: [PATCH 3/4] GLPI 9.4 compatibility --- sccm.xml | 6 ++++++ setup.php | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sccm.xml b/sccm.xml index 57387b6..da2b752 100644 --- a/sccm.xml +++ b/sccm.xml @@ -55,6 +55,12 @@ Prerequisite : TECLIB' + + 2.1.0 + 9.4 + 9.3 + 9.2 + 2.0.4 9.2 diff --git a/setup.php b/setup.php index 846cd22..10df2a1 100644 --- a/setup.php +++ b/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; From 15a5bb58550552288cd9c9759f25c9498b6954df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Mon, 10 Dec 2018 14:45:45 +0100 Subject: [PATCH 4/4] Fix return code in cron tasks --- inc/sccm.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/sccm.class.php b/inc/sccm.class.php index 4e46f0e..6ec0fc0 100644 --- a/inc/sccm.class.php +++ b/inc/sccm.class.php @@ -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; } @@ -651,7 +650,8 @@ static function executePush($task) { } else { echo __("Push is disabled by configuration.", "sccm"); } - $task->end($retcode); + + return $retcode; } }