diff --git a/.tx/config b/.tx/config new file mode 100644 index 0000000..0f194d3 --- /dev/null +++ b/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[glpi-plugin-sccm.sccm-pot] +file_filter = locales/.po +source_file = locales/sccm.pot +source_lang = en_GB +type = PO diff --git a/README.md b/README.md index a391941..33e29e9 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Extend GLPI with Plugins. ## Synopsis -Plugin to synchronize computers from SCCM (version 1802) to GLPI (version 9.2). +Plugin to synchronize computers from SCCM (version 1802) to GLPI (version 9.2 and 9.3). It uses the "FusionInventory for GLPI" plugin and the power of its internal engine: ### Workflow diff --git a/composer.json b/composer.json index dec8856..d0e918f 100644 --- a/composer.json +++ b/composer.json @@ -1,11 +1,13 @@ { - "minimum-stability": "dev", - "prefer-stable": true, "require": { "php": ">= 7.0.0" }, "require-dev": { - "glpi-project/tools": "^0.1.0", - "glpi-project/coding-standard": "0.5.0" + "glpi-project/tools": "^0.1" + }, + "config": { + "platform": { + "php": "7.0" + } } } diff --git a/composer.lock b/composer.lock index 9bd21b4..224519a 100644 --- a/composer.lock +++ b/composer.lock @@ -1,24 +1,24 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b219191113b75493df1a1d2d1d8e6145", + "content-hash": "68f4cb40093b82070645783a6108aa2a", "packages": [], "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "2.8.3", + "version": "2.8.5", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "8f8f5da2ca06fbd3a85f7d551c49f844b7c59437" + "reference": "1e8ff512072422b850b44aa721b5b303e4a5ebb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/8f8f5da2ca06fbd3a85f7d551c49f844b7c59437", - "reference": "8f8f5da2ca06fbd3a85f7d551c49f844b7c59437", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1e8ff512072422b850b44aa721b5b303e4a5ebb3", + "reference": "1e8ff512072422b850b44aa721b5b303e4a5ebb3", "shasum": "" }, "require": { @@ -30,9 +30,9 @@ "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "greg-1-anderson/composer-test-scenarios": "^1", - "phpunit/phpunit": "^4.8", - "satooshi/php-coveralls": "^1.0.2 | dev-master", + "g1a/composer-test-scenarios": "^2", + "phpunit/phpunit": "^6", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7" }, "type": "library", @@ -57,20 +57,20 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2018-02-23T16:32:04+00:00" + "time": "2018-08-18T23:51:49+00:00" }, { "name": "consolidation/config", - "version": "1.0.9", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "34ca8d7c1ee60a7b591b10617114cf1210a2e92c" + "reference": "c9fc25e9088a708637e18a256321addc0670e578" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/34ca8d7c1ee60a7b591b10617114cf1210a2e92c", - "reference": "34ca8d7c1ee60a7b591b10617114cf1210a2e92c", + "url": "https://api.github.com/repos/consolidation/config/zipball/c9fc25e9088a708637e18a256321addc0670e578", + "reference": "c9fc25e9088a708637e18a256321addc0670e578", "shasum": "" }, "require": { @@ -79,8 +79,8 @@ "php": ">=5.4.0" }, "require-dev": { - "greg-1-anderson/composer-test-scenarios": "^1", - "phpunit/phpunit": "^4", + "g1a/composer-test-scenarios": "^1", + "phpunit/phpunit": "^5", "satooshi/php-coveralls": "^1.0", "squizlabs/php_codesniffer": "2.*", "symfony/console": "^2.5|^3|^4", @@ -111,20 +111,20 @@ } ], "description": "Provide configuration services for a commandline tool.", - "time": "2017-12-22T17:28:19+00:00" + "time": "2018-08-07T22:57:00+00:00" }, { "name": "consolidation/log", - "version": "1.0.5", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "dbc7c535f319a4a2d5a5077738f8eb7c10df8821" + "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/dbc7c535f319a4a2d5a5077738f8eb7c10df8821", - "reference": "dbc7c535f319a4a2d5a5077738f8eb7c10df8821", + "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395", + "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395", "shasum": "" }, "require": { @@ -133,8 +133,9 @@ "symfony/console": "^2.8|^3|^4" }, "require-dev": { + "g1a/composer-test-scenarios": "^1", "phpunit/phpunit": "4.*", - "satooshi/php-coveralls": "dev-master", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "2.*" }, "type": "library", @@ -159,20 +160,20 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2017-11-29T01:44:16+00:00" + "time": "2018-05-25T18:14:39+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "da889e4bce19f145ca4ec5b1725a946f4eb625a9" + "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/da889e4bce19f145ca4ec5b1725a946f4eb625a9", - "reference": "da889e4bce19f145ca4ec5b1725a946f4eb625a9", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", + "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", "shasum": "" }, "require": { @@ -181,7 +182,7 @@ "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "g-1-a/composer-test-scenarios": "^2", + "g1a/composer-test-scenarios": "^2", "phpunit/phpunit": "^5.7.27", "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7", @@ -214,27 +215,29 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2018-03-20T15:18:32+00:00" + "time": "2018-05-25T18:02:34+00:00" }, { "name": "consolidation/robo", - "version": "dev-master", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "9a5d26c2b67f3513ead3ebcb5764f98066c183cb" + "reference": "31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/9a5d26c2b67f3513ead3ebcb5764f98066c183cb", - "reference": "9a5d26c2b67f3513ead3ebcb5764f98066c183cb", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d", + "reference": "31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d", "shasum": "" }, "require": { "consolidation/annotated-command": "^2.8.2", - "consolidation/config": "^1.0.1", + "consolidation/config": "^1.0.10", "consolidation/log": "~1", "consolidation/output-formatters": "^3.1.13", + "consolidation/self-update": "^1", + "g1a/composer-test-scenarios": "^2", "grasmash/yaml-expander": "^1.3", "league/container": "^2.2", "php": ">=5.5.0", @@ -251,7 +254,6 @@ "codeception/aspect-mock": "^1|^2.1.1", "codeception/base": "^2.3.7", "codeception/verify": "^0.3.2", - "g-1-a/composer-test-scenarios": "^2", "goaop/framework": "~2.1.2", "goaop/parser-reflection": "^1.1.0", "natxet/cssmin": "3.0.4", @@ -294,7 +296,50 @@ } ], "description": "Modern task runner", - "time": "2018-03-21T12:37:32+00:00" + "time": "2018-08-17T18:44:18+00:00" + }, + { + "name": "consolidation/self-update", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/consolidation/self-update.git", + "reference": "adbb784e58cc0836d8522851f7e38ee7ade0d553" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/consolidation/self-update/zipball/adbb784e58cc0836d8522851f7e38ee7ade0d553", + "reference": "adbb784e58cc0836d8522851f7e38ee7ade0d553", + "shasum": "" + }, + "require": { + "php": ">=5.5.0", + "symfony/console": "^2.8|^3|^4", + "symfony/filesystem": "^2.5|^3|^4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "SelfUpdate\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alexander Menk", + "email": "menk@mestrona.net" + } + ], + "description": "Provides a self:update command for Symfony Console applications.", + "time": "2018-08-17T04:50:59+00:00" }, { "name": "container-interop/container-interop", @@ -386,32 +431,65 @@ ], "time": "2017-01-20T21:14:22+00:00" }, + { + "name": "g1a/composer-test-scenarios", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/g1a/composer-test-scenarios.git", + "reference": "a166fd15191aceab89f30c097e694b7cf3db4880" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/g1a/composer-test-scenarios/zipball/a166fd15191aceab89f30c097e694b7cf3db4880", + "reference": "a166fd15191aceab89f30c097e694b7cf3db4880", + "shasum": "" + }, + "bin": [ + "scripts/create-scenario", + "scripts/dependency-licenses", + "scripts/install-scenario" + ], + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Greg Anderson", + "email": "greg.1.anderson@greenknowe.org" + } + ], + "description": "Useful scripts for testing multiple sets of Composer dependencies.", + "time": "2018-08-08T23:37:23+00:00" + }, { "name": "glpi-project/coding-standard", - "version": "0.5", + "version": "0.7.1", "source": { "type": "git", "url": "https://github.com/glpi-project/coding-standard.git", - "reference": "e19495c896a01199a2fec2e65b7613310598cf96" + "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/e19495c896a01199a2fec2e65b7613310598cf96", - "reference": "e19495c896a01199a2fec2e65b7613310598cf96", + "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/1cef37d764aecf8fd7d5d167db25da97e289cb03", + "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03", "shasum": "" }, "require": { - "squizlabs/php_codesniffer": "~2.0" + "squizlabs/php_codesniffer": "^3.3" }, "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ - "GPLv3" + "GPL-2.0-or-later" ], "authors": [ { "name": "Teclib'", - "email": "contact@teclib.com", + "email": "glpi@teclib.com", "homepage": "https://teclib.com" } ], @@ -421,27 +499,27 @@ "glpi", "phpcs" ], - "time": "2017-01-06T11:10:46+00:00" + "time": "2018-06-07T08:45:05+00:00" }, { "name": "glpi-project/tools", - "version": "0.1.3", + "version": "0.1.5", "source": { "type": "git", "url": "https://github.com/glpi-project/tools.git", - "reference": "b3ed8524ac663e1bbe2027c8c99e42da22f3aa7b" + "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/tools/zipball/b3ed8524ac663e1bbe2027c8c99e42da22f3aa7b", - "reference": "b3ed8524ac663e1bbe2027c8c99e42da22f3aa7b", + "url": "https://api.github.com/repos/glpi-project/tools/zipball/5ff99fa5967b468af3d3ba2d7a69ede1214273ea", + "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea", "shasum": "" }, "require": { - "consolidation/robo": "dev-master@dev", - "glpi-project/coding-standard": "~0.5", - "natxet/cssmin": "~3.0", - "patchwork/jsqueeze": "~1.0" + "consolidation/robo": "^1.3", + "glpi-project/coding-standard": "^0.7", + "natxet/cssmin": "^3.0", + "patchwork/jsqueeze": "^1.0" }, "bin": [ "tools/plugin-release", @@ -456,7 +534,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPLv3" + "GPL-3.0-or-later" ], "authors": [ { @@ -471,7 +549,7 @@ "plugins", "tools" ], - "time": "2018-01-02T10:48:41+00:00" + "time": "2018-06-21T11:59:33+00:00" }, { "name": "grasmash/expander", @@ -820,64 +898,37 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.9.1", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" + "reference": "628a481780561150481a9ec74709092b9759b3ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", - "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/628a481780561150481a9ec74709092b9759b3ec", + "reference": "628a481780561150481a9ec74709092b9759b3ec", "shasum": "" }, "require": { "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": ">=5.1.2" + "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "bin": [ - "scripts/phpcs", - "scripts/phpcbf" + "bin/phpcs", + "bin/phpcbf" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" } }, - "autoload": { - "classmap": [ - "CodeSniffer.php", - "CodeSniffer/CLI.php", - "CodeSniffer/Exception.php", - "CodeSniffer/File.php", - "CodeSniffer/Fixer.php", - "CodeSniffer/Report.php", - "CodeSniffer/Reporting.php", - "CodeSniffer/Sniff.php", - "CodeSniffer/Tokens.php", - "CodeSniffer/Reports/", - "CodeSniffer/Tokenizers/", - "CodeSniffer/DocGenerators/", - "CodeSniffer/Standards/AbstractPatternSniff.php", - "CodeSniffer/Standards/AbstractScopeSniff.php", - "CodeSniffer/Standards/AbstractVariableSniff.php", - "CodeSniffer/Standards/IncorrectPatternException.php", - "CodeSniffer/Standards/Generic/Sniffs/", - "CodeSniffer/Standards/MySource/Sniffs/", - "CodeSniffer/Standards/PEAR/Sniffs/", - "CodeSniffer/Standards/PSR1/Sniffs/", - "CodeSniffer/Standards/PSR2/Sniffs/", - "CodeSniffer/Standards/Squiz/Sniffs/", - "CodeSniffer/Standards/Zend/Sniffs/" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -894,48 +945,49 @@ "phpcs", "standards" ], - "time": "2017-05-22T02:43:20+00:00" + "time": "2018-07-26T23:47:18+00:00" }, { "name": "symfony/console", - "version": "v4.0.6", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "555c8dbe0ae9e561740451eabdbed2cc554b6a51" + "reference": "b0878233cb5c4391347e5495089c7af11b8e6201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/555c8dbe0ae9e561740451eabdbed2cc554b6a51", - "reference": "555c8dbe0ae9e561740451eabdbed2cc554b6a51", + "url": "https://api.github.com/repos/symfony/console/zipball/b0878233cb5c4391347e5495089c7af11b8e6201", + "reference": "b0878233cb5c4391347e5495089c7af11b8e6201", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": ">=5.5.9", + "symfony/debug": "~2.8|~3.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/dependency-injection": "<3.4", - "symfony/process": "<3.3" + "symfony/dependency-injection": "<3.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~3.4|~4.0", - "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.4|~4.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" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", - "symfony/lock": "", + "symfony/filesystem": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -962,34 +1014,90 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-02-26T15:55:47+00:00" + "time": "2017-07-29T21:27:59+00:00" + }, + { + "name": "symfony/debug", + "version": "v3.3.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/7c13ae8ce1e2adbbd574fc39de7be498e1284e13", + "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "psr/log": "~1.0" + }, + "conflict": { + "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + }, + "require-dev": { + "symfony/http-kernel": "~2.8|~3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Debug Component", + "homepage": "https://symfony.com", + "time": "2017-07-28T15:27:31+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.0.6", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "85eaf6a8ec915487abac52e133efc4a268204428" + "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/85eaf6a8ec915487abac52e133efc4a268204428", - "reference": "85eaf6a8ec915487abac52e133efc4a268204428", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67535f1e3fd662bdc68d7ba317c93eecd973617e", + "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": ">=5.5.9" }, "conflict": { - "symfony/dependency-injection": "<3.4" + "symfony/dependency-injection": "<3.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/expression-language": "~3.4|~4.0", - "symfony/stopwatch": "~3.4|~4.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" }, "suggest": { "symfony/dependency-injection": "", @@ -998,7 +1106,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1025,29 +1133,29 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-02-14T14:11:10+00:00" + "time": "2017-06-09T14:53:08+00:00" }, { "name": "symfony/filesystem", - "version": "v4.0.6", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21" + "reference": "427987eb4eed764c3b6e38d52a0f87989e010676" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21", - "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/427987eb4eed764c3b6e38d52a0f87989e010676", + "reference": "427987eb4eed764c3b6e38d52a0f87989e010676", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1074,29 +1182,29 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-02-22T10:50:29+00:00" + "time": "2017-07-11T07:17:58+00:00" }, { "name": "symfony/finder", - "version": "v4.0.6", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "44a796d2ecc2a16a5fc8f2956a34ee617934d55f" + "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/44a796d2ecc2a16a5fc8f2956a34ee617934d55f", - "reference": "44a796d2ecc2a16a5fc8f2956a34ee617934d55f", + "url": "https://api.github.com/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4", + "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1123,20 +1231,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-03-05T18:28:26+00:00" + "time": "2017-06-01T21:01:25+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" + "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", + "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", "shasum": "" }, "require": { @@ -1148,7 +1256,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -1182,29 +1290,29 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-08-06T14:22:27+00:00" }, { "name": "symfony/process", - "version": "v4.0.6", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "6ed08502a7c9559da8e60ea343bdbd19c3350b3e" + "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/6ed08502a7c9559da8e60ea343bdbd19c3350b3e", - "reference": "6ed08502a7c9559da8e60ea343bdbd19c3350b3e", + "url": "https://api.github.com/repos/symfony/process/zipball/07432804942b9f6dd7b7377faf9920af5f95d70a", + "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1231,30 +1339,27 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-02-19T12:18:43+00:00" + "time": "2017-07-13T13:05:09+00:00" }, { "name": "symfony/yaml", - "version": "v4.0.6", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "de5f125ea39de846b90b313b2cfb031a0152d223" + "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/de5f125ea39de846b90b313b2cfb031a0152d223", - "reference": "de5f125ea39de846b90b313b2cfb031a0152d223", + "url": "https://api.github.com/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed", + "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed", "shasum": "" }, "require": { - "php": "^7.1.3" - }, - "conflict": { - "symfony/console": "<3.4" + "php": ">=5.5.9" }, "require-dev": { - "symfony/console": "~3.4|~4.0" + "symfony/console": "~2.8|~3.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -1262,7 +1367,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1289,16 +1394,19 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-02-19T20:08:53+00:00" + "time": "2017-07-23T12:43:26+00:00" } ], "aliases": [], - "minimum-stability": "dev", + "minimum-stability": "stable", "stability-flags": [], - "prefer-stable": true, + "prefer-stable": false, "prefer-lowest": false, "platform": { "php": ">= 7.0.0" }, - "platform-dev": [] + "platform-dev": [], + "platform-overrides": { + "php": "7.0" + } } diff --git a/front/home.php b/front/home.php index 57a4021..f3f9ab0 100644 --- a/front/home.php +++ b/front/home.php @@ -63,7 +63,7 @@ $action = isset($_GET['task']) ? $_GET['task'] : "home"; -if (!in_array($action, array('home','test','showtable'))) { +if (!in_array($action, ['home','test','showtable'])) { die('Erreur'); } diff --git a/front/showtable.php b/front/showtable.php index 55cc198..f6db150 100644 --- a/front/showtable.php +++ b/front/showtable.php @@ -63,7 +63,7 @@ $action = isset($_GET['task']) ? $_GET['task'] : "home"; -if (!in_array($action, array('home','test','inject','showtable'))) { +if (!in_array($action, ['home','test','inject','showtable'])) { die('Erreur'); } diff --git a/front/test.php b/front/test.php index 756cdec..13b42ee 100644 --- a/front/test.php +++ b/front/test.php @@ -105,7 +105,7 @@ function nbPcToInject() { echo count($PluginSccmSccm->devices); } -function testViewHtml($limit,$where) { +function testViewHtml($limit, $where) { global $PluginSccmSccm; $PluginSccmSccm->getDevices($where); @@ -158,7 +158,7 @@ function testAdd($where) { $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $PluginSccmConfig->getField('fusioninventory_url')); - curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: text/xml')); + curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: text/xml']); curl_setopt($ch, CURLOPT_HEADER, 0); curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POSTFIELDS, $SXML->asXML()); diff --git a/inc/config.class.php b/inc/config.class.php index 00f3bd8..270317e 100644 --- a/inc/config.class.php +++ b/inc/config.class.php @@ -29,7 +29,7 @@ class PluginSccmConfig extends CommonDBTM { - static private $_instance = NULL; + static private $_instance = null; static function canCreate() { return Session::haveRight('config', UPDATE); @@ -43,11 +43,11 @@ static function canView() { return Session::haveRight('config', UPDATE); } - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { return __("Setup - SCCM", "sccm"); } - function getName($with_comment=0) { + function getName($with_comment = 0) { return __("Interface - SCCM", "sccm"); } @@ -94,7 +94,7 @@ static function install(Migration $migration) { `date_mod` datetime default NULL, `comment` text, PRIMARY KEY (`id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; $DB->queryOrDie($query, __("Error when using glpi_plugin_sccm_configs table.", "sccm") . "
".$DB->error()); @@ -217,7 +217,7 @@ static function showConfigForm($item) { Html::autocompletionTextField($config, 'auth_info'); echo "\n"; - $config->showFormButtons(array('candel'=>false)); + $config->showFormButtons(['candel'=>false]); return false; } diff --git a/inc/menu.class.php b/inc/menu.class.php index 253259f..47c75ea 100644 --- a/inc/menu.class.php +++ b/inc/menu.class.php @@ -35,7 +35,7 @@ static function getMenuName() { static function getMenuContent() { global $CFG_GLPI; - $menu = array(); + $menu = []; $menu['title'] = self::getMenuName(); $menu['page'] = '/plugins/sccm/front/config.form.php'; diff --git a/inc/sccm.class.php b/inc/sccm.class.php index bd49986..0057d44 100644 --- a/inc/sccm.class.php +++ b/inc/sccm.class.php @@ -31,7 +31,7 @@ class PluginSccmSccm { var $devices; - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { return __('SCCM', 'sccm'); } @@ -97,7 +97,7 @@ function getDevices($where = 0, $limit = 99999999) { $result = $PluginSccmSccmdb->exec_query($query); $i = 0; - $tab = array(); + $tab = []; while (($tab = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) AND $i < $limit) { @@ -111,7 +111,7 @@ function getDevices($where = 0, $limit = 99999999) { $PluginSccmSccmdb->disconnect(); } - function getDatas($type, $deviceid, $limit=99999999) { + function getDatas($type, $deviceid, $limit = 99999999) { $PluginSccmSccmdb = new PluginSccmSccmdb(); $res = $PluginSccmSccmdb->connect(); @@ -119,11 +119,11 @@ function getDatas($type, $deviceid, $limit=99999999) { die; } - $datas = array(); + $datas = []; switch ($type) { case 'processors' : - $fields = array('Manufacturer00','Name00','NormSpeed00','AddressWidth00','CPUKey00','NumberOfCores00', 'NumberOfLogicalProcessors00'); + $fields = ['Manufacturer00','Name00','NormSpeed00','AddressWidth00','CPUKey00','NumberOfCores00', 'NumberOfLogicalProcessors00']; $table = 'Processor_DATA'; break; } @@ -134,12 +134,12 @@ function getDatas($type, $deviceid, $limit=99999999) { $result = $PluginSccmSccmdb->exec_query($query); - $data = array(); + $data = []; $i=0; - $tab = array(); + $tab = []; while (($tab = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) AND $i < $limit) { - $tmp = array(); + $tmp = []; foreach ($tab as $key => $value) { $tmp[$key] = $this->cleanValue($value); @@ -184,12 +184,12 @@ function getNetwork($deviceid, $limit = 99999999) { $result = $PluginSccmSccmdb->exec_query($query); - $data = array(); + $data = []; $i=0; - $tab = array(); + $tab = []; while (($tab = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) AND $i < $limit) { - $tmp = array(); + $tmp = []; foreach ($tab as $key => $value) { $tmp[$key] = $this->cleanValue($value); @@ -230,12 +230,12 @@ function getSoftware($deviceid, $limit = 99999999) { $result = $PluginSccmSccmdb->exec_query($query); - $data = array(); + $data = []; $i=0; - $tab = array(); + $tab = []; while (($tab = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) AND $i < $limit) { - $tmp = array(); + $tmp = []; foreach ($tab as $key => $value) { $tmp[$key] = $this->cleanValue($value); @@ -278,12 +278,12 @@ function getMemories($deviceid, $limit = 99999999) { $result = $PluginSccmSccmdb->exec_query($query); - $data = array(); + $data = []; $i=0; - $tab = array(); + $tab = []; while (($tab = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) AND $i < $limit) { - $tmp = array(); + $tmp = []; foreach ($tab as $key => $value) { $tmp[$key] = $this->cleanValue($value); @@ -320,12 +320,12 @@ function getVideos($deviceid, $limit = 99999999) { $result = $PluginSccmSccmdb->exec_query($query); - $data = array(); + $data = []; $i=0; - $tab = array(); + $tab = []; while (($tab = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) AND $i < $limit) { - $tmp = array(); + $tmp = []; foreach ($tab as $key => $value) { $tmp[$key] = $this->cleanValue($value); @@ -358,12 +358,12 @@ function getSounds($deviceid, $limit = 99999999) { $result = $PluginSccmSccmdb->exec_query($query); - $data = array(); + $data = []; $i=0; - $tab = array(); + $tab = []; while (($tab = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) AND $i < $limit) { - $tmp = array(); + $tmp = []; foreach ($tab as $key => $value) { $tmp[$key] = $this->cleanValue($value); @@ -405,12 +405,12 @@ function getStorages($deviceid, $limit = 99999999) { $result = $PluginSccmSccmdb->exec_query($query); - $data = array(); + $data = []; $i=0; - $tab = array(); + $tab = []; while (($tab = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) AND $i < $limit) { - $tmp = array(); + $tmp = []; foreach ($tab as $key => $value) { $tmp[$key] = $this->cleanValue($value); @@ -446,12 +446,12 @@ function getMedias($deviceid, $limit = 99999999) { $result = $PluginSccmSccmdb->exec_query($query); - $data = array(); + $data = []; $i=0; - $tab = array(); + $tab = []; while (($tab = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) AND $i < $limit) { - $tmp = array(); + $tmp = []; foreach ($tab as $key => $value) { $tmp[$key] = $this->cleanValue($value); @@ -479,12 +479,12 @@ static function install() { } else if (!$cronCollect->getFromDBbyName(__CLASS__, 'SCCMCollect')) { CronTask::register(__CLASS__, 'SCCMCollect', 7 * DAY_TIMESTAMP, - array('param' => 24, 'mode' => CronTask::MODE_EXTERNAL, 'hourmin' => 4, 'hourmax' => 5)); + ['param' => 24, 'mode' => CronTask::MODE_EXTERNAL, 'hourmin' => 4, 'hourmax' => 5]); } CronTask::register(__CLASS__, 'SCCMPush', 7 * DAY_TIMESTAMP, - array('param' => 24, 'mode' => CronTask::MODE_EXTERNAL, 'hourmin' => 6, 'hourmax' => 7)); + ['param' => 24, 'mode' => CronTask::MODE_EXTERNAL, 'hourmin' => 6, 'hourmax' => 7]); } static function uninstall() { @@ -503,10 +503,10 @@ static function cronSCCMPush($task) { static function cronInfo($name) { if ($name == "SCCMCollect") { - return array('description' => __("Interface - SCCMCollect", "sccm")); + return ['description' => __("Interface - SCCMCollect", "sccm")]; } if ($name == "SCCMPush") { - return array('description' => __("Interface - SCCMPush", "sccm")); + return ['description' => __("Interface - SCCMPush", "sccm")]; } } @@ -578,7 +578,7 @@ static function executePush($task) { $query = "SELECT MachineID FROM Computer_System_DATA WHERE MachineID is not null and MachineID != ''"; $result = $PluginSccmSccmdb->exec_query($query); - $tab = array(); + $tab = []; while ($tab = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC)) { @@ -614,7 +614,7 @@ static function executePush($task) { } curl_setopt($ch, CURLOPT_URL, $PluginSccmConfig->getField('fusioninventory_url')); - curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: text/xml')); + curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: text/xml']); curl_setopt($ch, CURLOPT_HEADER, 1); curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POSTFIELDS, $xmlFile->asXML()); diff --git a/inc/sccmdb.class.php b/inc/sccmdb.class.php index cf949ba..660a988 100644 --- a/inc/sccmdb.class.php +++ b/inc/sccmdb.class.php @@ -43,12 +43,12 @@ function connect() { $password = $PluginSccmConfig->getField('sccmdb_password'); $password = Toolbox::decrypt($password, GLPIKEY); - $connectionOptions = array( + $connectionOptions = [ "Database" => $dbname, "Uid" => $user, "PWD" => $password, "CharacterSet" => "UTF-8" - ); + ]; $this->dbconn = sqlsrv_connect( $host, $connectionOptions ); if ($this->dbconn === false) { @@ -68,14 +68,14 @@ function disconnect() { function exec_query($query) { $result = sqlsrv_query($this->dbconn, $query) or die('Query error : ' . print_r(sqlsrv_errors(), true)); - if ($result == FALSE) { + if ($result == false) { die( FormatErrors( sqlsrv_errors())); } return $result; } - function FormatErrors( $errors ) { + function FormatErrors($errors) { foreach ($errors as $error) { $debug = ""; diff --git a/inc/sccmxml.class.php b/inc/sccmxml.class.php index fe5e0e6..e8b5b30 100644 --- a/inc/sccmxml.class.php +++ b/inc/sccmxml.class.php @@ -170,7 +170,7 @@ function setProcessors() { $PluginSccmSccm = new PluginSccmSccm(); - $cpukeys = array(); + $cpukeys = []; $CONTENT = $this->sxml->CONTENT[0]; $i = 0; foreach ($PluginSccmSccm->getDatas('processors', $this->device_id) as $value) { @@ -196,7 +196,7 @@ function setSoftwares() { $PluginSccmSccm = new PluginSccmSccm(); - $antivirus = array(); $inject_antivirus = false; + $antivirus = []; $inject_antivirus = false; $CONTENT = $this->sxml->CONTENT[0]; $i = 0; foreach ($PluginSccmSccm->getSoftware($this->device_id) as $value) { diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo new file mode 100644 index 0000000..285a7f5 Binary files /dev/null and b/locales/cs_CZ.mo differ diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po new file mode 100644 index 0000000..f4f1406 --- /dev/null +++ b/locales/cs_CZ.po @@ -0,0 +1,111 @@ +# 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. +# +#, 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: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Pavel Borecki , 2018\n" +"Language-Team: Czech (Czech Republic) (https://www.transifex.com/teclib/teams/28042/cs_CZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cs_CZ\n" +"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" + +#: front/showtable.php:81 +msgid "Synchronization is disabled by configuration." +msgstr "Synchronizace je vypnutá nastavením." + +#: 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/config.class.php:51 setup.php:58 +msgid "Interface - SCCM" +msgstr "Rozhraní – SCCM" + +#: inc/config.class.php:99 inc/config.class.php:110 +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 +msgid "Enable SCCM synchronization" +msgstr "Zapnout synchronizaci s SCCM" + +#: inc/config.class.php:169 +msgid "Server hostname (MSSQL)" +msgstr "Název serveru (MSSQL)" + +#: inc/config.class.php:174 +msgid "Database name" +msgstr "Název databáze" + +#: inc/config.class.php:179 +msgid "Username" +msgstr "Uživatelské jméno" + +#: inc/config.class.php:186 +msgid "Password" +msgstr "Heslo" + +#: inc/config.class.php:191 +msgid "URL FusionInventory for injection" +msgstr "URL adresa FusionInventory do které vložit" + +#: inc/config.class.php:196 +msgid "Verify SSL certificate" +msgstr "Ověřit SSL certifikát" + +#: inc/config.class.php:201 +msgid "Use NLTM authentication" +msgstr "Použít NLTM ověřování" + +#: inc/config.class.php:206 +msgid "Send credentials to other hosts too" +msgstr "Poslat přihlašovací údaje také na ostatní stroje" + +#: inc/config.class.php:211 +msgid "Use specific authentication information" +msgstr "Použít konkrétní ověřovací informace" + +#: inc/config.class.php:216 +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:506 +msgid "Interface - SCCMCollect" +msgstr "Rozhraní – SCCMCollect" + +#: inc/sccm.class.php:509 +msgid "Interface - SCCMPush" +msgstr "Rozhraní – SCCMPush" + +#: inc/sccm.class.php:562 +msgid "Collect is disabled by configuration." +msgstr "Shromažďování je vypnuté nastavením." + +#: inc/sccm.class.php:652 +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 82a4f8e..9a0a3f7 100644 Binary files a/locales/en_GB.mo and b/locales/en_GB.mo differ diff --git a/locales/en_GB.po b/locales/en_GB.po index e3d0916..ce104e2 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -1,111 +1,110 @@ -# GLPISCCMPLUGIN -# Copyright (C) 2014 by teclib. -# This file is distributed under the same license as the footprint package. -# François Legastelois , 2013. +# English translations for PACKAGE package. +# Copyright (C) 2018 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Automatically generated, 2018. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: 1.0.0\n" -"Report-Msgid-Bugs-To: flegastelois@teclib.com\n" -"POT-Creation-Date: 2013-12-10 14:31+0100\n" -"PO-Revision-Date: 2013-12-10 14:31+0100\n" -"Last-Translator: François Legastelois \n" -"Language-Team: TECLIB \n" +"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:05+0000\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"language/en_GB/)\n" -"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: front/showtable.php:88 +#: front/showtable.php:81 msgid "Synchronization is disabled by configuration." -msgstr "" +msgstr "Synchronization is disabled by configuration." -#: front/test.php:39 -msgid "SCCM - TEST" -msgstr "" - -#: front/config.form.php:38 inc/config.class.php:54 +#: front/config.form.php:31 inc/config.class.php:47 msgid "Setup - SCCM" -msgstr "" +msgstr "Setup - SCCM" -#: inc/sccm.class.php:42 -msgid "SCCM" -msgstr "" - -#: inc/sccm.class.php:46 -msgid "Please, read the documentation before using that." -msgstr "" - -#: inc/sccm.class.php:513 -msgid "Interface - SCCMCollect" -msgstr "" - -#: inc/sccm.class.php:516 -msgid "Interface - SCCMPush" -msgstr "" - -#: inc/sccm.class.php:570 -msgid "Collect is disabled by configuration." -msgstr "" - -#: inc/sccm.class.php:629 -msgid "Push is disabled by configuration." -msgstr "" +#: front/test.php:32 +msgid "SCCM - TEST" +msgstr "SCCM - TEST" -#: inc/config.class.php:58 setup.php:65 +#: inc/config.class.php:51 setup.php:58 msgid "Interface - SCCM" -msgstr "" +msgstr "Interface - SCCM" -#: inc/config.class.php:102 inc/config.class.php:113 +#: inc/config.class.php:99 inc/config.class.php:110 msgid "Error when using glpi_plugin_sccm_configs table." -msgstr "" +msgstr "Error when using glpi_plugin_sccm_configs table." -#: inc/config.class.php:145 +#: inc/config.class.php:164 msgid "Enable SCCM synchronization" -msgstr "" +msgstr "Enable SCCM synchronization" -#: inc/config.class.php:150 +#: inc/config.class.php:169 msgid "Server hostname (MSSQL)" -msgstr "" +msgstr "Server hostname (MSSQL)" -#: inc/config.class.php:155 +#: inc/config.class.php:174 msgid "Database name" -msgstr "" +msgstr "Database name" -#: inc/config.class.php:160 +#: inc/config.class.php:179 msgid "Username" -msgstr "" +msgstr "Username" -#: inc/config.class.php:167 +#: inc/config.class.php:186 msgid "Password" -msgstr "" +msgstr "Password" -#: inc/config.class.php:172 +#: inc/config.class.php:191 msgid "URL FusionInventory for injection" -msgstr "" +msgstr "URL FusionInventory for injection" -#: inc/config.class.php:177 +#: inc/config.class.php:196 msgid "Verify SSL certificate" -msgstr "" - -#: inc/menu.class.php:36 inc/menu.class.php:40 -msgid "SCCM Connector" -msgstr "" +msgstr "Verify SSL certificate" #: inc/config.class.php:201 msgid "Use NLTM authentication" -msgstr "" +msgstr "Use NLTM authentication" #: inc/config.class.php:206 msgid "Send credentials to other hosts too" -msgstr "" +msgstr "Send credentials to other hosts too" #: inc/config.class.php:211 msgid "Use specific authentication information" -msgstr "" +msgstr "Use specific authentication information" #: inc/config.class.php:216 msgid "Value for spécific authentication" -msgstr "" \ No newline at end of file +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:506 +msgid "Interface - SCCMCollect" +msgstr "Interface - SCCMCollect" + +#: inc/sccm.class.php:509 +msgid "Interface - SCCMPush" +msgstr "Interface - SCCMPush" + +#: inc/sccm.class.php:562 +msgid "Collect is disabled by configuration." +msgstr "Collect is disabled by configuration." + +#: inc/sccm.class.php:652 +msgid "Push is disabled by configuration." +msgstr "Push is disabled by configuration." diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo index 75e6dfc..a0e7fb6 100644 Binary files a/locales/fr_FR.mo and b/locales/fr_FR.mo differ diff --git a/locales/fr_FR.po b/locales/fr_FR.po index 22f2561..6e2fbd1 100644 --- a/locales/fr_FR.po +++ b/locales/fr_FR.po @@ -2,99 +2,70 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-19 14:05+0200\n" -"PO-Revision-Date: 2018-04-19 14:12+0200\n" -"Language-Team: \n" +"POT-Creation-Date: 2018-08-21 14:05+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Cédric Anne, 2018\n" +"Language-Team: French (France) (https://www.transifex.com/teclib/teams/28042/fr_FR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7.1\n" -"Last-Translator: \n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Language: fr_FR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: front/showtable.php:88 +#: front/showtable.php:81 msgid "Synchronization is disabled by configuration." - msgstr "La synchonisation est désactivée dans la configuration." -#: front/test.php:39 -msgid "SCCM - TEST" -msgstr "" - -#: front/config.form.php:38 inc/config.class.php:54 +#: front/config.form.php:31 inc/config.class.php:47 msgid "Setup - SCCM" msgstr "Configuration - SCCM" -#: inc/sccm.class.php:42 -msgid "SCCM" +#: front/test.php:32 +msgid "SCCM - TEST" msgstr "" -#: inc/sccm.class.php:46 -msgid "Please, read the documentation before using that." -msgstr "Merci de lire la documentation avant d'utiliser cette URL." - -#: 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:561 -msgid "Collect is disabled by configuration." -msgstr "La collecte est désactivé par la configuration" - -#: inc/sccm.class.php:620 -msgid "Push is disabled by configuration." -msgstr "L'implantation est désactivé par la configuration" - -#: inc/config.class.php:58 setup.php:65 +#: inc/config.class.php:51 setup.php:58 msgid "Interface - SCCM" msgstr "Interface - SCCM" -#: inc/config.class.php:102 inc/config.class.php:113 +#: inc/config.class.php:99 inc/config.class.php:110 msgid "Error when using glpi_plugin_sccm_configs table." msgstr "Erreur avec la table 'glpi_plugin_sccm_configs'" -#: inc/config.class.php:145 +#: inc/config.class.php:164 msgid "Enable SCCM synchronization" msgstr "Activer la synchronisation SCCM" -#: inc/config.class.php:150 +#: inc/config.class.php:169 msgid "Server hostname (MSSQL)" msgstr "Hostname (MSSQL) ou IP" -#: inc/config.class.php:155 +#: inc/config.class.php:174 msgid "Database name" msgstr "Nom BDD SCCM" -#: inc/config.class.php:160 +#: inc/config.class.php:179 msgid "Username" msgstr "Utilisateur SCCM" -#: inc/config.class.php:167 +#: inc/config.class.php:186 msgid "Password" msgstr "Mot de passe utilisateur SCCM" -#: inc/config.class.php:172 +#: inc/config.class.php:191 msgid "URL FusionInventory for injection" msgstr "URL FusionInventory pour injection" -#: inc/config.class.php:177 +#: inc/config.class.php:196 msgid "Verify SSL certificate" msgstr "Vérification du certificat SSL" -#: inc/menu.class.php:36 inc/menu.class.php:40 -msgid "SCCM Connector" -msgstr "Connecteur SCCM" - #: inc/config.class.php:201 msgid "Use NLTM authentication" msgstr "Utiliser l'authentification NTLM" @@ -109,4 +80,32 @@ msgstr "Utiliser des informations d'authentification spécifique" #: inc/config.class.php:216 msgid "Value for spécific authentication" -msgstr "Valeur à transmettre" \ No newline at end of file +msgstr "Valeur à transmettre" + +#: inc/menu.class.php:29 inc/menu.class.php:33 +msgid "SCCM Connector" +msgstr "Connecteur SCCM" + +#: inc/sccm.class.php:35 +msgid "SCCM" +msgstr "SCCM" + +#: inc/sccm.class.php:39 +msgid "Please, read the documentation before using that." +msgstr "Merci de lire la documentation avant d'utiliser cette URL." + +#: inc/sccm.class.php:506 +msgid "Interface - SCCMCollect" +msgstr "Interface - SCCMCollect" + +#: inc/sccm.class.php:509 +msgid "Interface - SCCMPush" +msgstr "Interface - SCCMPush" + +#: inc/sccm.class.php:562 +msgid "Collect is disabled by configuration." +msgstr "La collecte est désactivé par la configuration" + +#: inc/sccm.class.php:652 +msgid "Push is disabled by configuration." +msgstr "L'implantation est désactivé par la configuration" diff --git a/locales/sccm.pot b/locales/sccm.pot index 325a222..54fa7be 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: 2018-06-11 08:01+0200\n" +"POT-Creation-Date: 2018-08-21 14:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,16 +17,20 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: setup.php:58 inc/config.class.php:51 -msgid "Interface - SCCM" +#: front/showtable.php:81 +msgid "Synchronization is disabled by configuration." msgstr "" -#: inc/menu.class.php:29 inc/menu.class.php:33 -msgid "SCCM Connector" +#: front/config.form.php:31 inc/config.class.php:47 +msgid "Setup - SCCM" msgstr "" -#: inc/config.class.php:47 front/config.form.php:31 -msgid "Setup - SCCM" +#: front/test.php:32 +msgid "SCCM - TEST" +msgstr "" + +#: inc/config.class.php:51 setup.php:58 +msgid "Interface - SCCM" msgstr "" #: inc/config.class.php:99 inc/config.class.php:110 @@ -77,6 +81,10 @@ msgstr "" 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 "" @@ -97,14 +105,6 @@ msgstr "" msgid "Collect is disabled by configuration." msgstr "" -#: inc/sccm.class.php:641 +#: inc/sccm.class.php:652 msgid "Push is disabled by configuration." msgstr "" - -#: front/test.php:32 -msgid "SCCM - TEST" -msgstr "" - -#: front/showtable.php:81 -msgid "Synchronization is disabled by configuration." -msgstr "" diff --git a/sccm.xml b/sccm.xml index 66a82e8..57387b6 100644 --- a/sccm.xml +++ b/sccm.xml @@ -55,6 +55,11 @@ Prerequisite : TECLIB' + + 2.0.4 + 9.2 + 9.3 + 2.0.3 9.2 diff --git a/setup.php b/setup.php index 2e3bc7e..846cd22 100644 --- a/setup.php +++ b/setup.php @@ -23,12 +23,12 @@ * ------------------------------------------------------------------------ */ -define("PLUGIN_SCCM_VERSION", "2.0.3"); +define("PLUGIN_SCCM_VERSION", "2.0.4"); // Minimal GLPI version, inclusive define("PLUGIN_SCCM_MIN_GLPI", "9.2"); // Maximum GLPI version, exclusive -define("PLUGIN_SCCM_MAX_GLPI", "9.3"); +define("PLUGIN_SCCM_MAX_GLPI", "9.4"); function plugin_init_sccm() { global $PLUGIN_HOOKS,$CFG_GLPI; @@ -42,7 +42,7 @@ function plugin_init_sccm() { if (Session::haveRight("config", UPDATE)) { $PLUGIN_HOOKS['config_page']['sccm'] = "front/config.form.php"; - $PLUGIN_HOOKS["menu_toadd"]['sccm'] = array('config' => 'PluginSccmMenu'); + $PLUGIN_HOOKS["menu_toadd"]['sccm'] = ['config' => 'PluginSccmMenu']; } } } @@ -64,7 +64,9 @@ function plugin_version_sccm() { 'glpi' => [ 'min' => PLUGIN_SCCM_MIN_GLPI, 'max' => PLUGIN_SCCM_MAX_GLPI, - 'dev' => true + 'plugins' => [ + 'fusioninventory', + ], ], 'php' => [ 'min' => '7.0', @@ -83,14 +85,47 @@ 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; }