From be21d12a115db2d94fc66c39fe53e98aced71207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 7 Feb 2020 15:31:11 +0100 Subject: [PATCH 1/6] Update Travis configuration - Add PHP 7.4 in matrix. - Limit matrix to lowest and highiest PHP supported version. - Run CS checks in strict mode. - Remove dead config lines. --- .travis.yml | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index e223618..ba423eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,38 +1,19 @@ language: php - -env: - global: -# - GLPI_SOURCE="https://github.com/glpi-project/glpi -b 9.2/bugfixes" - - PHPUNIT_ARGS="--verbose --debug" - - CS=7.2 - matrix: -# - GLPI_BRANCH=9.2.1 -# - GLPI_BRANCH=9.2/bugfixes -# - GLPI_BRANCH=master - php: - 7.0 - - 7.1 - - 7.2 + - 7.4 - nightly -allow_failures: - - php: nightly - before_script: -# - mysql -u root -e 'create database glpitest;' -# - git clone --depth=1 $GLPI_SOURCE -b $GLPI_BRANCH ../glpi && cd ../glpi -# - mv ../sccm plugins/sccm -# - composer install --no-dev -# - if [ -e scripts/cliinstall.php ] ; then php scripts/cliinstall.php --db=glpitest --user=root --tests ; fi -# - if [ -e tools/cliinstall.php ] ; then php tools/cliinstall.php --db=glpitest --user=root --tests ; fi -# - cd plugins/sccm - - rm composer.lock - - composer install + - composer self-update + - composer install --optimize-autoloader --prefer-dist --no-interaction --no-progress --no-suggest script: -# - vendor/bin/phpunit $PHPUNIT_ARGS - - if [[ ${TRAVIS_PHP_VERSION:0:3} == "$CS" ]] ; then vendor/bin/robo --no-interaction code:cs; fi + - vendor/bin/robo --no-interaction code:cs --strict + +matrix: + allow_failures: + - php: nightly cache: directories: From e910071d25f432033a16d31bb0d38df059b77a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 21 Aug 2020 21:30:20 +0200 Subject: [PATCH 2/6] Add Croatian (Croatia) locale --- locales/hr_HR.mo | Bin 0 -> 2345 bytes locales/hr_HR.po | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 locales/hr_HR.mo create mode 100644 locales/hr_HR.po diff --git a/locales/hr_HR.mo b/locales/hr_HR.mo new file mode 100644 index 0000000000000000000000000000000000000000..8d6cdcba80362981e207870ea9a0c355949cb25f GIT binary patch literal 2345 zcma)-O>7%Q6vqcBw3yG9PYF<8soL0T*It_lf?F5b;D)G4>&8wHr)a!8w#Q!2tY&AE zChCD+k%B}KHxBd&7bGqmkSe66CnWBOiUSe{Zd^EU<3DS=DM?WoW&N8s`{vF2n0@*6 z(7w+Z#>;qK#d8PGF+5*9gdYt5;gMVhpMv}W_zEaMAG`)W3w{f}1l|Il2Y&$%fPaEz z@Ne*S@WdmG?E^1@Pk>GEX>b)h3M$aqxeh)Fehqryci<85_woDvFfs-CFzC*i1D*W_ z_#&8qKO%;Y!M7lA3u!w6LA^RA`w`U357D@?MQ^w-k?CMj_js}Td7r%y~izY^F)y1L&56G=}~ibc9D_| z74(c&ax+t9bz`)l^`20aCQ@~&8^v-pj?%7Ft4Rdn?@KC6{N%Cuokp+X9b2yu?&5n|G$ak!zLPOK9(bj;d#!6lFKi_PZcg#y-X z8c$+w{yU2gaBF#KfzBhlTFt999Ied;Av}_*55KU?mQkvU3#~=sDcpf`!KgZJJ&8pi zJ2Key4!dDvcvsJ4rC#AtDl+3qeCw(g3vEE|Rm7#Yo?IvDJS1H%HGpWId7?@czdYml zGhU@k<>{(FeZt4cE%3y8EyGn3aU`KiLm6qi5eqs!41vaZ)Xn*4NjI))|)_aitjOVabXhl5KzwlTu~IpRSa8X7&B0 zQX#iEzgXXivt0CZxFr^u_ge6$N>*I4r8weJouZ(}O(JYHMm9n#PjR;?5eVAt*K*Wzg8>L@#EyC{*hX_Oz)6S z(1v`bR++pyU7L2(e5Q7~?9?f$rXNHrKW4{S);oDsKg3^>I`;xKKE zXv?fmNVJFlY9vM0Ot-g01aE%(=(AA|*|Rcfb9om7KEB;MvSyG+!?0PT@K#$f;03mz zH{m14b(UEMGN%xb(c4?dMjw4S6-WuPp8EryuoCkJ68<|*nw;j1|)R6<86@2nihem9FD%AL<41{Y=_h^cd m86~&32AU-P2d%hzgbE=LPMhpcckN4E8*=HA_x7g&x9lJ0+Lmwt literal 0 HcmV?d00001 diff --git a/locales/hr_HR.po b/locales/hr_HR.po new file mode 100644 index 0000000..554844e --- /dev/null +++ b/locales/hr_HR.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: +# milotype , 2020 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-02-07 09:49+0000\n" +"PO-Revision-Date: 2018-08-21 14:04+0000\n" +"Last-Translator: milotype , 2020\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/teclib/teams/28042/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: front/showtable.php:81 +msgid "Synchronization is disabled by configuration." +msgstr "Sinkronizacija je deaktivirana u konfiguraciji." + +#: front/config.form.php:31 inc/config.class.php:47 +msgid "Setup - SCCM" +msgstr "Postavljanje – SCCM" + +#: front/test.php:32 +msgid "SCCM - TEST" +msgstr "SCCM – TEST" + +#: inc/config.class.php:51 setup.php:58 +msgid "Interface - SCCM" +msgstr "Sučelje – SCCM" + +#: inc/config.class.php:99 inc/config.class.php:110 +msgid "Error when using glpi_plugin_sccm_configs table." +msgstr "Greška pri upotrebi tablice glpi_plugin_sccm_configs." + +#: inc/config.class.php:164 +msgid "Enable SCCM synchronization" +msgstr "Aktiviraj SCCM sinkronizaciju" + +#: inc/config.class.php:169 +msgid "Server hostname (MSSQL)" +msgstr "Ime računala poslužitelja (MSSQL)" + +#: inc/config.class.php:174 +msgid "Database name" +msgstr "Ime baze podataka" + +#: inc/config.class.php:179 +msgid "Username" +msgstr "Korisničko ime" + +#: inc/config.class.php:186 +msgid "Password" +msgstr "Lozinka" + +#: inc/config.class.php:191 +msgid "URL FusionInventory for injection" +msgstr "URL FusionInventory za umetanje" + +#: inc/config.class.php:196 +msgid "Verify SSL certificate" +msgstr "Provjeri SSL certifikat" + +#: inc/config.class.php:201 +msgid "Use NLTM authentication" +msgstr "Koristi NLTM autentifikaciju" + +#: inc/config.class.php:206 +msgid "Send credentials to other hosts too" +msgstr "Pošalji vjerodajnice i ostalim računalima" + +#: inc/config.class.php:211 +msgid "Use specific authentication information" +msgstr "Koristi određene podatke autentifikacije" + +#: inc/config.class.php:216 +msgid "Value for spécific authentication" +msgstr "Vrijednost za određenu autentifikaciju" + +#: inc/menu.class.php:29 inc/menu.class.php:33 +msgid "SCCM Connector" +msgstr "SCCM konektor" + +#: inc/sccm.class.php:35 +msgid "SCCM" +msgstr "SCCM" + +#: inc/sccm.class.php:39 +msgid "Please, read the documentation before using that." +msgstr "Prije upotrebe pročitaj dokumentaciju." + +#: inc/sccm.class.php:504 +msgid "Interface - SCCMCollect" +msgstr "Sučelje – SCCMCollect (upit)" + +#: inc/sccm.class.php:507 +msgid "Interface - SCCMPush" +msgstr "Sučelje – SCCMPush (umetanje datoteka)" + +#: inc/sccm.class.php:560 +msgid "Collect is disabled by configuration." +msgstr "Slanje upita (collect) je deaktivirano u konfiguraciji." + +#: inc/sccm.class.php:651 +msgid "Push is disabled by configuration." +msgstr "Umetanje datoteka (push) je deaktivirano u konfiguraciji." From 043fbcbe077173d498ca326cb0144a76ce6272dc Mon Sep 17 00:00:00 2001 From: Stanislas Date: Tue, 4 Aug 2020 10:34:15 +0200 Subject: [PATCH 3/6] fix(curl): fix bad argument function --- inc/sccm.class.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/inc/sccm.class.php b/inc/sccm.class.php index 6ec0fc0..66e047b 100644 --- a/inc/sccm.class.php +++ b/inc/sccm.class.php @@ -592,10 +592,7 @@ static function executePush($task) { if ($xmlFile !== false) { $ch = curl_init(); - if ($PluginSccmConfig->getField('verify_ssl_cert') == "1") { - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1); - } else { + if ($PluginSccmConfig->getField('verify_ssl_cert') != "1") { curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); } From 109ec290f8e55ee0e4ba47db9bc68254d1ea5f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Thu, 14 Nov 2019 15:59:05 +0100 Subject: [PATCH 4/6] Add GLPI 9.5 compatibility - Use TIMESTAMP instead of DATETIME in DB for new installations - Add marketplace compatibility - Use sodium encryption feature - Use GLPI 9.5 min required PHP version --- .travis.yml | 7 +- composer.json | 8 +- composer.lock | 920 ++++++++++++++++++++++++++++++------------- inc/config.class.php | 27 +- inc/menu.class.php | 2 +- inc/sccmdb.class.php | 2 +- setup.php | 62 +-- 7 files changed, 670 insertions(+), 358 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba423eb..17203bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: php php: - - 7.0 + - 7.2 - 7.4 - - nightly before_script: - composer self-update @@ -11,10 +10,6 @@ before_script: script: - vendor/bin/robo --no-interaction code:cs --strict -matrix: - allow_failures: - - php: nightly - cache: directories: - $HOME/.composer/cache diff --git a/composer.json b/composer.json index d0e918f..d3318a0 100644 --- a/composer.json +++ b/composer.json @@ -1,13 +1,15 @@ { "require": { - "php": ">= 7.0.0" + "php": "^7.2" }, "require-dev": { "glpi-project/tools": "^0.1" }, "config": { + "optimize-autoloader": true, "platform": { - "php": "7.0" - } + "php": "7.2.0" + }, + "sort-packages": true } } diff --git a/composer.lock b/composer.lock index c3d0068..bb87a0a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,36 +4,36 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "68f4cb40093b82070645783a6108aa2a", + "content-hash": "469eca19f475207181e67a99b51f34a4", "packages": [], "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "2.12.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "512a2e54c98f3af377589de76c43b24652bcb789" + "reference": "efc58dc0f34a45539787c5190b41b5d2a50a08da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789", - "reference": "512a2e54c98f3af377589de76c43b24652bcb789", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/efc58dc0f34a45539787c5190b41b5d2a50a08da", + "reference": "efc58dc0f34a45539787c5190b41b5d2a50a08da", "shasum": "" }, "require": { - "consolidation/output-formatters": "^3.4", - "php": ">=5.4.5", - "psr/log": "^1", - "symfony/console": "^2.8|^3|^4", - "symfony/event-dispatcher": "^2.5|^3|^4", - "symfony/finder": "^2.5|^3|^4" + "consolidation/output-formatters": "^4.1.1", + "php": ">=7.1.3", + "psr/log": "^1|^2", + "symfony/console": "^4.4.8|^5", + "symfony/event-dispatcher": "^4.4.8|^5", + "symfony/finder": "^4.4.8|^5" }, "require-dev": { "g1a/composer-test-scenarios": "^3", - "php-coveralls/php-coveralls": "^1", + "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^6", - "squizlabs/php_codesniffer": "^2.7" + "squizlabs/php_codesniffer": "^3" }, "type": "library", "extra": { @@ -47,42 +47,10 @@ "php": "7.1.3" } } - }, - "symfony2": { - "require": { - "symfony/console": "^2.8" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - }, - "scenario-options": { - "create-lockfile": "false" - } - }, - "phpunit4": { - "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - } } }, "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "4.x-dev" } }, "autoload": { @@ -101,7 +69,7 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2019-03-08T16:55:03+00:00" + "time": "2020-05-27T21:11:36+00:00" }, { "name": "consolidation/config", @@ -186,74 +154,45 @@ }, { "name": "consolidation/log", - "version": "1.1.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a" + "reference": "ba0bf6af1fbd09ed4dc18fc2f27b12ceff487cbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", - "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", + "url": "https://api.github.com/repos/consolidation/log/zipball/ba0bf6af1fbd09ed4dc18fc2f27b12ceff487cbf", + "reference": "ba0bf6af1fbd09ed4dc18fc2f27b12ceff487cbf", "shasum": "" }, "require": { - "php": ">=5.4.5", + "php": ">=7.1.3", "psr/log": "^1.0", - "symfony/console": "^2.8|^3|^4" + "symfony/console": "^4|^5" }, "require-dev": { "g1a/composer-test-scenarios": "^3", - "php-coveralls/php-coveralls": "^1", + "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^6", - "squizlabs/php_codesniffer": "^2" + "squizlabs/php_codesniffer": "^3" }, "type": "library", "extra": { "scenarios": { "symfony4": { - "require": { - "symfony/console": "^4.0" - }, - "config": { - "platform": { - "php": "7.1.3" - } - } - }, - "symfony2": { - "require": { - "symfony/console": "^2.8" - }, "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - } - }, - "phpunit4": { - "require-dev": { - "phpunit/phpunit": "^4.8.36" + "symfony/console": "^4" }, - "remove": [ - "php-coveralls/php-coveralls" - ], "config": { "platform": { - "php": "5.4.8" + "php": "7.1.3" } } } }, "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -272,35 +211,35 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2019-01-01T17:30:51+00:00" + "time": "2020-05-27T17:06:13+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.5.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "99ec998ffb697e0eada5aacf81feebfb13023605" + "reference": "9deeddd6a916d0a756b216a8b40ce1016e17c0b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/99ec998ffb697e0eada5aacf81feebfb13023605", - "reference": "99ec998ffb697e0eada5aacf81feebfb13023605", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/9deeddd6a916d0a756b216a8b40ce1016e17c0b9", + "reference": "9deeddd6a916d0a756b216a8b40ce1016e17c0b9", "shasum": "" }, "require": { "dflydev/dot-access-data": "^1.1.0", - "php": ">=5.4.0", - "symfony/console": "^2.8|^3|^4", - "symfony/finder": "^2.5|^3|^4" + "php": ">=7.1.3", + "symfony/console": "^4|^5", + "symfony/finder": "^4|^5" }, "require-dev": { "g1a/composer-test-scenarios": "^3", - "php-coveralls/php-coveralls": "^1", - "phpunit/phpunit": "^5.7.27", - "squizlabs/php_codesniffer": "^2.7", - "symfony/var-dumper": "^2.8|^3|^4", - "victorjonsson/markdowndocs": "^1.3" + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^6", + "squizlabs/php_codesniffer": "^3", + "symfony/var-dumper": "^4", + "symfony/yaml": "^4" }, "suggest": { "symfony/var-dumper": "For using the var_dump formatter" @@ -312,49 +251,15 @@ "require": { "symfony/console": "^4.0" }, - "require-dev": { - "phpunit/phpunit": "^6" - }, "config": { "platform": { "php": "7.1.3" } } - }, - "symfony3": { - "require": { - "symfony/console": "^3.4", - "symfony/finder": "^3.4", - "symfony/var-dumper": "^3.4" - }, - "config": { - "platform": { - "php": "5.6.32" - } - } - }, - "symfony2": { - "require": { - "symfony/console": "^2.8" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - }, - "scenario-options": { - "create-lockfile": "false" - } } }, "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "4.x-dev" } }, "autoload": { @@ -373,30 +278,30 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2019-05-30T23:16:01+00:00" + "time": "2020-05-27T20:51:17+00:00" }, { "name": "consolidation/robo", - "version": "1.4.11", + "version": "1.4.12", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "5fa1d901776a628167a325baa9db95d8edf13a80" + "reference": "eb45606f498b3426b9a98b7c85e300666a968e51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/5fa1d901776a628167a325baa9db95d8edf13a80", - "reference": "5fa1d901776a628167a325baa9db95d8edf13a80", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/eb45606f498b3426b9a98b7c85e300666a968e51", + "reference": "eb45606f498b3426b9a98b7c85e300666a968e51", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.11.0", - "consolidation/config": "^1.2", - "consolidation/log": "~1", - "consolidation/output-formatters": "^3.1.13", - "consolidation/self-update": "^1", - "grasmash/yaml-expander": "^1.3", - "league/container": "^2.2", + "consolidation/annotated-command": "^2.11.0|^4.1", + "consolidation/config": "^1.2.1", + "consolidation/log": "^1.1.1|^2", + "consolidation/output-formatters": "^3.1.13|^4.1", + "consolidation/self-update": "^1.1.5", + "grasmash/yaml-expander": "^1.4", + "league/container": "^2.4.1", "php": ">=5.5.0", "symfony/console": "^2.8|^3|^4", "symfony/event-dispatcher": "^2.5|^3|^4", @@ -408,20 +313,13 @@ "codegyre/robo": "< 1.0" }, "require-dev": { - "codeception/aspect-mock": "^1|^2.1.1", - "codeception/base": "^2.3.7", - "codeception/verify": "^0.3.2", "g1a/composer-test-scenarios": "^3", - "goaop/framework": "~2.1.2", - "goaop/parser-reflection": "^1.1.0", "natxet/cssmin": "3.0.4", - "nikic/php-parser": "^3.1.5", - "patchwork/jsqueeze": "~2", + "patchwork/jsqueeze": "^2", "pear/archive_tar": "^1.4.4", "php-coveralls/php-coveralls": "^1", - "phpunit/php-code-coverage": "~2|~4", - "sebastian/comparator": "^1.2.4", - "squizlabs/php_codesniffer": "^2.8" + "phpunit/phpunit": "^5.7.27", + "squizlabs/php_codesniffer": "^3" }, "suggest": { "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch", @@ -449,8 +347,11 @@ "require": { "symfony/console": "^2.8" }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, "remove": [ - "goaop/framework" + "php-coveralls/php-coveralls" ], "config": { "platform": { @@ -463,7 +364,7 @@ } }, "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -482,26 +383,26 @@ } ], "description": "Modern task runner", - "time": "2019-10-29T15:50:02+00:00" + "time": "2020-02-18T17:31:26+00:00" }, { "name": "consolidation/self-update", - "version": "1.1.5", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/consolidation/self-update.git", - "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54" + "reference": "dba6b2c0708f20fa3ba8008a2353b637578849b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54", - "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54", + "url": "https://api.github.com/repos/consolidation/self-update/zipball/dba6b2c0708f20fa3ba8008a2353b637578849b4", + "reference": "dba6b2c0708f20fa3ba8008a2353b637578849b4", "shasum": "" }, "require": { "php": ">=5.5.0", - "symfony/console": "^2.8|^3|^4", - "symfony/filesystem": "^2.5|^3|^4" + "symfony/console": "^2.8|^3|^4|^5", + "symfony/filesystem": "^2.5|^3|^4|^5" }, "bin": [ "scripts/release" @@ -522,17 +423,17 @@ "MIT" ], "authors": [ - { - "name": "Greg Anderson", - "email": "greg.1.anderson@greenknowe.org" - }, { "name": "Alexander Menk", "email": "menk@mestrona.net" + }, + { + "name": "Greg Anderson", + "email": "greg.1.anderson@greenknowe.org" } ], "description": "Provides a self:update command for Symfony Console applications.", - "time": "2018-10-28T01:52:03+00:00" + "time": "2020-04-13T02:49:20+00:00" }, { "name": "container-interop/container-interop", @@ -663,16 +564,16 @@ }, { "name": "glpi-project/tools", - "version": "0.1.8", + "version": "0.1.13", "source": { "type": "git", "url": "https://github.com/glpi-project/tools.git", - "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897" + "reference": "2028ecf9acd8b838cff37771dcab77ced9391f41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/tools/zipball/39ca503a00454e6c5d7d97bd8baff358d262a897", - "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897", + "url": "https://api.github.com/repos/glpi-project/tools/zipball/2028ecf9acd8b838cff37771dcab77ced9391f41", + "reference": "2028ecf9acd8b838cff37771dcab77ced9391f41", "shasum": "" }, "require": { @@ -709,7 +610,7 @@ "plugins", "tools" ], - "time": "2019-06-07T09:46:17+00:00" + "time": "2020-06-19T10:29:26+00:00" }, { "name": "grasmash/expander", @@ -1011,16 +912,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -1054,20 +955,20 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.4", + "version": "3.5.6", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "dceec07328401de6211037abbb18bda423677e26" + "reference": "e97627871a7eab2f70e59166072a6b767d5834e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dceec07328401de6211037abbb18bda423677e26", - "reference": "dceec07328401de6211037abbb18bda423677e26", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0", + "reference": "e97627871a7eab2f70e59166072a6b767d5834e0", "shasum": "" }, "require": { @@ -1105,49 +1006,57 @@ "phpcs", "standards" ], - "time": "2020-01-30T22:20:29+00:00" + "time": "2020-08-10T04:50:15+00:00" }, { "name": "symfony/console", - "version": "v3.3.6", + "version": "v4.4.11", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "b0878233cb5c4391347e5495089c7af11b8e6201" + "reference": "55d07021da933dd0d633ffdab6f45d5b230c7e02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/b0878233cb5c4391347e5495089c7af11b8e6201", - "reference": "b0878233cb5c4391347e5495089c7af11b8e6201", + "url": "https://api.github.com/repos/symfony/console/zipball/55d07021da933dd0d633ffdab6f45d5b230c7e02", + "reference": "55d07021da933dd0d633ffdab6f45d5b230c7e02", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/debug": "~2.8|~3.0", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.8", + "symfony/polyfill-php80": "^1.15", + "symfony/service-contracts": "^1.1|^2" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4", + "symfony/event-dispatcher": "<4.3|>=5", + "symfony/lock": "<4.4", + "symfony/process": "<3.3" + }, + "provide": { + "psr/log-implementation": "1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3", - "symfony/dependency-injection": "~3.3", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/filesystem": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/event-dispatcher": "^4.3", + "symfony/lock": "^4.4|^5.0", + "symfony/process": "^3.4|^4.0|^5.0", + "symfony/var-dumper": "^4.3|^5.0" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", - "symfony/filesystem": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1174,41 +1083,69 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:27:59+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-06T13:18:39+00:00" }, { - "name": "symfony/debug", - "version": "v3.3.6", + "name": "symfony/event-dispatcher", + "version": "v4.4.11", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "6140fc7047dafc5abbe84ba16a34a86c0b0229b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/7c13ae8ce1e2adbbd574fc39de7be498e1284e13", - "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6140fc7047dafc5abbe84ba16a34a86c0b0229b8", + "reference": "6140fc7047dafc5abbe84ba16a34a86c0b0229b8", "shasum": "" }, "require": { - "php": ">=5.5.9", - "psr/log": "~1.0" + "php": ">=7.1.3", + "symfony/event-dispatcher-contracts": "^1.1" }, "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + "symfony/dependency-injection": "<3.4" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "1.1" }, "require-dev": { - "symfony/http-kernel": "~2.8|~3.0" + "psr/log": "~1.0", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/service-contracts": "^1.1|^2", + "symfony/stopwatch": "^3.4|^4.0|^5.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\Debug\\": "" + "Symfony\\Component\\EventDispatcher\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -1228,54 +1165,59 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Debug Component", + "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-07-28T15:27:31+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-18T17:59:13+00:00" }, { - "name": "symfony/event-dispatcher", - "version": "v3.3.6", + "name": "symfony/event-dispatcher-contracts", + "version": "v1.1.9", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e" + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67535f1e3fd662bdc68d7ba317c93eecd973617e", - "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7", + "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7", "shasum": "" }, "require": { - "php": ">=5.5.9" - }, - "conflict": { - "symfony/dependency-injection": "<3.3" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~3.3", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0" + "php": ">=7.1.3" }, "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "psr/event-dispatcher": "", + "symfony/event-dispatcher-implementation": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "1.1-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Symfony\\Contracts\\EventDispatcher\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1283,39 +1225,62 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "description": "Generic abstractions related to dispatching event", "homepage": "https://symfony.com", - "time": "2017-06-09T14:53:08+00:00" + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-06T13:19:58+00:00" }, { "name": "symfony/filesystem", - "version": "v3.3.6", + "version": "v4.4.11", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "427987eb4eed764c3b6e38d52a0f87989e010676" + "reference": "b27f491309db5757816db672b256ea2e03677d30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/427987eb4eed764c3b6e38d52a0f87989e010676", - "reference": "427987eb4eed764c3b6e38d52a0f87989e010676", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b27f491309db5757816db672b256ea2e03677d30", + "reference": "b27f491309db5757816db672b256ea2e03677d30", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=7.1.3", + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1342,29 +1307,43 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-07-11T07:17:58+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-30T18:50:54+00:00" }, { "name": "symfony/finder", - "version": "v3.3.6", + "version": "v4.4.11", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4" + "reference": "2727aa35fddfada1dd37599948528e9b152eb742" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4", - "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4", + "url": "https://api.github.com/repos/symfony/finder/zipball/2727aa35fddfada1dd37599948528e9b152eb742", + "reference": "2727aa35fddfada1dd37599948528e9b152eb742", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1391,20 +1370,110 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-06-01T21:01:25+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-05T09:39:30+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.18.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454", + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a", + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a", "shasum": "" }, "require": { @@ -1416,7 +1485,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -1450,29 +1523,199 @@ "portable", "shim" ], - "time": "2019-11-27T14:18:11+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" + }, + { + "name": "symfony/polyfill-php73", + "version": "v1.18.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca", + "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.18.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981", + "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981", + "shasum": "" + }, + "require": { + "php": ">=7.0.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/process", - "version": "v3.3.6", + "version": "v4.4.11", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a" + "reference": "65e70bab62f3da7089a8d4591fb23fbacacb3479" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/07432804942b9f6dd7b7377faf9920af5f95d70a", - "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a", + "url": "https://api.github.com/repos/symfony/process/zipball/65e70bab62f3da7089a8d4591fb23fbacacb3479", + "reference": "65e70bab62f3da7089a8d4591fb23fbacacb3479", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1499,27 +1742,121 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-07-13T13:05:09+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-23T08:31:43+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v1.1.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "b776d18b303a39f56c63747bcb977ad4b27aca26" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b776d18b303a39f56c63747bcb977ad4b27aca26", + "reference": "b776d18b303a39f56c63747bcb977ad4b27aca26", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "psr/container": "^1.0" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-06T13:19:58+00:00" }, { "name": "symfony/yaml", - "version": "v3.3.6", + "version": "v4.4.11", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed" + "reference": "c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed", - "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a", + "reference": "c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=7.1.3", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~2.8|~3.0" + "symfony/console": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -1527,7 +1864,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1554,7 +1891,21 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-07-23T12:43:26+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-20T08:37:50+00:00" } ], "aliases": [], @@ -1563,10 +1914,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">= 7.0.0" + "php": "^7.2" }, "platform-dev": [], "platform-overrides": { - "php": "7.0" - } + "php": "7.2.0" + }, + "plugin-api-version": "1.1.0" } diff --git a/inc/config.class.php b/inc/config.class.php index 8e9f6c6..2204699 100644 --- a/inc/config.class.php +++ b/inc/config.class.php @@ -65,7 +65,7 @@ static function getInstance() { function prepareInputForUpdate($input) { if (isset($input["sccmdb_password"]) AND !empty($input["sccmdb_password"])) { - $input["sccmdb_password"] = Toolbox::encrypt(stripslashes($input["sccmdb_password"]), GLPIKEY); + $input["sccmdb_password"] = Toolbox::sodiumEncrypt(stripslashes($input["sccmdb_password"])); } return $input; @@ -91,7 +91,8 @@ static function install(Migration $migration) { `unrestricted_auth` tinyint(1) NOT NULL, `use_auth_info` tinyint(1) NOT NULL, `auth_info` VARCHAR(255) NULL, - `date_mod` datetime default NULL, + `is_password_sodium_encrypted` tinyint(1) NOT NULL default '1', + `date_mod` timestamp NULL default NULL, `comment` text, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; @@ -99,7 +100,7 @@ static function install(Migration $migration) { $DB->queryOrDie($query, __("Error when using glpi_plugin_sccm_configs table.", "sccm") . "
".$DB->error()); - $sccmdb_password = Toolbox::encrypt("", GLPIKEY); + $sccmdb_password = Toolbox::sodiumEncrypt(""); $query = "INSERT INTO `$table` (id, date_mod, sccmdb_host, sccmdb_dbname, @@ -137,6 +138,24 @@ static function install(Migration $migration) { $migration->migrationOneTable('glpi_plugin_sccm_configs'); } + if (!$DB->fieldExists($table, 'is_password_sodium_encrypted')) { + $config = self::getInstance(); + if (!empty($config->fields['sccmdb_password'])) { + $migration->addPostQuery( + $DB->buildUpdate( + 'glpi_plugin_sccm_configs', + [ + 'sccmdb_password' => Toolbox::sodiumEncrypt(Toolbox::decrypt($config->getField('sccmdb_password'), GLPIKEY)) + ], + [ + 'id' => 1, + ] + ) + ); + } + $migration->addField("glpi_plugin_sccm_configs", "is_password_sodium_encrypted", "tinyint(1) NOT NULL default '1'"); + $migration->migrationOneTable('glpi_plugin_sccm_configs'); + } } return true; @@ -181,7 +200,7 @@ static function showConfigForm($item) { echo "\n"; $password = $config->getField('sccmdb_password'); - $password = Toolbox::decrypt($password, GLPIKEY); + $password = Toolbox::sodiumDecrypt($password); echo ""; echo "".__("Password", "sccm").""; echo ""; diff --git a/inc/menu.class.php b/inc/menu.class.php index 47c75ea..bf9eace 100644 --- a/inc/menu.class.php +++ b/inc/menu.class.php @@ -37,7 +37,7 @@ static function getMenuContent() { global $CFG_GLPI; $menu = []; $menu['title'] = self::getMenuName(); - $menu['page'] = '/plugins/sccm/front/config.form.php'; + $menu['page'] = '/' . Plugin::getWebDir('sccm', false) . '/front/config.form.php'; if (Session::haveRight('config', UPDATE)) { diff --git a/inc/sccmdb.class.php b/inc/sccmdb.class.php index 660a988..ef47a26 100644 --- 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); + $password = Toolbox::decrypt($password, GLPIKEY);// TODO Use sodium encryption $connectionOptions = [ "Database" => $dbname, diff --git a/setup.php b/setup.php index 425dd5b..696b36e 100644 --- a/setup.php +++ b/setup.php @@ -26,12 +26,12 @@ define("PLUGIN_SCCM_VERSION", "2.1.1"); // Minimal GLPI version, inclusive -define("PLUGIN_SCCM_MIN_GLPI", "9.2"); +define("PLUGIN_SCCM_MIN_GLPI", "9.5"); // Maximum GLPI version, exclusive -define("PLUGIN_SCCM_MAX_GLPI", "9.5"); +define("PLUGIN_SCCM_MAX_GLPI", "9.6"); function plugin_init_sccm() { - global $PLUGIN_HOOKS,$CFG_GLPI; + global $PLUGIN_HOOKS; $plugin = new Plugin(); @@ -69,7 +69,6 @@ function plugin_version_sccm() { ], ], 'php' => [ - 'min' => '7.0', 'exts'=> [ 'sqlsrv' => [ 'required' => true, @@ -84,58 +83,3 @@ function plugin_version_sccm() { ] ]; } - -/** - * Check pre-requisites before install - * - * @return boolean - */ -function plugin_sccm_check_prerequisites() { - - //Requirements check is not done by core in GLPI < 9.2 but has to be delegated to core in GLPI >= 9.2. - if (!method_exists('Plugin', 'checkGlpiVersion')) { - $version = preg_replace('/^((\d+\.?)+).*$/', '$1', GLPI_VERSION); - $matchMinGlpiReq = version_compare($version, PLUGIN_SCCM_MIN_GLPI, '>='); - $matchMaxGlpiReq = version_compare($version, PLUGIN_SCCM_MAX_GLPI, '<'); - - if (!$matchMinGlpiReq || !$matchMaxGlpiReq) { - echo vsprintf( - 'This plugin requires GLPI >= %1$s and < %2$s.', - [ - PLUGIN_SCCM_MIN_GLPI, - PLUGIN_SCCM_MAX_GLPI, - ] - ); - return false; - } - - if (!function_exists('curl_init')) { - echo "cURL extension (PHP) is required."; - return false; - } - - if (!function_exists('sqlsrv_connect')) { - echo "SQLSRV extension (PHP) is required."; - return false; - } - - $plugin = new Plugin(); - if (!$plugin->isActivated('fusioninventory')) { - echo "Fusioninventory plugin must be enabled"; - return false; - } - } - - return true; -} - -/** - * Check configuration process - * - * @param boolean $verbose Whether to display message on failure. Defaults to false - * - * @return boolean - */ -function plugin_sccm_check_config($verbose = false) { - return true; -} From ba1add0634925b7664a7770b61758e2096d92ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Mon, 24 Aug 2020 10:51:23 +0200 Subject: [PATCH 5/6] Update locales --- locales/cs_CZ.mo | Bin 2359 -> 2318 bytes locales/cs_CZ.po | 88 ++++++++++++++++++++++----------------------- locales/en_GB.mo | Bin 2114 -> 2073 bytes locales/en_GB.po | 90 +++++++++++++++++++++++------------------------ locales/fi_FI.mo | Bin 2254 -> 2213 bytes locales/fi_FI.po | 88 ++++++++++++++++++++++----------------------- locales/fr_FR.mo | Bin 2244 -> 2203 bytes locales/fr_FR.po | 88 ++++++++++++++++++++++----------------------- locales/hr_HR.po | 88 ++++++++++++++++++++++----------------------- locales/it_IT.mo | Bin 2262 -> 2221 bytes locales/it_IT.po | 88 ++++++++++++++++++++++----------------------- locales/pt_PT.mo | Bin 2286 -> 2245 bytes locales/pt_PT.po | 88 ++++++++++++++++++++++----------------------- locales/sccm.pot | 86 ++++++++++++++++++++++---------------------- 14 files changed, 352 insertions(+), 352 deletions(-) diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index c67ccf90b8faa217ef4b5f27e7baf7dfcabc10d4..0d05318c749a1762be69de9fe9525bbfd9e7e710 100644 GIT binary patch delta 208 zcmWm6u@1pd0EOYxxU@?Xy+jBLNe#+sm00v?Ow4veQ==|+Nv94bG1|>GFJNI5|DC?G zod04on?H9iPud%4B5B=_ns~$ko^g(MwD`jwM!wX+1naoO1XGN0gCtd8h$oD&MAy5a o`+t2c)MA8zG{zxLF~vS^(S;A##w(8SfnEFrRpHHQ)!VGhAJ~x>?f?J) delta 247 zcmWm6Jqtl$7>Ds2$6HYx5)o1;JoR)EIg5eG>OA{7zY`a~jl!3;jIfnPMS>=#L)jS1|d7spt|85VJmB;|@> zykiuf==475>~jHWON^%x5Gi2~YdFI+9?%J&F^+F6;183S4IXzcy}+_RW*0K89n0<5!fMw diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index c441f5f..66365cb 100644 --- a/locales/cs_CZ.po +++ b/locales/cs_CZ.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-07 09:49+0000\n" +"POT-Creation-Date: 2020-08-24 08:50+0000\n" "PO-Revision-Date: 2018-08-21 14:04+0000\n" "Last-Translator: Pavel Borecki , 2018\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/teclib/teams/28042/cs_CZ/)\n" @@ -25,90 +25,90 @@ msgstr "" msgid "Synchronization is disabled by configuration." msgstr "Synchronizace je vypnutá nastavením." +#: front/test.php:32 +msgid "SCCM - TEST" +msgstr "SCCM – TEST" + #: front/config.form.php:31 inc/config.class.php:47 msgid "Setup - SCCM" msgstr "Nastavení – SCCM" -#: front/test.php:32 -msgid "SCCM - TEST" -msgstr "SCCM – TEST" +#: inc/sccm.class.php:35 +msgid "SCCM" +msgstr "SCCM" + +#: inc/sccm.class.php:39 +msgid "Please, read the documentation before using that." +msgstr "Před použitím si přečtete dokumentaci." + +#: inc/sccm.class.php:504 +msgid "Interface - SCCMCollect" +msgstr "Rozhraní – SCCMCollect" + +#: inc/sccm.class.php:507 +msgid "Interface - SCCMPush" +msgstr "Rozhraní – SCCMPush" + +#: inc/sccm.class.php:560 +msgid "Collect is disabled by configuration." +msgstr "Shromažďování je vypnuté nastavením." + +#: inc/sccm.class.php:648 +msgid "Push is disabled by configuration." +msgstr "Odesílání je vypnuté nastavením." + +#: inc/menu.class.php:29 inc/menu.class.php:33 +msgid "SCCM Connector" +msgstr "Napojení na SCCM" #: inc/config.class.php:51 setup.php:58 msgid "Interface - SCCM" msgstr "Rozhraní – SCCM" -#: inc/config.class.php:99 inc/config.class.php:110 +#: inc/config.class.php:100 inc/config.class.php:111 msgid "Error when using glpi_plugin_sccm_configs table." msgstr "Chyba při použití tabulky glpi_plugin_sccm_configs." -#: inc/config.class.php:164 +#: inc/config.class.php:183 msgid "Enable SCCM synchronization" msgstr "Zapnout synchronizaci s SCCM" -#: inc/config.class.php:169 +#: inc/config.class.php:188 msgid "Server hostname (MSSQL)" msgstr "Název serveru (MSSQL)" -#: inc/config.class.php:174 +#: inc/config.class.php:193 msgid "Database name" msgstr "Název databáze" -#: inc/config.class.php:179 +#: inc/config.class.php:198 msgid "Username" msgstr "Uživatelské jméno" -#: inc/config.class.php:186 +#: inc/config.class.php:205 msgid "Password" msgstr "Heslo" -#: inc/config.class.php:191 +#: inc/config.class.php:210 msgid "URL FusionInventory for injection" msgstr "URL adresa FusionInventory do které vložit" -#: inc/config.class.php:196 +#: inc/config.class.php:215 msgid "Verify SSL certificate" msgstr "Ověřit SSL certifikát" -#: inc/config.class.php:201 +#: inc/config.class.php:220 msgid "Use NLTM authentication" msgstr "Použít NLTM ověřování" -#: inc/config.class.php:206 +#: inc/config.class.php:225 msgid "Send credentials to other hosts too" msgstr "Poslat přihlašovací údaje také na ostatní stroje" -#: inc/config.class.php:211 +#: inc/config.class.php:230 msgid "Use specific authentication information" msgstr "Použít konkrétní ověřovací informace" -#: inc/config.class.php:216 +#: inc/config.class.php:235 msgid "Value for spécific authentication" msgstr "Hodnota pro konkrétní ověření" - -#: inc/menu.class.php:29 inc/menu.class.php:33 -msgid "SCCM Connector" -msgstr "Napojení na SCCM" - -#: inc/sccm.class.php:35 -msgid "SCCM" -msgstr "SCCM" - -#: inc/sccm.class.php:39 -msgid "Please, read the documentation before using that." -msgstr "Před použitím si přečtete dokumentaci." - -#: inc/sccm.class.php:504 -msgid "Interface - SCCMCollect" -msgstr "Rozhraní – SCCMCollect" - -#: inc/sccm.class.php:507 -msgid "Interface - SCCMPush" -msgstr "Rozhraní – SCCMPush" - -#: inc/sccm.class.php:560 -msgid "Collect is disabled by configuration." -msgstr "Shromažďování je vypnuté nastavením." - -#: inc/sccm.class.php:651 -msgid "Push is disabled by configuration." -msgstr "Odesílání je vypnuté nastavením." diff --git a/locales/en_GB.mo b/locales/en_GB.mo index dfef6ba1449559bf4ccbfeb3969ac1356704323c..1db3e2f4cd91da14788522b2e217c7a89bdb6d9d 100644 GIT binary patch delta 222 zcmWm7tqQ_m7{&2tZgb)nZ;%-*P7%}ObvT#?!QusY8D{&cm;^!CO<2}U;zgJg!C(}F zRoMRx55FfI&bg{g?eA%9iR>JafrwmOkp{l8gFn=$${a4RjVo;78Y`IM7`NENGg2uJ ztl6E(DXbj# xzN*prQmvUgT#Tj@)gCTfCueC(D{U#=$Z6ZD+Z9bk`aLypm!tXnz2nVq8BZ|nC(Hl< diff --git a/locales/en_GB.po b/locales/en_GB.po index 541b91c..c7b6e44 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-07 09:49+0000\n" -"PO-Revision-Date: 2020-02-07 09:49+0000\n" +"POT-Creation-Date: 2020-08-24 08:50+0000\n" +"PO-Revision-Date: 2020-08-24 08:50+0000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_GB\n" @@ -21,90 +21,90 @@ msgstr "" msgid "Synchronization is disabled by configuration." msgstr "Synchronization is disabled by configuration." +#: front/test.php:32 +msgid "SCCM - TEST" +msgstr "SCCM - TEST" + #: front/config.form.php:31 inc/config.class.php:47 msgid "Setup - SCCM" msgstr "Setup - SCCM" -#: front/test.php:32 -msgid "SCCM - TEST" -msgstr "SCCM - TEST" +#: inc/sccm.class.php:35 +msgid "SCCM" +msgstr "SCCM" + +#: inc/sccm.class.php:39 +msgid "Please, read the documentation before using that." +msgstr "Please, read the documentation before using that." + +#: inc/sccm.class.php:504 +msgid "Interface - SCCMCollect" +msgstr "Interface - SCCMCollect" + +#: inc/sccm.class.php:507 +msgid "Interface - SCCMPush" +msgstr "Interface - SCCMPush" + +#: inc/sccm.class.php:560 +msgid "Collect is disabled by configuration." +msgstr "Collect is disabled by configuration." + +#: inc/sccm.class.php:648 +msgid "Push is disabled by configuration." +msgstr "Push is disabled by configuration." + +#: inc/menu.class.php:29 inc/menu.class.php:33 +msgid "SCCM Connector" +msgstr "SCCM Connector" #: inc/config.class.php:51 setup.php:58 msgid "Interface - SCCM" msgstr "Interface - SCCM" -#: inc/config.class.php:99 inc/config.class.php:110 +#: inc/config.class.php:100 inc/config.class.php:111 msgid "Error when using glpi_plugin_sccm_configs table." msgstr "Error when using glpi_plugin_sccm_configs table." -#: inc/config.class.php:164 +#: inc/config.class.php:183 msgid "Enable SCCM synchronization" msgstr "Enable SCCM synchronization" -#: inc/config.class.php:169 +#: inc/config.class.php:188 msgid "Server hostname (MSSQL)" msgstr "Server hostname (MSSQL)" -#: inc/config.class.php:174 +#: inc/config.class.php:193 msgid "Database name" msgstr "Database name" -#: inc/config.class.php:179 +#: inc/config.class.php:198 msgid "Username" msgstr "Username" -#: inc/config.class.php:186 +#: inc/config.class.php:205 msgid "Password" msgstr "Password" -#: inc/config.class.php:191 +#: inc/config.class.php:210 msgid "URL FusionInventory for injection" msgstr "URL FusionInventory for injection" -#: inc/config.class.php:196 +#: inc/config.class.php:215 msgid "Verify SSL certificate" msgstr "Verify SSL certificate" -#: inc/config.class.php:201 +#: inc/config.class.php:220 msgid "Use NLTM authentication" msgstr "Use NLTM authentication" -#: inc/config.class.php:206 +#: inc/config.class.php:225 msgid "Send credentials to other hosts too" msgstr "Send credentials to other hosts too" -#: inc/config.class.php:211 +#: inc/config.class.php:230 msgid "Use specific authentication information" msgstr "Use specific authentication information" -#: inc/config.class.php:216 +#: inc/config.class.php:235 msgid "Value for spécific authentication" msgstr "Value for spécific authentication" - -#: inc/menu.class.php:29 inc/menu.class.php:33 -msgid "SCCM Connector" -msgstr "SCCM Connector" - -#: inc/sccm.class.php:35 -msgid "SCCM" -msgstr "SCCM" - -#: inc/sccm.class.php:39 -msgid "Please, read the documentation before using that." -msgstr "Please, read the documentation before using that." - -#: inc/sccm.class.php:504 -msgid "Interface - SCCMCollect" -msgstr "Interface - SCCMCollect" - -#: inc/sccm.class.php:507 -msgid "Interface - SCCMPush" -msgstr "Interface - SCCMPush" - -#: inc/sccm.class.php:560 -msgid "Collect is disabled by configuration." -msgstr "Collect is disabled by configuration." - -#: inc/sccm.class.php:651 -msgid "Push is disabled by configuration." -msgstr "Push is disabled by configuration." diff --git a/locales/fi_FI.mo b/locales/fi_FI.mo index 11dd40482553a71d86931db3311e9cc2c3f8e65c..9d54e9274c4bd3554830958301bbeb796822cab2 100644 GIT binary patch delta 207 zcmXZWtqQ_W0LAe$HobxdZ}6jupm9cFW7sT$#TQsKXtbE@7Oi^#@d1|h3I>B&%!~60 z^nbjiSc5|vtF v3s>006hqwL05hZ6Z?GUp2yQq=Lu(I1bVugs4y@4)@Bg0i%$xXm6}8ePACRv5Lr-2>C@LqbWUR65@bK>3>FGm3|5&83J;vG}?!UTRWf@WAGk7=x7 z3#pVD#&C{NT%y7aX7Cc0=5O#t&>(nY0X3~j?4ke25d8<%=no(Mo=>|#C0OjL_Skc$ egV9iR+^OeeEp2I~Ev4&OZ97%Fthv+Gcm}@?{2~1S diff --git a/locales/fi_FI.po b/locales/fi_FI.po index f1cf52d..c9ca296 100644 --- a/locales/fi_FI.po +++ b/locales/fi_FI.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-07 09:49+0000\n" +"POT-Creation-Date: 2020-08-24 08:50+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" @@ -25,90 +25,90 @@ msgstr "" msgid "Synchronization is disabled by configuration." msgstr "Synkronointi on poistettu käytöstä asetusten perusteella." +#: front/test.php:32 +msgid "SCCM - TEST" +msgstr "SCCM - Testi" + #: 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/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:504 +msgid "Interface - SCCMCollect" +msgstr "Liitäntä - SCCMCollect" + +#: inc/sccm.class.php:507 +msgid "Interface - SCCMPush" +msgstr "Liitäntä - SCCMPush" + +#: inc/sccm.class.php:560 +msgid "Collect is disabled by configuration." +msgstr "\"Collect\" on poistettu käytöstä asetusten perusteella." + +#: inc/sccm.class.php:648 +msgid "Push is disabled by configuration." +msgstr "\"Push\" on poistettu käytöstä asetusten perusteella." + +#: inc/menu.class.php:29 inc/menu.class.php:33 +msgid "SCCM Connector" +msgstr "SCCM-liitin" #: 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 +#: inc/config.class.php:100 inc/config.class.php:111 msgid "Error when using glpi_plugin_sccm_configs table." msgstr "Virhe käytettäessä glpi_plugin_sccm_configs -taulukkoa." -#: inc/config.class.php:164 +#: inc/config.class.php:183 msgid "Enable SCCM synchronization" msgstr "Ota SCCM-synkronointi käyttöön" -#: inc/config.class.php:169 +#: inc/config.class.php:188 msgid "Server hostname (MSSQL)" msgstr "Palvelimen isäntänimi (MSSQL)" -#: inc/config.class.php:174 +#: inc/config.class.php:193 msgid "Database name" msgstr "Tietokannan nimi" -#: inc/config.class.php:179 +#: inc/config.class.php:198 msgid "Username" msgstr "Käyttäjätunnus" -#: inc/config.class.php:186 +#: inc/config.class.php:205 msgid "Password" msgstr "Salasana" -#: inc/config.class.php:191 +#: inc/config.class.php:210 msgid "URL FusionInventory for injection" msgstr "URL FusionInventory injektiota varten" -#: inc/config.class.php:196 +#: inc/config.class.php:215 msgid "Verify SSL certificate" msgstr "Vahvista SSL-varmenne" -#: inc/config.class.php:201 +#: inc/config.class.php:220 msgid "Use NLTM authentication" msgstr "Käytä NLTM-todennusta" -#: inc/config.class.php:206 +#: inc/config.class.php:225 msgid "Send credentials to other hosts too" msgstr "Lähetä valtuutukset myös muille isännille" -#: inc/config.class.php:211 +#: inc/config.class.php:230 msgid "Use specific authentication information" msgstr "Käytä tiettyjä todennustietoja" -#: inc/config.class.php:216 +#: inc/config.class.php:235 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:504 -msgid "Interface - SCCMCollect" -msgstr "Liitäntä - SCCMCollect" - -#: inc/sccm.class.php:507 -msgid "Interface - SCCMPush" -msgstr "Liitäntä - SCCMPush" - -#: inc/sccm.class.php:560 -msgid "Collect is disabled by configuration." -msgstr "\"Collect\" on poistettu käytöstä asetusten perusteella." - -#: inc/sccm.class.php:651 -msgid "Push is disabled by configuration." -msgstr "\"Push\" on poistettu käytöstä asetusten perusteella." diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo index 0f4bde4e1da1fbc51519b727bc7b3387ddff4f26..f50e539594e62d09e54f7e4c91557b090e305199 100644 GIT binary patch delta 199 zcmXBOy$XVG6vp9K`kN9#36(>H5;zw~(Z_9+cTjW9fvvR#j?zVhYh&OI1l>dz5KaB0 z={e_x^YQR<@A5qEEGaS4SW;IuzTydf;wkPi z#$TME-;!9V1s-9FGhAa2->{zFwREM3=9^%IYD)o};SDBOAAUd|U$B1cqk47@56+in iexGN>=I+)cS&_#, 2020\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/teclib/teams/28042/hr_HR/)\n" @@ -25,90 +25,90 @@ msgstr "" msgid "Synchronization is disabled by configuration." msgstr "Sinkronizacija je deaktivirana u konfiguraciji." +#: front/test.php:32 +msgid "SCCM - TEST" +msgstr "SCCM – TEST" + #: front/config.form.php:31 inc/config.class.php:47 msgid "Setup - SCCM" msgstr "Postavljanje – SCCM" -#: front/test.php:32 -msgid "SCCM - TEST" -msgstr "SCCM – TEST" +#: inc/sccm.class.php:35 +msgid "SCCM" +msgstr "SCCM" + +#: inc/sccm.class.php:39 +msgid "Please, read the documentation before using that." +msgstr "Prije upotrebe pročitaj dokumentaciju." + +#: inc/sccm.class.php:504 +msgid "Interface - SCCMCollect" +msgstr "Sučelje – SCCMCollect (upit)" + +#: inc/sccm.class.php:507 +msgid "Interface - SCCMPush" +msgstr "Sučelje – SCCMPush (umetanje datoteka)" + +#: inc/sccm.class.php:560 +msgid "Collect is disabled by configuration." +msgstr "Slanje upita (collect) je deaktivirano u konfiguraciji." + +#: inc/sccm.class.php:648 +msgid "Push is disabled by configuration." +msgstr "Umetanje datoteka (push) je deaktivirano u konfiguraciji." + +#: inc/menu.class.php:29 inc/menu.class.php:33 +msgid "SCCM Connector" +msgstr "SCCM konektor" #: inc/config.class.php:51 setup.php:58 msgid "Interface - SCCM" msgstr "Sučelje – SCCM" -#: inc/config.class.php:99 inc/config.class.php:110 +#: inc/config.class.php:100 inc/config.class.php:111 msgid "Error when using glpi_plugin_sccm_configs table." msgstr "Greška pri upotrebi tablice glpi_plugin_sccm_configs." -#: inc/config.class.php:164 +#: inc/config.class.php:183 msgid "Enable SCCM synchronization" msgstr "Aktiviraj SCCM sinkronizaciju" -#: inc/config.class.php:169 +#: inc/config.class.php:188 msgid "Server hostname (MSSQL)" msgstr "Ime računala poslužitelja (MSSQL)" -#: inc/config.class.php:174 +#: inc/config.class.php:193 msgid "Database name" msgstr "Ime baze podataka" -#: inc/config.class.php:179 +#: inc/config.class.php:198 msgid "Username" msgstr "Korisničko ime" -#: inc/config.class.php:186 +#: inc/config.class.php:205 msgid "Password" msgstr "Lozinka" -#: inc/config.class.php:191 +#: inc/config.class.php:210 msgid "URL FusionInventory for injection" msgstr "URL FusionInventory za umetanje" -#: inc/config.class.php:196 +#: inc/config.class.php:215 msgid "Verify SSL certificate" msgstr "Provjeri SSL certifikat" -#: inc/config.class.php:201 +#: inc/config.class.php:220 msgid "Use NLTM authentication" msgstr "Koristi NLTM autentifikaciju" -#: inc/config.class.php:206 +#: inc/config.class.php:225 msgid "Send credentials to other hosts too" msgstr "Pošalji vjerodajnice i ostalim računalima" -#: inc/config.class.php:211 +#: inc/config.class.php:230 msgid "Use specific authentication information" msgstr "Koristi određene podatke autentifikacije" -#: inc/config.class.php:216 +#: inc/config.class.php:235 msgid "Value for spécific authentication" msgstr "Vrijednost za određenu autentifikaciju" - -#: inc/menu.class.php:29 inc/menu.class.php:33 -msgid "SCCM Connector" -msgstr "SCCM konektor" - -#: inc/sccm.class.php:35 -msgid "SCCM" -msgstr "SCCM" - -#: inc/sccm.class.php:39 -msgid "Please, read the documentation before using that." -msgstr "Prije upotrebe pročitaj dokumentaciju." - -#: inc/sccm.class.php:504 -msgid "Interface - SCCMCollect" -msgstr "Sučelje – SCCMCollect (upit)" - -#: inc/sccm.class.php:507 -msgid "Interface - SCCMPush" -msgstr "Sučelje – SCCMPush (umetanje datoteka)" - -#: inc/sccm.class.php:560 -msgid "Collect is disabled by configuration." -msgstr "Slanje upita (collect) je deaktivirano u konfiguraciji." - -#: inc/sccm.class.php:651 -msgid "Push is disabled by configuration." -msgstr "Umetanje datoteka (push) je deaktivirano u konfiguraciji." diff --git a/locales/it_IT.mo b/locales/it_IT.mo index 2bfea44176c30d1d6c7ef6ba92ad472d82f15f94..b83b24b49e0236d08c8df3672a19a630aa6c28e5 100644 GIT binary patch delta 207 zcmXZWp$fuK6o>Ku*mQzH?oeD%5Wyli7_3-CvteM^$Tq%5^@j1!z;gh!0gVgs*O!3Spe!ajCF ziKM1j#T;u`U=J7A#9gS7>I^3qL%d)YKmUUk^#Sh;U1*LjutfKfy*+q|Z{NYw{{h?@ B7wP~2 delta 246 zcmWm8F$)1<7{KvIgfi%KVo_3OpjWR;=?qF3?8;=g;f7l%-C{CHu~;O&gUKkH#jH&C z0r&uR|9h9;)6>(x_hP(_eYiTuM79Z$rifTc5d$Y!LLYm$!5luZh#}_jhiS~DL|SNK z4M#{)0?gnNv$#eJ4_LrkO1fe)yjVE+!3tKWMh8PwIK?Qm!zggX=p*;*Db|Qr$Ev^Z g+`ymD)W8kAPTAJBR@zp&UDi&g<q@n(+NjfZ fdc%QLZ#$i`VJll%%C=O|P^EIAWGZfV)HVGLb7mp2 diff --git a/locales/pt_PT.po b/locales/pt_PT.po index d1e7cd9..b6f8619 100644 --- a/locales/pt_PT.po +++ b/locales/pt_PT.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-07 09:49+0000\n" +"POT-Creation-Date: 2020-08-24 08:50+0000\n" "PO-Revision-Date: 2018-08-21 14:04+0000\n" "Last-Translator: Rui Melo , 2019\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/teclib/teams/28042/pt_PT/)\n" @@ -25,90 +25,90 @@ msgstr "" msgid "Synchronization is disabled by configuration." msgstr "A sincronização é desativada pela configuração." +#: front/test.php:32 +msgid "SCCM - TEST" +msgstr "SCCM - TESTE" + #: front/config.form.php:31 inc/config.class.php:47 msgid "Setup - SCCM" msgstr "Configuração - SCCM" -#: front/test.php:32 -msgid "SCCM - TEST" -msgstr "SCCM - TESTE" +#: inc/sccm.class.php:35 +msgid "SCCM" +msgstr "SCCM" + +#: inc/sccm.class.php:39 +msgid "Please, read the documentation before using that." +msgstr "Por favor, leia a documentação antes de usar isso." + +#: inc/sccm.class.php:504 +msgid "Interface - SCCMCollect" +msgstr "Interface - SCCMCollect" + +#: inc/sccm.class.php:507 +msgid "Interface - SCCMPush" +msgstr "Interface - SCCMPush" + +#: inc/sccm.class.php:560 +msgid "Collect is disabled by configuration." +msgstr "Recolha é desativada pela configuração." + +#: inc/sccm.class.php:648 +msgid "Push is disabled by configuration." +msgstr "O impulso é desativado pela configuração." + +#: inc/menu.class.php:29 inc/menu.class.php:33 +msgid "SCCM Connector" +msgstr "Conetor SCCM" #: inc/config.class.php:51 setup.php:58 msgid "Interface - SCCM" msgstr "Interface - SCCM" -#: inc/config.class.php:99 inc/config.class.php:110 +#: inc/config.class.php:100 inc/config.class.php:111 msgid "Error when using glpi_plugin_sccm_configs table." msgstr "Erro ao usar a tabela glpi_plugin_sccm_configs." -#: inc/config.class.php:164 +#: inc/config.class.php:183 msgid "Enable SCCM synchronization" msgstr "Ativar a sincronização SCCM" -#: inc/config.class.php:169 +#: inc/config.class.php:188 msgid "Server hostname (MSSQL)" msgstr "Nome de host do servidor (MSSQL)" -#: inc/config.class.php:174 +#: inc/config.class.php:193 msgid "Database name" msgstr "Nome da base de dados" -#: inc/config.class.php:179 +#: inc/config.class.php:198 msgid "Username" msgstr "Nome de utilizador" -#: inc/config.class.php:186 +#: inc/config.class.php:205 msgid "Password" msgstr "Senha" -#: inc/config.class.php:191 +#: inc/config.class.php:210 msgid "URL FusionInventory for injection" msgstr "URL FusionInventory para injeção" -#: inc/config.class.php:196 +#: inc/config.class.php:215 msgid "Verify SSL certificate" msgstr "Verificar certificação SSL" -#: inc/config.class.php:201 +#: inc/config.class.php:220 msgid "Use NLTM authentication" msgstr "Use autenticação NLTM" -#: inc/config.class.php:206 +#: inc/config.class.php:225 msgid "Send credentials to other hosts too" msgstr "Envie credenciais para outros hosts também" -#: inc/config.class.php:211 +#: inc/config.class.php:230 msgid "Use specific authentication information" msgstr "Usar informações de autenticação específicas" -#: inc/config.class.php:216 +#: inc/config.class.php:235 msgid "Value for spécific authentication" msgstr "Valor para autenticação específica" - -#: inc/menu.class.php:29 inc/menu.class.php:33 -msgid "SCCM Connector" -msgstr "Conetor SCCM" - -#: inc/sccm.class.php:35 -msgid "SCCM" -msgstr "SCCM" - -#: inc/sccm.class.php:39 -msgid "Please, read the documentation before using that." -msgstr "Por favor, leia a documentação antes de usar isso." - -#: inc/sccm.class.php:504 -msgid "Interface - SCCMCollect" -msgstr "Interface - SCCMCollect" - -#: inc/sccm.class.php:507 -msgid "Interface - SCCMPush" -msgstr "Interface - SCCMPush" - -#: inc/sccm.class.php:560 -msgid "Collect is disabled by configuration." -msgstr "Recolha é desativada pela configuração." - -#: inc/sccm.class.php:651 -msgid "Push is disabled by configuration." -msgstr "O impulso é desativado pela configuração." diff --git a/locales/sccm.pot b/locales/sccm.pot index f5c0f42..b1e3284 100644 --- a/locales/sccm.pot +++ b/locales/sccm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-07 09:49+0000\n" +"POT-Creation-Date: 2020-08-24 08:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,90 +21,90 @@ msgstr "" msgid "Synchronization is disabled by configuration." msgstr "" +#: front/test.php:32 +msgid "SCCM - TEST" +msgstr "" + #: front/config.form.php:31 inc/config.class.php:47 msgid "Setup - SCCM" msgstr "" -#: front/test.php:32 -msgid "SCCM - TEST" +#: inc/sccm.class.php:35 +msgid "SCCM" +msgstr "" + +#: inc/sccm.class.php:39 +msgid "Please, read the documentation before using that." +msgstr "" + +#: inc/sccm.class.php:504 +msgid "Interface - SCCMCollect" +msgstr "" + +#: inc/sccm.class.php:507 +msgid "Interface - SCCMPush" +msgstr "" + +#: inc/sccm.class.php:560 +msgid "Collect is disabled by configuration." +msgstr "" + +#: inc/sccm.class.php:648 +msgid "Push is disabled by configuration." +msgstr "" + +#: inc/menu.class.php:29 inc/menu.class.php:33 +msgid "SCCM Connector" msgstr "" #: inc/config.class.php:51 setup.php:58 msgid "Interface - SCCM" msgstr "" -#: inc/config.class.php:99 inc/config.class.php:110 +#: inc/config.class.php:100 inc/config.class.php:111 msgid "Error when using glpi_plugin_sccm_configs table." msgstr "" -#: inc/config.class.php:164 +#: inc/config.class.php:183 msgid "Enable SCCM synchronization" msgstr "" -#: inc/config.class.php:169 +#: inc/config.class.php:188 msgid "Server hostname (MSSQL)" msgstr "" -#: inc/config.class.php:174 +#: inc/config.class.php:193 msgid "Database name" msgstr "" -#: inc/config.class.php:179 +#: inc/config.class.php:198 msgid "Username" msgstr "" -#: inc/config.class.php:186 +#: inc/config.class.php:205 msgid "Password" msgstr "" -#: inc/config.class.php:191 +#: inc/config.class.php:210 msgid "URL FusionInventory for injection" msgstr "" -#: inc/config.class.php:196 +#: inc/config.class.php:215 msgid "Verify SSL certificate" msgstr "" -#: inc/config.class.php:201 +#: inc/config.class.php:220 msgid "Use NLTM authentication" msgstr "" -#: inc/config.class.php:206 +#: inc/config.class.php:225 msgid "Send credentials to other hosts too" msgstr "" -#: inc/config.class.php:211 +#: inc/config.class.php:230 msgid "Use specific authentication information" msgstr "" -#: inc/config.class.php:216 +#: inc/config.class.php:235 msgid "Value for spécific authentication" msgstr "" - -#: inc/menu.class.php:29 inc/menu.class.php:33 -msgid "SCCM Connector" -msgstr "" - -#: inc/sccm.class.php:35 -msgid "SCCM" -msgstr "" - -#: inc/sccm.class.php:39 -msgid "Please, read the documentation before using that." -msgstr "" - -#: inc/sccm.class.php:504 -msgid "Interface - SCCMCollect" -msgstr "" - -#: inc/sccm.class.php:507 -msgid "Interface - SCCMPush" -msgstr "" - -#: inc/sccm.class.php:560 -msgid "Collect is disabled by configuration." -msgstr "" - -#: inc/sccm.class.php:651 -msgid "Push is disabled by configuration." -msgstr "" From c7b9f02e3c3310330125a371757ebc4aa6f31577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Mon, 24 Aug 2020 10:55:51 +0200 Subject: [PATCH 6/6] Add 2.2.0 version definition --- sccm.xml | 5 +++++ setup.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sccm.xml b/sccm.xml index cdeb186..222e21f 100644 --- a/sccm.xml +++ b/sccm.xml @@ -55,6 +55,11 @@ Prerequisite : TECLIB' + + 2.2.0 + ~9.5.0 + https://github.com/pluginsGLPI/sccm/releases/download/2.2.0/glpi-sccm-2.2.0.tar.bz2 + 2.1.1 ~9.4.0 diff --git a/setup.php b/setup.php index 696b36e..d887f0e 100644 --- a/setup.php +++ b/setup.php @@ -23,7 +23,7 @@ * ------------------------------------------------------------------------ */ -define("PLUGIN_SCCM_VERSION", "2.1.1"); +define("PLUGIN_SCCM_VERSION", "2.2.0"); // Minimal GLPI version, inclusive define("PLUGIN_SCCM_MIN_GLPI", "9.5");