From 766ed9eb6581dc286b0d63a6986e0339ab2a09bb Mon Sep 17 00:00:00 2001 From: Ricardo Dalinger Date: Fri, 17 Dec 2021 19:09:56 -0300 Subject: [PATCH 1/6] Actualiza version del paquete siu/arai-json-migrator@v1.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c1c4460f7..569efbe17 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "siu-toba/services_json": "^1.0.3.3", "siu-toba/ssl-cert-utils": "~1.0", "siu-toba/structures_graph": "^1.1.1.1", - "siu/arai-json-migrator": "~1.0", + "siu/arai-json-migrator": "~1.1", "siu/manejador-salida-toba": "~1.1", "siu/interfaces-manejador-salida-toba": "~1.2.0", "siu/security-multitool": "~1.1", From 404fb9a3083da22477f23f2e13389589a9073795 Mon Sep 17 00:00:00 2001 From: Ricardo Dalinger Date: Mon, 20 Dec 2021 12:00:54 -0300 Subject: [PATCH 2/6] Actualiza Changelog & sube archivo lock --- CHANGELOG.md | 6 ++ composer.lock | 251 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 169 insertions(+), 88 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac953f68f..9291af86a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ ## CHANGELOG [CURRENT](https://github.com/SIU-Toba/framework/compare/master...develop) +- Se actualizan los siguientes paquetes + * phpmailer/phpmailer: v6.5.3 + * phpoffice/phpspreadsheet: v1.20.0 + * nikic/php-parser: v4.13.2 + * vlucas/phpdotenv: v3.6.10 + * siu/arai-json-migrator: v1.1.0 [3.3.21](https://github.com/SIU-Toba/framework/releases/tag/v3.3.21) (2021-11-18) - Actualizacion de seguridad de paquetes JS: diff --git a/composer.lock b/composer.lock index add180cac..eb143e77c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "54e632eaf5a853e716c60b2f042f7ba9", + "content-hash": "1758aeffa44ecad101d9ae6f67cc4ab6", "packages": [ { "name": "container-interop/container-interop", @@ -828,16 +828,16 @@ }, { "name": "laminas/laminas-stdlib", - "version": "3.6.1", + "version": "3.6.2", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "db581851a092246ad99e12d4fddf105184924c71" + "reference": "6fe0842909638ca6bea8401b7e8168fb154bffb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/db581851a092246ad99e12d4fddf105184924c71", - "reference": "db581851a092246ad99e12d4fddf105184924c71", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/6fe0842909638ca6bea8401b7e8168fb154bffb5", + "reference": "6fe0842909638ca6bea8401b7e8168fb154bffb5", "shasum": "" }, "require": { @@ -883,7 +883,7 @@ "type": "community_bridge" } ], - "time": "2021-11-10T11:33:52+00:00" + "time": "2021-12-07T21:06:58+00:00" }, { "name": "laminas/laminas-uri", @@ -946,16 +946,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.15.0", + "version": "2.15.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "270380e87904f5a1a1fba3059989d4ca157e16a9" + "reference": "fbd87f30c0a27aaeeee8adb2f934c14fb6046c80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/270380e87904f5a1a1fba3059989d4ca157e16a9", - "reference": "270380e87904f5a1a1fba3059989d4ca157e16a9", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/fbd87f30c0a27aaeeee8adb2f934c14fb6046c80", + "reference": "fbd87f30c0a27aaeeee8adb2f934c14fb6046c80", "shasum": "" }, "require": { @@ -1032,7 +1032,7 @@ "type": "community_bridge" } ], - "time": "2021-09-08T23:16:56+00:00" + "time": "2021-12-02T14:23:06+00:00" }, { "name": "laminas/laminas-zendframework-bridge", @@ -1276,16 +1276,16 @@ }, { "name": "michelf/php-markdown", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c" + "reference": "5024d623c1a057dcd2d076d25b7d270a1d0d55f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/c83178d49e372ca967d1a8c77ae4e051b3a3c75c", - "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/5024d623c1a057dcd2d076d25b7d270a1d0d55f3", + "reference": "5024d623c1a057dcd2d076d25b7d270a1d0d55f3", "shasum": "" }, "require": { @@ -1323,9 +1323,9 @@ ], "support": { "issues": "https://github.com/michelf/php-markdown/issues", - "source": "https://github.com/michelf/php-markdown/tree/1.9.0" + "source": "https://github.com/michelf/php-markdown/tree/1.9.1" }, - "time": "2019-12-02T02:32:27+00:00" + "time": "2021-11-24T02:52:38+00:00" }, { "name": "mjohnson/decoda", @@ -1447,16 +1447,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.13.1", + "version": "v4.13.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd" + "reference": "210577fe3cf7badcc5814d99455df46564f3c077" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/63a79e8daa781cac14e5195e63ed8ae231dd10fd", - "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", + "reference": "210577fe3cf7badcc5814d99455df46564f3c077", "shasum": "" }, "require": { @@ -1497,9 +1497,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" }, - "time": "2021-11-03T20:52:16+00:00" + "time": "2021-11-30T19:35:32+00:00" }, { "name": "onelogin/php-saml", @@ -1875,16 +1875,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.5.1", + "version": "v6.5.3", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "dd803df5ad7492e1b40637f7ebd258fee5ca7355" + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/dd803df5ad7492e1b40637f7ebd258fee5ca7355", - "reference": "dd803df5ad7492e1b40637f7ebd258fee5ca7355", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/baeb7cde6b60b1286912690ab0693c7789a31e71", + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71", "shasum": "" }, "require": { @@ -1941,7 +1941,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.1" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.3" }, "funding": [ { @@ -1949,20 +1949,20 @@ "type": "github" } ], - "time": "2021-08-18T09:14:16+00:00" + "time": "2021-11-25T16:34:11+00:00" }, { "name": "phpoffice/phpspreadsheet", - "version": "1.19.0", + "version": "1.20.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf" + "reference": "44436f270bb134b4a94670f3d020a85dfa0a3c02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf", - "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/44436f270bb134b4a94670f3d020a85dfa0a3c02", + "reference": "44436f270bb134b4a94670f3d020a85dfa0a3c02", "shasum": "" }, "require": { @@ -1983,7 +1983,7 @@ "maennchen/zipstream-php": "^2.1", "markbaker/complex": "^3.0", "markbaker/matrix": "^3.0", - "php": "^7.2 || ^8.0", + "php": "^7.3 || ^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", "psr/simple-cache": "^1.0" @@ -1991,15 +1991,15 @@ "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "dev-master", "dompdf/dompdf": "^1.0", - "friendsofphp/php-cs-fixer": "^2.18", + "friendsofphp/php-cs-fixer": "^3.2", "jpgraph/jpgraph": "^4.0", "mpdf/mpdf": "^8.0", "phpcompatibility/php-compatibility": "^9.3", - "phpstan/phpstan": "^0.12.82", - "phpstan/phpstan-phpunit": "^0.12.18", - "phpunit/phpunit": "^8.5", - "squizlabs/php_codesniffer": "^3.5", - "tecnickcom/tcpdf": "^6.3" + "phpstan/phpstan": "^1.1", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^8.5 || ^9.0", + "squizlabs/php_codesniffer": "^3.6", + "tecnickcom/tcpdf": "^6.4" }, "suggest": { "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)", @@ -2051,22 +2051,22 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.19.0" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.20.0" }, - "time": "2021-10-31T15:09:20+00:00" + "time": "2021-11-23T15:23:42+00:00" }, { "name": "phpoption/phpoption", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "5455cb38aed4523f99977c4a12ef19da4bfe2a28" + "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/5455cb38aed4523f99977c4a12ef19da4bfe2a28", - "reference": "5455cb38aed4523f99977c4a12ef19da4bfe2a28", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", + "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", "shasum": "" }, "require": { @@ -2074,7 +2074,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4.1", - "phpunit/phpunit": "^6.5.14 || ^7.0.20 || ^8.5.19 || ^9.5.8" + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" }, "type": "library", "extra": { @@ -2094,11 +2094,13 @@ "authors": [ { "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com" + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh" }, { "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk" + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" } ], "description": "Option Type for PHP", @@ -2110,7 +2112,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.8.0" + "source": "https://github.com/schmittjoh/php-option/tree/1.8.1" }, "funding": [ { @@ -2122,7 +2124,7 @@ "type": "tidelift" } ], - "time": "2021-08-28T21:27:29+00:00" + "time": "2021-12-04T23:24:31+00:00" }, { "name": "psr/container", @@ -2917,11 +2919,11 @@ }, { "name": "siu/arai-json-migrator", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://gitlab.siu.edu.ar/siu-arai/arai-json-migrator.git", - "reference": "cae65466083dfbea3ed3ecc89a2a829549ba437b" + "reference": "ba33a9df19ba59fecd8e0084eabf62a9205dd461" }, "require": { "php": ">=5.3.0", @@ -2940,7 +2942,7 @@ } ], "description": "Utilidades para exportar e importar usuarios en Araí mediante un archivo JSON", - "time": "2017-05-04T17:28:41+00:00" + "time": "2021-12-17T20:40:31+00:00" }, { "name": "siu/interfaces-manejador-salida-toba", @@ -3481,16 +3483,16 @@ }, { "name": "symfony/yaml", - "version": "v4.4.29", + "version": "v4.4.34", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "3abcc4db06d4e776825eaa3ed8ad924d5bc7432a" + "reference": "2c309e258adeb9970229042be39b360d34986fad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/3abcc4db06d4e776825eaa3ed8ad924d5bc7432a", - "reference": "3abcc4db06d4e776825eaa3ed8ad924d5bc7432a", + "url": "https://api.github.com/repos/symfony/yaml/zipball/2c309e258adeb9970229042be39b360d34986fad", + "reference": "2c309e258adeb9970229042be39b360d34986fad", "shasum": "" }, "require": { @@ -3532,7 +3534,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v4.4.29" + "source": "https://github.com/symfony/yaml/tree/v4.4.34" }, "funding": [ { @@ -3548,20 +3550,20 @@ "type": "tidelift" } ], - "time": "2021-07-27T16:19:30+00:00" + "time": "2021-11-18T18:49:23+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v3.6.9", + "version": "v3.6.10", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "a1bf4c9853d90ade427b4efe35355fc41b3d6988" + "reference": "5b547cdb25825f10251370f57ba5d9d924e6f68e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a1bf4c9853d90ade427b4efe35355fc41b3d6988", - "reference": "a1bf4c9853d90ade427b4efe35355fc41b3d6988", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/5b547cdb25825f10251370f57ba5d9d924e6f68e", + "reference": "5b547cdb25825f10251370f57ba5d9d924e6f68e", "shasum": "" }, "require": { @@ -3596,11 +3598,13 @@ "authors": [ { "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk" + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" }, { "name": "Vance Lucas", - "email": "vance@vancelucas.com" + "email": "vance@vancelucas.com", + "homepage": "https://github.com/vlucas" } ], "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", @@ -3611,7 +3615,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v3.6.9" + "source": "https://github.com/vlucas/phpdotenv/tree/v3.6.10" }, "funding": [ { @@ -3623,7 +3627,7 @@ "type": "tidelift" } ], - "time": "2021-10-02T19:07:56+00:00" + "time": "2021-12-12T23:02:06+00:00" } ], "packages-dev": [ @@ -4504,16 +4508,16 @@ }, { "name": "symfony/console", - "version": "v4.4.33", + "version": "v4.4.34", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "8dbd23ef7a8884051482183ddee8d9061b5feed0" + "reference": "329b3a75cc6b16d435ba1b1a41df54a53382a3f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8dbd23ef7a8884051482183ddee8d9061b5feed0", - "reference": "8dbd23ef7a8884051482183ddee8d9061b5feed0", + "url": "https://api.github.com/repos/symfony/console/zipball/329b3a75cc6b16d435ba1b1a41df54a53382a3f0", + "reference": "329b3a75cc6b16d435ba1b1a41df54a53382a3f0", "shasum": "" }, "require": { @@ -4574,7 +4578,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.33" + "source": "https://github.com/symfony/console/tree/v4.4.34" }, "funding": [ { @@ -4590,7 +4594,7 @@ "type": "tidelift" } ], - "time": "2021-10-25T16:36:08+00:00" + "time": "2021-11-04T12:23:33+00:00" }, { "name": "symfony/debug", @@ -4660,6 +4664,73 @@ ], "time": "2021-09-24T13:30:14+00:00" }, + { + "name": "symfony/deprecation-contracts", + "version": "v2.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-07-12T14:48:14+00:00" + }, { "name": "symfony/polyfill-php73", "version": "v1.23.0", @@ -4824,16 +4895,16 @@ }, { "name": "symfony/process", - "version": "v5.3.7", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "38f26c7d6ed535217ea393e05634cb0b244a1967" + "reference": "5be20b3830f726e019162b26223110c8f47cf274" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/38f26c7d6ed535217ea393e05634cb0b244a1967", - "reference": "38f26c7d6ed535217ea393e05634cb0b244a1967", + "url": "https://api.github.com/repos/symfony/process/zipball/5be20b3830f726e019162b26223110c8f47cf274", + "reference": "5be20b3830f726e019162b26223110c8f47cf274", "shasum": "" }, "require": { @@ -4866,7 +4937,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.3.7" + "source": "https://github.com/symfony/process/tree/v5.4.0" }, "funding": [ { @@ -4882,25 +4953,29 @@ "type": "tidelift" } ], - "time": "2021-08-04T21:20:46+00:00" + "time": "2021-11-28T15:25:38+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", "shasum": "" }, "require": { "php": ">=7.2.5", - "psr/container": "^1.1" + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1" + }, + "conflict": { + "ext-psr": "<1.1|>=2" }, "suggest": { "symfony/service-implementation": "" @@ -4908,7 +4983,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -4945,7 +5020,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" }, "funding": [ { @@ -4961,7 +5036,7 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:43:52+00:00" + "time": "2021-11-04T16:48:04+00:00" } ], "aliases": [], From 36c79a33eaf581598c4d9d3c14d4ae8d42ac06ab Mon Sep 17 00:00:00 2001 From: Ricardo Dalinger Date: Tue, 21 Dec 2021 12:17:09 -0300 Subject: [PATCH 3/6] Fix error de indice en recuperacion de descripciones de items --- php/modelo/toba_modelo_proyecto.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/php/modelo/toba_modelo_proyecto.php b/php/modelo/toba_modelo_proyecto.php index 70270f3d7..bc3911ab7 100644 --- a/php/modelo/toba_modelo_proyecto.php +++ b/php/modelo/toba_modelo_proyecto.php @@ -608,9 +608,10 @@ private function get_descripciones_items($datos) { $desc = array(); if (! empty($datos)) { - foreach (array_keys($datos['items']) as $fila) { - $desc[$fila['item']] = $fila['nombre']; - } + foreach (array_keys($datos['items']) as $indx) { + $fila = $datos['items'][$indx]; + $desc[$fila['item']] = $fila['nombre']; + } } return $desc; } From fc7c83027966c29562171078d3451f2b95ecec30 Mon Sep 17 00:00:00 2001 From: Ricardo Dalinger Date: Thu, 23 Dec 2021 15:37:01 -0300 Subject: [PATCH 4/6] Elimina escapado extra en notificacion --- php/nucleo/toba_solicitud_web.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/php/nucleo/toba_solicitud_web.php b/php/nucleo/toba_solicitud_web.php index b6c12bc71..30f4be24a 100644 --- a/php/nucleo/toba_solicitud_web.php +++ b/php/nucleo/toba_solicitud_web.php @@ -141,7 +141,9 @@ protected function procesar_eventos() if (toba::logger()->modo_debug()) { $mensaje_debug = $escaper->escapeHtml($e->get_mensaje_log()); } - toba::notificacion()->error($escaper->escapeHtml($e->get_mensaje()), $mensaje_debug); + var_dump($escaper->escapeHtml($e->get_mensaje())); + + toba::notificacion()->error($e->get_mensaje(), $mensaje_debug); toba::notificacion()->set_titulo($escaper->escapeHtml($e->get_titulo_ventana())); } } @@ -270,7 +272,7 @@ protected function servicio__generar_html($objetos) if (toba::logger()->modo_debug()) { $mensaje_debug = $escaper->escapeHtml($e->get_mensaje_log()); } - toba::notificacion()->error($escaper->escapeHtml($e->get_mensaje()), $mensaje_debug); + toba::notificacion()->error($e->get_mensaje(), $mensaje_debug); } echo toba_js::cerrar(); @@ -447,7 +449,7 @@ protected function servicio__html_parcial($objetos) if (toba::logger()->modo_debug()) { $mensaje_debug = $escaper->escapeHtml($e->get_mensaje_log()); } - toba::notificacion()->error($escaper->escapeHtml($e->get_mensaje()), $mensaje_debug); + toba::notificacion()->error($e->get_mensaje(), $mensaje_debug); } } toba::notificacion()->mostrar(false); From f24e8da7be8e261cefc27edf03447fbacd4ba0ec Mon Sep 17 00:00:00 2001 From: Ricardo Dalinger Date: Thu, 23 Dec 2021 16:52:00 -0300 Subject: [PATCH 5/6] Elimina var_dump para debug --- php/nucleo/toba_solicitud_web.php | 1 - 1 file changed, 1 deletion(-) diff --git a/php/nucleo/toba_solicitud_web.php b/php/nucleo/toba_solicitud_web.php index 30f4be24a..a9a6f4bc6 100644 --- a/php/nucleo/toba_solicitud_web.php +++ b/php/nucleo/toba_solicitud_web.php @@ -141,7 +141,6 @@ protected function procesar_eventos() if (toba::logger()->modo_debug()) { $mensaje_debug = $escaper->escapeHtml($e->get_mensaje_log()); } - var_dump($escaper->escapeHtml($e->get_mensaje())); toba::notificacion()->error($e->get_mensaje(), $mensaje_debug); toba::notificacion()->set_titulo($escaper->escapeHtml($e->get_titulo_ventana())); From 20e677807c12ea1908cdd65bec0d5bcb8a4c5d03 Mon Sep 17 00:00:00 2001 From: Ricardo Dalinger Date: Thu, 23 Dec 2021 20:03:52 -0300 Subject: [PATCH 6/6] Changelog Update & Version Bump --- CHANGELOG.md | 3 +++ VERSION | 2 +- package.json | 2 +- proyectos/toba_editor/proyecto.ini | 2 +- proyectos/toba_referencia/proyecto.ini | 2 +- proyectos/toba_usuarios/proyecto.ini | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9291af86a..20cd5c61d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ ## CHANGELOG [CURRENT](https://github.com/SIU-Toba/framework/compare/master...develop) + +[3.3.22](https://github.com/SIU-Toba/framework/releases/tag/v3.3.22) (2021-12-23) +- Fix por escapado multiple en mensajes de error - Se actualizan los siguientes paquetes * phpmailer/phpmailer: v6.5.3 * phpoffice/phpspreadsheet: v1.20.0 diff --git a/VERSION b/VERSION index b2847d518..c21e5b4eb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.21 +3.3.22 diff --git a/package.json b/package.json index 3e36cfe44..80c0ea7b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "siu-toba-framework", - "version": "3.3.21", + "version": "3.3.22", "description": "Framework para desarrollo rápido de aplicaciones web", "license": "SEE LICENSE IN licencia.txt", "repository": "https://github.com/SIU-Toba/framework.git", diff --git a/proyectos/toba_editor/proyecto.ini b/proyectos/toba_editor/proyecto.ini index 9dbfa391d..76ed9604d 100644 --- a/proyectos/toba_editor/proyecto.ini +++ b/proyectos/toba_editor/proyecto.ini @@ -6,7 +6,7 @@ mail_soporte = url_ayuda = doc/wiki/trac/toba/wiki/ ;Versi? del proyecto, debe ser formato x.y.z -version = 3.3.21 +version = 3.3.22 ;Nombre de fantas? de la versi? version_fantasia = diff --git a/proyectos/toba_referencia/proyecto.ini b/proyectos/toba_referencia/proyecto.ini index 1d2dfa36f..44a615ec4 100644 --- a/proyectos/toba_referencia/proyecto.ini +++ b/proyectos/toba_referencia/proyecto.ini @@ -8,7 +8,7 @@ url_ayuda_agregar_extension = 0 mostrar_resize_fuente = 1 ;Versi? del proyecto, debe ser formato x.y.z -version = 3.3.21 +version = 3.3.22 api_major = 1 api_minor = 0 diff --git a/proyectos/toba_usuarios/proyecto.ini b/proyectos/toba_usuarios/proyecto.ini index 3f94a618b..ab52eb063 100644 --- a/proyectos/toba_usuarios/proyecto.ini +++ b/proyectos/toba_usuarios/proyecto.ini @@ -5,7 +5,7 @@ descripcion = Descripci? del proyecto mail_soporte = ;Versi? del proyecto, debe ser formato x.y.z -version = 3.3.21 +version = 3.3.22 app_launcher = 1 ;Nombre de fantas? de la versi?