From 9573143b85508d8367974ce0defdb5dc34b0a072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 7 Feb 2020 11:31:09 +0100 Subject: [PATCH 1/2] 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 | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index 972e75d..b389e06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,51 +1,20 @@ language: php php: - 5.6 - - 7.0 - - 7.1 - - 7.2 + - 7.4 - nightly -#env: -# global: -# - DB=mysql -# matrix: -# - GLPIVER=9.1/bugfixes -# - GLPIVER=master - before_script: - composer self-update -# - git clone --depth=1 https://github.com/glpi-project/glpi -b $GLPIVER ../glpi && cd ../glpi -# - composer install --no-dev -# - mysql -u root -e 'create database glpitest;' -# - php tools/cliinstall.php --db=glpi-test --user=travis --tests -# - mv ../{LNAME} plugins/{LNAME} -# - cd plugins/{LNAME} - - composer install -o - + - composer install --optimize-autoloader --prefer-dist --no-interaction --no-progress --no-suggest script: - - vendor/bin/robo --no-interaction code:cs -# - mysql -u root -e 'select version();' -# - ./vendor/bin/atoum -bf tests/bootstrap.php -d tests/units/ - + - vendor/bin/robo --no-interaction code:cs --strict matrix: -# exclude: -# - php: 5.4 -# env: GLPIVER=master allow_failures: - php: nightly cache: directories: - $HOME/.composer/cache - -#notifications: -# irc: -# channels: -# - "irc.freenode.org#channel" -# on_success: change -# on_failure: always -# use_notice: true -# skip_join: true From ccea03532398e3aab7a40d3c5a98d86ee38fcf9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Mon, 6 Jul 2020 10:32:46 +0200 Subject: [PATCH 2/2] GLPI 9.5 compatibility (#15) * Add GLPI 9.5 compatibility * Replace usage of deprecated 'getAllDatasFromTable()' * Use TIMESTAMP instead of DATETIME in DB for new installations * Add marketplace compatibility * Use GLPI 9.5 min required PHP version * Add 1.5.0 version definition --- .travis.yml | 7 +- airwatch.xml | 5 + composer.json | 9 +- composer.lock | 827 +++++++++++++++++++++++++-------------- hook.php | 18 +- inc/compliance.class.php | 4 +- inc/detail.class.php | 14 +- locales/airwatch.pot | 86 ++-- locales/cs_CZ.mo | Bin 2938 -> 2897 bytes locales/cs_CZ.po | 89 +++-- locales/en_GB.mo | Bin 2691 -> 2650 bytes locales/en_GB.po | 89 +++-- locales/fr_FR.mo | Bin 2972 -> 2931 bytes locales/fr_FR.po | 89 +++-- locales/pt_PT.mo | Bin 2925 -> 2884 bytes locales/pt_PT.po | 89 +++-- setup.php | 45 +-- 17 files changed, 795 insertions(+), 576 deletions(-) diff --git a/.travis.yml b/.travis.yml index b389e06..17203bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: php php: - - 5.6 + - 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/airwatch.xml b/airwatch.xml index d0505bb..e66d7de 100644 --- a/airwatch.xml +++ b/airwatch.xml @@ -25,6 +25,11 @@ Walid Nouh + + 1.5.0 + ~9.5.0 + https://github.com/pluginsGLPI/airwatch/releases/download/1.5.0/glpi-airwatch-1.5.0.tar.bz2 + 1.4.1 9.2 diff --git a/composer.json b/composer.json index e21ea28..d3318a0 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,15 @@ { + "require": { + "php": "^7.2" + }, "require-dev": { "glpi-project/tools": "^0.1" }, "config": { + "optimize-autoloader": true, "platform": { - "php": "5.6" - } + "php": "7.2.0" + }, + "sort-packages": true } } diff --git a/composer.lock b/composer.lock index a716401..ac3b4d4 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": "1780e587040d1a21844800dc378c2f2e", + "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", @@ -563,6 +464,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", + "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, { @@ -663,16 +565,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 +611,7 @@ "plugins", "tools" ], - "time": "2019-06-07T09:46:17+00:00" + "time": "2020-06-19T10:29:26+00:00" }, { "name": "grasmash/expander", @@ -1011,16 +913,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 +956,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.5", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "dceec07328401de6211037abbb18bda423677e26" + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6" }, "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/73e2e7f57d958e7228fce50dc0c61f58f017f9f6", + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6", "shasum": "" }, "require": { @@ -1105,29 +1007,33 @@ "phpcs", "standards" ], - "time": "2020-01-30T22:20:29+00:00" + "time": "2020-04-17T01:09:41+00:00" }, { "name": "symfony/console", - "version": "v3.4.37", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12" + "reference": "326b064d804043005526f5a0494cfb49edb59bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12", - "reference": "7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12", + "url": "https://api.github.com/repos/symfony/console/zipball/326b064d804043005526f5a0494cfb49edb59bb0", + "reference": "326b064d804043005526f5a0494cfb49edb59bb0", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0|~4.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.4", + "symfony/event-dispatcher": "<4.3|>=5", + "symfony/lock": "<4.4", "symfony/process": "<3.3" }, "provide": { @@ -1135,11 +1041,12 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", - "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.3|~4.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", @@ -1150,7 +1057,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1177,41 +1084,69 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2020-01-10T07:52:48+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-30T20:06:45+00:00" }, { - "name": "symfony/debug", - "version": "v3.4.37", + "name": "symfony/event-dispatcher", + "version": "v4.4.10", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "70dd18e93bb8bdf3c4db7fde832619fef9828cf8" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/70dd18e93bb8bdf3c4db7fde832619fef9828cf8", - "reference": "70dd18e93bb8bdf3c4db7fde832619fef9828cf8", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5370aaa7807c7a439b21386661ffccf3dff2866", + "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "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|~4.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.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\Debug\\": "" + "Symfony\\Component\\EventDispatcher\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -1231,54 +1166,55 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Debug Component", + "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2020-01-08T16:36:15+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" }, { - "name": "symfony/event-dispatcher", - "version": "v3.4.37", + "name": "symfony/event-dispatcher-contracts", + "version": "v1.1.7", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8" + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/79ede8f2836e5ec910ebb325bde40f987244baa8", - "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18", + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" - }, - "conflict": { - "symfony/dependency-injection": "<3.3" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.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.4-dev" + "dev-master": "1.1-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Symfony\\Contracts\\EventDispatcher\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1286,40 +1222,48 @@ ], "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": "2020-01-04T12:05:51+00:00" + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-09-17T09:54:03+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.37", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "0a0d3b4bda11aa3a0464531c40e681e184e75628" + "reference": "b27f491309db5757816db672b256ea2e03677d30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/0a0d3b4bda11aa3a0464531c40e681e184e75628", - "reference": "0a0d3b4bda11aa3a0464531c40e681e184e75628", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b27f491309db5757816db672b256ea2e03677d30", + "reference": "b27f491309db5757816db672b256ea2e03677d30", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": ">=7.1.3", "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1346,29 +1290,43 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2020-01-17T08:50:08+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.4.37", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "a90a9d3b9f458a5cdeabfa4090b20c000ca3962f" + "reference": "5729f943f9854c5781984ed4907bbb817735776b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/a90a9d3b9f458a5cdeabfa4090b20c000ca3962f", - "reference": "a90a9d3b9f458a5cdeabfa4090b20c000ca3962f", + "url": "https://api.github.com/repos/symfony/finder/zipball/5729f943f9854c5781984ed4907bbb817735776b", + "reference": "5729f943f9854c5781984ed4907bbb817735776b", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1395,20 +1353,34 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2020-01-01T11:03: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-03-27T16:54:36+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.13.1", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", "shasum": "" }, "require": { @@ -1420,7 +1392,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -1453,20 +1429,34 @@ "polyfill", "portable" ], - "time": "2019-11-27T13:56:44+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-06T08:46:27+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "7110338d81ce1cbc3e273136e4574663627037a7" }, "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/7110338d81ce1cbc3e273136e4574663627037a7", + "reference": "7110338d81ce1cbc3e273136e4574663627037a7", "shasum": "" }, "require": { @@ -1478,7 +1468,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -1512,29 +1506,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-06-06T08:46:27+00:00" + }, + { + "name": "symfony/polyfill-php73", + "version": "v1.17.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a", + "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-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-06-06T08:46:27+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.17.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2", + "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2", + "shasum": "" + }, + "require": { + "php": ">=7.0.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-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-06-06T08:46:27+00:00" }, { "name": "symfony/process", - "version": "v3.4.37", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "5b9d2bcffe4678911a4c941c00b7c161252cf09a" + "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/5b9d2bcffe4678911a4c941c00b7c161252cf09a", - "reference": "5b9d2bcffe4678911a4c941c00b7c161252cf09a", + "url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5", + "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1561,31 +1725,103 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2020-01-01T11:03: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-05-30T20:06:45+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v1.1.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf", + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "psr/container": "^1.0" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "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" + ], + "time": "2019-10-14T12:27:06+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.37", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "aa46bc2233097d5212332c907f9911533acfbf80" + "reference": "c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/aa46bc2233097d5212332c907f9911533acfbf80", - "reference": "aa46bc2233097d5212332c907f9911533acfbf80", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a", + "reference": "c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": ">=7.1.3", "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~3.4|~4.0" + "symfony/console": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -1593,7 +1829,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1620,7 +1856,21 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2020-01-13T08:00: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-05-20T08:37:50+00:00" } ], "aliases": [], @@ -1628,9 +1878,12 @@ "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "php": "^7.2" + }, "platform-dev": [], "platform-overrides": { - "php": "5.6" - } + "php": "7.2.0" + }, + "plugin-api-version": "1.1.0" } diff --git a/hook.php b/hook.php index b939ff7..d96ffcd 100644 --- a/hook.php +++ b/hook.php @@ -242,11 +242,13 @@ function plugin_airwatch_searchOptionsValues($type, $ID, $data, $num) { /***************** Install / uninstall functions **************/ function plugin_airwatch_install() { + $airwatch_dir = Plugin::getPhpDir('airwatch'); + $migration = new Migration(PLUGIN_AIRWATCH_VERSION); - include (GLPI_ROOT."/plugins/airwatch/inc/config.class.php"); - include (GLPI_ROOT."/plugins/airwatch/inc/airwatch.class.php"); - include (GLPI_ROOT."/plugins/airwatch/inc/detail.class.php"); - include (GLPI_ROOT."/plugins/airwatch/inc/compliance.class.php"); + include ($airwatch_dir."/inc/config.class.php"); + include ($airwatch_dir."/inc/airwatch.class.php"); + include ($airwatch_dir."/inc/detail.class.php"); + include ($airwatch_dir."/inc/compliance.class.php"); PluginairwatchConfig::install($migration); PluginAirwatchAirwatch::install($migration); PluginAirwatchDetail::install($migration); @@ -255,10 +257,12 @@ function plugin_airwatch_install() { } function plugin_airwatch_uninstall() { + $airwatch_dir = Plugin::getPhpDir('airwatch'); + $migration = new Migration(PLUGIN_AIRWATCH_VERSION); - include (GLPI_ROOT."/plugins/airwatch/inc/config.class.php"); - include (GLPI_ROOT."/plugins/airwatch/inc/detail.class.php"); - include (GLPI_ROOT."/plugins/airwatch/inc/compliance.class.php"); + include ($airwatch_dir."/inc/config.class.php"); + include ($airwatch_dir."/inc/detail.class.php"); + include ($airwatch_dir."/inc/compliance.class.php"); PluginairwatchConfig::uninstall($migration); PluginairwatchDetail::uninstall($migration); PluginAirwatchCompliance::uninstall($migration); diff --git a/inc/compliance.class.php b/inc/compliance.class.php index 6ee610f..5bee944 100644 --- a/inc/compliance.class.php +++ b/inc/compliance.class.php @@ -54,7 +54,7 @@ static function deleteForComputer($computers_id) { static function showForComputer(CommonDBTM $item) { $computers_id = $item->getID(); - $data = getAllDatasFromTable( + $data = getAllDataFromTable( 'glpi_plugin_airwatch_compliances', ['computers_id' => $computers_id] ); @@ -111,7 +111,7 @@ static function install(Migration $migration) { `computers_id` int(11) NOT NULL DEFAULT '0', `name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `is_compliant` tinyint(1) NOT NULL DEFAULT '0', - `date_last_check` datetime DEFAULT NULL, + `date_last_check` timestamp NULL DEFAULT NULL, PRIMARY KEY (`id`), KEY `computers_id` (`computers_id`), KEY `is_compliant` (`is_compliant`), diff --git a/inc/detail.class.php b/inc/detail.class.php index c6eefb3..31b89f9 100644 --- a/inc/detail.class.php +++ b/inc/detail.class.php @@ -431,13 +431,13 @@ public static function install(Migration $migration) { `imei` varchar(255) character set utf8 collate utf8_unicode_ci NOT NULL DEFAULT '', `simcard_serial` varchar(255) character set utf8 collate utf8_unicode_ci NOT NULL DEFAULT '', `phone_number` varchar(255) character set utf8 collate utf8_unicode_ci NOT NULL DEFAULT '', - `date_mod` datetime DEFAULT NULL, - `date_creation` datetime DEFAULT NULL, - `date_last_seen` datetime DEFAULT NULL, - `date_last_enrollment` datetime DEFAULT NULL, - `date_last_enrollment_check` datetime DEFAULT NULL, - `date_last_compliance_check` datetime DEFAULT NULL, - `date_last_compromised_check` datetime DEFAULT NULL, + `date_mod` timestamp NULL DEFAULT NULL, + `date_creation` timestamp NULL DEFAULT NULL, + `date_last_seen` timestamp NULL DEFAULT NULL, + `date_last_enrollment` timestamp NULL DEFAULT NULL, + `date_last_enrollment_check` timestamp NULL DEFAULT NULL, + `date_last_compliance_check` timestamp NULL DEFAULT NULL, + `date_last_compromised_check` timestamp NULL DEFAULT NULL, `is_enrolled` tinyint(1) NOT NULL DEFAULT '0', `is_compliant` tinyint(1) NOT NULL DEFAULT '-1', `is_compromised` tinyint(1) NOT NULL DEFAULT '-1', diff --git a/locales/airwatch.pot b/locales/airwatch.pot index d1249f8..8c6a671 100644 --- a/locales/airwatch.pot +++ b/locales/airwatch.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-06 14:44+0000\n" +"POT-Creation-Date: 2020-07-03 13:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,10 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: front/config.form.php:51 hook.php:38 hook.php:45 hook.php:52 hook.php:60 -#: hook.php:68 hook.php:76 hook.php:84 hook.php:92 hook.php:100 hook.php:108 -#: hook.php:116 hook.php:124 hook.php:133 hook.php:142 hook.php:151 -#: hook.php:160 hook.php:169 hook.php:180 hook.php:190 inc/detail.class.php:290 +#: hook.php:38 hook.php:45 hook.php:52 hook.php:60 hook.php:68 hook.php:76 +#: hook.php:84 hook.php:92 hook.php:100 hook.php:108 hook.php:116 hook.php:124 +#: hook.php:133 hook.php:142 hook.php:151 hook.php:160 hook.php:169 +#: hook.php:180 hook.php:190 front/config.form.php:51 inc/detail.class.php:290 msgid "Airwatch" msgstr "" @@ -92,8 +92,40 @@ msgstr "" msgid "Last check date" msgstr "" -#: inc/airwatch.class.php:65 -msgid "Import devices informations from Airwatch" +#: inc/detail.class.php:110 +msgid "General" +msgstr "" + +#: inc/detail.class.php:126 inc/detail.class.php:295 +msgid "Phone number" +msgstr "" + +#: inc/detail.class.php:140 +msgid "Data encryption enabled" +msgstr "" + +#: inc/detail.class.php:144 +msgid "Current SIM serial number" +msgstr "" + +#: inc/detail.class.php:160 +msgid "See device in Airwatch console" +msgstr "" + +#: inc/detail.class.php:164 +msgid "Enrollment process" +msgstr "" + +#: inc/detail.class.php:182 +msgid "Last enrollment check" +msgstr "" + +#: inc/detail.class.php:193 +msgid "Other status checks" +msgstr "" + +#: inc/detail.class.php:225 +msgid "Roaming" msgstr "" #: inc/config.class.php:40 setup.php:71 @@ -132,42 +164,10 @@ msgstr "" msgid "Skip SSL check" msgstr "" -#: inc/detail.class.php:110 -msgid "General" -msgstr "" - -#: inc/detail.class.php:126 inc/detail.class.php:295 -msgid "Phone number" -msgstr "" - -#: inc/detail.class.php:140 -msgid "Data encryption enabled" -msgstr "" - -#: inc/detail.class.php:144 -msgid "Current SIM serial number" -msgstr "" - -#: inc/detail.class.php:160 -msgid "See device in Airwatch console" -msgstr "" - -#: inc/detail.class.php:164 -msgid "Enrollment process" -msgstr "" - -#: inc/detail.class.php:182 -msgid "Last enrollment check" -msgstr "" - -#: inc/detail.class.php:193 -msgid "Other status checks" -msgstr "" - -#: inc/detail.class.php:225 -msgid "Roaming" -msgstr "" - #: inc/compliance.class.php:66 msgid "Compliance details" msgstr "" + +#: inc/airwatch.class.php:65 +msgid "Import devices informations from Airwatch" +msgstr "" diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index fa42469ac65077f4ef06c75317d7929b1102e370..edda5d660846868320daf7ee2f90cda0daeb3da3 100644 GIT binary patch delta 329 zcmXZXJ!%3`5Ww+ST~~JvvKra=5k*i?>;xft0KrBGAqTLs@&Xnj0h=^wEd;T$78Vqxw(rL5Y>2p)$b*Pj2@#Gwaux9zpRg0gub3qs zqyGQEG=58B`SgGNhxSCjl9CFZG$UziN@8n|V;T2x0h9mt z70&a%LHmD)bNGZ+e8U3%;3B4Tl8-BB@ok*N7B1mYPJLy$bO}u2CD!p8E%6>J_=4;B zjh2|rO98H78Jk$bW3-0PF@pmv;t*GHgv_dEw7ReP-El`B1U3nLp(S|J<3eS$Nn*6g v56}vnJPuOt>5X>Syyzso)3a{aN_w3}5V^>OE(+aFP>&mNTyw13Lof3OvwSAW diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index f853750..91eaf09 100644 --- a/locales/cs_CZ.po +++ b/locales/cs_CZ.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPi Plugin - Airwatch\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-06 14:44+0000\n" +"POT-Creation-Date: 2020-07-03 13:05+0000\n" "PO-Revision-Date: 2018-04-10 12:31+0000\n" "Last-Translator: Pavel Borecki \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-plugin-airwatch/language/cs_CZ/)\n" @@ -18,11 +18,10 @@ msgstr "" "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/config.form.php:51 hook.php:38 hook.php:45 hook.php:52 hook.php:60 -#: hook.php:68 hook.php:76 hook.php:84 hook.php:92 hook.php:100 hook.php:108 -#: hook.php:116 hook.php:124 hook.php:133 hook.php:142 hook.php:151 -#: hook.php:160 hook.php:169 hook.php:180 hook.php:190 -#: inc/detail.class.php:290 +#: hook.php:38 hook.php:45 hook.php:52 hook.php:60 hook.php:68 hook.php:76 +#: hook.php:84 hook.php:92 hook.php:100 hook.php:108 hook.php:116 hook.php:124 +#: hook.php:133 hook.php:142 hook.php:151 hook.php:160 hook.php:169 +#: hook.php:180 hook.php:190 front/config.form.php:51 inc/detail.class.php:290 msgid "Airwatch" msgstr "Airwatch" @@ -94,9 +93,41 @@ msgstr "Profil" msgid "Last check date" msgstr "Datum minulé kontroly" -#: inc/airwatch.class.php:65 -msgid "Import devices informations from Airwatch" -msgstr "Naimportovat informace o zařízeních z Airwatch" +#: inc/detail.class.php:110 +msgid "General" +msgstr "Obecné" + +#: inc/detail.class.php:126 inc/detail.class.php:295 +msgid "Phone number" +msgstr "Telefonní číslo" + +#: inc/detail.class.php:140 +msgid "Data encryption enabled" +msgstr "Šifrování dat zapnuto" + +#: inc/detail.class.php:144 +msgid "Current SIM serial number" +msgstr "Sériové číslo stávající SIM karty" + +#: inc/detail.class.php:160 +msgid "See device in Airwatch console" +msgstr "Zobrazit zařízení v konzoli Airwatch" + +#: inc/detail.class.php:164 +msgid "Enrollment process" +msgstr "Proces nasazení" + +#: inc/detail.class.php:182 +msgid "Last enrollment check" +msgstr "Minulá kontrola nasazení" + +#: inc/detail.class.php:193 +msgid "Other status checks" +msgstr "Ostatní kontroly stavu" + +#: inc/detail.class.php:225 +msgid "Roaming" +msgstr "Roaming" #: inc/config.class.php:40 setup.php:71 msgid "GLPi Airwatch Connector" @@ -134,42 +165,10 @@ msgstr "Klíč k API" msgid "Skip SSL check" msgstr "Přeskočit kontrolu SSL" -#: inc/detail.class.php:110 -msgid "General" -msgstr "Obecné" - -#: inc/detail.class.php:126 inc/detail.class.php:295 -msgid "Phone number" -msgstr "Telefonní číslo" - -#: inc/detail.class.php:140 -msgid "Data encryption enabled" -msgstr "Šifrování dat zapnuto" - -#: inc/detail.class.php:144 -msgid "Current SIM serial number" -msgstr "Sériové číslo stávající SIM karty" - -#: inc/detail.class.php:160 -msgid "See device in Airwatch console" -msgstr "Zobrazit zařízení v konzoli Airwatch" - -#: inc/detail.class.php:164 -msgid "Enrollment process" -msgstr "Proces nasazení" - -#: inc/detail.class.php:182 -msgid "Last enrollment check" -msgstr "Minulá kontrola nasazení" - -#: inc/detail.class.php:193 -msgid "Other status checks" -msgstr "Ostatní kontroly stavu" - -#: inc/detail.class.php:225 -msgid "Roaming" -msgstr "Roaming" - #: inc/compliance.class.php:66 msgid "Compliance details" msgstr "Podrobnosti o shodě" + +#: inc/airwatch.class.php:65 +msgid "Import devices informations from Airwatch" +msgstr "Naimportovat informace o zařízeních z Airwatch" diff --git a/locales/en_GB.mo b/locales/en_GB.mo index b8f5c24e2cb08896d043fdf13e9d226c79e6b366..467a24bf80d1b286ad2d63e3cf41e6d0112dc935 100644 GIT binary patch delta 329 zcmXZXJr4mv5P;!1ALs4}!W}^(loEwbL8(%T%74)4MM5DGzd)suTqltz6bgmrN*#@! zR_`4y+3b^@*_qj0cz1U{G-kdbk~KvVB64E0@PaM|n8aszeq)Za!KDHL1_r2&K3K-MEmFZ6de}vc4^Rh;ktK7sJg$*a x*`hwwN4a%*sK>K}0NPiPUO zzrZOR0>>7I28RZh8yosQb;t33xaYa|`MvL_Gj?aa#AuZe*-we2MdXVmgWu?2gjuvH z>bHvpJjNVeU>-YofH$~@Pgue+>b@!Jz8UJgMcn_$$mlP4L&2i4#UqSR2OZiXWjw_S zw$a5fu0Nv&OpsSzS&I0EjF5NKgRW5jTcchyiv6+A|AVYu!e}_CCv2bwwNP((jXLl) ut`Fuf$>mP1=UqOA{o&oiy?50ghRv#PeB&A4GiTL$&\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/teclib/glpi-plugin-airwatch/language/en_GB/)\n" @@ -18,11 +18,10 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: front/config.form.php:51 hook.php:38 hook.php:45 hook.php:52 hook.php:60 -#: hook.php:68 hook.php:76 hook.php:84 hook.php:92 hook.php:100 hook.php:108 -#: hook.php:116 hook.php:124 hook.php:133 hook.php:142 hook.php:151 -#: hook.php:160 hook.php:169 hook.php:180 hook.php:190 -#: inc/detail.class.php:290 +#: hook.php:38 hook.php:45 hook.php:52 hook.php:60 hook.php:68 hook.php:76 +#: hook.php:84 hook.php:92 hook.php:100 hook.php:108 hook.php:116 hook.php:124 +#: hook.php:133 hook.php:142 hook.php:151 hook.php:160 hook.php:169 +#: hook.php:180 hook.php:190 front/config.form.php:51 inc/detail.class.php:290 msgid "Airwatch" msgstr "Airwatch" @@ -94,9 +93,41 @@ msgstr "Profile" msgid "Last check date" msgstr "Last check date" -#: inc/airwatch.class.php:65 -msgid "Import devices informations from Airwatch" -msgstr "Import devices informations from Airwatch" +#: inc/detail.class.php:110 +msgid "General" +msgstr "General" + +#: inc/detail.class.php:126 inc/detail.class.php:295 +msgid "Phone number" +msgstr "Phone number" + +#: inc/detail.class.php:140 +msgid "Data encryption enabled" +msgstr "Data encryption enabled" + +#: inc/detail.class.php:144 +msgid "Current SIM serial number" +msgstr "Current SIM serial number" + +#: inc/detail.class.php:160 +msgid "See device in Airwatch console" +msgstr "See device in Airwatch console" + +#: inc/detail.class.php:164 +msgid "Enrollment process" +msgstr "Enrollment process" + +#: inc/detail.class.php:182 +msgid "Last enrollment check" +msgstr "Last enrollment check" + +#: inc/detail.class.php:193 +msgid "Other status checks" +msgstr "Other status checks" + +#: inc/detail.class.php:225 +msgid "Roaming" +msgstr "Roaming" #: inc/config.class.php:40 setup.php:71 msgid "GLPi Airwatch Connector" @@ -134,42 +165,10 @@ msgstr "API Key" msgid "Skip SSL check" msgstr "Skip SSL check" -#: inc/detail.class.php:110 -msgid "General" -msgstr "General" - -#: inc/detail.class.php:126 inc/detail.class.php:295 -msgid "Phone number" -msgstr "Phone number" - -#: inc/detail.class.php:140 -msgid "Data encryption enabled" -msgstr "Data encryption enabled" - -#: inc/detail.class.php:144 -msgid "Current SIM serial number" -msgstr "Current SIM serial number" - -#: inc/detail.class.php:160 -msgid "See device in Airwatch console" -msgstr "See device in Airwatch console" - -#: inc/detail.class.php:164 -msgid "Enrollment process" -msgstr "Enrollment process" - -#: inc/detail.class.php:182 -msgid "Last enrollment check" -msgstr "Last enrollment check" - -#: inc/detail.class.php:193 -msgid "Other status checks" -msgstr "Other status checks" - -#: inc/detail.class.php:225 -msgid "Roaming" -msgstr "Roaming" - #: inc/compliance.class.php:66 msgid "Compliance details" msgstr "Compliance details" + +#: inc/airwatch.class.php:65 +msgid "Import devices informations from Airwatch" +msgstr "Import devices informations from Airwatch" diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo index e3db53e1a11e47cb4dc58579fe1be5ef175edd3e..52e4ffe42f73b61562bb303fd01ee28a0741c171 100644 GIT binary patch delta 329 zcmXZXyAAoatw)t@q#71Vg{d>$FHYBkwM(RIQFoMLoA?; z7H+VH2UPtJRDCX1@D-MoM7Sh50$9W*R#7!fu!D0{1Gd=0ix<0CCeE^b68mW37}cN! x=Fmp<-WvI+O&>o9HEKR^Tv1gpO?BB`~jx_A36X4 delta 368 zcmXZXze_?<6u|LgsrjQ<3Zh~~uOJcS!tL?2aBxteC5OOCCkLS)q#%xglS9xyAoxd! z@1GDF8k(ZjRS=}T??vx$Klhx=IrrR6a+;boeWQg>Bo-8jh{(@@NC=mh!4)PjL^6eE zJBxTo+&~LksPPfgI6)idc!A$&>i^KxSz&r%CM+Z2EVpcatl|~kp(%Jpg<~`ic$mZG zF1DEZl(>S&*hU*)&^+{kNt~eRH$(m^3yk7d\n" "Language-Team: French (France) (http://www.transifex.com/teclib/glpi-plugin-airwatch/language/fr_FR/)\n" @@ -19,11 +19,10 @@ msgstr "" "Language: fr_FR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: front/config.form.php:51 hook.php:38 hook.php:45 hook.php:52 hook.php:60 -#: hook.php:68 hook.php:76 hook.php:84 hook.php:92 hook.php:100 hook.php:108 -#: hook.php:116 hook.php:124 hook.php:133 hook.php:142 hook.php:151 -#: hook.php:160 hook.php:169 hook.php:180 hook.php:190 -#: inc/detail.class.php:290 +#: hook.php:38 hook.php:45 hook.php:52 hook.php:60 hook.php:68 hook.php:76 +#: hook.php:84 hook.php:92 hook.php:100 hook.php:108 hook.php:116 hook.php:124 +#: hook.php:133 hook.php:142 hook.php:151 hook.php:160 hook.php:169 +#: hook.php:180 hook.php:190 front/config.form.php:51 inc/detail.class.php:290 msgid "Airwatch" msgstr "Airwatch" @@ -95,9 +94,41 @@ msgstr "Profil" msgid "Last check date" msgstr "Dernière vérification" -#: inc/airwatch.class.php:65 -msgid "Import devices informations from Airwatch" -msgstr "Import des matériels depuis Airwatch" +#: inc/detail.class.php:110 +msgid "General" +msgstr "Général" + +#: inc/detail.class.php:126 inc/detail.class.php:295 +msgid "Phone number" +msgstr "Numéro de téléphone" + +#: inc/detail.class.php:140 +msgid "Data encryption enabled" +msgstr "Chiffrement des données activé" + +#: inc/detail.class.php:144 +msgid "Current SIM serial number" +msgstr "Numéro de série de la carte SIM en utilisation" + +#: inc/detail.class.php:160 +msgid "See device in Airwatch console" +msgstr "Voir le matériel dans la console Airwatch" + +#: inc/detail.class.php:164 +msgid "Enrollment process" +msgstr "Processus d'enrôlement" + +#: inc/detail.class.php:182 +msgid "Last enrollment check" +msgstr "Dernière vérification de l'enrôlement" + +#: inc/detail.class.php:193 +msgid "Other status checks" +msgstr "Autres vérifications de statuts" + +#: inc/detail.class.php:225 +msgid "Roaming" +msgstr "Itinérance" #: inc/config.class.php:40 setup.php:71 msgid "GLPi Airwatch Connector" @@ -135,42 +166,10 @@ msgstr "Clef d'API" msgid "Skip SSL check" msgstr "Passer les vérifications SSL" -#: inc/detail.class.php:110 -msgid "General" -msgstr "Général" - -#: inc/detail.class.php:126 inc/detail.class.php:295 -msgid "Phone number" -msgstr "Numéro de téléphone" - -#: inc/detail.class.php:140 -msgid "Data encryption enabled" -msgstr "Chiffrement des données activé" - -#: inc/detail.class.php:144 -msgid "Current SIM serial number" -msgstr "Numéro de série de la carte SIM en utilisation" - -#: inc/detail.class.php:160 -msgid "See device in Airwatch console" -msgstr "Voir le matériel dans la console Airwatch" - -#: inc/detail.class.php:164 -msgid "Enrollment process" -msgstr "Processus d'enrôlement" - -#: inc/detail.class.php:182 -msgid "Last enrollment check" -msgstr "Dernière vérification de l'enrôlement" - -#: inc/detail.class.php:193 -msgid "Other status checks" -msgstr "Autres vérifications de statuts" - -#: inc/detail.class.php:225 -msgid "Roaming" -msgstr "Itinérance" - #: inc/compliance.class.php:66 msgid "Compliance details" msgstr "Détails de conformité" + +#: inc/airwatch.class.php:65 +msgid "Import devices informations from Airwatch" +msgstr "Import des matériels depuis Airwatch" diff --git a/locales/pt_PT.mo b/locales/pt_PT.mo index 4ba2da3bcf7ee5df8cdc1653ed5a4e6a929f7a21..7c9e344abf19528818edfb1b32ae4dc67a8cfab0 100644 GIT binary patch delta 329 zcmXZXt8M~O5XSKjSm<&Km!`{|8UzqlAxJ7Ph`s=-su&&tMT17ILy)vj&=497!8O4U zJc z#5Pv(6`yd36&$0Pn_~`t{Qn&mc%N)d6sEY+u<(Xmv`AwX^w7ltHqpZxZm@+XG{F+2 z%wQd#@deG^H#C9X(F7kMx5`6q(Ja=Hk`!Mw8u*PVJfKN<_ElWU@-Cve$X!i?`_Sqm H@^9S%VWc4G delta 368 zcmXZXu}gwM7{~F)QhQZGOM1;h6A8)k;Cy*4aB$K7070BwBpd?K2zLi3UHlW8+yfUk z2g8PD5!#|naH&6_zDM2idG5L6?)SXdTl=}@=`TGZ5x+=4MAmyE7JlFfZZL>Gnx`1S zW6YtAw;06+Ch-A}aEu9@pt-le7{33Xe_@=x6_CF8DAN4y#S1KWroZq^WcrhKE*4IEUqw&KWGw$Lw{!RkbN1= tMD^)#=WRDrQ{~52vv=R^s7kZfDyAImXr&#cuTy!q=(<;$HLd!;y}$hdDc=A9 diff --git a/locales/pt_PT.po b/locales/pt_PT.po index 88cd7f2..42209d0 100644 --- a/locales/pt_PT.po +++ b/locales/pt_PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPi Plugin - Airwatch\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-06 14:44+0000\n" +"POT-Creation-Date: 2020-07-03 13:05+0000\n" "PO-Revision-Date: 2019-03-01 10:57+0000\n" "Last-Translator: Rui Melo \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/teclib/glpi-plugin-airwatch/language/pt_PT/)\n" @@ -17,11 +17,10 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: front/config.form.php:51 hook.php:38 hook.php:45 hook.php:52 hook.php:60 -#: hook.php:68 hook.php:76 hook.php:84 hook.php:92 hook.php:100 hook.php:108 -#: hook.php:116 hook.php:124 hook.php:133 hook.php:142 hook.php:151 -#: hook.php:160 hook.php:169 hook.php:180 hook.php:190 -#: inc/detail.class.php:290 +#: hook.php:38 hook.php:45 hook.php:52 hook.php:60 hook.php:68 hook.php:76 +#: hook.php:84 hook.php:92 hook.php:100 hook.php:108 hook.php:116 hook.php:124 +#: hook.php:133 hook.php:142 hook.php:151 hook.php:160 hook.php:169 +#: hook.php:180 hook.php:190 front/config.form.php:51 inc/detail.class.php:290 msgid "Airwatch" msgstr "Airwatch" @@ -93,9 +92,41 @@ msgstr "Perfil" msgid "Last check date" msgstr "Última data de verificação" -#: inc/airwatch.class.php:65 -msgid "Import devices informations from Airwatch" -msgstr "Informações sobre a importação de dispositivos do Airwatch" +#: inc/detail.class.php:110 +msgid "General" +msgstr "Geral" + +#: inc/detail.class.php:126 inc/detail.class.php:295 +msgid "Phone number" +msgstr "Número de Telemóvel" + +#: inc/detail.class.php:140 +msgid "Data encryption enabled" +msgstr "Criptografia de dados ativada" + +#: inc/detail.class.php:144 +msgid "Current SIM serial number" +msgstr "Número de série atual do SIM" + +#: inc/detail.class.php:160 +msgid "See device in Airwatch console" +msgstr "Veja o dispositivo no console do Airwatch" + +#: inc/detail.class.php:164 +msgid "Enrollment process" +msgstr "Processo de inscrição" + +#: inc/detail.class.php:182 +msgid "Last enrollment check" +msgstr "Última verificação de inscrição" + +#: inc/detail.class.php:193 +msgid "Other status checks" +msgstr "Outras verificações de status" + +#: inc/detail.class.php:225 +msgid "Roaming" +msgstr "Roaming" #: inc/config.class.php:40 setup.php:71 msgid "GLPi Airwatch Connector" @@ -133,42 +164,10 @@ msgstr "Chave API" msgid "Skip SSL check" msgstr "Ignorar verificação SSL" -#: inc/detail.class.php:110 -msgid "General" -msgstr "Geral" - -#: inc/detail.class.php:126 inc/detail.class.php:295 -msgid "Phone number" -msgstr "Número de Telemóvel" - -#: inc/detail.class.php:140 -msgid "Data encryption enabled" -msgstr "Criptografia de dados ativada" - -#: inc/detail.class.php:144 -msgid "Current SIM serial number" -msgstr "Número de série atual do SIM" - -#: inc/detail.class.php:160 -msgid "See device in Airwatch console" -msgstr "Veja o dispositivo no console do Airwatch" - -#: inc/detail.class.php:164 -msgid "Enrollment process" -msgstr "Processo de inscrição" - -#: inc/detail.class.php:182 -msgid "Last enrollment check" -msgstr "Última verificação de inscrição" - -#: inc/detail.class.php:193 -msgid "Other status checks" -msgstr "Outras verificações de status" - -#: inc/detail.class.php:225 -msgid "Roaming" -msgstr "Roaming" - #: inc/compliance.class.php:66 msgid "Compliance details" msgstr "Detalhes de conformidade" + +#: inc/airwatch.class.php:65 +msgid "Import devices informations from Airwatch" +msgstr "Informações sobre a importação de dispositivos do Airwatch" diff --git a/setup.php b/setup.php index 4c2bb2b..fbb108f 100644 --- a/setup.php +++ b/setup.php @@ -32,12 +32,12 @@ define ('AIRWATCH_API_RESULT_OK', 'ok'); define ('AIRWATCH_API_RESULT_ERROR', 'ko'); define ('AIRWATCH_USER_AGENT', 'Airwatch-Connector-1.1'); -define ('PLUGIN_AIRWATCH_VERSION', '1.4.1'); +define ('PLUGIN_AIRWATCH_VERSION', '1.5.0'); // Minimal GLPI version, inclusive -define('PLUGIN_AIRWATCH_MIN_GLPI', '9.2'); +define('PLUGIN_AIRWATCH_MIN_GLPI', '9.5'); // Maximum GLPI version, exclusive -define('PLUGIN_AIRWATCH_MAX_GLPI', '9.5'); +define('PLUGIN_AIRWATCH_MAX_GLPI', '9.6'); function plugin_init_airwatch() { global $PLUGIN_HOOKS,$CFG_GLPI,$LANG; @@ -91,42 +91,3 @@ function plugin_version_airwatch() { ] ]; } - -function plugin_airwatch_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_AIRWATCH_MIN_GLPI, '>='); - $matchMaxGlpiReq = version_compare($version, PLUGIN_AIRWATCH_MAX_GLPI, '<'); - - if (!$matchMinGlpiReq || !$matchMaxGlpiReq) { - echo vsprintf( - 'This plugin requires GLPI >= %1$s and < %2$s.', - [ - PLUGIN_AIRWATCH_MIN_GLPI, - PLUGIN_AIRWATCH_MAX_GLPI, - ] - ); - return false; - } - - if (!function_exists('curl_init')) { - echo "cURL extension (PHP) is required."; - return false; - } - - $plugin = new Plugin(); - if (!$plugin->isActivated('fusioninventory')) { - echo "Fusioninventory plugin must be enabled"; - return false; - } - } - - return true; -} - -function plugin_airwatch_check_config() { - - return true; -}