diff --git a/.travis.yml b/.travis.yml index f2963c9..972e75d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: php php: - - 5.5 - 5.6 - 7.0 - 7.1 + - 7.2 - nightly #env: diff --git a/.tx/config b/.tx/config index e2f91f5..888ac0a 100644 --- a/.tx/config +++ b/.tx/config @@ -1,9 +1,8 @@ [main] host = https://www.transifex.com -[glpi-plugin-uninstall.uninstall-230pot] +[glpi-plugin-uninstall.uninstall-pot] file_filter = locales/.po source_file = locales/uninstall.pot source_lang = en -minimum_perc: 100 - +type = PO diff --git a/ajax/dropdownReplaceFindDevice.php b/ajax/dropdownReplaceFindDevice.php index 1b931c0..f664518 100644 --- a/ajax/dropdownReplaceFindDevice.php +++ b/ajax/dropdownReplaceFindDevice.php @@ -35,9 +35,9 @@ $itemtypeisplugin = isPluginItemType($_REQUEST['itemtype']); $item = new $_REQUEST['itemtype'](); $table = getTableForItemType($_REQUEST['itemtype']); -$options = array(); +$options = []; $count = 0; -$datastoadd = array(); +$datastoadd = []; $displaywith = false; if (isset($_REQUEST['displaywith'])) { @@ -122,12 +122,12 @@ || (strlen($outputval) == 0)) { $outputval = sprintf(__('%1$s (%2$s)'), $outputval, $ID); } - array_push($options, array('id' => $ID, - 'text' => $outputval, - 'title' => $title)); + array_push($options, ['id' => $ID, + 'text' => $outputval, + 'title' => $title]); $count++; } -echo json_encode(array('results' => $options, - 'count' => $count)); +echo json_encode(['results' => $options, + 'count' => $count]); diff --git a/ajax/groups.php b/ajax/groups.php index 8662e5a..6a24e68 100644 --- a/ajax/groups.php +++ b/ajax/groups.php @@ -40,10 +40,10 @@ break; case 'set' : - Group::dropdown(array('value' => $_POST["groups_id"], - 'entity' => $_POST["entities_id"], - 'entity_sons' => $_POST["entity_sons"], - 'emptylabel' => __('None'))); + Group::dropdown(['value' => $_POST["groups_id"], + 'entity' => $_POST["entities_id"], + 'entity_sons' => $_POST["entity_sons"], + 'emptylabel' => __('None')]); break; } } diff --git a/ajax/locations.php b/ajax/locations.php index 831d4cd..4127418 100644 --- a/ajax/locations.php +++ b/ajax/locations.php @@ -37,9 +37,9 @@ $location = PluginUninstallPreference::getLocationByUserByEntity($_POST["users_id"], $_POST["templates_id"], $_POST["entity"]); - Location::dropdown(array('value' => ($location == '' ? 0 : $location), - 'comments' => 1, - 'entity' => $_POST["entity"], - 'toadd' => array(-1 => __('Keep previous location', 'uninstall'), - 0 => __('Empty location', 'uninstall')))); + Location::dropdown(['value' => ($location == '' ? 0 : $location), + 'comments' => 1, + 'entity' => $_POST["entity"], + 'toadd' => [-1 => __('Keep previous location', 'uninstall'), + 0 => __('Empty location', 'uninstall')]]); } diff --git a/composer.json b/composer.json index 1ac36cb..e21ea28 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,10 @@ { - "minimum-stability": "dev", - "prefer-stable": true, "require-dev": { - "glpi-project/tools": "^0.1.0" + "glpi-project/tools": "^0.1" + }, + "config": { + "platform": { + "php": "5.6" + } } } diff --git a/composer.lock b/composer.lock index df8bdc9..148885b 100644 --- a/composer.lock +++ b/composer.lock @@ -1,38 +1,38 @@ { "_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": "8a6db7f45e083d6f582cc8949facfebb", + "content-hash": "1780e587040d1a21844800dc378c2f2e", "packages": [], "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "2.4.0", + "version": "2.8.4", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "80afffd362bd1cf83bef60db690a8c50d8390803" + "reference": "651541a0b68318a2a202bda558a676e5ad92223c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/80afffd362bd1cf83bef60db690a8c50d8390803", - "reference": "80afffd362bd1cf83bef60db690a8c50d8390803", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/651541a0b68318a2a202bda558a676e5ad92223c", + "reference": "651541a0b68318a2a202bda558a676e5ad92223c", "shasum": "" }, "require": { - "consolidation/output-formatters": "^3.1.5", + "consolidation/output-formatters": "^3.1.12", "php": ">=5.4.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", - "psr/log": "~1", - "symfony/console": "^2.8|~3", - "symfony/event-dispatcher": "^2.5|~3", - "symfony/finder": "^2.5|~3" + "psr/log": "^1", + "symfony/console": "^2.8|^3|^4", + "symfony/event-dispatcher": "^2.5|^3|^4", + "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "phpunit/phpunit": "4.*", - "satooshi/php-coveralls": "^1.0", + "g1a/composer-test-scenarios": "^2", + "phpunit/phpunit": "^6", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7" }, "type": "library", @@ -57,29 +57,85 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2017-02-04T06:13:54+00:00" + "time": "2018-05-25T18:04:25+00:00" + }, + { + "name": "consolidation/config", + "version": "1.0.11", + "source": { + "type": "git", + "url": "https://github.com/consolidation/config.git", + "reference": "ede41d946078e97e7a9513aadc3352f1c26817af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/consolidation/config/zipball/ede41d946078e97e7a9513aadc3352f1c26817af", + "reference": "ede41d946078e97e7a9513aadc3352f1c26817af", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^1.1.0", + "grasmash/expander": "^1", + "php": ">=5.4.0" + }, + "require-dev": { + "g1a/composer-test-scenarios": "^1", + "phpunit/phpunit": "^4", + "satooshi/php-coveralls": "^1.0", + "squizlabs/php_codesniffer": "2.*", + "symfony/console": "^2.5|^3|^4", + "symfony/yaml": "^2.8.11|^3|^4" + }, + "suggest": { + "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Consolidation\\Config\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Greg Anderson", + "email": "greg.1.anderson@greenknowe.org" + } + ], + "description": "Provide configuration services for a commandline tool.", + "time": "2018-05-27T01:17:02+00:00" }, { "name": "consolidation/log", - "version": "1.0.3", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "74ba81b4edc585616747cc5c5309ce56fec41254" + "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/74ba81b4edc585616747cc5c5309ce56fec41254", - "reference": "74ba81b4edc585616747cc5c5309ce56fec41254", + "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395", + "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395", "shasum": "" }, "require": { "php": ">=5.5.0", "psr/log": "~1.0", - "symfony/console": "~2.5|~3.0" + "symfony/console": "^2.8|^3|^4" }, "require-dev": { + "g1a/composer-test-scenarios": "^1", "phpunit/phpunit": "4.*", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "2.*" }, "type": "library", @@ -104,37 +160,43 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2016-03-23T23:46:42+00:00" + "time": "2018-05-25T18:14:39+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.1.7", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "da39a0f14d5aaaee06732bb7cef2aea1de056b40" + "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/da39a0f14d5aaaee06732bb7cef2aea1de056b40", - "reference": "da39a0f14d5aaaee06732bb7cef2aea1de056b40", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", + "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", "shasum": "" }, "require": { "php": ">=5.4.0", - "symfony/console": "~2.5|~3.0", - "symfony/finder": "~2.5|~3.0" + "symfony/console": "^2.8|^3|^4", + "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "phpunit/phpunit": "4.*", - "satooshi/php-coveralls": "^1.0", - "squizlabs/php_codesniffer": "2.*", + "g1a/composer-test-scenarios": "^2", + "phpunit/phpunit": "^5.7.27", + "satooshi/php-coveralls": "^2", + "squizlabs/php_codesniffer": "^2.7", + "symfony/console": "3.2.3", + "symfony/var-dumper": "^2.8|^3|^4", "victorjonsson/markdowndocs": "^1.3" }, + "suggest": { + "symfony/var-dumper": "For using the var_dump formatter" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { @@ -153,52 +215,57 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2017-01-21T06:26:40+00:00" + "time": "2018-05-25T18:02:34+00:00" }, { "name": "consolidation/robo", - "version": "dev-master", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "cdc15c0059a1b2d5287910df678e8a73cbaa8ed6" + "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/cdc15c0059a1b2d5287910df678e8a73cbaa8ed6", - "reference": "cdc15c0059a1b2d5287910df678e8a73cbaa8ed6", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/ac563abfadf7cb7314b4e152f2b5033a6c255f6f", + "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.2", + "consolidation/annotated-command": "^2.8.2", + "consolidation/config": "^1.0.10", "consolidation/log": "~1", - "consolidation/output-formatters": "^3.1.5", + "consolidation/output-formatters": "^3.1.13", + "grasmash/yaml-expander": "^1.3", "league/container": "^2.2", "php": ">=5.5.0", - "symfony/console": "~2.8|~3.0", - "symfony/event-dispatcher": "~2.5|~3.0", - "symfony/filesystem": "~2.5|~3.0", - "symfony/finder": "~2.5|~3.0", - "symfony/process": "~2.5|~3.0" + "symfony/console": "^2.8|^3|^4", + "symfony/event-dispatcher": "^2.5|^3|^4", + "symfony/filesystem": "^2.5|^3|^4", + "symfony/finder": "^2.5|^3|^4", + "symfony/process": "^2.5|^3|^4" }, "replace": { "codegyre/robo": "< 1.0" }, "require-dev": { - "codeception/aspect-mock": "~1", - "codeception/base": "^2.2.6", + "codeception/aspect-mock": "^1|^2.1.1", + "codeception/base": "^2.3.7", "codeception/verify": "^0.3.2", - "henrikbjorn/lurker": "~1", - "natxet/cssmin": "~3", + "g1a/composer-test-scenarios": "^2", + "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", "pear/archive_tar": "^1.4.2", "phpunit/php-code-coverage": "~2|~4", - "satooshi/php-coveralls": "~1", - "squizlabs/php_codesniffer": "~2" + "satooshi/php-coveralls": "^2", + "squizlabs/php_codesniffer": "^2.8" }, "suggest": { "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch", - "natxet/CssMin": "For minifying JS files in taskMinify", + "natxet/CssMin": "For minifying CSS files in taskMinify", "patchwork/jsqueeze": "For minifying JS files in taskMinify", "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively." }, @@ -208,13 +275,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "1.x-dev", + "dev-state": "1.x-dev" } }, "autoload": { - "classmap": [ - "scripts/composer/ScriptHandler.php" - ], "psr-4": { "Robo\\": "src" } @@ -230,22 +295,25 @@ } ], "description": "Modern task runner", - "time": "2017-02-08T01:45:50+00:00" + "time": "2018-05-27T01:42:53+00:00" }, { "name": "container-interop/container-interop", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/container-interop/container-interop.git", - "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e" + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e", - "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e", + "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", "shasum": "" }, + "require": { + "psr/container": "^1.0" + }, "type": "library", "autoload": { "psr-4": { @@ -257,34 +325,94 @@ "MIT" ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", - "time": "2014-12-30T15:22:37+00:00" + "homepage": "https://github.com/container-interop/container-interop", + "time": "2017-02-14T19:40:03+00:00" + }, + { + "name": "dflydev/dot-access-data", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/dflydev/dflydev-dot-access-data.git", + "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a", + "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Dflydev\\DotAccessData": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dragonfly Development Inc.", + "email": "info@dflydev.com", + "homepage": "http://dflydev.com" + }, + { + "name": "Beau Simensen", + "email": "beau@dflydev.com", + "homepage": "http://beausimensen.com" + }, + { + "name": "Carlos Frutos", + "email": "carlos@kiwing.it", + "homepage": "https://github.com/cfrutos" + } + ], + "description": "Given a deep data structure, access data by dot notation.", + "homepage": "https://github.com/dflydev/dflydev-dot-access-data", + "keywords": [ + "access", + "data", + "dot", + "notation" + ], + "time": "2017-01-20T21:14:22+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" } ], @@ -294,27 +422,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.1", + "version": "0.1.5", "source": { "type": "git", "url": "https://github.com/glpi-project/tools.git", - "reference": "89083f6e71fac05190c7cc76a9c5afd8b1f421ef" + "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/tools/zipball/89083f6e71fac05190c7cc76a9c5afd8b1f421ef", - "reference": "89083f6e71fac05190c7cc76a9c5afd8b1f421ef", + "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", @@ -329,13 +457,13 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPLv3" + "GPL-3.0-or-later" ], "authors": [ { "name": "Teclib'", "email": "glpi@teclib.com", - "homepage": "https://teclib.com" + "homepage": "http://teclib-group.com" } ], "description": "Various tools for GLPI and its plugins", @@ -344,28 +472,124 @@ "plugins", "tools" ], - "time": "2017-02-08T08:20:09+00:00" + "time": "2018-06-21T11:59:33+00:00" + }, + { + "name": "grasmash/expander", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/grasmash/expander.git", + "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f", + "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^1.1.0", + "php": ">=5.4" + }, + "require-dev": { + "greg-1-anderson/composer-test-scenarios": "^1", + "phpunit/phpunit": "^4|^5.5.4", + "satooshi/php-coveralls": "^1.0.2|dev-master", + "squizlabs/php_codesniffer": "^2.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Grasmash\\Expander\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthew Grasmick" + } + ], + "description": "Expands internal property references in PHP arrays file.", + "time": "2017-12-21T22:14:55+00:00" + }, + { + "name": "grasmash/yaml-expander", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/grasmash/yaml-expander.git", + "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1", + "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^1.1.0", + "php": ">=5.4", + "symfony/yaml": "^2.8.11|^3|^4" + }, + "require-dev": { + "greg-1-anderson/composer-test-scenarios": "^1", + "phpunit/phpunit": "^4.8|^5.5.4", + "satooshi/php-coveralls": "^1.0.2|dev-master", + "squizlabs/php_codesniffer": "^2.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Grasmash\\YamlExpander\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthew Grasmick" + } + ], + "description": "Expands internal property references in a yaml file.", + "time": "2017-12-16T16:06:03+00:00" }, { "name": "league/container", - "version": "2.2.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/thephpleague/container.git", - "reference": "c0e7d947b690891f700dc4967ead7bdb3d6708c1" + "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/container/zipball/c0e7d947b690891f700dc4967ead7bdb3d6708c1", - "reference": "c0e7d947b690891f700dc4967ead7bdb3d6708c1", + "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0", + "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.1", - "php": ">=5.4.0" + "container-interop/container-interop": "^1.2", + "php": "^5.4.0 || ^7.0" }, "provide": { - "container-interop/container-interop-implementation": "^1.1" + "container-interop/container-interop-implementation": "^1.2", + "psr/container-implementation": "^1.0" }, "replace": { "orno/di": "~2.0" @@ -376,7 +600,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev", + "dev-2.x": "2.x-dev", "dev-1.x": "1.x-dev" } }, @@ -408,20 +632,20 @@ "provider", "service" ], - "time": "2016-03-17T11:07:59+00:00" + "time": "2017-05-10T09:20:27+00:00" }, { "name": "natxet/CssMin", - "version": "v3.0.4", + "version": "v3.0.6", "source": { "type": "git", "url": "https://github.com/natxet/CssMin.git", - "reference": "92de3fe3ccb4f8298d31952490ef7d5395855c39" + "reference": "d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/natxet/CssMin/zipball/92de3fe3ccb4f8298d31952490ef7d5395855c39", - "reference": "92de3fe3ccb4f8298d31952490ef7d5395855c39", + "url": "https://api.github.com/repos/natxet/CssMin/zipball/d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd", + "reference": "d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd", "shasum": "" }, "require": { @@ -455,7 +679,7 @@ "css", "minify" ], - "time": "2015-09-25T11:13:11+00:00" + "time": "2018-01-09T11:15:01+00:00" }, { "name": "patchwork/jsqueeze", @@ -500,24 +724,21 @@ "time": "2015-03-25T10:11:08+00:00" }, { - "name": "phpdocumentor/reflection-common", - "version": "1.0", + "name": "psr/container", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", "shasum": "" }, "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" + "php": ">=5.3.0" }, "type": "library", "extra": { @@ -527,9 +748,7 @@ }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] + "Psr\\Container\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -538,112 +757,20 @@ ], "authors": [ { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2015-12-27T11:43:31+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", - "webmozart/assert": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30T07:12:33+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "0.2.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" ], - "time": "2016-11-25T06:54:22+00:00" + "time": "2017-02-14T16:28:37+00:00" }, { "name": "psr/log", @@ -694,64 +821,37 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.8.0", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "86dd55a522238211f9f3631e3361703578941d9a" + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/86dd55a522238211f9f3631e3361703578941d9a", - "reference": "86dd55a522238211f9f3631e3361703578941d9a", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266", + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266", "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" @@ -768,43 +868,49 @@ "phpcs", "standards" ], - "time": "2017-02-02T03:30:00+00:00" + "time": "2018-06-06T23:58:19+00:00" }, { "name": "symfony/console", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936" + "reference": "1b97071a26d028c9bd4588264e101e14f6e7cd00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/7a8405a9fc175f87fed8a3c40856b0d866d61936", - "reference": "7a8405a9fc175f87fed8a3c40856b0d866d61936", + "url": "https://api.github.com/repos/symfony/console/zipball/1b97071a26d028c9bd4588264e101e14f6e7cd00", + "reference": "1b97071a26d028c9bd4588264e101e14f6e7cd00", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/debug": "~2.8|~3.0", + "php": "^5.5.9|>=7.0.8", + "symfony/debug": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" + }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/filesystem": "~2.8|~3.0", - "symfony/process": "~2.8|~3.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" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", - "symfony/filesystem": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -831,37 +937,36 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-02-06T12:04:21+00:00" + "time": "2018-05-23T05:02:55+00:00" }, { "name": "symfony/debug", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477" + "reference": "47e6788c5b151cf0cfdf3329116bf33800632d75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/b4d9818f127c60ce21ed62c395da7df868dc8477", - "reference": "b4d9818f127c60ce21ed62c395da7df868dc8477", + "url": "https://api.github.com/repos/symfony/debug/zipball/47e6788c5b151cf0cfdf3329116bf33800632d75", + "reference": "47e6788c5b151cf0cfdf3329116bf33800632d75", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "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/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -888,31 +993,34 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-01-28T02:37:08+00:00" + "time": "2018-06-25T11:10:40+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6" + "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9137eb3a3328e413212826d63eeeb0217836e2b6", - "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8", + "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8", "shasum": "" }, "require": { - "php": ">=5.5.9" + "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", - "symfony/dependency-injection": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.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" }, "suggest": { "symfony/dependency-injection": "", @@ -921,7 +1029,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -948,29 +1056,30 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:32:22+00:00" + "time": "2018-04-06T07:35:25+00:00" }, { "name": "symfony/filesystem", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "a0c6ef2dc78d33b58d91d3a49f49797a184d06f4" + "reference": "8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/a0c6ef2dc78d33b58d91d3a49f49797a184d06f4", - "reference": "a0c6ef2dc78d33b58d91d3a49f49797a184d06f4", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed", + "reference": "8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -997,29 +1106,29 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-01-08T20:47:33+00:00" + "time": "2018-06-21T11:10:19+00:00" }, { "name": "symfony/finder", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "8c71141cae8e2957946b403cc71a67213c0380d6" + "reference": "3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6", - "reference": "8c71141cae8e2957946b403cc71a67213c0380d6", + "url": "https://api.github.com/repos/symfony/finder/zipball/3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394", + "reference": "3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1046,20 +1155,75 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:32:22+00:00" + "time": "2018-06-19T20:52:10+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2018-04-30T19:57:29+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.3.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" + "reference": "3296adf6a6454a050679cde90f95350ad604b171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -1071,7 +1235,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -1105,29 +1269,29 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/process", - "version": "v3.2.3", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "32646a7cf53f3956c76dcb5c82555224ae321858" + "reference": "acc5a37c706ace827962851b69705b24e71ca17c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/32646a7cf53f3956c76dcb5c82555224ae321858", - "reference": "32646a7cf53f3956c76dcb5c82555224ae321858", + "url": "https://api.github.com/repos/symfony/process/zipball/acc5a37c706ace827962851b69705b24e71ca17c", + "reference": "acc5a37c706ace827962851b69705b24e71ca17c", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1154,39 +1318,48 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-02-03T12:11:38+00:00" + "time": "2018-05-30T04:24:30+00:00" }, { - "name": "webmozart/assert", - "version": "1.2.0", + "name": "symfony/yaml", + "version": "v3.4.12", "source": { "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" + "url": "https://github.com/symfony/yaml.git", + "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", + "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/console": "<3.4" }, "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" + "symfony/console": "~3.4|~4.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { "psr-4": { - "Webmozart\\Assert\\": "src/" - } + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1194,24 +1367,27 @@ ], "authors": [ { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2016-11-23T20:04:58+00:00" + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2018-05-03T23:18:14+00:00" } ], "aliases": [], - "minimum-stability": "dev", + "minimum-stability": "stable", "stability-flags": [], - "prefer-stable": true, + "prefer-stable": false, "prefer-lowest": false, "platform": [], - "platform-dev": [] + "platform-dev": [], + "platform-overrides": { + "php": "5.6" + } } diff --git a/front/action.php b/front/action.php index 035c945..70af20c 100644 --- a/front/action.php +++ b/front/action.php @@ -71,14 +71,14 @@ //Massive uninstallation PluginUninstallUninstall::uninstall($_REQUEST["device_type"], $_REQUEST["model_id"], - array($_REQUEST["device_type"] - => array($_REQUEST["id"] => $_REQUEST["id"])), + [$_REQUEST["device_type"] + => [$_REQUEST["id"] => $_REQUEST["id"]]], $location); Html::back(); } else { PluginUninstallReplace::showForm($_REQUEST["device_type"], $_REQUEST["model_id"], - array($_REQUEST["device_type"] - => array($_REQUEST["id"] => $_REQUEST["id"])), + [$_REQUEST["device_type"] + => [$_REQUEST["id"] => $_REQUEST["id"]]], $location); Html::footer(); } diff --git a/hook.php b/hook.php index aa5c874..c8b029a 100644 --- a/hook.php +++ b/hook.php @@ -47,7 +47,7 @@ function plugin_uninstall_MassiveActions($type) { } if (in_array($type, $UNINSTALL_TYPES)) { - return array("PluginUninstallUninstall:uninstall" => __("Uninstall", 'uninstall')); + return ["PluginUninstallUninstall:uninstall" => __("Uninstall", 'uninstall')]; } return []; } diff --git a/inc/model.class.php b/inc/model.class.php index f742016..de0d503 100644 --- a/inc/model.class.php +++ b/inc/model.class.php @@ -38,7 +38,7 @@ class PluginUninstallModel extends CommonDBTM { const TYPE_MODEL_UNINSTALL = 1; const TYPE_MODEL_REPLACEMENT = 2; - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { return __("Uninstallation template", 'uninstall'); } @@ -103,13 +103,13 @@ function prepareInputForUpdate($input) { * @param $name select name (default 'types_id') * @param $value default value (default '') **/ - static function dropdownType($name='types_id', $value='') { + static function dropdownType($name = 'types_id', $value = '') { $values[1] = __('Uninstallation', 'uninstall'); if (self::canReplace()) { $values[2] = __('Replacement', 'uninstall'); } - Dropdown::showFromArray($name, $values, array('value' => $value)); + Dropdown::showFromArray($name, $values, ['value' => $value]); } @@ -134,17 +134,17 @@ static function getReplacementMethods() { * @param $name select name * @param $value default value (default '') **/ - static function dropdownMethodReplacement($name, $value='') { + static function dropdownMethodReplacement($name, $value = '') { Dropdown::showFromArray($name, self::getReplacementMethods(), - array('value' => $value)); + ['value' => $value]); } /** * @param $value (default 0) **/ - static function getMethodReplacement($value=0) { + static function getMethodReplacement($value = 0) { $values = self::getReplacementMethods(); if (isset($values[$value])) { @@ -156,7 +156,7 @@ static function getMethodReplacement($value=0) { /** * Définition du nom de l'onglet **/ - function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { + function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { switch ($item->getType()) { case 'Preference' : @@ -174,7 +174,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { /** * Définition du contenu de l'onglet **/ - static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) { switch ($item->getType()) { case __CLASS__ : switch ($tabnum) { @@ -189,14 +189,14 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtempl return true; } - function defineTabs($options=[]) { + function defineTabs($options = []) { $ong = []; $this->addStandardTab(__CLASS__, $ong, $options); $this->addStandardTab('Log', $ong, $options); return $ong; } - function showForm($ID, $options=[]) { + function showForm($ID, $options = []) { global $DB, $CFG_GLPI; $this->initForm($ID, $options); @@ -225,8 +225,8 @@ function showForm($ID, $options=[]) { } else { $value = $this->fields["transfers_id"]; } - Transfer::dropdown(array('value' => $value, - 'display_emptychoice' => false)); + Transfer::dropdown(['value' => $value, + 'display_emptychoice' => false]); } else { echo ""; echo ""; @@ -240,8 +240,8 @@ function showForm($ID, $options=[]) { echo "" . __('New status of the computer', 'uninstall') .""; echo ""; - State::dropdown(array('value' => $this->fields['states_id'], - 'emptylabel' => __('None'))); + State::dropdown(['value' => $this->fields['states_id'], + 'emptylabel' => __('None')]); echo ""; echo ""; @@ -265,10 +265,10 @@ function showForm($ID, $options=[]) { echo "" . __('New group', 'uninstall') . ""; echo ""; if ($this->fields['groups_id'] != -1) { - Group::dropdown(array('value' => $this->fields["groups_id"], - 'entity' => $this->fields["entities_id"], - 'entity_sons' => $entities, - 'emptylabel' => __('None'))); + Group::dropdown(['value' => $this->fields["groups_id"], + 'entity' => $this->fields["entities_id"], + 'entity_sons' => $entities, + 'emptylabel' => __('None')]); } else { echo Dropdown::EMPTY_VALUE; } @@ -374,6 +374,14 @@ function showPartFormUninstall() { (isset($this->fields["raz_budget"]) ? $this->fields["raz_budget"] : 0)); echo ""; + + echo ""; + echo "" .sprintf(__('%1$s %2$s'), __('Blank'), __('Antivirus')) . ""; + echo ""; + Dropdown::showYesNo("raz_antivirus", + (isset($this->fields["raz_antivirus"]) + ? $this->fields["raz_antivirus"] : 1)); + echo ""; } function showPartFormRemplacement() { @@ -387,7 +395,7 @@ function showPartFormRemplacement() { Dropdown::showYesNo("replace_name", (isset($this->fields["replace_name"]) ? $this->fields["replace_name"]: 1), - -1, array('width' => '100%')); + -1, ['width' => '100%']); echo ""; echo "" .sprintf(__('%1$s %2$s'), __('Copy'), __('Serial number')) . ""; Dropdown::showYesNo("replace_serial", @@ -400,7 +408,7 @@ function showPartFormRemplacement() { Dropdown::showYesNo("replace_otherserial", (isset($this->fields["replace_otherserial"]) ? $this->fields["replace_otherserial"]: 1), - -1, array('width' => '100%')); + -1, ['width' => '100%']); echo ""; echo "".__('Overwrite informations (from old item to the new)', 'uninstall').""; echo ""; @@ -439,7 +447,7 @@ function showPartFormRemplacement() { Dropdown::showYesNo("replace_documents", (isset($this->fields["replace_documents"]) ? $this->fields["replace_documents"] : 1), - -1, array('width' => '100%')); + -1, ['width' => '100%']); echo ""; echo "".sprintf(__('%1$s %2$s'), __('Copy'), _n('Contract', 'Contracts', 2)).""; echo ""; @@ -455,7 +463,7 @@ function showPartFormRemplacement() { Dropdown::showYesNo("replace_infocoms", (isset($this->fields["replace_infocoms"]) ? $this->fields["replace_infocoms"] : 1), - -1, array('width' => '100%')); + -1, ['width' => '100%']); echo ""; echo "".sprintf(__('%1$s %2$s'), __('Copy'), _n('Reservation', 'Reservations', 2)); echo ""; @@ -476,7 +484,7 @@ function showPartFormRemplacement() { } else { $user = 1; } - Dropdown::showYesNo("replace_users", $user, -1, array('width' => '100%')); + Dropdown::showYesNo("replace_users", $user, -1, ['width' => '100%']); echo ""; echo "" .sprintf(__('%1$s %2$s'), __('Copy'), __('Group')) . ""; echo ""; @@ -492,7 +500,7 @@ function showPartFormRemplacement() { Dropdown::showYesNo("replace_tickets", (isset ($this->fields["replace_tickets"]) ? $this->fields["replace_tickets"] : 1), - -1, array('width' => '100%')); + -1, ['width' => '100%']); echo ""; echo "" .sprintf(__('%1$s %2$s'), __('Copy'), sprintf(__('%1$s %2$s'), _n('Connection', 'Connections', 2), @@ -510,7 +518,7 @@ function showPartFormRemplacement() { Dropdown::showYesNo("replace_direct_connections", (isset($this->fields["replace_direct_connections"]) ? $this->fields["replace_direct_connections"] : 1), - -1, array('width' => '100%')); + -1, ['width' => '100%']); echo ""; echo "" .sprintf(__('%1$s %2$s'), __('Copy'), __('Alternate username')); echo ""; @@ -518,7 +526,7 @@ function showPartFormRemplacement() { Dropdown::showYesNo("replace_contact", (isset($this->fields["replace_contact"]) ? $this->fields["replace_contact"] : 1), - -1, array('width' => '100%')); + -1, ['width' => '100%']); echo ""; echo ""; @@ -529,7 +537,7 @@ function showPartFormRemplacement() { Dropdown::showYesNo("replace_contact_num", (isset($this->fields["replace_contact_num"]) ? $this->fields["replace_contact_num"] : 1), - -1, array('width' => '100%')); + -1, ['width' => '100%']); echo ""; echo ""; echo ""; @@ -587,7 +595,7 @@ function showFormAction($item) { echo ""; Dropdown::showYesNo("remove_from_ocs", (isset($this->fields["remove_from_ocs"]) - ? $this->fields["remove_from_ocs"] : 0), -1, array('width' => '100%')); + ? $this->fields["remove_from_ocs"] : 0), -1, ['width' => '100%']); echo ""; echo "" . __('Delete link with computer in OCSNG', 'uninstall') . ""; echo ""; @@ -607,7 +615,7 @@ function showFormAction($item) { echo ""; Dropdown::showYesNo("raz_fusioninventory", (isset($this->fields["raz_fusioninventory"]) - ? $this->fields["raz_fusioninventory"] : 0), -1, array('width' => '100%')); + ? $this->fields["raz_fusioninventory"] : 0), -1, ['width' => '100%']); echo ""; echo ""; echo ""; @@ -624,7 +632,7 @@ function showFormAction($item) { Dropdown::showYesNo("raz_plugin_fields", (isset($this->fields["raz_plugin_fields"]) ? $this->fields["raz_plugin_fields"] : 1), - -1, array('width' => '100%')); + -1, ['width' => '100%']); echo ""; echo ""; echo ""; @@ -662,193 +670,293 @@ function cleanDBonPurge() { } - function getSearchOptions() { - - $tab = []; - - $tab['common'] = self::getTypeName(); - - $tab[1]['table'] = $this->getTable(); - $tab[1]['field'] = 'name'; - $tab[1]['name'] = __('Name'); - $tab[1]['datatype'] = 'itemlink'; - $tab[1]['itemlink_type'] = $this->getType(); - - $tab[3]['table'] = $this->getTable(); - $tab[3]['field'] = 'raz_name'; - $tab[3]['name'] = sprintf(__('%1$s %2$s'), __('Blank'), __('Name')); - $tab[3]['datatype'] = 'bool'; - - $tab[4]['table'] = $this->getTable(); - $tab[4]['field'] = 'raz_soft_history'; - $tab[4]['name'] = __('Delete software history (computers)', 'uninstall'); - $tab[4]['datatype'] = 'bool'; - - $tab[5]['table'] = $this->getTable(); - $tab[5]['field'] = 'raz_contact'; - $tab[5]['name'] = sprintf(__('%1$s %2$s'), __('Blank'), __('Alternate username')); - $tab[5]['datatype'] = 'bool'; - - $tab[33]['table'] = $this->getTable(); - $tab[33]['field'] = 'raz_contact_num'; - $tab[33]['name'] = sprintf(__('%1$s %2$s'), __('Blank'), __('Alternate username number')); - $tab[33]['datatype'] = 'bool'; - - $tab[6]['table'] = $this->getTable(); - $tab[6]['field'] = 'raz_user'; - $tab[6]['name'] = sprintf(__('%1$s %2$s'), __('Blank'), __('User')); - $tab[6]['datatype'] = 'bool'; - - $tab[7]['table'] = 'glpi_states'; - $tab[7]['field'] = 'name'; - $tab[7]['name'] = __('Status'); - $tab[7]['datatype'] = 'dropdown'; - - $tab[8]['table'] = $this->getTable(); - $tab[8]['field'] = 'raz_os'; - $tab[8]['name'] = sprintf(__('%1$s %2$s'), __('Blank'), __('Operating system')); - $tab[8]['datatype'] = 'bool'; - - $tab[9]['table'] = $this->getTable(); - $tab[9]['field'] = 'raz_network'; - $tab[9]['name'] = sprintf(__('%1$s %2$s'), __('Blank'), __('Network')); - $tab[9]['datatype'] ='bool'; - - $tab[10]['table'] = $this->getTable(); - $tab[10]['field'] = 'raz_domain'; - $tab[10]['name'] = sprintf(__('%1$s %2$s'), __('Blank'), __('Domain')); - $tab[10]['datatype'] = 'bool'; - - $tab[11]['table'] = $this->getTable(); - $tab[11]['field'] = 'raz_ip'; - $tab[11]['name'] = sprintf(__('%1$s %2$s'), __('Blank'), - __('IP')." & ".__('Subnet mask')." & ".__('Gateway'). - " & ".__('Subnet')); - $tab[11]['datatype'] = 'bool'; - - $tab[12]['table'] = $this->getTable(); - $tab[12]['field'] = 'raz_budget'; - $tab[12]['name'] = sprintf(__('%1$s %2$s'), __('Blank'), __('Budget')); - $tab[12]['datatype'] = 'bool'; - - $tab[13]['table'] = $this->getTable(); - $tab[13]['field'] = 'is_recursive'; - $tab[13]['name'] = __('Child entities'); - $tab[13]['datatype'] = 'bool'; - - $tab[15]['table'] = 'glpi_transfers'; - $tab[15]['field'] = 'name'; - $tab[15]['name'] = __("Transfer's model to use", "uninstall"); - $tab[15]['datatype'] = 'itemlink'; - $tab[15]['itemlink_type'] = 'Transfer'; - - $tab[17]['table'] = $this->getTable(); - $tab[17]['field'] = 'comment'; - $tab[17]['name'] = __('Comments'); - $tab[17]['datatype'] = 'text'; + function rawSearchOptions() { + + $tab = []; + + $tab[] = [ + 'id' => 'common', + 'name' => self::getTypeName(), + ]; + + $tab[] = [ + 'id' => '1', + 'table' => $this->getTable(), + 'field' => 'name', + 'name' => __('Name'), + 'datatype' => 'itemlink', + 'itemlink_type' => $this->getType(), + ]; + + $tab[] = [ + 'id' => '3', + 'table' => $this->getTable(), + 'field' => 'raz_name', + 'name' => sprintf(__('%1$s %2$s'), __('Blank'), __('Name')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '4', + 'table' => $this->getTable(), + 'field' => 'raz_soft_history', + 'name' => __('Delete software history (computers)', 'uninstall'), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '5', + 'table' => $this->getTable(), + 'field' => 'raz_contact', + 'name' => sprintf(__('%1$s %2$s'), __('Blank'), __('Alternate username')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '33', + 'table' => $this->getTable(), + 'field' => 'raz_contact_num', + 'name' => sprintf(__('%1$s %2$s'), __('Blank'), __('Alternate username number')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '6', + 'table' => $this->getTable(), + 'field' => 'raz_user', + 'name' => sprintf(__('%1$s %2$s'), __('Blank'), __('User')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '7', + 'table' => 'glpi_states', + 'field' => 'name', + 'name' => __('Status'), + 'datatype' => 'dropdown', + ]; + + $tab[] = [ + 'id' => '8', + 'table' => $this->getTable(), + 'field' => 'raz_os', + 'name' => sprintf(__('%1$s %2$s'), __('Blank'), __('Operating system')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '9', + 'table' => $this->getTable(), + 'field' => 'raz_network', + 'name' => sprintf(__('%1$s %2$s'), __('Blank'), __('Network')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '10', + 'table' => $this->getTable(), + 'field' => 'raz_domain', + 'name' => sprintf(__('%1$s %2$s'), __('Blank'), __('Domain')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '11', + 'table' => $this->getTable(), + 'field' => 'raz_ip', + 'name' => sprintf( + __('%1$s %2$s'), + __('Blank'), + __('IP') . " & " . __('Subnet mask') . " & " . __('Gateway') . " & " . __('Subnet') + ), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '12', + 'table' => $this->getTable(), + 'field' => 'raz_budget', + 'name' => sprintf(__('%1$s %2$s'), __('Blank'), __('Budget')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '13', + 'table' => $this->getTable(), + 'field' => 'is_recursive', + 'name' => __('Child entities'), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '15', + 'table' => 'glpi_transfers', + 'field' => 'name', + 'name' => __('Transfer\'s model to use', 'uninstall'), + 'datatype' => 'itemlink', + 'itemlink_type' => 'Transfer', + ]; + + $tab[] = [ + 'id' => '17', + 'table' => $this->getTable(), + 'field' => 'comment', + 'name' => __('Comments'), + 'datatype' => 'text', + ]; $plug = new Plugin(); if ($plug->isActivated('ocsinventoryng')) { - - $tab[18]['table'] = $this->getTable(); - $tab[18]['field'] = 'remove_from_ocs'; - $tab[18]['name'] = __('Delete computer in OCSNG', 'ocsinventoryng'); - $tab[18]['datatype'] = 'bool'; - - $tab[19]['table'] = $this->getTable(); - $tab[19]['field'] = 'delete_ocs_link'; - $tab[19]['name'] = __('Delete link with computer in OCSNG', 'uninstall'); - $tab[19]['datatype'] ='bool'; + $tab[] = [ + 'id' => '18', + 'table' => $this->getTable(), + 'field' => 'remove_from_ocs', + 'name' => __('Delete computer in OCSNG', 'ocsinventoryng'), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '19', + 'table' => $this->getTable(), + 'field' => 'delete_ocs_link', + 'name' => __('Delete link with computer in OCSNG', 'uninstall'), + 'datatype' => 'bool', + ]; } - $tab[20]['table'] = $this->getTable(); - $tab[20]['field'] = 'types_id'; - $tab[20]['name'] = __('Type of template', 'uninstall'); - $tab[20]['linkfield'] = ''; - $tab[20]['datatype'] = 'specific'; - $tab[20]['searchtype'] = 'equals'; - - $tab[21]['table'] = $this->getTable(); - $tab[21]['field'] = 'groups_id'; - $tab[21]['linkfield'] = ''; - $tab[21]['name'] = __('Action on group', 'uninstall'); - $tab[21]['datatype'] = 'specific'; - $tab[21]['searchtype'] = 'equals'; - - $tab[22]['table'] = $this->getTable(); - $tab[22]['field'] = 'replace_method'; - $tab[22]['linkfield'] = ''; - $tab[22]['name'] = __('Archiving method of the old material', 'uninstall'); - $tab[22]['datatype'] = 'specific'; - $tab[22]['searchtype'] = 'equals'; - - $tab[23]['table'] = $this->getTable(); - $tab[23]['field'] = 'raz_history'; - $tab[23]['name'] = __('Delete the whole history', 'uninstall'); - $tab[23]['datatype'] = 'bool'; - - $tab[24]['table'] = $this->getTable(); - $tab[24]['field'] = 'replace_users'; - $tab[24]['name'] = sprintf(__('%1$s %2$s'), __('Copy'), __('User')); - $tab[24]['datatype'] = 'bool'; - - $tab[25]['table'] = $this->getTable(); - $tab[25]['field'] = 'replace_name'; - $tab[25]['name'] = sprintf(__('%1$s %2$s'), __('Copy'), __('Name')); - $tab[25]['datatype'] = 'bool'; - - $tab[26]['table'] = $this->getTable(); - $tab[26]['field'] = 'replace_serial'; - $tab[26]['name'] = sprintf(__('%1$s %2$s'), __('Copy'), __('Serial number')); - $tab[26]['datatype'] = 'bool'; - - $tab[27]['table'] = $this->getTable(); - $tab[27]['field'] = 'replace_otherserial'; - $tab[27]['name'] = sprintf(__('%1$s %2$s'), __('Copy'), __('Inventory number')); - $tab[27]['datatype'] = 'bool'; - - $tab[28]['table'] = $this->getTable(); - $tab[28]['field'] = 'replace_documents'; - $tab[28]['name'] = sprintf(__('%1$s %2$s'), __('Copy'), - _n('Document', 'Documents', 2)); - $tab[28]['datatype'] = 'bool'; - - $tab[29]['table'] = $this->getTable(); - $tab[29]['field'] = 'replace_contracts'; - $tab[29]['name'] = sprintf(__('%1$s %2$s'), __('Copy'), - _n('Contract', 'Contracts', 2)); - $tab[29]['datatype'] = 'bool'; - - $tab[30]['table'] = $this->getTable(); - $tab[30]['field'] = 'replace_infocoms'; - $tab[30]['name'] = sprintf(__('%1$s %2$s'), __('Copy'), - __('Financial and administratives information')); - $tab[30]['datatype'] = 'bool'; - - $tab[31]['table'] = $this->getTable(); - $tab[31]['field'] = 'replace_reservations'; - $tab[31]['name'] = sprintf(__('%1$s %2$s'), __('Copy'), - _n('Reservation', 'Reservations', 2)); - $tab[31]['datatype'] = 'bool'; - - $tab[32]['table'] = $this->getTable(); - $tab[32]['field'] = 'replace_groups'; - $tab[32]['name'] = sprintf(__('%1$s %2$s'), __('Copy'), __('Group')); - $tab[32]['datatype'] = 'bool'; - - $tab[80]['table'] = 'glpi_entities'; - $tab[80]['field'] = 'completename'; - $tab[80]['name'] = __('Entity'); - $tab[80]['datatype'] = 'dropdown'; - - /* - $tab[33]['table'] = $this->getTable(); - $tab[33]['field'] = 'raz_ocs_registrkeys'; - $tab[33]['linkfield'] = 'raz_ocs_registrykeys'; - $tab[33]['name'] = 'unknown'; //unknown name on 0.85 - $tab[33]['datatype'] = 'bool'; - $tab[33]['searchtype'] = 'equals'; - */ + $tab[] = [ + 'id' => '20', + 'table' => $this->getTable(), + 'field' => 'types_id', + 'name' => __('Type of template', 'uninstall'), + 'linkfield' => '', + 'datatype' => 'specific', + 'searchtype' => 'equals', + ]; + + $tab[] = [ + 'id' => '21', + 'table' => $this->getTable(), + 'field' => 'groups_id', + 'name' => __('Action on group', 'uninstall'), + 'linkfield' => '', + 'datatype' => 'specific', + 'searchtype' => 'equals', + ]; + + $tab[] = [ + 'id' => '22', + 'table' => $this->getTable(), + 'field' => 'replace_method', + 'name' => __('Archiving method of the old material', 'uninstall'), + 'linkfield' => '', + 'datatype' => 'specific', + 'searchtype' => 'equals', + ]; + + $tab[] = [ + 'id' => '23', + 'table' => $this->getTable(), + 'field' => 'raz_history', + 'name' => __('Delete the whole history', 'uninstall'), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '24', + 'table' => $this->getTable(), + 'field' => 'replace_users', + 'name' => sprintf(__('%1$s %2$s'), __('Copy'), __('User')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '25', + 'table' => $this->getTable(), + 'field' => 'replace_name', + 'name' => sprintf(__('%1$s %2$s'), __('Copy'), __('Name')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '26', + 'table' => $this->getTable(), + 'field' => 'replace_serial', + 'name' => sprintf(__('%1$s %2$s'), __('Copy'), __('Serial number')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '27', + 'table' => $this->getTable(), + 'field' => 'replace_otherserial', + 'name' => sprintf(__('%1$s %2$s'), __('Copy'), __('Inventory number')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '28', + 'table' => $this->getTable(), + 'field' => 'replace_documents', + 'name' => sprintf( + __('%1$s %2$s'), + __('Copy'), + _n('Document', 'Documents', 2) + ), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '29', + 'table' => $this->getTable(), + 'field' => 'replace_contracts', + 'name' => sprintf( + __('%1$s %2$s'), + __('Copy'), + _n('Contract', 'Contracts', 2) + ), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '30', + 'table' => $this->getTable(), + 'field' => 'replace_infocoms', + 'name' => sprintf( + __('%1$s %2$s'), + __('Copy'), + __('Financial and administratives information') + ), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '31', + 'table' => $this->getTable(), + 'field' => 'replace_reservations', + 'name' => sprintf( + __('%1$s %2$s'), + __('Copy'), + _n('Reservation', 'Reservations', 2) + ), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '32', + 'table' => $this->getTable(), + 'field' => 'replace_groups', + 'name' => sprintf(__('%1$s %2$s'), __('Copy'), __('Group')), + 'datatype' => 'bool', + ]; + + $tab[] = [ + 'id' => '80', + 'table' => 'glpi_entities', + 'field' => 'completename', + 'name' => __('Entity'), + 'datatype' => 'dropdown', + ]; return $tab; } @@ -861,10 +969,10 @@ function getSearchOptions() { * @param $values * @param $options array **/ - static function getSpecificValueToDisplay($field, $values, array $options=[]) { + static function getSpecificValueToDisplay($field, $values, array $options = []) { if (!is_array($values)) { - $values = array($field => $values); + $values = [$field => $values]; } switch ($field) { @@ -905,10 +1013,10 @@ static function getSpecificValueToDisplay($field, $values, array $options=[]) { * @param $values (defaut '') * @param $options array **/ - static function getSpecificValueToSelect($field, $name='', $values='', array $options=[]) { + static function getSpecificValueToSelect($field, $name = '', $values = '', array $options = []) { if (!is_array($values)) { - $values = array($field => $values); + $values = [$field => $values]; } $options['display'] = false; switch ($field) { @@ -961,7 +1069,7 @@ static function install($migration) { $migration->addField($table, 'FK_entities', 'integer'); $migration->addField($table, 'recursive', 'int(1) NOT NULL DEFAULT 1'); $migration->addField($table, 'name', 'string'); - $migration->addField($table, `comments`, 'text', array('value' => 'NOT NULL')); + $migration->addField($table, `comments`, 'text', ['value' => 'NOT NULL']); $migration->migrationOneTable($table); $ID = PluginUninstallUninstall::getUninstallTransferModelID(); @@ -992,7 +1100,7 @@ static function install($migration) { $migration->changeField($table, 'ID', 'id', 'autoincrement'); $migration->changeField($table, 'FK_entities', 'entities_id', 'integer'); $migration->changeField($table, 'recursive', 'is_recursive', "bool", - array('value' => 1)); + ['value' => 1]); $migration->changeField($table, 'transfer_id', 'transfers_id', "integer"); $migration->changeField($table, 'state', 'states_id', "integer"); $migration->changeField($table, 'group', 'groups_id', "integer"); @@ -1021,7 +1129,7 @@ static function install($migration) { $migration->addField($table, 'replace_netports', "bool"); $migration->addField($table, 'replace_direct_connections', "bool"); $migration->addField($table, 'overwrite', "bool"); - $migration->addField($table, 'replace_method', "integer", array('value' => 2)); + $migration->addField($table, 'replace_method', "integer", ['value' => 2]); $migration->migrationOneTable($table); self::createTransferModel('Replace'); @@ -1029,7 +1137,7 @@ static function install($migration) { // from 2.0.0 to 2.0.1 if (!$DB->fieldExists($table, 'raz_history')) { - $migration->addField($table, 'raz_history', 'integer', array('after' => 'raz_network')); + $migration->addField($table, 'raz_history', 'integer', ['after' => 'raz_network']); } if (!$DB->fieldExists($table, 'raz_ocs_registrykeys')) { @@ -1063,6 +1171,10 @@ static function install($migration) { $migration->addField($table, 'raz_plugin_fields', "bool"); } + if (!$DB->fieldExists($table, 'raz_antivirus')) { + $migration->addField($table, 'raz_antivirus', "bool"); + } + $migration->migrationOneTable($table); } else { @@ -1084,6 +1196,7 @@ static function install($migration) { `raz_history` int(1) NOT NULL DEFAULT '1', `raz_soft_history` int(1) NOT NULL DEFAULT '1', `raz_budget` int(1) NOT NULL DEFAULT '1', + `raz_antivirus` int(1) NOT NULL DEFAULT '1', `raz_user` int(1) NOT NULL DEFAULT '1', `raz_ocs_registrykeys` int(1) NOT NULL DEFAULT '1', `comment` text COLLATE utf8_unicode_ci NOT NULL, @@ -1130,20 +1243,20 @@ static function uninstall() { $transfer_id = PluginUninstallUninstall::getUninstallTransferModelID(false); if ($transfer_id) { $tr = new Transfer(); - $tr->delete(array('id' => $transfer_id), true); + $tr->delete(['id' => $transfer_id], true); } //Delete history $log = new Log(); $log->dohistory = false; - $log->deleteByCriteria(array('itemtype' => __CLASS__)); + $log->deleteByCriteria(['itemtype' => __CLASS__]); } /** * @param $name (default 'Uninstall') **/ - static function createTransferModel($name='Uninstall') { + static function createTransferModel($name = 'Uninstall') { $transfers_id = PluginUninstallUninstall::getUninstallTransferModelID(); @@ -1208,13 +1321,13 @@ static function showMassiveActionsSubForm(MassiveAction $ma) { case 'transfert': Entity::dropdown(); echo " ". - Html::submit(_x('button', 'Post'), array('name' => 'massiveaction')); + Html::submit(_x('button', 'Post'), ['name' => 'massiveaction']); return true; } return ""; } - function getSpecificMassiveActions($checkitem=NULL) { + function getSpecificMassiveActions($checkitem = null) { $isadmin = static::canUpdate(); $actions = parent::getSpecificMassiveActions($checkitem); @@ -1244,11 +1357,11 @@ static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBT foreach ($ids as $id) { if ($item->getFromDB($id)) { - $item->update(array( + $item->update([ "id" => $id, "entities_id" => $entities_id, "update" => __('Update'), - )); + ]); $ma->itemDone($item->getType(), $id, MassiveAction::ACTION_OK); } } diff --git a/inc/preference.class.php b/inc/preference.class.php index 5345ed1..bd0cdee 100644 --- a/inc/preference.class.php +++ b/inc/preference.class.php @@ -67,13 +67,12 @@ function showFormUserPreferences() { echo ""; $value = (isset($this->fields["locations_id"]) ? $this->fields["locations_id"] : 0); - Location::dropdown(array('name' => "id[$pref_ID][locations_id]", - 'value' => ($value == '' ? 0 : $value), - 'comments' => 1, - 'entity' => $entity, - 'toadd' => array(-1 => __('Keep previous location', - 'uninstall'), - 0 => __('Empty location', 'uninstall')))); + Location::dropdown(['name' => "id[$pref_ID][locations_id]", + 'value' => ($value == '' ? 0 : $value), + 'comments' => 1, + 'entity' => $entity, + 'toadd' => [-1 => __('Keep previous location', 'uninstall'), + 0 => __('Empty location', 'uninstall')]]); echo ""; echo ""; @@ -124,7 +123,7 @@ static function beforeItemPurge($item) { * @param $models_id * @param $except_entity (default -1) **/ - static function deleteUserPreferenceForModel($models_id, $except_entity=-1) { + static function deleteUserPreferenceForModel($models_id, $except_entity = -1) { global $DB; $query = "DELETE FROM `".getTableForItemType(__CLASS__)."` @@ -142,7 +141,7 @@ static function deleteUserPreferenceForModel($models_id, $except_entity=-1) { **/ static function deleteUserPreferences($users_id) { $preference = new self(); - $preference->deleteByCriteria(array('users_id' => $users_id)); + $preference->deleteByCriteria(['users_id' => $users_id]); } @@ -206,7 +205,7 @@ static function getLocationByUserByEntity($user_id, $template, $entity) { } - function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { + function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { if ($item->getType() == 'Preference' && Session::haveRight(PluginUninstallProfile::$rightname, READ)) { return PluginUninstallUninstall::getTypeName(); @@ -215,7 +214,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { } - static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) { global $CFG_GLPI; if ($item->getType() == 'Preference' && Session::haveRight(PluginUninstallProfile::$rightname, READ)) { diff --git a/inc/profile.class.php b/inc/profile.class.php index dc4e253..c5e2f63 100644 --- a/inc/profile.class.php +++ b/inc/profile.class.php @@ -38,20 +38,20 @@ class PluginUninstallProfile extends Profile { * @return array:array:string rights matrix */ function getGeneralRights() { - $rights = array( - array( - 'itemtype' => 'PluginUninstallProfile', - 'label' => PluginUninstallUninstall::getTypeName(), - 'field' => "uninstall:profile", - 'rights' => array(READ => __('Read'), - UPDATE => __('Write'), - self::RIGHT_REPLACE => PluginUninstallReplace::getTypeName()) - ), - ); + $rights = [ + [ + 'itemtype' => 'PluginUninstallProfile', + 'label' => PluginUninstallUninstall::getTypeName(), + 'field' => "uninstall:profile", + 'rights' => [READ => __('Read'), + UPDATE => __('Write'), + self::RIGHT_REPLACE => PluginUninstallReplace::getTypeName()] + ], + ]; return $rights; } - function showForm($ID, $options=array()) { + function showForm($ID, $options = []) { global $DB; $profile = new Profile(); @@ -71,8 +71,8 @@ function showForm($ID, $options=array()) { } $rights = $this->getGeneralRights(); - $profile->displayRightsChoiceMatrix($rights, array('canedit' => $canedit, - 'default_class' => 'tab_bg_2')); + $profile->displayRightsChoiceMatrix($rights, ['canedit' => $canedit, + 'default_class' => 'tab_bg_2']); if ($canedit) { $options['candel'] = false; $this->showFormButtons($options); @@ -81,8 +81,8 @@ function showForm($ID, $options=array()) { static function createFirstAccess($ID) { self::addDefaultProfileInfos($ID, - array('uninstall:profile' => UPDATE | READ | self::RIGHT_REPLACE, - 'plugin_uninstall_replace' => 1), true); + ['uninstall:profile' => UPDATE | READ | self::RIGHT_REPLACE, + 'plugin_uninstall_replace' => 1], true); } /** @@ -122,7 +122,7 @@ static function migrateOneProfile($profiles_id) { "`id`='$profiles_id'") as $profile_data) { $translatedRight = self::translateARight($profile_data["use"]); $translatedRight = $translatedRight | (self::translateARight($profile_data["replace"]) ? self::RIGHT_REPLACE : 0); - ProfileRight::updateProfileRights($profiles_id, array(PluginUninstallProfile::$rightname => $translatedRight)); + ProfileRight::updateProfileRights($profiles_id, [PluginUninstallProfile::$rightname => $translatedRight]); } } @@ -133,9 +133,9 @@ static function migrateAllProfiles() { global $DB; //Add new rights in glpi_profilerights table - foreach (array(PluginUninstallProfile::$rightname) as $field) { + foreach ([PluginUninstallProfile::$rightname] as $field) { if (countElementsInTable("glpi_profilerights", "`name` = '".$field."'") == 0) { - ProfileRight::addProfileRights(array($field)); + ProfileRight::addProfileRights([$field]); } } @@ -151,7 +151,7 @@ static function migrateAllProfiles() { } } - function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { + function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { if ($item->getType() == 'Profile') { if ($item->getField('interface') == 'central') { @@ -168,7 +168,7 @@ static function addDefaultProfileInfos($profiles_id, $rights, $drop_existing = f foreach ($rights as $right => $value) { if (countElementsInTable('glpi_profilerights', "`profiles_id`='$profiles_id' AND `name`='$right'") && $drop_existing) { - $profileRight->deleteByCriteria(array('profiles_id' => $profiles_id, 'name' => $right)); + $profileRight->deleteByCriteria(['profiles_id' => $profiles_id, 'name' => $right]); } if (!countElementsInTable('glpi_profilerights', "`profiles_id`='$profiles_id' AND `name`='$right'")) { @@ -183,14 +183,14 @@ static function addDefaultProfileInfos($profiles_id, $rights, $drop_existing = f } } - static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) { if ($item->getType() == 'Profile') { $ID = $item->getID(); $prof = new self(); self::addDefaultProfileInfos($ID, - array(PluginUninstallProfile::$rightname => 0)); + [PluginUninstallProfile::$rightname => 0]); $prof->showForm($ID); } return true; @@ -202,7 +202,7 @@ static function install($migration) { // From 0.2 to 1.0.0 $table = 'glpi_plugin_uninstallcomputer_profiles'; if ($DB->tableExists($table)) { - $migration->changeField($table, 'use', 'use', "char", array('value' => '0')); + $migration->changeField($table, 'use', 'use', "char", ['value' => '0']); $migration->migrationOneTable($table); $query = "UPDATE `".$table."` diff --git a/inc/replace.class.php b/inc/replace.class.php index c0a302e..19d7fb2 100644 --- a/inc/replace.class.php +++ b/inc/replace.class.php @@ -36,7 +36,7 @@ class PluginUninstallReplace extends CommonDBTM { static $rightname = "uninstall:profile"; - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { return __("Item's replacement", 'uninstall'); } @@ -83,8 +83,8 @@ static function replace($type, $model_id, $tab_ids, $location) { //States if ($model->fields['states_id'] != 0) { - $olditem->update(array('id' => $olditem_id, - 'states_id' => $model->fields['states_id']), + $olditem->update(['id' => $olditem_id, + 'states_id' => $model->fields['states_id']], false); } @@ -101,7 +101,7 @@ static function replace($type, $model_id, $tab_ids, $location) { $tab = self::getPdfUserPreference($olditem); $itempdf = new $PLUGIN_HOOKS['plugin_pdf'][$type]($olditem); - $out = $itempdf->generatePDF(array($olditem_id), $tab, 1, false); + $out = $itempdf->generatePDF([$olditem_id], $tab, 1, false); $name_out .= ".pdf"; } else { //TODO Which datas ? Add Defaults... @@ -132,16 +132,16 @@ static function replace($type, $model_id, $tab_ids, $location) { // Create & Attach new document to current item $doc = new Document(); - $input = array('name' => addslashes(__('Archive of old material', 'uninstall')), - 'upload_file' => $name_out, - 'comment' => addslashes($comment), - 'add' => __('Add'), - 'entities_id' => $newitem->getEntityID(), - 'is_recursive' => $newitem->isRecursive(), - 'link' => "", - 'documentcategories_id' => 0, - 'items_id' => $olditem_id, - 'itemtype' => $type); + $input = ['name' => addslashes(__('Archive of old material', 'uninstall')), + 'upload_file' => $name_out, + 'comment' => addslashes($comment), + 'add' => __('Add'), + 'entities_id' => $newitem->getEntityID(), + 'is_recursive' => $newitem->isRecursive(), + 'link' => "", + 'documentcategories_id' => 0, + 'items_id' => $olditem_id, + 'itemtype' => $type]; //Attached the document to the old item, to generate an accurate name $document_added = $doc->add($input); @@ -149,19 +149,19 @@ static function replace($type, $model_id, $tab_ids, $location) { //Attach the document to the new item, once the document's name is correct $docItem = new Document_Item(); - $docItemId = $docItem->add(array( - 'documents_id' => $document_added, - 'itemtype' => $type, - 'items_id' => (int) $newitem_id, - )); + $docItemId = $docItem->add([ + 'documents_id' => $document_added, + 'itemtype' => $type, + 'items_id' => (int) $newitem_id, + ]); } // General Informations - NAME if ($model->fields["replace_name"]) { if ($overwrite || empty($newitem->fields['name'])) { - $newitem->update(array('id' => $newitem_id, - 'name' => $olditem->getField('name')), + $newitem->update(['id' => $newitem_id, + 'name' => $olditem->getField('name')], false); } } @@ -171,8 +171,8 @@ static function replace($type, $model_id, $tab_ids, $location) { if ($model->fields["replace_serial"]) { if ($overwrite || empty($newitem->fields['serial'])) { - $newitem->update(array('id' => $newitem_id, - 'serial' => $olditem->getField('serial')), + $newitem->update(['id' => $newitem_id, + 'serial' => $olditem->getField('serial')], false); } } @@ -181,8 +181,8 @@ static function replace($type, $model_id, $tab_ids, $location) { if ($model->fields["replace_otherserial"]) { if ($overwrite || empty($newitem->fields['otherserial'])) { - $newitem->update(array('id' => $newitem_id, - 'otherserial' => $olditem->getField('otherserial')), + $newitem->update(['id' => $newitem_id, + 'otherserial' => $olditem->getField('otherserial')], false); } } @@ -193,9 +193,9 @@ static function replace($type, $model_id, $tab_ids, $location) { $doc_item = new Document_Item(); foreach (self::getAssociatedDocuments($olditem) as $document) { - $doc_item->update(array('id' => $document['assocID'], - 'itemtype' => $type, - 'items_id' => $newitem_id), + $doc_item->update(['id' => $document['assocID'], + 'itemtype' => $type, + 'items_id' => $newitem_id], false); } @@ -207,9 +207,9 @@ static function replace($type, $model_id, $tab_ids, $location) { $contract_item = new Contract_Item(); foreach (self::getAssociatedContracts($olditem) as $contract) { - $contract_item->update(array('id' => $contract['id'], - 'itemtype' => $type, - 'items_id' => $newitem_id), + $contract_item->update(['id' => $contract['id'], + 'itemtype' => $type, + 'items_id' => $newitem_id], false); } @@ -231,9 +231,9 @@ static function replace($type, $model_id, $tab_ids, $location) { // Update current Infocoms of old item if ($infocom->getFromDBforDevice($type, $olditem_id)) { - $infocom->update(array('id' => $infocom->getID(), - 'itemtype' => $type, - 'items_id' => $newitem_id), + $infocom->update(['id' => $infocom->getID(), + 'itemtype' => $type, + 'items_id' => $newitem_id], false); } @@ -268,9 +268,9 @@ static function replace($type, $model_id, $tab_ids, $location) { $resa_old->getFromDBbyItem($type, $olditem_id); if (count($resa_old->fields)) { - $resa_old->update(array('id' => $resa_old->getID(), - 'itemtype' => $type, - 'items_id' => $newitem_id), + $resa_old->update(['id' => $resa_old->getID(), + 'itemtype' => $type, + 'items_id' => $newitem_id], false); } } @@ -308,8 +308,8 @@ static function replace($type, $model_id, $tab_ids, $location) { && in_array($type, $CFG_GLPI["linkgroup_types"])) { if ($newitem->isField('groups_id') && ($overwrite || empty($data['groups_id']))) { - $newitem->update(array('id' => $newitem_id, - 'groups_id' => $olditem->getField('groups_id')), + $newitem->update(['id' => $newitem_id, + 'groups_id' => $olditem->getField('groups_id')], false); } } @@ -320,8 +320,8 @@ static function replace($type, $model_id, $tab_ids, $location) { $ticket_item = new Item_Ticket(); foreach (self::getAssociatedTickets($type, $olditem_id) as $ticket) { - $ticket_item->update(array('id' => $ticket['id'], - 'items_id' => $newitem_id), + $ticket_item->update(['id' => $ticket['id'], + 'items_id' => $newitem_id], false); } @@ -339,9 +339,9 @@ static function replace($type, $model_id, $tab_ids, $location) { $netport_item = new NetworkPort(); foreach (self::getAssociatedNetports($type, $olditem_id) as $netport) { - $netport_item->update(array('id' => $netport['id'], - 'itemtype' => $type, - 'items_id' => $newitem_id), + $netport_item->update(['id' => $netport['id'], + 'itemtype' => $type, + 'items_id' => $newitem_id], false); } @@ -349,15 +349,15 @@ static function replace($type, $model_id, $tab_ids, $location) { // Directs connections if ($model->fields["replace_direct_connections"] - && (in_array($type, array('Computer')))) { + && (in_array($type, ['Computer']))) { $comp_item = new Computer_Item(); foreach (self::getAssociatedItems($olditem) as $itemtype => $connections) { foreach ($connections as $connection) { - $comp_item->update(array('id' => $connection['id'], - 'computers_id' => $newitem_id, - 'itemtype' => $itemtype), + $comp_item->update(['id' => $connection['id'], + 'computers_id' => $newitem_id, + 'itemtype' => $itemtype], false); } } @@ -371,8 +371,8 @@ static function replace($type, $model_id, $tab_ids, $location) { break; default: - $olditem->update(array('id' => $olditem_id, - 'locations_id' => $location), + $olditem->update(['id' => $olditem_id, + 'locations_id' => $location], false); break; } @@ -479,7 +479,7 @@ static function replace($type, $model_id, $tab_ids, $location) { * * @return the comments generated **/ - static function getCommentsForReplacement(CommonDBTM $item, $new=true, $display_message=true) { + static function getCommentsForReplacement(CommonDBTM $item, $new = true, $display_message = true) { $string = ""; @@ -690,9 +690,9 @@ static function showForm($type, $model_id, $tab_ids, $location) { } echo ""; - $type::dropdown(array('name' => "newItems[$id]", - 'displaywith' => array('serial', 'otherserial'), - 'url' => $CFG_GLPI['root_doc']."/plugins/uninstall/ajax/dropdownReplaceFindDevice.php")); + $type::dropdown(['name' => "newItems[$id]", + 'displaywith' => ['serial', 'otherserial'], + 'url' => $CFG_GLPI['root_doc']."/plugins/uninstall/ajax/dropdownReplaceFindDevice.php"]); echo ""; } @@ -715,10 +715,10 @@ class='submit'>"; * @param $itemtype * @param $field (default '') **/ - static function searchFieldInSearchOptions($itemtype, $field='') { + static function searchFieldInSearchOptions($itemtype, $field = '') { if ($item = getItemForItemtype($itemtype)) { - foreach ($item->getSearchOptionsNew() as $id => $searchOption) { + foreach ($item->rawSearchOptions() as $searchOption) { if (is_array($searchOption) && isset($searchOption['field']) && $searchOption['field']==$field) { @@ -737,7 +737,7 @@ static function searchFieldInSearchOptions($itemtype, $field='') { * @param $item CommonDBTM object for which associated documents must be displayed * @param $withtemplate (default '') **/ - static function getAssociatedDocuments(CommonDBTM $item, $withtemplate='') { + static function getAssociatedDocuments(CommonDBTM $item, $withtemplate = '') { global $DB, $CFG_GLPI; if (!(($item instanceof KnowbaseItem) diff --git a/inc/uninstall.class.php b/inc/uninstall.class.php index 97746d9..ea02b69 100644 --- a/inc/uninstall.class.php +++ b/inc/uninstall.class.php @@ -34,7 +34,7 @@ class PluginUninstallUninstall extends CommonDBTM { static $rightname = "uninstall:profile"; - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { return __("Item's uninstallation", 'uninstall'); } @@ -58,7 +58,7 @@ static function showMassiveActionsSubForm(MassiveAction $ma) { $uninst->dropdownUninstallModels("model_id", $_SESSION["glpiID"], $_SESSION["glpiactive_entity"]); echo " ". - Html::submit(_x('button', 'Post'), array('name' => 'massiveaction')); + Html::submit(_x('button', 'Post'), ['name' => 'massiveaction']); return true; } return ""; @@ -136,8 +136,8 @@ static function uninstall($type, $model_id, $tab_ids, $location) { //------------------// if (in_array($type, $UNINSTALL_DIRECT_CONNECTIONS_TYPE)) { $conn = new Computer_Item(); - $conn->deleteByCriteria(array('itemtype' => $type, - 'items_id' => $id), true); + $conn->deleteByCriteria(['itemtype' => $type, + 'items_id' => $id], true); } //--------------------// @@ -267,7 +267,9 @@ static function uninstall($type, $model_id, $tab_ids, $location) { self::purgeComputerVolumes($id); //Delete computer antivirus - self::purgeComputerAntivirus($id); + if ($model->fields["raz_antivirus"] == 1) { + self::purgeComputerAntivirus($id); + } if ($model->fields["raz_history"] == 1) { //Delete history related to software @@ -289,7 +291,7 @@ static function uninstall($type, $model_id, $tab_ids, $location) { } //Should never happend that transfer_id = 0, but just in case if ($model->fields["transfers_id"] > 0) { - $transfer->moveItems(array($type => array($id => $id)), + $transfer->moveItems([$type => [$id => $id]], $entity, $transfer->fields); } } @@ -379,10 +381,10 @@ static function deleteComputerInOCS($ocs_id, $ocs_server_id) { WHERE `networks`.`HARDWARE_ID` = '".$ocs_id."')"; $DBocs->query($query); - $tables = array ("accesslog", "accountinfo", "bios", "controllers", "devices", "drives", + $tables = ["accesslog", "accountinfo", "bios", "controllers", "devices", "drives", "download_history", "download_servers", "groups_cache", "inputs", "memories", "modems", "monitors", "networks", "ports", "printers", - "registry", "slots", "softwares", "sounds", "storages", "videos"); + "registry", "slots", "softwares", "sounds", "storages", "videos"]; foreach ($tables as $table) { if (self::OcsTableExists($ocs_server_id, $table)) { @@ -402,19 +404,14 @@ static function deleteComputerInOCS($ocs_id, $ocs_server_id) { static function OcsTableExists($ocs_server_id, $tablename) { - $DBocs = PluginOcsinventoryngOcsServer::getDBocs($ocs_server_id)->getDB(); + $dbClient = PluginOcsinventoryngOcsServer::getDBocs($ocs_server_id); - // Get a list of tables contained within the database. - $result = $DBocs->list_tables("%".$tablename."%"); - if ($rcount = $DBocs->numrows($result)) { - while ($data = $DBocs->fetch_row($result)) { - if ($data[0] === $tablename) { - return true; - } - } + if (!($dbClient instanceof PluginOcsinventoryngOcsDbClient)) { + return false; } - $DBocs->free_result($result); - return false; + + $DBocs = $dbClient->getDB(); + return $DBocs->tableExists($tablename); } /** @@ -451,21 +448,21 @@ static function deleteFusionInventoryLink($itemtype, $items_id) { if ($itemtype == 'Computer') { // remove agent(s) foreach ($agents as $current_agent) { - $agent->deleteByCriteria(array('id' => $current_agent['id']), true); + $agent->deleteByCriteria(['id' => $current_agent['id']], true); } // remove licences $pfComputerLicenseInfo = new PluginFusioninventoryComputerLicenseInfo(); - $pfComputerLicenseInfo->deleteByCriteria(array('computers_id' => $items_id)); + $pfComputerLicenseInfo->deleteByCriteria(['computers_id' => $items_id]); } } } static function purgeComputerVolumes($computers_id) { - $computerdisk = new ComputerDisk(); - $computerdisk->dohistory = false; - $computerdisk->deleteByCriteria(['computers_id' => $computers_id]); + $disk = new Item_Disk(); + $disk->dohistory = false; + $disk->deleteByCriteria(['items_id' => $computers_id, 'itemtype' => 'Computer']); } @@ -489,7 +486,7 @@ static function purgeComputerAntivirus($computers_id) { * * @return nothing **/ - static function deleteHistory($computer_id, $only_history=true) { + static function deleteHistory($computer_id, $only_history = true) { global $DB; $where = "`itemtype` = 'Computer' @@ -515,7 +512,7 @@ static function deleteHistory($computer_id, $only_history=true) { * @param $action (default 'uninstall' * @param $ocs_id (default '') **/ - static function addUninstallLog($type, $computer_id, $action='uninstall', $ocs_id='') { + static function addUninstallLog($type, $computer_id, $action = 'uninstall', $ocs_id = '') { $changes[0] = 0; $changes[1] = ""; @@ -638,9 +635,9 @@ static function showFormUninstallation($ID, $item, $user_id) { $item->fields["entities_id"]); echo ""; - $params = array('templates_id' => '__VALUE__', - 'entity' => $item->fields["entities_id"], - 'users_id' => $_SESSION["glpiID"]); + $params = ['templates_id' => '__VALUE__', + 'entity' => $item->fields["entities_id"], + 'users_id' => $_SESSION["glpiID"]]; Ajax::updateItemOnSelectEvent("dropdown_model_id$rand", "show_objects", $CFG_GLPI["root_doc"] . "/plugins/uninstall/ajax/locations.php", @@ -706,10 +703,10 @@ static function dropdownUninstallModels($name, $user, $entity) { } } - return PluginUninstallModel::dropdown(array('name' => $name, + return PluginUninstallModel::dropdown(['name' => $name, 'value' => 0, 'entity' => $entity, - 'used' => $used)); + 'used' => $used]); } @@ -719,7 +716,7 @@ static function dropdownUninstallModels($name, $user, $entity) { * @param $entity_sons array * @param $value (default -1) */ - static function dropdownFieldAction($name, $entity=0, $entity_sons=[], $value=-1) { + static function dropdownFieldAction($name, $entity = 0, $entity_sons = [], $value = -1) { global $CFG_GLPI; if ($value == -1) { @@ -753,7 +750,7 @@ static function dropdownFieldAction($name, $entity=0, $entity_sons=[], $value=-1 * @param $entity * @param $add_entity (false by default) **/ - static function getAllTemplatesByEntity($entity, $add_entity=false) { + static function getAllTemplatesByEntity($entity, $add_entity = false) { global $DB, $CFG_GLPI; $templates = []; @@ -775,7 +772,7 @@ static function getAllTemplatesByEntity($entity, $add_entity=false) { } - function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { + function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { global $UNINSTALL_TYPES; if (self::canView() @@ -788,7 +785,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { } - static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) { global $UNINSTALL_TYPES; if (in_array($item->getType(), $UNINSTALL_TYPES)) { diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index d398604..67ee32f 100644 Binary files a/locales/cs_CZ.mo and b/locales/cs_CZ.mo differ diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index 7036637..d297ffd 100644 --- a/locales/cs_CZ.po +++ b/locales/cs_CZ.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 12:03+0200\n" +"POT-Creation-Date: 2018-06-28 09:42+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" @@ -18,35 +18,35 @@ 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/action.php:55 inc/replace.class.php:447 +#: front/action.php:55 inc/replace.class.php:466 msgid "Replacement successful" msgstr "Nahrazení úspěšné" -#: front/action.php:96 inc/uninstall.class.php:315 +#: front/action.php:96 inc/uninstall.class.php:320 msgid "Uninstallation successful" msgstr "Odinstalace úspěšná" -#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:770 -msgid "Uninstall" -msgstr "Odinstalovat" - -#: ajax/locations.php:43 inc/replace.class.php:560 inc/preference.class.php:74 +#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:579 msgid "Keep previous location" msgstr "Ponechat předchozí umístění" -#: ajax/locations.php:44 inc/replace.class.php:564 inc/preference.class.php:76 +#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:583 msgid "Empty location" msgstr "Prázdné umístění" +#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:781 +msgid "Uninstall" +msgstr "Odinstalovat" + #: inc/model.class.php:42 msgid "Uninstallation template" msgstr "Šablona odinstalace" -#: inc/model.class.php:108 inc/model.class.php:880 inc/model.class.php:922 +#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Odinstalace" -#: inc/model.class.php:110 inc/model.class.php:882 inc/model.class.php:924 +#: inc/model.class.php:110 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Nahrazení" @@ -75,19 +75,19 @@ msgstr "Ponechat + komentovat" msgid "Replacing data" msgstr "Nahrazují se data" -#: inc/model.class.php:212 inc/model.class.php:766 +#: inc/model.class.php:212 inc/model.class.php:831 msgid "Type of template" msgstr "Typ šablony" -#: inc/model.class.php:221 inc/model.class.php:741 +#: inc/model.class.php:221 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Model přenosu který použít" -#: inc/model.class.php:241 inc/replace.class.php:574 +#: inc/model.class.php:241 inc/replace.class.php:593 msgid "New status of the computer" msgstr "Nový stav počítače" -#: inc/model.class.php:253 inc/model.class.php:774 +#: inc/model.class.php:253 inc/model.class.php:841 msgid "Action on group" msgstr "Akce na skupině" @@ -107,35 +107,35 @@ msgstr "Spravovat šablony" msgid "Erase datas" msgstr "Vymazat data" -#: inc/model.class.php:303 inc/model.class.php:684 +#: inc/model.class.php:303 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Smazat historii software (počítače)" -#: inc/model.class.php:308 inc/model.class.php:787 +#: inc/model.class.php:308 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Smazat celou historii" -#: inc/model.class.php:382 inc/model.class.php:432 +#: inc/model.class.php:390 inc/model.class.php:440 msgid "Informations replacement" msgstr "Nahrazení informací" -#: inc/model.class.php:383 inc/replace.class.php:520 +#: inc/model.class.php:391 inc/replace.class.php:539 msgid "General informations" msgstr "Obecné informace" -#: inc/model.class.php:405 inc/replace.class.php:535 +#: inc/model.class.php:413 inc/replace.class.php:554 msgid "Overwrite informations (from old item to the new)" msgstr "Přepsat informace (z původní položky do nové)" -#: inc/model.class.php:412 inc/model.class.php:781 inc/replace.class.php:538 +#: inc/model.class.php:420 inc/model.class.php:851 inc/replace.class.php:557 msgid "Archiving method of the old material" msgstr "Metoda archivace původního materiálu" -#: inc/model.class.php:422 +#: inc/model.class.php:430 msgid "Plugin PDF is installed and activated" msgstr "Zásuvný modul pro PDF je nainstalovaný a zapnutý" -#: inc/model.class.php:425 +#: inc/model.class.php:433 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -143,15 +143,15 @@ msgstr "" "Zásuvný modul pro PDF není nainstalován, proto nebude možné pro archivaci " "použít PDF formát" -#: inc/model.class.php:433 inc/replace.class.php:596 +#: inc/model.class.php:441 inc/replace.class.php:615 msgid "Connections with other materials" msgstr "Propojení s ostatními materiály" -#: inc/model.class.php:507 inc/replace.class.php:631 +#: inc/model.class.php:515 inc/replace.class.php:650 msgid "Direct connections" msgstr "Přímá propojení" -#: inc/model.class.php:580 +#: inc/model.class.php:588 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "OCSNG odkaz" @@ -159,34 +159,66 @@ msgstr[1] "OCSNG odkazy" msgstr[2] "OCSNG odkazů" msgstr[3] "OCSNG odkazy" -#: inc/model.class.php:582 +#: inc/model.class.php:590 msgid "These options only apply to computers coming from OCSNG" msgstr "Tyto volby jsou uplatněny pouze na počítače pocházející z OCSNG" -#: inc/model.class.php:586 inc/model.class.php:755 +#: inc/model.class.php:594 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Smazat počítač v OCSNG" -#: inc/model.class.php:592 inc/model.class.php:760 +#: inc/model.class.php:600 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Smazat propojení s počítačem v OCSNG" -#: inc/model.class.php:606 +#: inc/model.class.php:614 msgid "Delete computer in FusionInventory" msgstr "Smazat počítač ve FusionInventory" -#: inc/model.class.php:618 +#: inc/model.class.php:626 msgid "Additionnal fields" msgstr "Další kolonky" -#: inc/model.class.php:622 +#: inc/model.class.php:630 msgid "Delete Fields plugin informations" msgstr "Smazat informace zásuvného modulu Kolonky" -#: inc/model.class.php:887 inc/uninstall.class.php:717 +#: inc/model.class.php:995 inc/uninstall.class.php:728 msgid "Keep in the current group" msgstr "Ponechat ve stávající skupině" +#: inc/preference.class.php:54 inc/uninstall.class.php:646 +msgid "Item's location after uninstall" +msgstr "Umístění položky po odinstalaci" + +#: inc/uninstall.class.php:38 setup.php:89 +msgid "Item's uninstallation" +msgstr "Odinstalace položky" + +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Čekejte, probíhá odinstalace…" + +#: inc/uninstall.class.php:522 +msgid "Item is now uninstalled" +msgstr "Položka je nyní odinstalovaná" + +#: inc/uninstall.class.php:526 +msgid "Item replaced by a new one" +msgstr "Položka je nahrazena novou" + +#: inc/uninstall.class.php:530 +msgid "Item replacing an old one" +msgstr "Položka nahrazující tu původní" + +#: inc/uninstall.class.php:535 +msgid "Removed from OCSNG with ID" +msgstr "Odebráno z OCSNG s identifikátorem" + +#: inc/uninstall.class.php:729 +msgid "Affect to a new group" +msgstr "Přiřadit do nové skupiny" + #: inc/replace.class.php:40 msgid "Item's replacement" msgstr "Nahrazení položky" @@ -203,70 +235,38 @@ msgstr "Tento dokument je archiv nahrazené položky" msgid "Archive of old material" msgstr "Archiv starého materiálu" -#: inc/replace.class.php:403 +#: inc/replace.class.php:409 msgid "See attached document" msgstr "Zobrazit přiložený dokument" -#: inc/replace.class.php:473 +#: inc/replace.class.php:488 msgid "This item is a replacement for item" msgstr "Tato položka je náhradou za položku" -#: inc/replace.class.php:475 +#: inc/replace.class.php:490 msgid "This item was replaced by" msgstr "Tato položka byla nahrazena" -#: inc/replace.class.php:519 inc/replace.class.php:595 +#: inc/replace.class.php:538 inc/replace.class.php:614 msgid "Reminder of the replacement model" msgstr "Připomínka modelu nahrazení" -#: inc/replace.class.php:557 +#: inc/replace.class.php:576 msgid "New location of item" msgstr "Nové umístění položky" -#: inc/replace.class.php:642 +#: inc/replace.class.php:661 msgid "Choices for item to replace" msgstr "Volby pro položky k nahrazení" -#: inc/replace.class.php:645 +#: inc/replace.class.php:664 msgid "Old item" msgstr "Původní položka" -#: inc/replace.class.php:655 +#: inc/replace.class.php:674 msgid "New item" msgstr "Nová položka" -#: inc/replace.class.php:687 +#: inc/replace.class.php:706 msgid "Replace" msgstr "Nahradit" - -#: inc/uninstall.class.php:38 setup.php:83 -msgid "Item's uninstallation" -msgstr "Odinstalace položky" - -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Čekejte, probíhá odinstalace…" - -#: inc/uninstall.class.php:511 -msgid "Item is now uninstalled" -msgstr "Položka je nyní odinstalovaná" - -#: inc/uninstall.class.php:515 -msgid "Item replaced by a new one" -msgstr "Položka je nahrazena novou" - -#: inc/uninstall.class.php:519 -msgid "Item replacing an old one" -msgstr "Položka nahrazující tu původní" - -#: inc/uninstall.class.php:524 -msgid "Removed from OCSNG with ID" -msgstr "Odebráno z OCSNG s identifikátorem" - -#: inc/uninstall.class.php:635 inc/preference.class.php:54 -msgid "Item's location after uninstall" -msgstr "Umístění položky po odinstalaci" - -#: inc/uninstall.class.php:718 -msgid "Affect to a new group" -msgstr "Přiřadit do nové skupiny" diff --git a/locales/en_GB.mo b/locales/en_GB.mo new file mode 100644 index 0000000..47393ed Binary files /dev/null and b/locales/en_GB.mo differ diff --git a/locales/en_GB.po b/locales/en_GB.po new file mode 100644 index 0000000..bfbce4d --- /dev/null +++ b/locales/en_GB.po @@ -0,0 +1,269 @@ +# 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. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-06-28 09:42+0000\n" +"PO-Revision-Date: 2018-06-28 09:42+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=ASCII\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: front/action.php:55 inc/replace.class.php:466 +msgid "Replacement successful" +msgstr "Replacement successful" + +#: front/action.php:96 inc/uninstall.class.php:320 +msgid "Uninstallation successful" +msgstr "Uninstallation successful" + +#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:579 +msgid "Keep previous location" +msgstr "Keep previous location" + +#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:583 +msgid "Empty location" +msgstr "Empty location" + +#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:781 +msgid "Uninstall" +msgstr "Uninstall" + +#: inc/model.class.php:42 +msgid "Uninstallation template" +msgstr "Uninstallation template" + +#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +msgid "Uninstallation" +msgstr "Uninstallation" + +#: inc/model.class.php:110 inc/model.class.php:990 inc/model.class.php:1032 +#: inc/replace.class.php:61 inc/replace.class.php:108 +msgid "Replacement" +msgstr "Replacement" + +#: inc/model.class.php:120 +msgid "PDF Archiving" +msgstr "PDF Archiving" + +#: inc/model.class.php:122 +msgid "CSV Archiving" +msgstr "CSV Archiving" + +#: inc/model.class.php:125 +msgid "Purge" +msgstr "Purge" + +#: inc/model.class.php:126 +msgid "Delete + Comment" +msgstr "Delete + Comment" + +#: inc/model.class.php:127 +msgid "Keep + Comment" +msgstr "Keep + Comment" + +#: inc/model.class.php:168 +msgid "Replacing data" +msgstr "Replacing data" + +#: inc/model.class.php:212 inc/model.class.php:831 +msgid "Type of template" +msgstr "Type of template" + +#: inc/model.class.php:221 inc/model.class.php:795 +msgid "Transfer's model to use" +msgstr "Transfer's model to use" + +#: inc/model.class.php:241 inc/replace.class.php:593 +msgid "New status of the computer" +msgstr "New status of the computer" + +#: inc/model.class.php:253 inc/model.class.php:841 +msgid "Action on group" +msgstr "Action on group" + +#: inc/model.class.php:265 +msgid "New group" +msgstr "New group" + +#: inc/model.class.php:286 +msgid "Add template" +msgstr "Add template" + +#: inc/model.class.php:289 +msgid "Manage templates" +msgstr "Manage templates" + +#: inc/model.class.php:300 +msgid "Erase datas" +msgstr "Erase datas" + +#: inc/model.class.php:303 inc/model.class.php:703 +msgid "Delete software history (computers)" +msgstr "Delete software history (computers)" + +#: inc/model.class.php:308 inc/model.class.php:861 +msgid "Delete the whole history" +msgstr "Delete the whole history" + +#: inc/model.class.php:390 inc/model.class.php:440 +msgid "Informations replacement" +msgstr "Informations replacement" + +#: inc/model.class.php:391 inc/replace.class.php:539 +msgid "General informations" +msgstr "General informations" + +#: inc/model.class.php:413 inc/replace.class.php:554 +msgid "Overwrite informations (from old item to the new)" +msgstr "Overwrite informations (from old item to the new)" + +#: inc/model.class.php:420 inc/model.class.php:851 inc/replace.class.php:557 +msgid "Archiving method of the old material" +msgstr "Archiving method of the old material" + +#: inc/model.class.php:430 +msgid "Plugin PDF is installed and activated" +msgstr "Plugin PDF is installed and activated" + +#: inc/model.class.php:433 +msgid "" +"Plugin PDF is not installed, you won't be able to use PDF format for " +"archiving" +msgstr "" +"Plugin PDF is not installed, you won't be able to use PDF format for " +"archiving" + +#: inc/model.class.php:441 inc/replace.class.php:615 +msgid "Connections with other materials" +msgstr "Connections with other materials" + +#: inc/model.class.php:515 inc/replace.class.php:650 +msgid "Direct connections" +msgstr "Direct connections" + +#: inc/model.class.php:588 +msgid "OCSNG link" +msgid_plural "OCSNG links" +msgstr[0] "OCSNG link" +msgstr[1] "OCSNG links" + +#: inc/model.class.php:590 +msgid "These options only apply to computers coming from OCSNG" +msgstr "These options only apply to computers coming from OCSNG" + +#: inc/model.class.php:594 inc/model.class.php:814 +msgid "Delete computer in OCSNG" +msgstr "Delete computer in OCSNG" + +#: inc/model.class.php:600 inc/model.class.php:822 +msgid "Delete link with computer in OCSNG" +msgstr "Delete link with computer in OCSNG" + +#: inc/model.class.php:614 +msgid "Delete computer in FusionInventory" +msgstr "Delete computer in FusionInventory" + +#: inc/model.class.php:626 +msgid "Additionnal fields" +msgstr "Additionnal fields" + +#: inc/model.class.php:630 +msgid "Delete Fields plugin informations" +msgstr "Delete Fields plugin informations" + +#: inc/model.class.php:995 inc/uninstall.class.php:728 +msgid "Keep in the current group" +msgstr "Keep in the current group" + +#: inc/preference.class.php:54 inc/uninstall.class.php:646 +msgid "Item's location after uninstall" +msgstr "Item's location after uninstall" + +#: inc/uninstall.class.php:38 setup.php:89 +msgid "Item's uninstallation" +msgstr "Item's uninstallation" + +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Please wait, uninstallation is running..." + +#: inc/uninstall.class.php:522 +msgid "Item is now uninstalled" +msgstr "Item is now uninstalled" + +#: inc/uninstall.class.php:526 +msgid "Item replaced by a new one" +msgstr "Item replaced by a new one" + +#: inc/uninstall.class.php:530 +msgid "Item replacing an old one" +msgstr "Item replacing an old one" + +#: inc/uninstall.class.php:535 +msgid "Removed from OCSNG with ID" +msgstr "Removed from OCSNG with ID" + +#: inc/uninstall.class.php:729 +msgid "Affect to a new group" +msgstr "Affect to a new group" + +#: inc/replace.class.php:40 +msgid "Item's replacement" +msgstr "Item's replacement" + +#: inc/replace.class.php:65 +msgid "Please wait, replacement is running..." +msgstr "Please wait, replacement is running..." + +#: inc/replace.class.php:130 +msgid "This document is the archive of this replaced item" +msgstr "This document is the archive of this replaced item" + +#: inc/replace.class.php:135 +msgid "Archive of old material" +msgstr "Archive of old material" + +#: inc/replace.class.php:409 +msgid "See attached document" +msgstr "See attached document" + +#: inc/replace.class.php:488 +msgid "This item is a replacement for item" +msgstr "This item is a replacement for item" + +#: inc/replace.class.php:490 +msgid "This item was replaced by" +msgstr "This item was replaced by" + +#: inc/replace.class.php:538 inc/replace.class.php:614 +msgid "Reminder of the replacement model" +msgstr "Reminder of the replacement model" + +#: inc/replace.class.php:576 +msgid "New location of item" +msgstr "New location of item" + +#: inc/replace.class.php:661 +msgid "Choices for item to replace" +msgstr "Choices for item to replace" + +#: inc/replace.class.php:664 +msgid "Old item" +msgstr "Old item" + +#: inc/replace.class.php:674 +msgid "New item" +msgstr "New item" + +#: inc/replace.class.php:706 +msgid "Replace" +msgstr "Replace" diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo index 3a6f59c..eed4f51 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 85c6756..0ec2123 100644 --- a/locales/fr_FR.po +++ b/locales/fr_FR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 12:03+0200\n" +"POT-Creation-Date: 2018-06-28 09:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Johan Cwiklinski , 2017\n" "Language-Team: French (France) (https://www.transifex.com/teclib/teams/28042/fr_FR/)\n" @@ -18,35 +18,35 @@ msgstr "" "Language: fr_FR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: front/action.php:55 inc/replace.class.php:447 +#: front/action.php:55 inc/replace.class.php:466 msgid "Replacement successful" msgstr "Remplacement effectué avec succès" -#: front/action.php:96 inc/uninstall.class.php:315 +#: front/action.php:96 inc/uninstall.class.php:320 msgid "Uninstallation successful" msgstr "Désinstallation effectuée avec succès" -#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:770 -msgid "Uninstall" -msgstr "Désinstaller" - -#: ajax/locations.php:43 inc/replace.class.php:560 inc/preference.class.php:74 +#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:579 msgid "Keep previous location" msgstr "Garder l'ancien lieu" -#: ajax/locations.php:44 inc/replace.class.php:564 inc/preference.class.php:76 +#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:583 msgid "Empty location" msgstr "Vider le lieu" +#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:781 +msgid "Uninstall" +msgstr "Désinstaller" + #: inc/model.class.php:42 msgid "Uninstallation template" msgstr "Modèle de désinstallation" -#: inc/model.class.php:108 inc/model.class.php:880 inc/model.class.php:922 +#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Désinstallation" -#: inc/model.class.php:110 inc/model.class.php:882 inc/model.class.php:924 +#: inc/model.class.php:110 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Remplacement" @@ -75,19 +75,19 @@ msgstr "Ne pas supprimer + Commentaires" msgid "Replacing data" msgstr "Remplacement des données" -#: inc/model.class.php:212 inc/model.class.php:766 +#: inc/model.class.php:212 inc/model.class.php:831 msgid "Type of template" msgstr "Type de modèle" -#: inc/model.class.php:221 inc/model.class.php:741 +#: inc/model.class.php:221 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Modèle de transfert à utiliser" -#: inc/model.class.php:241 inc/replace.class.php:574 +#: inc/model.class.php:241 inc/replace.class.php:593 msgid "New status of the computer" msgstr "Nouveau statut du matériel" -#: inc/model.class.php:253 inc/model.class.php:774 +#: inc/model.class.php:253 inc/model.class.php:841 msgid "Action on group" msgstr "Action sur le groupe" @@ -107,35 +107,35 @@ msgstr "Gestion des modèles" msgid "Erase datas" msgstr "Effacement de données" -#: inc/model.class.php:303 inc/model.class.php:684 +#: inc/model.class.php:303 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Supprimer l'historique des logiciels (ordinateurs)" -#: inc/model.class.php:308 inc/model.class.php:787 +#: inc/model.class.php:308 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Effacement de tout l'historique" -#: inc/model.class.php:382 inc/model.class.php:432 +#: inc/model.class.php:390 inc/model.class.php:440 msgid "Informations replacement" msgstr "Remplacement des données" -#: inc/model.class.php:383 inc/replace.class.php:520 +#: inc/model.class.php:391 inc/replace.class.php:539 msgid "General informations" msgstr "Informations générales" -#: inc/model.class.php:405 inc/replace.class.php:535 +#: inc/model.class.php:413 inc/replace.class.php:554 msgid "Overwrite informations (from old item to the new)" msgstr "Ecraser les informations (de l'ancien matériel vers le nouveau)" -#: inc/model.class.php:412 inc/model.class.php:781 inc/replace.class.php:538 +#: inc/model.class.php:420 inc/model.class.php:851 inc/replace.class.php:557 msgid "Archiving method of the old material" msgstr "Méthode d'archivage de l'ancien matériel" -#: inc/model.class.php:422 +#: inc/model.class.php:430 msgid "Plugin PDF is installed and activated" msgstr "Le plugin PDF est installé et activé" -#: inc/model.class.php:425 +#: inc/model.class.php:433 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -143,48 +143,80 @@ msgstr "" "Le plugin PDF n'est pas installé, vous ne pouvez pas utiliser le format PDF " "pour l'archivage" -#: inc/model.class.php:433 inc/replace.class.php:596 +#: inc/model.class.php:441 inc/replace.class.php:615 msgid "Connections with other materials" msgstr "Connexion avec les autres matériels" -#: inc/model.class.php:507 inc/replace.class.php:631 +#: inc/model.class.php:515 inc/replace.class.php:650 msgid "Direct connections" msgstr "connexions directes" -#: inc/model.class.php:580 +#: inc/model.class.php:588 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "Lien OCSNG" msgstr[1] "Liens OCSNG" -#: inc/model.class.php:582 +#: inc/model.class.php:590 msgid "These options only apply to computers coming from OCSNG" msgstr "Ces options s'appliquent seulement aux ordinateurs provenant d'OCSNG" -#: inc/model.class.php:586 inc/model.class.php:755 +#: inc/model.class.php:594 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Supprimer l'ordinateur dans OCSNG" -#: inc/model.class.php:592 inc/model.class.php:760 +#: inc/model.class.php:600 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Supprimer le lien avec la machine OCS" -#: inc/model.class.php:606 +#: inc/model.class.php:614 msgid "Delete computer in FusionInventory" msgstr "Supprimer le lien avec FusionInventory" -#: inc/model.class.php:618 +#: inc/model.class.php:626 msgid "Additionnal fields" msgstr "Champs additionnels" -#: inc/model.class.php:622 +#: inc/model.class.php:630 msgid "Delete Fields plugin informations" msgstr "Supprimer les informations du plugin Fields" -#: inc/model.class.php:887 inc/uninstall.class.php:717 +#: inc/model.class.php:995 inc/uninstall.class.php:728 msgid "Keep in the current group" msgstr "Conserver la valeur actuelle" +#: inc/preference.class.php:54 inc/uninstall.class.php:646 +msgid "Item's location after uninstall" +msgstr "Lieu du matériel après désinstallation" + +#: inc/uninstall.class.php:38 setup.php:89 +msgid "Item's uninstallation" +msgstr "Désinstallation d'un matériel" + +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Veuillez patienter, désinstallation en cours..." + +#: inc/uninstall.class.php:522 +msgid "Item is now uninstalled" +msgstr "Matériel désinstallé" + +#: inc/uninstall.class.php:526 +msgid "Item replaced by a new one" +msgstr "Matériel remplacé" + +#: inc/uninstall.class.php:530 +msgid "Item replacing an old one" +msgstr "Matériel provenant d'un remplacement" + +#: inc/uninstall.class.php:535 +msgid "Removed from OCSNG with ID" +msgstr "Supprimé d'OCSNG ID OCS" + +#: inc/uninstall.class.php:729 +msgid "Affect to a new group" +msgstr "Affecter à une nouvelle valeur" + #: inc/replace.class.php:40 msgid "Item's replacement" msgstr "Remplacement d'un matériel" @@ -201,70 +233,38 @@ msgstr "Ce document est l'archive de l'objet remplacé" msgid "Archive of old material" msgstr "Archive de l'ancien matériel" -#: inc/replace.class.php:403 +#: inc/replace.class.php:409 msgid "See attached document" msgstr "Voir le document attaché" -#: inc/replace.class.php:473 +#: inc/replace.class.php:488 msgid "This item is a replacement for item" msgstr "Cet objet est le remplacement de l'objet" -#: inc/replace.class.php:475 +#: inc/replace.class.php:490 msgid "This item was replaced by" msgstr "Cet objet a été remplacé par" -#: inc/replace.class.php:519 inc/replace.class.php:595 +#: inc/replace.class.php:538 inc/replace.class.php:614 msgid "Reminder of the replacement model" msgstr "Rappel du modèle de remplacement" -#: inc/replace.class.php:557 +#: inc/replace.class.php:576 msgid "New location of item" msgstr "Nouveau lieu du matériel" -#: inc/replace.class.php:642 +#: inc/replace.class.php:661 msgid "Choices for item to replace" msgstr "Choix des matériels de remplacement" -#: inc/replace.class.php:645 +#: inc/replace.class.php:664 msgid "Old item" msgstr "Ancien matériel" -#: inc/replace.class.php:655 +#: inc/replace.class.php:674 msgid "New item" msgstr "Nouveau matériel" -#: inc/replace.class.php:687 +#: inc/replace.class.php:706 msgid "Replace" msgstr "Remplacer" - -#: inc/uninstall.class.php:38 setup.php:83 -msgid "Item's uninstallation" -msgstr "Désinstallation d'un matériel" - -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Veuillez patienter, désinstallation en cours..." - -#: inc/uninstall.class.php:511 -msgid "Item is now uninstalled" -msgstr "Matériel désinstallé" - -#: inc/uninstall.class.php:515 -msgid "Item replaced by a new one" -msgstr "Matériel remplacé" - -#: inc/uninstall.class.php:519 -msgid "Item replacing an old one" -msgstr "Matériel provenant d'un remplacement" - -#: inc/uninstall.class.php:524 -msgid "Removed from OCSNG with ID" -msgstr "Supprimé d'OCSNG ID OCS" - -#: inc/uninstall.class.php:635 inc/preference.class.php:54 -msgid "Item's location after uninstall" -msgstr "Lieu du matériel après désinstallation" - -#: inc/uninstall.class.php:718 -msgid "Affect to a new group" -msgstr "Affecter à une nouvelle valeur" diff --git a/locales/pl_PL.mo b/locales/pl_PL.mo index dd0e081..e0576b8 100644 Binary files a/locales/pl_PL.mo and b/locales/pl_PL.mo differ diff --git a/locales/pl_PL.po b/locales/pl_PL.po index 2d9d50a..f77e2d9 100644 --- a/locales/pl_PL.po +++ b/locales/pl_PL.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 12:03+0200\n" +"POT-Creation-Date: 2018-06-28 09:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Jacek Maciol , 2017\n" "Language-Team: Polish (Poland) (https://www.transifex.com/teclib/teams/28042/pl_PL/)\n" @@ -18,35 +18,35 @@ msgstr "" "Language: pl_PL\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -#: front/action.php:55 inc/replace.class.php:447 +#: front/action.php:55 inc/replace.class.php:466 msgid "Replacement successful" msgstr "Wymiana zakończona powodzeniem" -#: front/action.php:96 inc/uninstall.class.php:315 +#: front/action.php:96 inc/uninstall.class.php:320 msgid "Uninstallation successful" msgstr "Dezinstalacja zakończona sukcesem" -#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:770 -msgid "Uninstall" -msgstr "Odinstaluj" - -#: ajax/locations.php:43 inc/replace.class.php:560 inc/preference.class.php:74 +#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:579 msgid "Keep previous location" msgstr "Zachowaj poprzednią lokalizację" -#: ajax/locations.php:44 inc/replace.class.php:564 inc/preference.class.php:76 +#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:583 msgid "Empty location" msgstr "Opróżnij lokalizacje" +#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:781 +msgid "Uninstall" +msgstr "Odinstaluj" + #: inc/model.class.php:42 msgid "Uninstallation template" msgstr "Szablon dezinstalacyjny" -#: inc/model.class.php:108 inc/model.class.php:880 inc/model.class.php:922 +#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Dezinstalacja" -#: inc/model.class.php:110 inc/model.class.php:882 inc/model.class.php:924 +#: inc/model.class.php:110 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Wymiana" @@ -75,19 +75,19 @@ msgstr "Zostaw + Komentarz" msgid "Replacing data" msgstr "Zastępowanie danych" -#: inc/model.class.php:212 inc/model.class.php:766 +#: inc/model.class.php:212 inc/model.class.php:831 msgid "Type of template" msgstr "Typ modelu" -#: inc/model.class.php:221 inc/model.class.php:741 +#: inc/model.class.php:221 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Przenieś model do użycia" -#: inc/model.class.php:241 inc/replace.class.php:574 +#: inc/model.class.php:241 inc/replace.class.php:593 msgid "New status of the computer" msgstr "Nowy status komputera" -#: inc/model.class.php:253 inc/model.class.php:774 +#: inc/model.class.php:253 inc/model.class.php:841 msgid "Action on group" msgstr "Działanie w grupie" @@ -107,35 +107,35 @@ msgstr "Zarządzaj szablonami" msgid "Erase datas" msgstr "Kasowanie danych" -#: inc/model.class.php:303 inc/model.class.php:684 +#: inc/model.class.php:303 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Usuń historię oprogramowania (komputery)" -#: inc/model.class.php:308 inc/model.class.php:787 +#: inc/model.class.php:308 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Wymaż całą historię" -#: inc/model.class.php:382 inc/model.class.php:432 +#: inc/model.class.php:390 inc/model.class.php:440 msgid "Informations replacement" msgstr "Wymiana danych" -#: inc/model.class.php:383 inc/replace.class.php:520 +#: inc/model.class.php:391 inc/replace.class.php:539 msgid "General informations" msgstr "Informacje ogólne" -#: inc/model.class.php:405 inc/replace.class.php:535 +#: inc/model.class.php:413 inc/replace.class.php:554 msgid "Overwrite informations (from old item to the new)" msgstr "Zastąp informacje (ze starego przedmiotu na nowy)" -#: inc/model.class.php:412 inc/model.class.php:781 inc/replace.class.php:538 +#: inc/model.class.php:420 inc/model.class.php:851 inc/replace.class.php:557 msgid "Archiving method of the old material" msgstr "Metoda archiwizacji dla starego sprzętu" -#: inc/model.class.php:422 +#: inc/model.class.php:430 msgid "Plugin PDF is installed and activated" msgstr "Wtyczka PDF jest zainstalowana i aktywowana" -#: inc/model.class.php:425 +#: inc/model.class.php:433 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -143,15 +143,15 @@ msgstr "" "Wtyczka PDF nie jest zainstalowana, nie można używać formatu PDF do " "archiwizacji" -#: inc/model.class.php:433 inc/replace.class.php:596 +#: inc/model.class.php:441 inc/replace.class.php:615 msgid "Connections with other materials" msgstr "Połączenia z innymi materiałami" -#: inc/model.class.php:507 inc/replace.class.php:631 +#: inc/model.class.php:515 inc/replace.class.php:650 msgid "Direct connections" msgstr "Połączenia bezpośrednie" -#: inc/model.class.php:580 +#: inc/model.class.php:588 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "Łącze OCSNG" @@ -159,34 +159,66 @@ msgstr[1] "Łącze OCSNG" msgstr[2] "Łącza OCSNG" msgstr[3] "Łącza OCSNG" -#: inc/model.class.php:582 +#: inc/model.class.php:590 msgid "These options only apply to computers coming from OCSNG" msgstr "Te opcje dotyczą tylko komputerów z OCSNG" -#: inc/model.class.php:586 inc/model.class.php:755 +#: inc/model.class.php:594 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Usuń komputer w OCSNG" -#: inc/model.class.php:592 inc/model.class.php:760 +#: inc/model.class.php:600 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Usuń łącze z komputerem w OCSNG" -#: inc/model.class.php:606 +#: inc/model.class.php:614 msgid "Delete computer in FusionInventory" msgstr "Usuń komputer w FusionInventory" -#: inc/model.class.php:618 +#: inc/model.class.php:626 msgid "Additionnal fields" msgstr "Pola dodatkowe" -#: inc/model.class.php:622 +#: inc/model.class.php:630 msgid "Delete Fields plugin informations" msgstr "Usuń informacje z wtyczki Fields" -#: inc/model.class.php:887 inc/uninstall.class.php:717 +#: inc/model.class.php:995 inc/uninstall.class.php:728 msgid "Keep in the current group" msgstr "Zachowaj aktualną wartość" +#: inc/preference.class.php:54 inc/uninstall.class.php:646 +msgid "Item's location after uninstall" +msgstr "Lokalizacja przedmiotu po odinstalowaniu" + +#: inc/uninstall.class.php:38 setup.php:89 +msgid "Item's uninstallation" +msgstr "Dezinstalacja przedmiotu" + +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Proszę czekać, trwa dezinstalacja..." + +#: inc/uninstall.class.php:522 +msgid "Item is now uninstalled" +msgstr "Odinstalowany sprzęt" + +#: inc/uninstall.class.php:526 +msgid "Item replaced by a new one" +msgstr "Element zastąpiony nowym" + +#: inc/uninstall.class.php:530 +msgid "Item replacing an old one" +msgstr "Przedmiot zastępujący stary" + +#: inc/uninstall.class.php:535 +msgid "Removed from OCSNG with ID" +msgstr "Usunięto z OCSNG z ID" + +#: inc/uninstall.class.php:729 +msgid "Affect to a new group" +msgstr "Dotyczy nowej grupy" + #: inc/replace.class.php:40 msgid "Item's replacement" msgstr "Wymiana przedmiotu" @@ -203,70 +235,38 @@ msgstr "Ten dokument jest archiwum tego wymienionego przedmiotu" msgid "Archive of old material" msgstr "Archiwum starego materiału" -#: inc/replace.class.php:403 +#: inc/replace.class.php:409 msgid "See attached document" msgstr "Zobacz załączony dokument" -#: inc/replace.class.php:473 +#: inc/replace.class.php:488 msgid "This item is a replacement for item" msgstr "Ten przedmiot jest zamiennikiem przedmiotu" -#: inc/replace.class.php:475 +#: inc/replace.class.php:490 msgid "This item was replaced by" msgstr "Element został zastąpiony przez" -#: inc/replace.class.php:519 inc/replace.class.php:595 +#: inc/replace.class.php:538 inc/replace.class.php:614 msgid "Reminder of the replacement model" msgstr "Przypomnienie o modelu zastępczym" -#: inc/replace.class.php:557 +#: inc/replace.class.php:576 msgid "New location of item" msgstr "Nowe miejsce przedmiotu" -#: inc/replace.class.php:642 +#: inc/replace.class.php:661 msgid "Choices for item to replace" msgstr "Wybory do zastąpienia przedmiotu" -#: inc/replace.class.php:645 +#: inc/replace.class.php:664 msgid "Old item" msgstr "Stary przedmiot" -#: inc/replace.class.php:655 +#: inc/replace.class.php:674 msgid "New item" msgstr "Nowy przedmiot" -#: inc/replace.class.php:687 +#: inc/replace.class.php:706 msgid "Replace" msgstr "Zastąp" - -#: inc/uninstall.class.php:38 setup.php:83 -msgid "Item's uninstallation" -msgstr "Dezinstalacja przedmiotu" - -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Proszę czekać, trwa dezinstalacja..." - -#: inc/uninstall.class.php:511 -msgid "Item is now uninstalled" -msgstr "Odinstalowany sprzęt" - -#: inc/uninstall.class.php:515 -msgid "Item replaced by a new one" -msgstr "Element zastąpiony nowym" - -#: inc/uninstall.class.php:519 -msgid "Item replacing an old one" -msgstr "Przedmiot zastępujący stary" - -#: inc/uninstall.class.php:524 -msgid "Removed from OCSNG with ID" -msgstr "Usunięto z OCSNG z ID" - -#: inc/uninstall.class.php:635 inc/preference.class.php:54 -msgid "Item's location after uninstall" -msgstr "Lokalizacja przedmiotu po odinstalowaniu" - -#: inc/uninstall.class.php:718 -msgid "Affect to a new group" -msgstr "Dotyczy nowej grupy" diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo index 8244e8b..0a67b37 100644 Binary files a/locales/pt_BR.mo and b/locales/pt_BR.mo differ diff --git a/locales/pt_BR.po b/locales/pt_BR.po index 16a9c6a..dfcf735 100644 --- a/locales/pt_BR.po +++ b/locales/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 12:03+0200\n" +"POT-Creation-Date: 2018-06-28 09:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Eduardo Spinola , 2017\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/teclib/teams/28042/pt_BR/)\n" @@ -18,35 +18,35 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: front/action.php:55 inc/replace.class.php:447 +#: front/action.php:55 inc/replace.class.php:466 msgid "Replacement successful" msgstr "Substituição executada com sucesso" -#: front/action.php:96 inc/uninstall.class.php:315 +#: front/action.php:96 inc/uninstall.class.php:320 msgid "Uninstallation successful" msgstr "Desinstalação executada com sucesso" -#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:770 -msgid "Uninstall" -msgstr "Desinstalar" - -#: ajax/locations.php:43 inc/replace.class.php:560 inc/preference.class.php:74 +#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:579 msgid "Keep previous location" msgstr "Manter localização anterior" -#: ajax/locations.php:44 inc/replace.class.php:564 inc/preference.class.php:76 +#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:583 msgid "Empty location" msgstr "Esvaziar localização" +#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:781 +msgid "Uninstall" +msgstr "Desinstalar" + #: inc/model.class.php:42 msgid "Uninstallation template" msgstr "Modelo de desinstalação" -#: inc/model.class.php:108 inc/model.class.php:880 inc/model.class.php:922 +#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Desinstalação" -#: inc/model.class.php:110 inc/model.class.php:882 inc/model.class.php:924 +#: inc/model.class.php:110 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Recolocação" @@ -75,19 +75,19 @@ msgstr "Manter + Comentar" msgid "Replacing data" msgstr "Substituindo dados" -#: inc/model.class.php:212 inc/model.class.php:766 +#: inc/model.class.php:212 inc/model.class.php:831 msgid "Type of template" msgstr "Tipo de modelo" -#: inc/model.class.php:221 inc/model.class.php:741 +#: inc/model.class.php:221 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Modelo de transferência a utilizar" -#: inc/model.class.php:241 inc/replace.class.php:574 +#: inc/model.class.php:241 inc/replace.class.php:593 msgid "New status of the computer" msgstr "Novo status do computador" -#: inc/model.class.php:253 inc/model.class.php:774 +#: inc/model.class.php:253 inc/model.class.php:841 msgid "Action on group" msgstr "Ação no grupo" @@ -107,35 +107,35 @@ msgstr "Gerenciar modelos" msgid "Erase datas" msgstr "Excluir dados" -#: inc/model.class.php:303 inc/model.class.php:684 +#: inc/model.class.php:303 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Excluir hisórico de software (computadores)" -#: inc/model.class.php:308 inc/model.class.php:787 +#: inc/model.class.php:308 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Excluir todo histórico" -#: inc/model.class.php:382 inc/model.class.php:432 +#: inc/model.class.php:390 inc/model.class.php:440 msgid "Informations replacement" msgstr "Substituição de informações" -#: inc/model.class.php:383 inc/replace.class.php:520 +#: inc/model.class.php:391 inc/replace.class.php:539 msgid "General informations" msgstr "Informações gerais" -#: inc/model.class.php:405 inc/replace.class.php:535 +#: inc/model.class.php:413 inc/replace.class.php:554 msgid "Overwrite informations (from old item to the new)" msgstr "Sobrescrever informações (da mais antiga a mais recente)" -#: inc/model.class.php:412 inc/model.class.php:781 inc/replace.class.php:538 +#: inc/model.class.php:420 inc/model.class.php:851 inc/replace.class.php:557 msgid "Archiving method of the old material" msgstr "Método de arquivamento do material antigo" -#: inc/model.class.php:422 +#: inc/model.class.php:430 msgid "Plugin PDF is installed and activated" msgstr "Plugin PDF está instalado e ativado" -#: inc/model.class.php:425 +#: inc/model.class.php:433 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -143,48 +143,80 @@ msgstr "" "Plugin PDF não está instalado, você não poderá utilizar o arquivamento no " "formato PDF" -#: inc/model.class.php:433 inc/replace.class.php:596 +#: inc/model.class.php:441 inc/replace.class.php:615 msgid "Connections with other materials" msgstr "Conexões com outros materiais" -#: inc/model.class.php:507 inc/replace.class.php:631 +#: inc/model.class.php:515 inc/replace.class.php:650 msgid "Direct connections" msgstr "Conexões diretas" -#: inc/model.class.php:580 +#: inc/model.class.php:588 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "Conexão OCSNG" msgstr[1] "Conexões OCSNG" -#: inc/model.class.php:582 +#: inc/model.class.php:590 msgid "These options only apply to computers coming from OCSNG" msgstr "Estas opções apenas se aplicam a computadores vindos do OCSNG" -#: inc/model.class.php:586 inc/model.class.php:755 +#: inc/model.class.php:594 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Excluir computador no OCSNG" -#: inc/model.class.php:592 inc/model.class.php:760 +#: inc/model.class.php:600 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Excluir conexão com computador no OCSNG" -#: inc/model.class.php:606 +#: inc/model.class.php:614 msgid "Delete computer in FusionInventory" msgstr "Excluir computador no Fusioninventory" -#: inc/model.class.php:618 +#: inc/model.class.php:626 msgid "Additionnal fields" msgstr "Campos adicional" -#: inc/model.class.php:622 +#: inc/model.class.php:630 msgid "Delete Fields plugin informations" msgstr "Excluir campos de informações do plugin" -#: inc/model.class.php:887 inc/uninstall.class.php:717 +#: inc/model.class.php:995 inc/uninstall.class.php:728 msgid "Keep in the current group" msgstr "Manter no grupo atua" +#: inc/preference.class.php:54 inc/uninstall.class.php:646 +msgid "Item's location after uninstall" +msgstr "Localização do item após a desinstalação" + +#: inc/uninstall.class.php:38 setup.php:89 +msgid "Item's uninstallation" +msgstr "Desinstalação do item" + +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Por favor aguarde, desinstalação em execução..." + +#: inc/uninstall.class.php:522 +msgid "Item is now uninstalled" +msgstr "O item está desinstalado" + +#: inc/uninstall.class.php:526 +msgid "Item replaced by a new one" +msgstr "Item substituído por outro" + +#: inc/uninstall.class.php:530 +msgid "Item replacing an old one" +msgstr "Item substituindo um mais antigo" + +#: inc/uninstall.class.php:535 +msgid "Removed from OCSNG with ID" +msgstr "Removido do OCSNG com ID" + +#: inc/uninstall.class.php:729 +msgid "Affect to a new group" +msgstr "Impacto a um novo grupo" + #: inc/replace.class.php:40 msgid "Item's replacement" msgstr "Substituição de item" @@ -201,70 +233,38 @@ msgstr "O documento é o arquivo desse item substituído" msgid "Archive of old material" msgstr "Arquivamento de material antigo" -#: inc/replace.class.php:403 +#: inc/replace.class.php:409 msgid "See attached document" msgstr "Visualizar documento anexado" -#: inc/replace.class.php:473 +#: inc/replace.class.php:488 msgid "This item is a replacement for item" msgstr "Este item é a substituição para item" -#: inc/replace.class.php:475 +#: inc/replace.class.php:490 msgid "This item was replaced by" msgstr "Este item foi substituído por" -#: inc/replace.class.php:519 inc/replace.class.php:595 +#: inc/replace.class.php:538 inc/replace.class.php:614 msgid "Reminder of the replacement model" msgstr "Lembrete de modelo de substituição" -#: inc/replace.class.php:557 +#: inc/replace.class.php:576 msgid "New location of item" msgstr "Nova localização do item" -#: inc/replace.class.php:642 +#: inc/replace.class.php:661 msgid "Choices for item to replace" msgstr "Escolhas de item para substituir" -#: inc/replace.class.php:645 +#: inc/replace.class.php:664 msgid "Old item" msgstr "Item antigo" -#: inc/replace.class.php:655 +#: inc/replace.class.php:674 msgid "New item" msgstr "Novo item" -#: inc/replace.class.php:687 +#: inc/replace.class.php:706 msgid "Replace" msgstr "Substituir" - -#: inc/uninstall.class.php:38 setup.php:83 -msgid "Item's uninstallation" -msgstr "Desinstalação do item" - -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Por favor aguarde, desinstalação em execução..." - -#: inc/uninstall.class.php:511 -msgid "Item is now uninstalled" -msgstr "O item está desinstalado" - -#: inc/uninstall.class.php:515 -msgid "Item replaced by a new one" -msgstr "Item substituído por outro" - -#: inc/uninstall.class.php:519 -msgid "Item replacing an old one" -msgstr "Item substituindo um mais antigo" - -#: inc/uninstall.class.php:524 -msgid "Removed from OCSNG with ID" -msgstr "Removido do OCSNG com ID" - -#: inc/uninstall.class.php:635 inc/preference.class.php:54 -msgid "Item's location after uninstall" -msgstr "Localização do item após a desinstalação" - -#: inc/uninstall.class.php:718 -msgid "Affect to a new group" -msgstr "Impacto a um novo grupo" diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo index 41d1720..1dcb321 100644 Binary files a/locales/ru_RU.mo and b/locales/ru_RU.mo differ diff --git a/locales/ru_RU.po b/locales/ru_RU.po index cfdadb6..ed1e1f9 100644 --- a/locales/ru_RU.po +++ b/locales/ru_RU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 12:03+0200\n" +"POT-Creation-Date: 2018-06-28 09:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Nikolay , 2018\n" "Language-Team: Russian (Russia) (https://www.transifex.com/teclib/teams/28042/ru_RU/)\n" @@ -18,35 +18,35 @@ msgstr "" "Language: ru_RU\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: front/action.php:55 inc/replace.class.php:447 +#: front/action.php:55 inc/replace.class.php:466 msgid "Replacement successful" msgstr "Успешная замена" -#: front/action.php:96 inc/uninstall.class.php:315 +#: front/action.php:96 inc/uninstall.class.php:320 msgid "Uninstallation successful" msgstr "Успешное удаление" -#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:770 -msgid "Uninstall" -msgstr "Удалить" - -#: ajax/locations.php:43 inc/replace.class.php:560 inc/preference.class.php:74 +#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:579 msgid "Keep previous location" msgstr "Сохранить предыдущее местоположение" -#: ajax/locations.php:44 inc/replace.class.php:564 inc/preference.class.php:76 +#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:583 msgid "Empty location" msgstr "Пустое местоположение" +#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:781 +msgid "Uninstall" +msgstr "Удалить" + #: inc/model.class.php:42 msgid "Uninstallation template" msgstr "Шаблон удаления" -#: inc/model.class.php:108 inc/model.class.php:880 inc/model.class.php:922 +#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Удаление" -#: inc/model.class.php:110 inc/model.class.php:882 inc/model.class.php:924 +#: inc/model.class.php:110 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Замена" @@ -75,19 +75,19 @@ msgstr "Сохранить + Комментарий" msgid "Replacing data" msgstr "Замена данных" -#: inc/model.class.php:212 inc/model.class.php:766 +#: inc/model.class.php:212 inc/model.class.php:831 msgid "Type of template" msgstr "Тип шаблона" -#: inc/model.class.php:221 inc/model.class.php:741 +#: inc/model.class.php:221 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Модель переноса для использования" -#: inc/model.class.php:241 inc/replace.class.php:574 +#: inc/model.class.php:241 inc/replace.class.php:593 msgid "New status of the computer" msgstr "Новый статус компьютера" -#: inc/model.class.php:253 inc/model.class.php:774 +#: inc/model.class.php:253 inc/model.class.php:841 msgid "Action on group" msgstr "Действие по группе" @@ -107,35 +107,35 @@ msgstr "Управление шаблонами" msgid "Erase datas" msgstr "Сбросить даты" -#: inc/model.class.php:303 inc/model.class.php:684 +#: inc/model.class.php:303 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Удалить историю ПО (компьютеры)" -#: inc/model.class.php:308 inc/model.class.php:787 +#: inc/model.class.php:308 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Удалить всю историю" -#: inc/model.class.php:382 inc/model.class.php:432 +#: inc/model.class.php:390 inc/model.class.php:440 msgid "Informations replacement" msgstr "Замена информации" -#: inc/model.class.php:383 inc/replace.class.php:520 +#: inc/model.class.php:391 inc/replace.class.php:539 msgid "General informations" msgstr "Общая информация" -#: inc/model.class.php:405 inc/replace.class.php:535 +#: inc/model.class.php:413 inc/replace.class.php:554 msgid "Overwrite informations (from old item to the new)" msgstr "" -#: inc/model.class.php:412 inc/model.class.php:781 inc/replace.class.php:538 +#: inc/model.class.php:420 inc/model.class.php:851 inc/replace.class.php:557 msgid "Archiving method of the old material" msgstr "" -#: inc/model.class.php:422 +#: inc/model.class.php:430 msgid "Plugin PDF is installed and activated" msgstr "" -#: inc/model.class.php:425 +#: inc/model.class.php:433 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -143,15 +143,15 @@ msgstr "" "Плагин PDF не установлен, вы не сможете использовать формат PDF для " "архивации" -#: inc/model.class.php:433 inc/replace.class.php:596 +#: inc/model.class.php:441 inc/replace.class.php:615 msgid "Connections with other materials" msgstr "" -#: inc/model.class.php:507 inc/replace.class.php:631 +#: inc/model.class.php:515 inc/replace.class.php:650 msgid "Direct connections" msgstr "" -#: inc/model.class.php:580 +#: inc/model.class.php:588 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "" @@ -159,34 +159,66 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: inc/model.class.php:582 +#: inc/model.class.php:590 msgid "These options only apply to computers coming from OCSNG" msgstr "" -#: inc/model.class.php:586 inc/model.class.php:755 +#: inc/model.class.php:594 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "" -#: inc/model.class.php:592 inc/model.class.php:760 +#: inc/model.class.php:600 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "" -#: inc/model.class.php:606 +#: inc/model.class.php:614 msgid "Delete computer in FusionInventory" msgstr "" -#: inc/model.class.php:618 +#: inc/model.class.php:626 msgid "Additionnal fields" msgstr "" -#: inc/model.class.php:622 +#: inc/model.class.php:630 msgid "Delete Fields plugin informations" msgstr "" -#: inc/model.class.php:887 inc/uninstall.class.php:717 +#: inc/model.class.php:995 inc/uninstall.class.php:728 msgid "Keep in the current group" msgstr "" +#: inc/preference.class.php:54 inc/uninstall.class.php:646 +msgid "Item's location after uninstall" +msgstr "" + +#: inc/uninstall.class.php:38 setup.php:89 +msgid "Item's uninstallation" +msgstr "Удаление элемента" + +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Пожалуйста, ожидайте, удаление запущено..." + +#: inc/uninstall.class.php:522 +msgid "Item is now uninstalled" +msgstr "" + +#: inc/uninstall.class.php:526 +msgid "Item replaced by a new one" +msgstr "" + +#: inc/uninstall.class.php:530 +msgid "Item replacing an old one" +msgstr "" + +#: inc/uninstall.class.php:535 +msgid "Removed from OCSNG with ID" +msgstr "" + +#: inc/uninstall.class.php:729 +msgid "Affect to a new group" +msgstr "" + #: inc/replace.class.php:40 msgid "Item's replacement" msgstr "" @@ -203,70 +235,38 @@ msgstr "" msgid "Archive of old material" msgstr "" -#: inc/replace.class.php:403 +#: inc/replace.class.php:409 msgid "See attached document" msgstr "" -#: inc/replace.class.php:473 +#: inc/replace.class.php:488 msgid "This item is a replacement for item" msgstr "" -#: inc/replace.class.php:475 +#: inc/replace.class.php:490 msgid "This item was replaced by" msgstr "" -#: inc/replace.class.php:519 inc/replace.class.php:595 +#: inc/replace.class.php:538 inc/replace.class.php:614 msgid "Reminder of the replacement model" msgstr "" -#: inc/replace.class.php:557 +#: inc/replace.class.php:576 msgid "New location of item" msgstr "" -#: inc/replace.class.php:642 +#: inc/replace.class.php:661 msgid "Choices for item to replace" msgstr "" -#: inc/replace.class.php:645 +#: inc/replace.class.php:664 msgid "Old item" msgstr "" -#: inc/replace.class.php:655 +#: inc/replace.class.php:674 msgid "New item" msgstr "" -#: inc/replace.class.php:687 +#: inc/replace.class.php:706 msgid "Replace" msgstr "" - -#: inc/uninstall.class.php:38 setup.php:83 -msgid "Item's uninstallation" -msgstr "Удаление элемента" - -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Пожалуйста, ожидайте, удаление запущено..." - -#: inc/uninstall.class.php:511 -msgid "Item is now uninstalled" -msgstr "" - -#: inc/uninstall.class.php:515 -msgid "Item replaced by a new one" -msgstr "" - -#: inc/uninstall.class.php:519 -msgid "Item replacing an old one" -msgstr "" - -#: inc/uninstall.class.php:524 -msgid "Removed from OCSNG with ID" -msgstr "" - -#: inc/uninstall.class.php:635 inc/preference.class.php:54 -msgid "Item's location after uninstall" -msgstr "" - -#: inc/uninstall.class.php:718 -msgid "Affect to a new group" -msgstr "" diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo index 8bd4309..572d82c 100644 Binary files a/locales/tr_TR.mo and b/locales/tr_TR.mo differ diff --git a/locales/tr_TR.po b/locales/tr_TR.po index 97d50b6..60099d2 100644 --- a/locales/tr_TR.po +++ b/locales/tr_TR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 12:03+0200\n" +"POT-Creation-Date: 2018-06-28 09:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Kaya Zeren , 2017\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/teclib/teams/28042/tr_TR/)\n" @@ -18,35 +18,35 @@ msgstr "" "Language: tr_TR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: front/action.php:55 inc/replace.class.php:447 +#: front/action.php:55 inc/replace.class.php:466 msgid "Replacement successful" msgstr "Değiştirildi" -#: front/action.php:96 inc/uninstall.class.php:315 +#: front/action.php:96 inc/uninstall.class.php:320 msgid "Uninstallation successful" msgstr "Kaldırıldı" -#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:770 -msgid "Uninstall" -msgstr "Kaldır" - -#: ajax/locations.php:43 inc/replace.class.php:560 inc/preference.class.php:74 +#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:579 msgid "Keep previous location" msgstr "Önceki konum korunsun" -#: ajax/locations.php:44 inc/replace.class.php:564 inc/preference.class.php:76 +#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:583 msgid "Empty location" msgstr "Boş konum" +#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:781 +msgid "Uninstall" +msgstr "Kaldır" + #: inc/model.class.php:42 msgid "Uninstallation template" msgstr "Kaldırma kalıbı" -#: inc/model.class.php:108 inc/model.class.php:880 inc/model.class.php:922 +#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Kaldırma" -#: inc/model.class.php:110 inc/model.class.php:882 inc/model.class.php:924 +#: inc/model.class.php:110 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Değişiklik" @@ -75,19 +75,19 @@ msgstr "Koru ve Yorum Yaz" msgid "Replacing data" msgstr "Veri değiştiriliyor" -#: inc/model.class.php:212 inc/model.class.php:766 +#: inc/model.class.php:212 inc/model.class.php:831 msgid "Type of template" msgstr "Kalıp türü" -#: inc/model.class.php:221 inc/model.class.php:741 +#: inc/model.class.php:221 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Kullanılacak aktarım modeli" -#: inc/model.class.php:241 inc/replace.class.php:574 +#: inc/model.class.php:241 inc/replace.class.php:593 msgid "New status of the computer" msgstr "Bilgisayarın yeni durumu" -#: inc/model.class.php:253 inc/model.class.php:774 +#: inc/model.class.php:253 inc/model.class.php:841 msgid "Action on group" msgstr "Gruba uygulanacak işlem" @@ -107,83 +107,115 @@ msgstr "Kalıp yönetimi" msgid "Erase datas" msgstr "Verileri sil" -#: inc/model.class.php:303 inc/model.class.php:684 +#: inc/model.class.php:303 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Yazılım geçmişini sil (bilgisayarlar)" -#: inc/model.class.php:308 inc/model.class.php:787 +#: inc/model.class.php:308 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Tüm geçmişi sil" -#: inc/model.class.php:382 inc/model.class.php:432 +#: inc/model.class.php:390 inc/model.class.php:440 msgid "Informations replacement" msgstr "Bilgi değişikliği" -#: inc/model.class.php:383 inc/replace.class.php:520 +#: inc/model.class.php:391 inc/replace.class.php:539 msgid "General informations" msgstr "Genel bilgiler" -#: inc/model.class.php:405 inc/replace.class.php:535 +#: inc/model.class.php:413 inc/replace.class.php:554 msgid "Overwrite informations (from old item to the new)" msgstr "Üzerine yazılacak bilgiler (eski ögeden yeniye)" -#: inc/model.class.php:412 inc/model.class.php:781 inc/replace.class.php:538 +#: inc/model.class.php:420 inc/model.class.php:851 inc/replace.class.php:557 msgid "Archiving method of the old material" msgstr "Eski materyali arşivleme yöntemi" -#: inc/model.class.php:422 +#: inc/model.class.php:430 msgid "Plugin PDF is installed and activated" msgstr "PDF uygulama eki kuruldu ve etkinleştirildi" -#: inc/model.class.php:425 +#: inc/model.class.php:433 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" msgstr "PDF uygulama eki kurulmamış, arşivleme için PDF biçimi kullanılamaz" -#: inc/model.class.php:433 inc/replace.class.php:596 +#: inc/model.class.php:441 inc/replace.class.php:615 msgid "Connections with other materials" msgstr "Diğer materyaller ile bağlantılar" -#: inc/model.class.php:507 inc/replace.class.php:631 +#: inc/model.class.php:515 inc/replace.class.php:650 msgid "Direct connections" msgstr "Doğrudan bağlantılar" -#: inc/model.class.php:580 +#: inc/model.class.php:588 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "OCSNG bağlantısı" msgstr[1] "OCSNG bağlantısı" -#: inc/model.class.php:582 +#: inc/model.class.php:590 msgid "These options only apply to computers coming from OCSNG" msgstr "" "Bu ayarlar yalnız bilgileri OCSNG üzerinden alınan bilgisayarlara uygulanır" -#: inc/model.class.php:586 inc/model.class.php:755 +#: inc/model.class.php:594 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "OCSNG üzerinden bilgisayar sil" -#: inc/model.class.php:592 inc/model.class.php:760 +#: inc/model.class.php:600 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "OCSNG üzerinden bilgisayar bağlantısını sil" -#: inc/model.class.php:606 +#: inc/model.class.php:614 msgid "Delete computer in FusionInventory" msgstr "FusionInventory üzerinden bilgisayar sil" -#: inc/model.class.php:618 +#: inc/model.class.php:626 msgid "Additionnal fields" msgstr "Ek alanlar" -#: inc/model.class.php:622 +#: inc/model.class.php:630 msgid "Delete Fields plugin informations" msgstr "Alanlar uygulama eki bilgilerini sil" -#: inc/model.class.php:887 inc/uninstall.class.php:717 +#: inc/model.class.php:995 inc/uninstall.class.php:728 msgid "Keep in the current group" msgstr "Geçerli grupta tut" +#: inc/preference.class.php:54 inc/uninstall.class.php:646 +msgid "Item's location after uninstall" +msgstr "Kaldırma sonrası öge konumu" + +#: inc/uninstall.class.php:38 setup.php:89 +msgid "Item's uninstallation" +msgstr "Ögenin kaldırılması" + +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Lütfen bekleyin kaldırma işlemi sürüyor..." + +#: inc/uninstall.class.php:522 +msgid "Item is now uninstalled" +msgstr "Öge kaldırıldı" + +#: inc/uninstall.class.php:526 +msgid "Item replaced by a new one" +msgstr "Yenisi ile değiştirilen öge" + +#: inc/uninstall.class.php:530 +msgid "Item replacing an old one" +msgstr "Eskinin yerine konulan öge" + +#: inc/uninstall.class.php:535 +msgid "Removed from OCSNG with ID" +msgstr "OCSNG üzerinden kod ile kaldırıldı" + +#: inc/uninstall.class.php:729 +msgid "Affect to a new group" +msgstr "Yeni bir gruba etki" + #: inc/replace.class.php:40 msgid "Item's replacement" msgstr "Ögenin değişikilği" @@ -200,70 +232,38 @@ msgstr "Bu belge, bu değiştirilmiş ögenin arşividir" msgid "Archive of old material" msgstr "Eski materyalin arşivi" -#: inc/replace.class.php:403 +#: inc/replace.class.php:409 msgid "See attached document" msgstr "Ekli belgeye bakın" -#: inc/replace.class.php:473 +#: inc/replace.class.php:488 msgid "This item is a replacement for item" msgstr "Bu öge şu ögenin yerine değiştirildi" -#: inc/replace.class.php:475 +#: inc/replace.class.php:490 msgid "This item was replaced by" msgstr "Bu öge şu kişi tarafından değiştirildi" -#: inc/replace.class.php:519 inc/replace.class.php:595 +#: inc/replace.class.php:538 inc/replace.class.php:614 msgid "Reminder of the replacement model" msgstr "Değişiklik modeli anımsatıcı" -#: inc/replace.class.php:557 +#: inc/replace.class.php:576 msgid "New location of item" msgstr "Ögenin yeni konumu" -#: inc/replace.class.php:642 +#: inc/replace.class.php:661 msgid "Choices for item to replace" msgstr "Değiştirilecek öge için seçenekler" -#: inc/replace.class.php:645 +#: inc/replace.class.php:664 msgid "Old item" msgstr "Eski öge" -#: inc/replace.class.php:655 +#: inc/replace.class.php:674 msgid "New item" msgstr "Yeni öge" -#: inc/replace.class.php:687 +#: inc/replace.class.php:706 msgid "Replace" msgstr "Değiştir" - -#: inc/uninstall.class.php:38 setup.php:83 -msgid "Item's uninstallation" -msgstr "Ögenin kaldırılması" - -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Lütfen bekleyin kaldırma işlemi sürüyor..." - -#: inc/uninstall.class.php:511 -msgid "Item is now uninstalled" -msgstr "Öge kaldırıldı" - -#: inc/uninstall.class.php:515 -msgid "Item replaced by a new one" -msgstr "Yenisi ile değiştirilen öge" - -#: inc/uninstall.class.php:519 -msgid "Item replacing an old one" -msgstr "Eskinin yerine konulan öge" - -#: inc/uninstall.class.php:524 -msgid "Removed from OCSNG with ID" -msgstr "OCSNG üzerinden kod ile kaldırıldı" - -#: inc/uninstall.class.php:635 inc/preference.class.php:54 -msgid "Item's location after uninstall" -msgstr "Kaldırma sonrası öge konumu" - -#: inc/uninstall.class.php:718 -msgid "Affect to a new group" -msgstr "Yeni bir gruba etki" diff --git a/locales/uninstall.pot b/locales/uninstall.pot index 9a8a36b..9b0d5aa 100644 --- a/locales/uninstall.pot +++ b/locales/uninstall.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-22 12:03+0200\n" +"POT-Creation-Date: 2018-06-28 09:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,35 +18,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: front/action.php:55 inc/replace.class.php:447 +#: front/action.php:55 inc/replace.class.php:466 msgid "Replacement successful" msgstr "" -#: front/action.php:96 inc/uninstall.class.php:315 +#: front/action.php:96 inc/uninstall.class.php:320 msgid "Uninstallation successful" msgstr "" -#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:770 -msgid "Uninstall" -msgstr "" - -#: ajax/locations.php:43 inc/replace.class.php:560 inc/preference.class.php:74 +#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:579 msgid "Keep previous location" msgstr "" -#: ajax/locations.php:44 inc/replace.class.php:564 inc/preference.class.php:76 +#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:583 msgid "Empty location" msgstr "" +#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:781 +msgid "Uninstall" +msgstr "" + #: inc/model.class.php:42 msgid "Uninstallation template" msgstr "" -#: inc/model.class.php:108 inc/model.class.php:880 inc/model.class.php:922 +#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "" -#: inc/model.class.php:110 inc/model.class.php:882 inc/model.class.php:924 +#: inc/model.class.php:110 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "" @@ -75,19 +75,19 @@ msgstr "" msgid "Replacing data" msgstr "" -#: inc/model.class.php:212 inc/model.class.php:766 +#: inc/model.class.php:212 inc/model.class.php:831 msgid "Type of template" msgstr "" -#: inc/model.class.php:221 inc/model.class.php:741 +#: inc/model.class.php:221 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "" -#: inc/model.class.php:241 inc/replace.class.php:574 +#: inc/model.class.php:241 inc/replace.class.php:593 msgid "New status of the computer" msgstr "" -#: inc/model.class.php:253 inc/model.class.php:774 +#: inc/model.class.php:253 inc/model.class.php:841 msgid "Action on group" msgstr "" @@ -107,82 +107,114 @@ msgstr "" msgid "Erase datas" msgstr "" -#: inc/model.class.php:303 inc/model.class.php:684 +#: inc/model.class.php:303 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "" -#: inc/model.class.php:308 inc/model.class.php:787 +#: inc/model.class.php:308 inc/model.class.php:861 msgid "Delete the whole history" msgstr "" -#: inc/model.class.php:382 inc/model.class.php:432 +#: inc/model.class.php:390 inc/model.class.php:440 msgid "Informations replacement" msgstr "" -#: inc/model.class.php:383 inc/replace.class.php:520 +#: inc/model.class.php:391 inc/replace.class.php:539 msgid "General informations" msgstr "" -#: inc/model.class.php:405 inc/replace.class.php:535 +#: inc/model.class.php:413 inc/replace.class.php:554 msgid "Overwrite informations (from old item to the new)" msgstr "" -#: inc/model.class.php:412 inc/model.class.php:781 inc/replace.class.php:538 +#: inc/model.class.php:420 inc/model.class.php:851 inc/replace.class.php:557 msgid "Archiving method of the old material" msgstr "" -#: inc/model.class.php:422 +#: inc/model.class.php:430 msgid "Plugin PDF is installed and activated" msgstr "" -#: inc/model.class.php:425 +#: inc/model.class.php:433 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" msgstr "" -#: inc/model.class.php:433 inc/replace.class.php:596 +#: inc/model.class.php:441 inc/replace.class.php:615 msgid "Connections with other materials" msgstr "" -#: inc/model.class.php:507 inc/replace.class.php:631 +#: inc/model.class.php:515 inc/replace.class.php:650 msgid "Direct connections" msgstr "" -#: inc/model.class.php:580 +#: inc/model.class.php:588 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "" msgstr[1] "" -#: inc/model.class.php:582 +#: inc/model.class.php:590 msgid "These options only apply to computers coming from OCSNG" msgstr "" -#: inc/model.class.php:586 inc/model.class.php:755 +#: inc/model.class.php:594 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "" -#: inc/model.class.php:592 inc/model.class.php:760 +#: inc/model.class.php:600 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "" -#: inc/model.class.php:606 +#: inc/model.class.php:614 msgid "Delete computer in FusionInventory" msgstr "" -#: inc/model.class.php:618 +#: inc/model.class.php:626 msgid "Additionnal fields" msgstr "" -#: inc/model.class.php:622 +#: inc/model.class.php:630 msgid "Delete Fields plugin informations" msgstr "" -#: inc/model.class.php:887 inc/uninstall.class.php:717 +#: inc/model.class.php:995 inc/uninstall.class.php:728 msgid "Keep in the current group" msgstr "" +#: inc/preference.class.php:54 inc/uninstall.class.php:646 +msgid "Item's location after uninstall" +msgstr "" + +#: inc/uninstall.class.php:38 setup.php:89 +msgid "Item's uninstallation" +msgstr "" + +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "" + +#: inc/uninstall.class.php:522 +msgid "Item is now uninstalled" +msgstr "" + +#: inc/uninstall.class.php:526 +msgid "Item replaced by a new one" +msgstr "" + +#: inc/uninstall.class.php:530 +msgid "Item replacing an old one" +msgstr "" + +#: inc/uninstall.class.php:535 +msgid "Removed from OCSNG with ID" +msgstr "" + +#: inc/uninstall.class.php:729 +msgid "Affect to a new group" +msgstr "" + #: inc/replace.class.php:40 msgid "Item's replacement" msgstr "" @@ -199,70 +231,38 @@ msgstr "" msgid "Archive of old material" msgstr "" -#: inc/replace.class.php:403 +#: inc/replace.class.php:409 msgid "See attached document" msgstr "" -#: inc/replace.class.php:473 +#: inc/replace.class.php:488 msgid "This item is a replacement for item" msgstr "" -#: inc/replace.class.php:475 +#: inc/replace.class.php:490 msgid "This item was replaced by" msgstr "" -#: inc/replace.class.php:519 inc/replace.class.php:595 +#: inc/replace.class.php:538 inc/replace.class.php:614 msgid "Reminder of the replacement model" msgstr "" -#: inc/replace.class.php:557 +#: inc/replace.class.php:576 msgid "New location of item" msgstr "" -#: inc/replace.class.php:642 +#: inc/replace.class.php:661 msgid "Choices for item to replace" msgstr "" -#: inc/replace.class.php:645 +#: inc/replace.class.php:664 msgid "Old item" msgstr "" -#: inc/replace.class.php:655 +#: inc/replace.class.php:674 msgid "New item" msgstr "" -#: inc/replace.class.php:687 +#: inc/replace.class.php:706 msgid "Replace" msgstr "" - -#: inc/uninstall.class.php:38 setup.php:83 -msgid "Item's uninstallation" -msgstr "" - -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "" - -#: inc/uninstall.class.php:511 -msgid "Item is now uninstalled" -msgstr "" - -#: inc/uninstall.class.php:515 -msgid "Item replaced by a new one" -msgstr "" - -#: inc/uninstall.class.php:519 -msgid "Item replacing an old one" -msgstr "" - -#: inc/uninstall.class.php:524 -msgid "Removed from OCSNG with ID" -msgstr "" - -#: inc/uninstall.class.php:635 inc/preference.class.php:54 -msgid "Item's location after uninstall" -msgstr "" - -#: inc/uninstall.class.php:718 -msgid "Affect to a new group" -msgstr "" diff --git a/setup.php b/setup.php index 0af3037..2b0fbc3 100644 --- a/setup.php +++ b/setup.php @@ -28,12 +28,12 @@ @since 2009 ---------------------------------------------------------------------- */ -define ('PLUGIN_UNINSTALL_VERSION', '2.3.2'); +define ('PLUGIN_UNINSTALL_VERSION', '2.4.0'); // Minimal GLPI version, inclusive -define("PLUGIN_UNINSTALL_MIN_GLPI", "9.2"); +define("PLUGIN_UNINSTALL_MIN_GLPI", "9.3"); // Maximum GLPI version, exclusive -define("PLUGIN_UNINSTALL_MAX_GLPI", "9.3"); +define("PLUGIN_UNINSTALL_MAX_GLPI", "9.4"); /** * Function Init @@ -125,6 +125,6 @@ function plugin_uninstall_check_prerequisites() { return true; } -function plugin_uninstall_check_config($verbose=false) { +function plugin_uninstall_check_config($verbose = false) { return true; } diff --git a/uninstall.xml b/uninstall.xml index 736c98c..0d1024d 100644 --- a/uninstall.xml +++ b/uninstall.xml @@ -23,6 +23,10 @@ Remi Collet + + 2.4.0 + 9.3 + 2.3.2 9.2