You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(246) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(243) |
Feb
(145) |
Mar
(512) |
Apr
(423) |
May
(572) |
Jun
(344) |
Jul
(1439) |
Aug
(1086) |
Sep
(452) |
Oct
(1093) |
Nov
(1000) |
Dec
(1070) |
2004 |
Jan
(1462) |
Feb
(753) |
Mar
(1752) |
Apr
(714) |
May
(617) |
Jun
(1326) |
Jul
(829) |
Aug
(726) |
Sep
(723) |
Oct
(777) |
Nov
(295) |
Dec
(203) |
2005 |
Jan
(694) |
Feb
(664) |
Mar
(606) |
Apr
(798) |
May
(429) |
Jun
(236) |
Jul
(197) |
Aug
(340) |
Sep
(432) |
Oct
(443) |
Nov
(334) |
Dec
(434) |
2006 |
Jan
(452) |
Feb
(283) |
Mar
(163) |
Apr
(341) |
May
(202) |
Jun
(147) |
Jul
(291) |
Aug
(363) |
Sep
(342) |
Oct
(309) |
Nov
(600) |
Dec
(722) |
2007 |
Jan
(363) |
Feb
(699) |
Mar
(1009) |
Apr
(186) |
May
(368) |
Jun
(551) |
Jul
(1146) |
Aug
(1152) |
Sep
(500) |
Oct
(714) |
Nov
(780) |
Dec
(725) |
2008 |
Jan
(640) |
Feb
(670) |
Mar
(679) |
Apr
(496) |
May
(351) |
Jun
(331) |
Jul
(621) |
Aug
(627) |
Sep
(361) |
Oct
(579) |
Nov
(423) |
Dec
(342) |
2009 |
Jan
(384) |
Feb
(603) |
Mar
(815) |
Apr
(663) |
May
(1194) |
Jun
(1055) |
Jul
(699) |
Aug
(907) |
Sep
(1104) |
Oct
(1142) |
Nov
(942) |
Dec
(631) |
2010 |
Jan
(935) |
Feb
(1420) |
Mar
(766) |
Apr
(517) |
May
(715) |
Jun
(512) |
Jul
(499) |
Aug
(725) |
Sep
(1272) |
Oct
(855) |
Nov
(657) |
Dec
(959) |
2011 |
Jan
(1048) |
Feb
(1135) |
Mar
(703) |
Apr
(548) |
May
(659) |
Jun
(543) |
Jul
(980) |
Aug
(1197) |
Sep
(1358) |
Oct
(890) |
Nov
(522) |
Dec
(318) |
2012 |
Jan
(400) |
Feb
(402) |
Mar
(846) |
Apr
(748) |
May
(565) |
Jun
(583) |
Jul
(383) |
Aug
(331) |
Sep
(451) |
Oct
(615) |
Nov
(483) |
Dec
(325) |
2013 |
Jan
(353) |
Feb
(335) |
Mar
(402) |
Apr
(498) |
May
(355) |
Jun
(444) |
Jul
(445) |
Aug
(408) |
Sep
(542) |
Oct
(525) |
Nov
(641) |
Dec
(480) |
2014 |
Jan
(431) |
Feb
(512) |
Mar
(485) |
Apr
(527) |
May
(541) |
Jun
(237) |
Jul
(455) |
Aug
(244) |
Sep
(268) |
Oct
(303) |
Nov
(265) |
Dec
(174) |
2015 |
Jan
(349) |
Feb
(490) |
Mar
(766) |
Apr
(464) |
May
(339) |
Jun
(196) |
Jul
(177) |
Aug
(172) |
Sep
(290) |
Oct
(258) |
Nov
(259) |
Dec
(275) |
2016 |
Jan
(281) |
Feb
(385) |
Mar
(478) |
Apr
(383) |
May
(264) |
Jun
(299) |
Jul
(343) |
Aug
(288) |
Sep
(331) |
Oct
(288) |
Nov
(465) |
Dec
(301) |
2017 |
Jan
(534) |
Feb
(136) |
Mar
(1034) |
Apr
(592) |
May
(630) |
Jun
(405) |
Jul
(419) |
Aug
(447) |
Sep
(436) |
Oct
(527) |
Nov
(508) |
Dec
(391) |
2018 |
Jan
(443) |
Feb
(203) |
Mar
(289) |
Apr
(437) |
May
(397) |
Jun
(321) |
Jul
(339) |
Aug
(294) |
Sep
(505) |
Oct
(549) |
Nov
(345) |
Dec
(227) |
2019 |
Jan
(351) |
Feb
(499) |
Mar
(306) |
Apr
(343) |
May
(300) |
Jun
(210) |
Jul
(274) |
Aug
(302) |
Sep
(349) |
Oct
(282) |
Nov
(2652) |
Dec
(1512) |
2020 |
Jan
(313) |
Feb
(463) |
Mar
(595) |
Apr
(429) |
May
(338) |
Jun
(308) |
Jul
(362) |
Aug
(204) |
Sep
(199) |
Oct
(462) |
Nov
(191) |
Dec
(165) |
2021 |
Jan
(364) |
Feb
(327) |
Mar
(247) |
Apr
(155) |
May
(206) |
Jun
(221) |
Jul
(338) |
Aug
(216) |
Sep
(259) |
Oct
(337) |
Nov
(300) |
Dec
(180) |
2022 |
Jan
(396) |
Feb
(338) |
Mar
(249) |
Apr
(249) |
May
(170) |
Jun
(137) |
Jul
(226) |
Aug
(350) |
Sep
(306) |
Oct
(340) |
Nov
(531) |
Dec
(307) |
2023 |
Jan
(287) |
Feb
(217) |
Mar
(606) |
Apr
(364) |
May
(636) |
Jun
(1012) |
Jul
(1137) |
Aug
(426) |
Sep
(357) |
Oct
(698) |
Nov
(513) |
Dec
(392) |
2024 |
Jan
(419) |
Feb
(470) |
Mar
(434) |
Apr
(370) |
May
(514) |
Jun
(690) |
Jul
(409) |
Aug
(484) |
Sep
(306) |
Oct
|
Nov
|
Dec
|
From: benoitg@users.sourceforge.net - 2024-09-19 16:45:07
|
Revision: 86605 http://sourceforge.net/p/tikiwiki/code/86605 Author: "benoitg" Date: 2024-09-19 16:45:05 +0000 (Thu, 19 Sep 2024) Log Message: ----------- [REF] Change christian-vigh-phpclasses/PdfToText with smalot/pdfparser --- * [REF] Change christian-vigh-phpclasses/PdfToText with smalot/pdfparser --- * [REF] Change christian-vigh-phpclasses/PdfToText with smalot/pdfparser See merge request tikiwiki/tiki!5841 See merge request tikiwiki/tiki!5849 Modified Paths: -------------- branches/27.x/lib/filegals/filegallib.php branches/27.x/vendor_bundled/composer.json branches/27.x/vendor_bundled/composer.lock Property Changed: ---------------- branches/27.x/ Index: branches/27.x =================================================================== --- branches/27.x 2024-09-19 14:19:04 UTC (rev 86604) +++ branches/27.x 2024-09-19 16:45:05 UTC (rev 86605) Property changes on: branches/27.x ___________________________________________________________________ Added: subgit:lock:0ddbba3f655a224f18b8319f0cfe5719667e8e42 ## -0,0 +1 ## +2024-09-19T16:45:03.415 \ No newline at end of property Deleted: subgit:lock:ca2d25445e274e287fbc0f1836381ad5bf8b8d80 ## -1 +0,0 ## -2024-09-19T11:47:49.804 \ No newline at end of property Modified: branches/27.x/lib/filegals/filegallib.php =================================================================== --- branches/27.x/lib/filegals/filegallib.php 2024-09-19 14:19:04 UTC (rev 86604) +++ branches/27.x/lib/filegals/filegallib.php 2024-09-19 16:45:05 UTC (rev 86605) @@ -905,11 +905,11 @@ case 'application/pdf': return function (FileWrapper $wrapper) { $getTextFromPdf = function () use ($wrapper) { - require_once TIKI_VENDOR_BUNDLED_PATH . "/christian-vigh-phpclasses/PdfToText/PdfToText.phpclass"; ob_start(); - $pdf = new \PdfToText($wrapper->getReadableFile()); + $parser = new \Smalot\PdfParser\Parser(); + $pdf = $parser->parseFile($wrapper->getReadableFile()); ob_end_clean(); - return $pdf->Text; + return $pdf->getText(); }; // Call the closure to get text from PDF Modified: branches/27.x/vendor_bundled/composer.json =================================================================== --- branches/27.x/vendor_bundled/composer.json 2024-09-19 14:19:04 UTC (rev 86604) +++ branches/27.x/vendor_bundled/composer.json 2024-09-19 16:45:05 UTC (rev 86605) @@ -142,7 +142,6 @@ "bacon/bacon-qr-code": "^2.0.0", "candy-chat/xmpp-prebind-php": "dev-master", "cboden/ratchet": "^0.4", - "christian-vigh-phpclasses/pdftotext": "^1.6.0", "ckeditor/ckeditor": "<=4.22.1", "codemirror/codemirror": "5.19.0", "codercat/jwk-to-pem": "^1.1", @@ -267,6 +266,7 @@ "sentry/sdk": "^3.3", "simile_timeline/simile_timeline": "2.3.0", "slm/mail": "^4.2", + "smalot/pdfparser": "^2.11", "smarty/smarty": "^5.0", "steverhoades/oauth2-openid-connect-client": "^2.0.0", "studio-42/elfinder": "~2.1", Modified: branches/27.x/vendor_bundled/composer.lock =================================================================== --- branches/27.x/vendor_bundled/composer.lock 2024-09-19 14:19:04 UTC (rev 86604) +++ branches/27.x/vendor_bundled/composer.lock 2024-09-19 16:45:05 UTC (rev 86605) @@ -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": "8d8307a273f589aae9b261f14625802c", + "content-hash": "3c8a62cbe28640697dac04fefba2c5df", "packages": [ { "name": "Sam152/Javascript-Equal-Height-Responsive-Rows", @@ -812,16 +812,6 @@ "time": "2021-02-26T10:19:33+00:00" }, { - "name": "christian-vigh-phpclasses/PdfToText", - "version": "1.6.7", - "dist": { - "type": "zip", - "url": "https://composer.tiki.org/dist/christian-vigh-phpclasses/pdftotext/christian-vigh-phpclasses-pdftotext-1.6.7.zip", - "shasum": "4fda0cbb9d044b0c4844587177629763c6afb229" - }, - "type": "library" - }, - { "name": "ckeditor/ckeditor", "version": "4.22.1", "source": { @@ -1019,24 +1009,24 @@ }, { "name": "composer/semver", - "version": "3.4.2", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6" + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/composer/semver/composer-semver-c51258e759afdb17f1fd1fe83bc12baaef6309d6-zip-cb0ebb.zip", - "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6", - "shasum": "b7c5d936bae9bf9f3f125488d9fb0245ee29778f" + "url": "https://composer.tiki.org/dist/composer/semver/composer-semver-4313d26ada5e0c4edfbd1dc481a92ff7bff91f12-zip-68dec6.zip", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "shasum": "11a49a7fb09446459669749f67e4d2e554d02a0f" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" }, "type": "library", "extra": { @@ -1091,7 +1081,7 @@ "type": "tidelift" } ], - "time": "2024-07-12T11:35:52+00:00" + "time": "2024-09-19T14:15:21+00:00" }, { "name": "css-tricks/anythingslider-themes", @@ -6458,11 +6448,11 @@ }, { "name": "npm-asset/picocolors", - "version": "1.0.1", + "version": "1.1.0", "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/npm-asset/picocolors/npm-asset-picocolors-1.0.1.zip", - "shasum": "de67a73b8ecfced81f1d8f341493661ab1d21455" + "url": "https://composer.tiki.org/dist/npm-asset/picocolors/npm-asset-picocolors-1.1.0.zip", + "shasum": "7b099d0c90fba672f5c9f2b94f76a27565c8e4d7" }, "type": "npm-asset", "license": [ @@ -6484,16 +6474,16 @@ }, { "name": "npm-asset/postcss", - "version": "8.4.41", + "version": "8.4.47", "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/npm-asset/postcss/npm-asset-postcss-8.4.41.zip", - "shasum": "d58fc91e94ddd1a5d577c18f4a2d54b8851d4306" + "url": "https://composer.tiki.org/dist/npm-asset/postcss/npm-asset-postcss-8.4.47.zip", + "shasum": "107fa9280700b6d77c0a2355eb767c3e64e8d0ee" }, "require": { "npm-asset/nanoid": ">=3.3.7,<4.0.0", - "npm-asset/picocolors": ">=1.0.1,<2.0.0", - "npm-asset/source-map-js": ">=1.2.0,<2.0.0" + "npm-asset/picocolors": ">=1.1.0,<2.0.0", + "npm-asset/source-map-js": ">=1.2.1,<2.0.0" }, "type": "npm-asset", "license": [ @@ -6867,11 +6857,11 @@ }, { "name": "npm-asset/source-map-js", - "version": "1.2.0", + "version": "1.2.1", "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/npm-asset/source-map-js/npm-asset-source-map-js-1.2.0.zip", - "shasum": "2d2387780dd0c0a42d29a15eb298753c24107bf6" + "url": "https://composer.tiki.org/dist/npm-asset/source-map-js/npm-asset-source-map-js-1.2.1.zip", + "shasum": "32aaf559db0eda52433dee7710f09c49b590b16f" }, "type": "npm-asset", "license": [ @@ -10623,6 +10613,53 @@ "time": "2023-11-20T07:27:47+00:00" }, { + "name": "smalot/pdfparser", + "version": "v2.11.0", + "source": { + "type": "git", + "url": "https://github.com/smalot/pdfparser.git", + "reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6" + }, + "dist": { + "type": "zip", + "url": "https://composer.tiki.org/dist/smalot/pdfparser/smalot-pdfparser-ac8e6678b0940e4b2ccd5caadd3fb18e68093be6-zip-d79b68.zip", + "reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6", + "shasum": "abd2ef990dff70726c4ab4052b09d9361c079759" + }, + "require": { + "ext-iconv": "*", + "ext-zlib": "*", + "php": ">=7.1", + "symfony/polyfill-mbstring": "^1.18" + }, + "type": "library", + "autoload": { + "psr-0": { + "Smalot\\PdfParser\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Sebastien MALOT", + "email": "seb...@ma..." + } + ], + "description": "Pdf parser library. Can read and extract information from pdf file.", + "homepage": "https://www.pdfparser.org", + "keywords": [ + "extract", + "parse", + "parser", + "pdf", + "text" + ], + "time": "2024-08-16T06:48:03+00:00" + }, + { "name": "smarty/smarty", "version": "v5.4.1", "source": { @@ -15144,13 +15181,13 @@ "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibility.git", - "reference": "d1419106f4e78b9bbcb918604e47422cb36d44b1" + "reference": "5320beafb871c9267c7d03442044eedea4ca1f52" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/phpcompatibility/php-compatibility/phpcompatibility-php-compatibility-d1419106f4e78b9bbcb918604e47422cb36d44b1-zip-eba3ea.zip", - "reference": "d1419106f4e78b9bbcb918604e47422cb36d44b1", - "shasum": "f631cb16232559c97948167cd9847e66e7db0b01" + "url": "https://composer.tiki.org/dist/phpcompatibility/php-compatibility/phpcompatibility-php-compatibility-5320beafb871c9267c7d03442044eedea4ca1f52-zip-67cf7a.zip", + "reference": "5320beafb871c9267c7d03442044eedea4ca1f52", + "shasum": "08d96f213a836ecb72e155cf483e03ae59868622" }, "require": { "php": ">=5.4", @@ -15220,7 +15257,7 @@ "type": "open_collective" } ], - "time": "2024-09-15T16:22:56+00:00" + "time": "2024-09-18T23:29:28+00:00" }, { "name": "phpcsstandards/phpcsutils", @@ -15306,17 +15343,17 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.3", + "version": "1.12.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009" + "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/phpstan/phpstan/phpstan-phpstan-0fcbf194ab63d8159bb70d9aa3e1350051632009-zip-2af357.zip", - "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009", - "shasum": "0b6a7d315dcc2a442657aa5065b18bbc2b7794b3" + "url": "https://composer.tiki.org/dist/phpstan/phpstan/phpstan-phpstan-ffa517cb918591b93acc9b95c0bebdcd0e4538bd-zip-e40bb3.zip", + "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd", + "shasum": "f3ad18b5408466850d0b2cfab3098ee524e4129d" }, "require": { "php": "^7.2|^8.0" @@ -15353,7 +15390,7 @@ "type": "github" } ], - "time": "2024-09-09T08:10:35+00:00" + "time": "2024-09-19T07:58:01+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -16743,17 +16780,17 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.2", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/squizlabs/php_codesniffer/squizlabs-php_codesniffer-86e5f5dd9a840c46810ebe5ff1885581c42a3017-zip-c71194.zip", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", - "shasum": "23add5e22cd8de64c91cc5cba2c8c07f4b7970eb" + "url": "https://composer.tiki.org/dist/squizlabs/php_codesniffer/squizlabs-php_codesniffer-62d32998e820bddc40f99f8251958aed187a5c9c-zip-101dd1.zip", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", + "shasum": "aa053fa2087ae8d5c3f21410d0b15981a26c5600" }, "require": { "ext-simplexml": "*", @@ -16813,7 +16850,7 @@ "type": "open_collective" } ], - "time": "2024-07-21T23:26:44+00:00" + "time": "2024-09-18T10:38:58+00:00" }, { "name": "symfony/browser-kit", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Benoit G. (@b. <gi...@mg...> - 2024-09-19 16:44:59
|
Benoit Grégoire pushed to branch 27.x at Tiki Wiki CMS Groupware / Tiki Commits: 0ddbba3f by franck franck kalunga at 2024-09-19T16:44:32+00:00 [REF] Change christian-vigh-phpclasses/PdfToText with smalot/pdfparser --- * [REF] Change christian-vigh-phpclasses/PdfToText with smalot/pdfparser --- * [REF] Change christian-vigh-phpclasses/PdfToText with smalot/pdfparser See merge request tikiwiki/tiki!5841 See merge request tikiwiki/tiki!5849 - - - - - 3 changed files: - lib/filegals/filegallib.php - vendor_bundled/composer.json - vendor_bundled/composer.lock Changes: ===================================== lib/filegals/filegallib.php ===================================== @@ -905,11 +905,11 @@ class FileGalLib extends TikiLib case 'application/pdf': return function (FileWrapper $wrapper) { $getTextFromPdf = function () use ($wrapper) { - require_once TIKI_VENDOR_BUNDLED_PATH . "/christian-vigh-phpclasses/PdfToText/PdfToText.phpclass"; ob_start(); - $pdf = new \PdfToText($wrapper->getReadableFile()); + $parser = new \Smalot\PdfParser\Parser(); + $pdf = $parser->parseFile($wrapper->getReadableFile()); ob_end_clean(); - return $pdf->Text; + return $pdf->getText(); }; // Call the closure to get text from PDF ===================================== vendor_bundled/composer.json ===================================== @@ -142,7 +142,6 @@ "bacon/bacon-qr-code": "^2.0.0", "candy-chat/xmpp-prebind-php": "dev-master", "cboden/ratchet": "^0.4", - "christian-vigh-phpclasses/pdftotext": "^1.6.0", "ckeditor/ckeditor": "<=4.22.1", "codemirror/codemirror": "5.19.0", "codercat/jwk-to-pem": "^1.1", @@ -267,6 +266,7 @@ "sentry/sdk": "^3.3", "simile_timeline/simile_timeline": "2.3.0", "slm/mail": "^4.2", + "smalot/pdfparser": "^2.11", "smarty/smarty": "^5.0", "steverhoades/oauth2-openid-connect-client": "^2.0.0", "studio-42/elfinder": "~2.1", ===================================== vendor_bundled/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": "8d8307a273f589aae9b261f14625802c", + "content-hash": "3c8a62cbe28640697dac04fefba2c5df", "packages": [ { "name": "Sam152/Javascript-Equal-Height-Responsive-Rows", @@ -811,16 +811,6 @@ ], "time": "2021-02-26T10:19:33+00:00" }, - { - "name": "christian-vigh-phpclasses/PdfToText", - "version": "1.6.7", - "dist": { - "type": "zip", - "url": "https://composer.tiki.org/dist/christian-vigh-phpclasses/pdftotext/christian-vigh-phpclasses-pdftotext-1.6.7.zip", - "shasum": "4fda0cbb9d044b0c4844587177629763c6afb229" - }, - "type": "library" - }, { "name": "ckeditor/ckeditor", "version": "4.22.1", @@ -1019,24 +1009,24 @@ }, { "name": "composer/semver", - "version": "3.4.2", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6" + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/composer/semver/composer-semver-c51258e759afdb17f1fd1fe83bc12baaef6309d6-zip-cb0ebb.zip", - "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6", - "shasum": "b7c5d936bae9bf9f3f125488d9fb0245ee29778f" + "url": "https://composer.tiki.org/dist/composer/semver/composer-semver-4313d26ada5e0c4edfbd1dc481a92ff7bff91f12-zip-68dec6.zip", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "shasum": "11a49a7fb09446459669749f67e4d2e554d02a0f" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" }, "type": "library", "extra": { @@ -1091,7 +1081,7 @@ "type": "tidelift" } ], - "time": "2024-07-12T11:35:52+00:00" + "time": "2024-09-19T14:15:21+00:00" }, { "name": "css-tricks/anythingslider-themes", @@ -6458,11 +6448,11 @@ }, { "name": "npm-asset/picocolors", - "version": "1.0.1", + "version": "1.1.0", "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/npm-asset/picocolors/npm-asset-picocolors-1.0.1.zip", - "shasum": "de67a73b8ecfced81f1d8f341493661ab1d21455" + "url": "https://composer.tiki.org/dist/npm-asset/picocolors/npm-asset-picocolors-1.1.0.zip", + "shasum": "7b099d0c90fba672f5c9f2b94f76a27565c8e4d7" }, "type": "npm-asset", "license": [ @@ -6484,16 +6474,16 @@ }, { "name": "npm-asset/postcss", - "version": "8.4.41", + "version": "8.4.47", "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/npm-asset/postcss/npm-asset-postcss-8.4.41.zip", - "shasum": "d58fc91e94ddd1a5d577c18f4a2d54b8851d4306" + "url": "https://composer.tiki.org/dist/npm-asset/postcss/npm-asset-postcss-8.4.47.zip", + "shasum": "107fa9280700b6d77c0a2355eb767c3e64e8d0ee" }, "require": { "npm-asset/nanoid": ">=3.3.7,<4.0.0", - "npm-asset/picocolors": ">=1.0.1,<2.0.0", - "npm-asset/source-map-js": ">=1.2.0,<2.0.0" + "npm-asset/picocolors": ">=1.1.0,<2.0.0", + "npm-asset/source-map-js": ">=1.2.1,<2.0.0" }, "type": "npm-asset", "license": [ @@ -6867,11 +6857,11 @@ }, { "name": "npm-asset/source-map-js", - "version": "1.2.0", + "version": "1.2.1", "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/npm-asset/source-map-js/npm-asset-source-map-js-1.2.0.zip", - "shasum": "2d2387780dd0c0a42d29a15eb298753c24107bf6" + "url": "https://composer.tiki.org/dist/npm-asset/source-map-js/npm-asset-source-map-js-1.2.1.zip", + "shasum": "32aaf559db0eda52433dee7710f09c49b590b16f" }, "type": "npm-asset", "license": [ @@ -10622,6 +10612,53 @@ ], "time": "2023-11-20T07:27:47+00:00" }, + { + "name": "smalot/pdfparser", + "version": "v2.11.0", + "source": { + "type": "git", + "url": "https://github.com/smalot/pdfparser.git", + "reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6" + }, + "dist": { + "type": "zip", + "url": "https://composer.tiki.org/dist/smalot/pdfparser/smalot-pdfparser-ac8e6678b0940e4b2ccd5caadd3fb18e68093be6-zip-d79b68.zip", + "reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6", + "shasum": "abd2ef990dff70726c4ab4052b09d9361c079759" + }, + "require": { + "ext-iconv": "*", + "ext-zlib": "*", + "php": ">=7.1", + "symfony/polyfill-mbstring": "^1.18" + }, + "type": "library", + "autoload": { + "psr-0": { + "Smalot\\PdfParser\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Sebastien MALOT", + "email": "seb...@ma..." + } + ], + "description": "Pdf parser library. Can read and extract information from pdf file.", + "homepage": "https://www.pdfparser.org", + "keywords": [ + "extract", + "parse", + "parser", + "pdf", + "text" + ], + "time": "2024-08-16T06:48:03+00:00" + }, { "name": "smarty/smarty", "version": "v5.4.1", @@ -15144,13 +15181,13 @@ "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibility.git", - "reference": "d1419106f4e78b9bbcb918604e47422cb36d44b1" + "reference": "5320beafb871c9267c7d03442044eedea4ca1f52" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/phpcompatibility/php-compatibility/phpcompatibility-php-compatibility-d1419106f4e78b9bbcb918604e47422cb36d44b1-zip-eba3ea.zip", - "reference": "d1419106f4e78b9bbcb918604e47422cb36d44b1", - "shasum": "f631cb16232559c97948167cd9847e66e7db0b01" + "url": "https://composer.tiki.org/dist/phpcompatibility/php-compatibility/phpcompatibility-php-compatibility-5320beafb871c9267c7d03442044eedea4ca1f52-zip-67cf7a.zip", + "reference": "5320beafb871c9267c7d03442044eedea4ca1f52", + "shasum": "08d96f213a836ecb72e155cf483e03ae59868622" }, "require": { "php": ">=5.4", @@ -15220,7 +15257,7 @@ "type": "open_collective" } ], - "time": "2024-09-15T16:22:56+00:00" + "time": "2024-09-18T23:29:28+00:00" }, { "name": "phpcsstandards/phpcsutils", @@ -15306,17 +15343,17 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.3", + "version": "1.12.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009" + "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/phpstan/phpstan/phpstan-phpstan-0fcbf194ab63d8159bb70d9aa3e1350051632009-zip-2af357.zip", - "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009", - "shasum": "0b6a7d315dcc2a442657aa5065b18bbc2b7794b3" + "url": "https://composer.tiki.org/dist/phpstan/phpstan/phpstan-phpstan-ffa517cb918591b93acc9b95c0bebdcd0e4538bd-zip-e40bb3.zip", + "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd", + "shasum": "f3ad18b5408466850d0b2cfab3098ee524e4129d" }, "require": { "php": "^7.2|^8.0" @@ -15353,7 +15390,7 @@ "type": "github" } ], - "time": "2024-09-09T08:10:35+00:00" + "time": "2024-09-19T07:58:01+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -16743,17 +16780,17 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.2", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/squizlabs/php_codesniffer/squizlabs-php_codesniffer-86e5f5dd9a840c46810ebe5ff1885581c42a3017-zip-c71194.zip", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", - "shasum": "23add5e22cd8de64c91cc5cba2c8c07f4b7970eb" + "url": "https://composer.tiki.org/dist/squizlabs/php_codesniffer/squizlabs-php_codesniffer-62d32998e820bddc40f99f8251958aed187a5c9c-zip-101dd1.zip", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", + "shasum": "aa053fa2087ae8d5c3f21410d0b15981a26c5600" }, "require": { "ext-simplexml": "*", @@ -16813,7 +16850,7 @@ "type": "open_collective" } ], - "time": "2024-07-21T23:26:44+00:00" + "time": "2024-09-18T10:38:58+00:00" }, { "name": "symfony/browser-kit", View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/0ddbba3f655a224f18b8319f0cfe5719667e8e42 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/0ddbba3f655a224f18b8319f0cfe5719667e8e42 You're receiving this email because of your account on gitlab.com. |
From: benoitg@users.sourceforge.net - 2024-09-19 14:19:32
|
Revision: 86604 http://sourceforge.net/p/tikiwiki/code/86604 Author: "benoitg" Date: 2024-09-19 14:19:29 +0000 (Thu, 19 Sep 2024) Log Message: ----------- [FIX] datetime-picker: Unsaved file in prior commit --- * [FIX] datetime-picker: Unsaved file in prior commit See merge request tikiwiki/tiki!5846 Modified Paths: -------------- trunk/src/js/vue-widgets/datetime-picker/src/helpers/helpers.js Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-19 11:53:06 UTC (rev 86603) +++ trunk 2024-09-19 14:19:29 UTC (rev 86604) Property changes on: trunk ___________________________________________________________________ Deleted: subgit:lock:1c566d11a28cd8efdc9d1b709f73760763ea4b26 ## -1 +0,0 ## -2024-09-19T11:53:30.230 \ No newline at end of property Added: subgit:lock:5303dd6a59bedd5724df18ada7ce452ac83b9352 ## -0,0 +1 ## +2024-09-19T14:19:28.806 \ No newline at end of property Modified: trunk/src/js/vue-widgets/datetime-picker/src/helpers/helpers.js =================================================================== --- trunk/src/js/vue-widgets/datetime-picker/src/helpers/helpers.js 2024-09-19 11:53:06 UTC (rev 86603) +++ trunk/src/js/vue-widgets/datetime-picker/src/helpers/helpers.js 2024-09-19 14:19:29 UTC (rev 86604) @@ -1,5 +1,5 @@ import { format } from "date-fns"; -import moment from "moment-timezone"; +import moment from "moment-timezone/builds/moment-timezone-with-data-10-year-range.js"; /** * @param {Number} date timestamp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Benoit G. (@b. <gi...@mg...> - 2024-09-19 14:19:26
|
Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: 5303dd6a by Benoit Grégoire at 2024-09-19T14:19:04+00:00 [FIX] datetime-picker: Unsaved file in prior commit --- * [FIX] datetime-picker: Unsaved file in prior commit See merge request tikiwiki/tiki!5846 - - - - - 1 changed file: - src/js/vue-widgets/datetime-picker/src/helpers/helpers.js Changes: ===================================== src/js/vue-widgets/datetime-picker/src/helpers/helpers.js ===================================== @@ -1,5 +1,5 @@ import { format } from "date-fns"; -import moment from "moment-timezone"; +import moment from "moment-timezone/builds/moment-timezone-with-data-10-year-range.js"; /** * @param {Number} date timestamp View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/5303dd6a59bedd5724df18ada7ce452ac83b9352 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/5303dd6a59bedd5724df18ada7ce452ac83b9352 You're receiving this email because of your account on gitlab.com. |
From: kroky6@users.sourceforge.net - 2024-09-19 11:53:34
|
Revision: 86603 http://sourceforge.net/p/tikiwiki/code/86603 Author: "kroky6" Date: 2024-09-19 11:53:32 +0000 (Thu, 19 Sep 2024) Log Message: ----------- [REM] Removing noJsPath() as pref.enable_javascript has been removed in Tiki --- * [REM] Removing noJsPath() as pref.enable_javascript has been removed in Tiki See merge request tikiwiki/tiki!5809 Modified Paths: -------------- trunk/lib/core/Services/Forum/Controller.php trunk/lib/core/Services/Menu/Controller.php trunk/lib/core/Services/Tracker/Controller.php trunk/lib/core/Services/Tracker/TabularController.php trunk/lib/core/Services/User/Controller.php trunk/lib/core/Services/Wiki/Controller.php trunk/lib/userslib.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-19 11:47:20 UTC (rev 86602) +++ trunk 2024-09-19 11:53:32 UTC (rev 86603) Property changes on: trunk ___________________________________________________________________ Added: subgit:lock:1c566d11a28cd8efdc9d1b709f73760763ea4b26 ## -0,0 +1 ## +2024-09-19T11:53:30.230 \ No newline at end of property Deleted: subgit:lock:4eb7b5e2b9d98f8c92dd0596600cae2b07ff41b3 ## -1 +0,0 ## -2024-09-19T11:30:09.451 \ No newline at end of property Modified: trunk/lib/core/Services/Forum/Controller.php =================================================================== --- trunk/lib/core/Services/Forum/Controller.php 2024-09-19 11:47:20 UTC (rev 86602) +++ trunk/lib/core/Services/Forum/Controller.php 2024-09-19 11:53:32 UTC (rev 86603) @@ -122,7 +122,6 @@ 'toMsg' => tra('With this topic:'), 'title' => $title, 'items' => $util->items, - 'extra' => ['referer' => Services_Utilities::noJsPath()], 'toList' => $diff, 'object' => $object, 'modal' => '1', @@ -158,7 +157,7 @@ ]; Feedback::success($feedback); //return to page - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } @@ -206,7 +205,6 @@ 'items' => $items, 'extra' => [ 'id' => $forumId, - 'referer' => Services_Utilities::noJsPath() ], 'modal' => '1', ] @@ -241,7 +239,7 @@ ]; Feedback::success($feedback); //return to page - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } @@ -297,7 +295,7 @@ Feedback::success($feedback); //return to page if ($this->lib->count_comments('forum:' . $util->extra['forumId']) > 0) { - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } else { global $base_url; return Services_Utilities::redirect($base_url . 'tiki-forums.php'); @@ -349,7 +347,7 @@ ]; Feedback::success($feedback); //return to page - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } @@ -430,7 +428,7 @@ ]; Feedback::success($feedback); //return to page - return Services_Utilities::refresh($util->extra['referer'], 'queryAndAnchor'); + return Services_Utilities::refresh('queryAndAnchor'); } } @@ -484,7 +482,7 @@ ]; Feedback::success($feedback); //return to page - return Services_Utilities::refresh($util->extra['referer'], 'queryAndAnchor'); + return Services_Utilities::refresh('queryAndAnchor'); } } @@ -603,7 +601,7 @@ ]; Feedback::success($feedback); //return to page - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } @@ -637,7 +635,6 @@ 'items' => $util->items, 'extra' => [ 'comments_parentId' => $topicId, - 'referer' => Services_Utilities::noJsPath() ], 'modal' => '1', ] @@ -664,7 +661,7 @@ ]; Feedback::success($feedback); //return to page - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } } Modified: trunk/lib/core/Services/Menu/Controller.php =================================================================== --- trunk/lib/core/Services/Menu/Controller.php 2024-09-19 11:47:20 UTC (rev 86602) +++ trunk/lib/core/Services/Menu/Controller.php 2024-09-19 11:53:32 UTC (rev 86603) @@ -514,7 +514,7 @@ */ public function action_remove($input) { - $input->replaceFilters(['menuId' => 'digits', 'referer' => 'url']); + $input->replaceFilters(['menuId' => 'digits']); $util = new Services_Utilities(); //get menu details $menuId = $input['menuId']; @@ -538,7 +538,7 @@ } else { Feedback::error(tr('The %0 menu has not been removed', $menuDetails['info']['name'])); } - return Services_Utilities::refresh($util->extra['referer'] ?? false); + return Services_Utilities::refresh(); } else { return [ 'FORWARD' => [ @@ -550,7 +550,7 @@ 'confirmClass' => 'n', 'customMsg' => tr('Delete the %0 menu?', $menuDetails['info']['name']), 'confirmButton' => tra('Delete'), - 'extra' => ['referer' => Services_Utilities::noJsPath(), 'menuId' => $menuId], + 'extra' => ['menuId' => $menuId], ] ]; } Modified: trunk/lib/core/Services/Tracker/Controller.php =================================================================== --- trunk/lib/core/Services/Tracker/Controller.php 2024-09-19 11:47:20 UTC (rev 86602) +++ trunk/lib/core/Services/Tracker/Controller.php 2024-09-19 11:53:32 UTC (rev 86603) @@ -1412,14 +1412,12 @@ } //return to page if ($skipRedirect === 1 || ! $redirect) { - $referer = Services_Utilities::noJsPath(); - // Return item data and refresh info if ($input->skipRefresh->bool()) { - $return = Services_Utilities::closeModal($referer); + $return = Services_Utilities::closeModal(); $return = array_merge($return, $item); } else { - $return = Services_Utilities::refresh($referer); + $return = Services_Utilities::refresh(); $return = array_merge($return, $item); } Modified: trunk/lib/core/Services/Tracker/TabularController.php =================================================================== --- trunk/lib/core/Services/Tracker/TabularController.php 2024-09-19 11:47:20 UTC (rev 86602) +++ trunk/lib/core/Services/Tracker/TabularController.php 2024-09-19 11:53:32 UTC (rev 86603) @@ -166,8 +166,7 @@ $lib->update($tabularId, $input->name->text(), $schema->getFormatDescriptor(), $schema->getFilterDescriptor(), $info['config'], $info['odbc_config'], $info['api_config']); - $referer = Services_Utilities::noJsPath(); - return Services_Utilities::refresh($referer); + return Services_Utilities::refresh(); } return [ Modified: trunk/lib/core/Services/User/Controller.php =================================================================== --- trunk/lib/core/Services/User/Controller.php 2024-09-19 11:47:20 UTC (rev 86602) +++ trunk/lib/core/Services/User/Controller.php 2024-09-19 11:53:32 UTC (rev 86603) @@ -387,7 +387,6 @@ 'customMsg' => $msg, 'confirmButton' => tra('Delete'), 'items' => $util->items, - 'extra' => ['referer' => Services_Utilities::noJsPath()], //'ticket' => $check['ticket'], 'confirm' => 'y', 'trackerIds' => $trackerIds, @@ -409,7 +408,7 @@ $remove_files = ! empty($input['remove_files']); // do the deleting... - $del = $this->removeUsers($util->items, $remove_pages, $remove_items, $remove_files, $util->extra['referer']); + $del = $this->removeUsers($util->items, $remove_pages, $remove_items, $remove_files); if ($del) { //prepare feedback @@ -438,7 +437,7 @@ return ['feedback' => $feedback]; } else { Feedback::success($feedback); - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } } @@ -505,12 +504,6 @@ $util->setVars($input, $this->filters, 'checked'); if ($util->itemsCount > 0) { //provide redirect if js is not enabled - if (! empty($input['anchor'])) { - $referer = $_SERVER['HTTP_REFERER']; - } else { - $referer = Services_Utilities::noJsPath(); - } - $extraFields = []; if ($prefs['users_admin_actions_require_validation'] == 'y') { @@ -538,7 +531,6 @@ [ 'add_remove' => 'remove', 'group' => $group, - 'referer' => $referer, 'anchor' => $input->anchor->striptags(), 'fields' => $extraFields ] @@ -587,7 +579,6 @@ 'countgrps' => $countgrps, 'items' => $util->items, 'extra' => [ - 'referer' => $referer, 'fields' => $extraFields ], 'modal' => '1', @@ -648,7 +639,7 @@ throw new Services_Exception($msg); } Feedback::error(['mes' => $msg]); - return Services_Utilities::closeModal($util->extra['referer']); + return Services_Utilities::closeModal(); } } elseif ($add_remove === 'remove') { $this->lib->remove_user_from_group($assign_user, $group); @@ -666,7 +657,7 @@ throw new Services_Exception_Denied(); } Feedback::error(['mes' => tra('Permission denied')]); - return Services_Utilities::closeModal($util->extra['referer']); + return Services_Utilities::closeModal(); } } @@ -703,9 +694,9 @@ Feedback::success($feedback); //return to page if (! empty($util->extra['anchor'])) { - return Services_Utilities::redirect($util->extra['referer'] . $util->extra['anchor']); + return Services_Utilities::redirect($util->extra['anchor']); } else { - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } else { $msg = tra('No groups were selected. Please select one or more groups.'); @@ -713,7 +704,7 @@ throw new Services_Exception($msg); } Feedback::error(['mes' => $msg]); - return Services_Utilities::closeModal($util->extra['referer']); + return Services_Utilities::closeModal(); } } } @@ -749,7 +740,6 @@ 'toList' => $all_groups, 'toMsg' => tra('Make this the default group:'), 'items' => $util->items, - 'extra' => ['referer' => Services_Utilities::noJsPath()], 'modal' => '1', ] ]; @@ -793,10 +783,10 @@ ]; Feedback::success($feedback); //return to page - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } else { Feedback::error(['mes' => tra('No groups were selected. Please select one or more groups.')]); - return Services_Utilities::closeModal($util->extra['referer']); + return Services_Utilities::closeModal(); } } } @@ -826,7 +816,6 @@ 'confirmController' => 'user', 'customMsg' => tra('For these selected users:'), 'items' => $util->items, - 'extra' => ['referer' => Services_Utilities::noJsPath()], 'modal' => '1', ]; } else { @@ -843,7 +832,7 @@ throw new Services_Exception_NotFound(); } Feedback::error(tra('Page not found')); - return Services_Utilities::closeModal($util->extra['referer']); + return Services_Utilities::closeModal(); } if (empty($pageinfo['description'])) { $msg = tra('The page does not have a description, which is mandatory to perform this action.'); @@ -851,7 +840,7 @@ throw new Services_Exception($msg); } Feedback::error($msg); - return Services_Utilities::closeModal($util->extra['referer']); + return Services_Utilities::closeModal(); } $bcc = $input['bcc']; include_once('lib/webmail/tikimaillib.php'); @@ -859,7 +848,7 @@ if (! empty($bcc)) { if (! validate_email($bcc)) { Feedback::error(tra('Invalid bcc email address')); - return Services_Utilities::closeModal($util->extra['referer']); + return Services_Utilities::closeModal(); } $mail->setBcc($bcc); $bccmsg = tr('and blind copied (bcc) to %0', $bcc); @@ -879,7 +868,7 @@ throw new Services_Exception($msg); } Feedback::error($msg); - return Services_Utilities::closeModal($util->extra['referer']); + return Services_Utilities::closeModal(); } $mail->setHtml($text); if (! $mail->send($this->lib->get_user_email($mail_user))) { @@ -892,7 +881,7 @@ throw new Services_Exception($errormsg); } Feedback::error($errormsg); - return Services_Utilities::closeModal($util->extra['referer']); + return Services_Utilities::closeModal(); } else { if (! empty($bcc)) { $logmsg = sprintf(tra('Mail sent to user %s'), $mail_user); @@ -919,7 +908,7 @@ } Feedback::success($feedback); //return to page - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } @@ -927,7 +916,6 @@ { global $user; $userlib = TikiLib::lib('user'); - $referer = Services_Utilities::noJsPath(); if (TIKI_API) { $userwatch = $input->to->text(); } else { @@ -939,7 +927,7 @@ throw new Services_Exception_NotFound(); } Feedback::error(tra('No user was selected.')); - return Services_Utilities::closeModal($referer); + return Services_Utilities::closeModal(); } //sets default priority for the message to 3 if no priority was given if (! empty($input->priority->text())) { @@ -990,13 +978,12 @@ Feedback::error($msg); } } - return Services_Utilities::closeModal($referer); + return Services_Utilities::closeModal(); } else { return [ 'title' => tra("Send Me a Message"), 'userwatch' => $userwatch, 'priority' => $priority, - 'referer' => $referer ]; } } @@ -1030,8 +1017,6 @@ $expiry = $input->tempuser_expiry->int(); $prefix = $input->tempuser_prefix->text(); $path = $input->tempuser_path->text(); - $referer = Services_Utilities::noJsPath(); - if (empty($prefix)) { $prefix = 'guest'; } @@ -1047,13 +1032,13 @@ $expiry = $expiry * 3600 * 24; //translate day input to seconds } elseif ($expiry != -1) { Feedback::error(tra('Please specify validity period')); - Services_Utilities::sendFeedback($referer); + Services_Utilities::sendFeedback(); } foreach ($groups as $grp) { if (! TikiLib::lib('user')->group_exists($grp)) { Feedback::error(tr('The group %0 does not exist', $grp)); - Services_Utilities::sendFeedback($referer); + Services_Utilities::sendFeedback(); } } @@ -1060,7 +1045,7 @@ TikiLib::lib('user')->invite_tempuser($emails, $groups, $expiry, $prefix, $path); Feedback::success(tra('Your invite has been sent.')); - Services_Utilities::sendFeedback($referer); + Services_Utilities::sendFeedback(); } /** @@ -1106,7 +1091,7 @@ } } - private function removeUsers(array $users, $page = false, $trackerIds = [], $files = false, $referer = false) + private function removeUsers(array $users, $page = false, $trackerIds = [], $files = false) { global $user; foreach ($users as $deleteuser) { @@ -1121,7 +1106,7 @@ $res = $tikilib->remove_all_versions($page); if ($res !== true) { Feedback::error(tr('An error occurred. User page for %0 could not be deleted', $deleteuser)); - Services_Utilities::closeModal($referer); + Services_Utilities::closeModal(); return false; } } @@ -1158,7 +1143,7 @@ $logslib->add_log('adminusers', sprintf(tra('Deleted account %s'), $deleteuser), $user); } else { Feedback::error(tr('An error occurred. User %0 could not be deleted', $deleteuser)); - Services_Utilities::closeModal($referer); + Services_Utilities::closeModal(); return false; } } @@ -1219,7 +1204,7 @@ return ['feedback' => $feedback]; } else { Feedback::success($feedback); - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } } @@ -1226,7 +1211,7 @@ } } - private function updateUserLockStatus($users, $newLockStatus, $referer = false) + private function updateUserLockStatus($users, $newLockStatus) { global $user; foreach ($users as $user_to_lock) { @@ -1236,7 +1221,7 @@ Feedback::success(tr('User %0 lock status successfully updated', $user_to_lock)); } else { Feedback::error(tr('An error occurred. User %0 lock status could not be updated', $user_to_lock)); - Services_Utilities::closeModal($referer); + Services_Utilities::closeModal(); return false; } } Modified: trunk/lib/core/Services/Wiki/Controller.php =================================================================== --- trunk/lib/core/Services/Wiki/Controller.php 2024-09-19 11:47:20 UTC (rev 86602) +++ trunk/lib/core/Services/Wiki/Controller.php 2024-09-19 11:53:32 UTC (rev 86603) @@ -338,7 +338,7 @@ 'customMsg' => $msg, 'confirmButton' => tra('Delete'), 'items' => $util->items, - 'extra' => ['referer' => Services_Utilities::noJsPath(), 'version' => $v, 'one' => $one], + 'extra' => ['version' => $v, 'one' => $one], 'modal' => '1', 'included_by' => $included_by, ]; @@ -489,7 +489,7 @@ global $prefs, $base_url; return Services_Utilities::redirect($base_url . $prefs['tikiIndex']); } - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } @@ -579,7 +579,7 @@ Feedback::error($feedback); } //return to page - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } @@ -630,7 +630,7 @@ return ['url' => 'tiki-print_multi_pages.php?print=y&printpages=' . urlencode(json_encode($util->items))]; } else { Feedback::error(tr('No page specified.')); - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } } @@ -687,7 +687,7 @@ } else { Feedback::error(tr('No page specified.')); } - return Services_Utilities::closeModal($util->extra['referer']); + return Services_Utilities::closeModal(); } } @@ -784,7 +784,7 @@ Feedback::success($feedback2); } //return to page - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } @@ -886,7 +886,7 @@ Feedback::success($feedback2); } //return to page - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } @@ -932,7 +932,7 @@ Feedback::error(['mes' => $xmllib->get_error()]); } //return to page - return Services_Utilities::closeModal($util->extra['referer']); + return Services_Utilities::closeModal(); } } @@ -1004,7 +1004,7 @@ Feedback::success($feedback2); } //return to page - return Services_Utilities::refresh($util->extra['referer']); + return Services_Utilities::refresh(); } } } Modified: trunk/lib/userslib.php =================================================================== --- trunk/lib/userslib.php 2024-09-19 11:47:20 UTC (rev 86602) +++ trunk/lib/userslib.php 2024-09-19 11:53:32 UTC (rev 86603) @@ -8823,14 +8823,12 @@ global $user, $prefs; $smarty = TikiLib::lib('smarty'); include_once('lib/webmail/tikimaillib.php'); - $referer = Services_Utilities::noJsPath(); - $mail = new TikiMail(); foreach ($emails as $email) { if (! validate_email($email)) { $mes = empty($email) ? tr('Email address is required.') : tr('Invalid email address "%0"', $email); Feedback::error($mes); - Services_Utilities::sendFeedback($referer); + Services_Utilities::sendFeedback(); } } $smarty->assign('mail_sender', $user); @@ -8856,7 +8854,7 @@ $errormsg .= $mailerrors; } Feedback::error($errormsg); - Services_Utilities::sendFeedback($referer); + Services_Utilities::sendFeedback(); } $smarty->assign_by_ref('user', $user); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: benoitg@users.sourceforge.net - 2024-09-19 11:47:52
|
Revision: 86602 http://sourceforge.net/p/tikiwiki/code/86602 Author: "benoitg" Date: 2024-09-19 11:47:50 +0000 (Thu, 19 Sep 2024) Log Message: ----------- [BP] [FIX] Tiki Admin Credits: Manage Credits returns ERROR (E_WARNING): Undefined... --- * [FIX] Tiki Admin Credits: Manage Credits returns ERROR (E_WARNING): Undefined array key credit_types --- See merge request tikiwiki/tiki!5827 See merge request tikiwiki/tiki!5844 Modified Paths: -------------- branches/27.x/tiki-admin_credits.php Property Changed: ---------------- branches/27.x/ Index: branches/27.x =================================================================== --- branches/27.x 2024-09-19 11:29:42 UTC (rev 86601) +++ branches/27.x 2024-09-19 11:47:50 UTC (rev 86602) Property changes on: branches/27.x ___________________________________________________________________ Deleted: subgit:lock:74988fd926f964a0e0e90c95cb38cadcea525d15 ## -1 +0,0 ## -2024-09-18T19:11:29.661 \ No newline at end of property Added: subgit:lock:ca2d25445e274e287fbc0f1836381ad5bf8b8d80 ## -0,0 +1 ## +2024-09-19T11:47:49.804 \ No newline at end of property Modified: branches/27.x/tiki-admin_credits.php =================================================================== --- branches/27.x/tiki-admin_credits.php 2024-09-19 11:29:42 UTC (rev 86601) +++ branches/27.x/tiki-admin_credits.php 2024-09-19 11:47:50 UTC (rev 86602) @@ -47,7 +47,7 @@ exit; } -if (isset($_REQUEST['update_types'])) { +if (isset($credit_types) && is_array($credit_types)) { foreach ($_POST['credit_types'] as $key => $values) { $creditslib->updateCreditType( $values['credit_type'], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Benoit G. (@b. <gi...@mg...> - 2024-09-19 11:47:32
|
Benoit Grégoire pushed to branch 27.x at Tiki Wiki CMS Groupware / Tiki Commits: ca2d2544 by Joseph Ushindi at 2024-09-19T11:47:20+00:00 [BP] [FIX] Tiki Admin Credits: Manage Credits returns ERROR (E_WARNING): Undefined... --- * [FIX] Tiki Admin Credits: Manage Credits returns ERROR (E_WARNING): Undefined array key credit_types --- See merge request tikiwiki/tiki!5827 See merge request tikiwiki/tiki!5844 - - - - - 1 changed file: - tiki-admin_credits.php Changes: ===================================== tiki-admin_credits.php ===================================== @@ -47,7 +47,7 @@ if (isset($_REQUEST['purge_credits'])) { exit; } -if (isset($_REQUEST['update_types'])) { +if (isset($credit_types) && is_array($credit_types)) { foreach ($_POST['credit_types'] as $key => $values) { $creditslib->updateCreditType( $values['credit_type'], View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ca2d25445e274e287fbc0f1836381ad5bf8b8d80 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ca2d25445e274e287fbc0f1836381ad5bf8b8d80 You're receiving this email because of your account on gitlab.com. |
From: marclaporte@users.sourceforge.net - 2024-09-19 11:30:23
|
Revision: 86601 http://sourceforge.net/p/tikiwiki/code/86601 Author: "marclaporte" Date: 2024-09-19 11:30:20 +0000 (Thu, 19 Sep 2024) Log Message: ----------- [REF] Change christian-vigh-phpclasses/PdfToText with smalot/pdfparser --- * [REF] Change christian-vigh-phpclasses/PdfToText with smalot/pdfparser See merge request tikiwiki/tiki!5841 Modified Paths: -------------- trunk/lib/filegals/filegallib.php trunk/vendor_bundled/composer.json trunk/vendor_bundled/composer.lock Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-19 08:54:47 UTC (rev 86600) +++ trunk 2024-09-19 11:30:20 UTC (rev 86601) Property changes on: trunk ___________________________________________________________________ Deleted: subgit:lock:46b0ee731522c5e68cc4decc274e14a3f53f0360 ## -1 +0,0 ## -2024-09-19T08:55:11.369 \ No newline at end of property Added: subgit:lock:4eb7b5e2b9d98f8c92dd0596600cae2b07ff41b3 ## -0,0 +1 ## +2024-09-19T11:30:09.451 \ No newline at end of property Modified: trunk/lib/filegals/filegallib.php =================================================================== --- trunk/lib/filegals/filegallib.php 2024-09-19 08:54:47 UTC (rev 86600) +++ trunk/lib/filegals/filegallib.php 2024-09-19 11:30:20 UTC (rev 86601) @@ -905,11 +905,11 @@ case 'application/pdf': return function (FileWrapper $wrapper) { $getTextFromPdf = function () use ($wrapper) { - require_once TIKI_VENDOR_BUNDLED_PATH . "/christian-vigh-phpclasses/PdfToText/PdfToText.phpclass"; ob_start(); - $pdf = new \PdfToText($wrapper->getReadableFile()); + $parser = new \Smalot\PdfParser\Parser(); + $pdf = $parser->parseFile($wrapper->getReadableFile()); ob_end_clean(); - return $pdf->Text; + return $pdf->getText(); }; // Call the closure to get text from PDF Modified: trunk/vendor_bundled/composer.json =================================================================== --- trunk/vendor_bundled/composer.json 2024-09-19 08:54:47 UTC (rev 86600) +++ trunk/vendor_bundled/composer.json 2024-09-19 11:30:20 UTC (rev 86601) @@ -138,7 +138,6 @@ "bacon/bacon-qr-code": "^2.0.0", "candy-chat/xmpp-prebind-php": "dev-master", "cboden/ratchet": "^0.4", - "christian-vigh-phpclasses/pdftotext": "^1.6.0", "ckeditor/ckeditor": "<=4.22.1", "codercat/jwk-to-pem": "^1.1", "composer/semver": "^3.2", @@ -252,6 +251,7 @@ "sentry/sdk": "^3.3", "simile_timeline/simile_timeline": "2.3.0", "slm/mail": "^4.2", + "smalot/pdfparser": "^2.11", "smarty/smarty": "^5.0", "steverhoades/oauth2-openid-connect-client": "^2.0.0", "studio-42/elfinder": "~2.1", Modified: trunk/vendor_bundled/composer.lock =================================================================== --- trunk/vendor_bundled/composer.lock 2024-09-19 08:54:47 UTC (rev 86600) +++ trunk/vendor_bundled/composer.lock 2024-09-19 11:30:20 UTC (rev 86601) @@ -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": "78284c734044391505ccc62a47e029d7", + "content-hash": "ffb56ad004285a3abca4312d6df56882", "packages": [ { "name": "Sam152/Javascript-Equal-Height-Responsive-Rows", @@ -812,16 +812,6 @@ "time": "2021-02-26T10:19:33+00:00" }, { - "name": "christian-vigh-phpclasses/PdfToText", - "version": "1.6.7", - "dist": { - "type": "zip", - "url": "https://composer.tiki.org/dist/christian-vigh-phpclasses/pdftotext/christian-vigh-phpclasses-pdftotext-1.6.7.zip", - "shasum": "4fda0cbb9d044b0c4844587177629763c6afb229" - }, - "type": "library" - }, - { "name": "ckeditor/ckeditor", "version": "4.22.1", "source": { @@ -1422,17 +1412,17 @@ }, { "name": "elliotjreed/disposable-emails-filter", - "version": "4.0.15", + "version": "4.0.16", "source": { "type": "git", "url": "https://github.com/elliotjreed/disposable-emails-filter-php.git", - "reference": "afff94f48995b68a4331567358ed3c9ae18220fe" + "reference": "d24677626b60eb4986d3460b3d11a05f727d75e3" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/elliotjreed/disposable-emails-filter/elliotjreed-disposable-emails-filter-afff94f48995b68a4331567358ed3c9ae18220fe-zip-c0acc3.zip", - "reference": "afff94f48995b68a4331567358ed3c9ae18220fe", - "shasum": "cfd7ee4c05984dd1af6e5e6877df271caf4fe48f" + "url": "https://composer.tiki.org/dist/elliotjreed/disposable-emails-filter/elliotjreed-disposable-emails-filter-d24677626b60eb4986d3460b3d11a05f727d75e3-zip-c1fc29.zip", + "reference": "d24677626b60eb4986d3460b3d11a05f727d75e3", + "shasum": "50cc0cb33dff8faff24d9938d8dba424e20702cc" }, "require": { "php": "^8.1" @@ -1462,7 +1452,7 @@ } ], "description": "A PHP package for determining whether an email address is from a disposable / temporary email address provider.", - "time": "2024-09-11T07:33:53+00:00" + "time": "2024-09-16T07:33:33+00:00" }, { "name": "evenement/evenement", @@ -8031,17 +8021,17 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.41", + "version": "3.0.42", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb" + "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/phpseclib/phpseclib/phpseclib-phpseclib-621c73f7dcb310b61de34d1da4c4204e8ace6ceb-zip-3ebed5.zip", - "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb", - "shasum": "d3e0f8ee1f10d0b69975c2f0cbd09da705922e7b" + "url": "https://composer.tiki.org/dist/phpseclib/phpseclib/phpseclib-phpseclib-db92f1b1987b12b13f248fe76c3a52cadb67bb98-zip-9f59a1.zip", + "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98", + "shasum": "3162b91ac6d6cae8cc9662f76ab8b27f038166ba" }, "require": { "paragonie/constant_time_encoding": "^1|^2|^3", @@ -8133,7 +8123,7 @@ "type": "tidelift" } ], - "time": "2024-08-12T00:13:54+00:00" + "time": "2024-09-16T03:06:04+00:00" }, { "name": "phpxmlrpc/phpxmlrpc", @@ -10360,6 +10350,53 @@ "time": "2023-11-20T07:27:47+00:00" }, { + "name": "smalot/pdfparser", + "version": "v2.11.0", + "source": { + "type": "git", + "url": "https://github.com/smalot/pdfparser.git", + "reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6" + }, + "dist": { + "type": "zip", + "url": "https://composer.tiki.org/dist/smalot/pdfparser/smalot-pdfparser-ac8e6678b0940e4b2ccd5caadd3fb18e68093be6-zip-d79b68.zip", + "reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6", + "shasum": "abd2ef990dff70726c4ab4052b09d9361c079759" + }, + "require": { + "ext-iconv": "*", + "ext-zlib": "*", + "php": ">=7.1", + "symfony/polyfill-mbstring": "^1.18" + }, + "type": "library", + "autoload": { + "psr-0": { + "Smalot\\PdfParser\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Sebastien MALOT", + "email": "seb...@ma..." + } + ], + "description": "Pdf parser library. Can read and extract information from pdf file.", + "homepage": "https://www.pdfparser.org", + "keywords": [ + "extract", + "parse", + "parser", + "pdf", + "text" + ], + "time": "2024-08-16T06:48:03+00:00" + }, + { "name": "smarty/smarty", "version": "v5.4.1", "source": { @@ -16526,17 +16563,17 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.2", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/squizlabs/php_codesniffer/squizlabs-php_codesniffer-86e5f5dd9a840c46810ebe5ff1885581c42a3017-zip-c71194.zip", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", - "shasum": "23add5e22cd8de64c91cc5cba2c8c07f4b7970eb" + "url": "https://composer.tiki.org/dist/squizlabs/php_codesniffer/squizlabs-php_codesniffer-62d32998e820bddc40f99f8251958aed187a5c9c-zip-101dd1.zip", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", + "shasum": "aa053fa2087ae8d5c3f21410d0b15981a26c5600" }, "require": { "ext-simplexml": "*", @@ -16596,7 +16633,7 @@ "type": "open_collective" } ], - "time": "2024-07-21T23:26:44+00:00" + "time": "2024-09-18T10:38:58+00:00" }, { "name": "stevegrunwell/phpunit-markup-assertions", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Marc L. (@marclaporte) <gi...@mg...> - 2024-09-19 11:30:13
|
Marc Laporte pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: 4eb7b5e2 by franck franck kalunga at 2024-09-19T11:29:42+00:00 [REF] Change christian-vigh-phpclasses/PdfToText with smalot/pdfparser --- * [REF] Change christian-vigh-phpclasses/PdfToText with smalot/pdfparser See merge request tikiwiki/tiki!5841 - - - - - 3 changed files: - lib/filegals/filegallib.php - vendor_bundled/composer.json - vendor_bundled/composer.lock Changes: ===================================== lib/filegals/filegallib.php ===================================== @@ -905,11 +905,11 @@ class FileGalLib extends TikiLib case 'application/pdf': return function (FileWrapper $wrapper) { $getTextFromPdf = function () use ($wrapper) { - require_once TIKI_VENDOR_BUNDLED_PATH . "/christian-vigh-phpclasses/PdfToText/PdfToText.phpclass"; ob_start(); - $pdf = new \PdfToText($wrapper->getReadableFile()); + $parser = new \Smalot\PdfParser\Parser(); + $pdf = $parser->parseFile($wrapper->getReadableFile()); ob_end_clean(); - return $pdf->Text; + return $pdf->getText(); }; // Call the closure to get text from PDF ===================================== vendor_bundled/composer.json ===================================== @@ -138,7 +138,6 @@ "bacon/bacon-qr-code": "^2.0.0", "candy-chat/xmpp-prebind-php": "dev-master", "cboden/ratchet": "^0.4", - "christian-vigh-phpclasses/pdftotext": "^1.6.0", "ckeditor/ckeditor": "<=4.22.1", "codercat/jwk-to-pem": "^1.1", "composer/semver": "^3.2", @@ -252,6 +251,7 @@ "sentry/sdk": "^3.3", "simile_timeline/simile_timeline": "2.3.0", "slm/mail": "^4.2", + "smalot/pdfparser": "^2.11", "smarty/smarty": "^5.0", "steverhoades/oauth2-openid-connect-client": "^2.0.0", "studio-42/elfinder": "~2.1", ===================================== vendor_bundled/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": "78284c734044391505ccc62a47e029d7", + "content-hash": "ffb56ad004285a3abca4312d6df56882", "packages": [ { "name": "Sam152/Javascript-Equal-Height-Responsive-Rows", @@ -811,16 +811,6 @@ ], "time": "2021-02-26T10:19:33+00:00" }, - { - "name": "christian-vigh-phpclasses/PdfToText", - "version": "1.6.7", - "dist": { - "type": "zip", - "url": "https://composer.tiki.org/dist/christian-vigh-phpclasses/pdftotext/christian-vigh-phpclasses-pdftotext-1.6.7.zip", - "shasum": "4fda0cbb9d044b0c4844587177629763c6afb229" - }, - "type": "library" - }, { "name": "ckeditor/ckeditor", "version": "4.22.1", @@ -1422,17 +1412,17 @@ }, { "name": "elliotjreed/disposable-emails-filter", - "version": "4.0.15", + "version": "4.0.16", "source": { "type": "git", "url": "https://github.com/elliotjreed/disposable-emails-filter-php.git", - "reference": "afff94f48995b68a4331567358ed3c9ae18220fe" + "reference": "d24677626b60eb4986d3460b3d11a05f727d75e3" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/elliotjreed/disposable-emails-filter/elliotjreed-disposable-emails-filter-afff94f48995b68a4331567358ed3c9ae18220fe-zip-c0acc3.zip", - "reference": "afff94f48995b68a4331567358ed3c9ae18220fe", - "shasum": "cfd7ee4c05984dd1af6e5e6877df271caf4fe48f" + "url": "https://composer.tiki.org/dist/elliotjreed/disposable-emails-filter/elliotjreed-disposable-emails-filter-d24677626b60eb4986d3460b3d11a05f727d75e3-zip-c1fc29.zip", + "reference": "d24677626b60eb4986d3460b3d11a05f727d75e3", + "shasum": "50cc0cb33dff8faff24d9938d8dba424e20702cc" }, "require": { "php": "^8.1" @@ -1462,7 +1452,7 @@ } ], "description": "A PHP package for determining whether an email address is from a disposable / temporary email address provider.", - "time": "2024-09-11T07:33:53+00:00" + "time": "2024-09-16T07:33:33+00:00" }, { "name": "evenement/evenement", @@ -8031,17 +8021,17 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.41", + "version": "3.0.42", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb" + "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/phpseclib/phpseclib/phpseclib-phpseclib-621c73f7dcb310b61de34d1da4c4204e8ace6ceb-zip-3ebed5.zip", - "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb", - "shasum": "d3e0f8ee1f10d0b69975c2f0cbd09da705922e7b" + "url": "https://composer.tiki.org/dist/phpseclib/phpseclib/phpseclib-phpseclib-db92f1b1987b12b13f248fe76c3a52cadb67bb98-zip-9f59a1.zip", + "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98", + "shasum": "3162b91ac6d6cae8cc9662f76ab8b27f038166ba" }, "require": { "paragonie/constant_time_encoding": "^1|^2|^3", @@ -8133,7 +8123,7 @@ "type": "tidelift" } ], - "time": "2024-08-12T00:13:54+00:00" + "time": "2024-09-16T03:06:04+00:00" }, { "name": "phpxmlrpc/phpxmlrpc", @@ -10359,6 +10349,53 @@ ], "time": "2023-11-20T07:27:47+00:00" }, + { + "name": "smalot/pdfparser", + "version": "v2.11.0", + "source": { + "type": "git", + "url": "https://github.com/smalot/pdfparser.git", + "reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6" + }, + "dist": { + "type": "zip", + "url": "https://composer.tiki.org/dist/smalot/pdfparser/smalot-pdfparser-ac8e6678b0940e4b2ccd5caadd3fb18e68093be6-zip-d79b68.zip", + "reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6", + "shasum": "abd2ef990dff70726c4ab4052b09d9361c079759" + }, + "require": { + "ext-iconv": "*", + "ext-zlib": "*", + "php": ">=7.1", + "symfony/polyfill-mbstring": "^1.18" + }, + "type": "library", + "autoload": { + "psr-0": { + "Smalot\\PdfParser\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Sebastien MALOT", + "email": "seb...@ma..." + } + ], + "description": "Pdf parser library. Can read and extract information from pdf file.", + "homepage": "https://www.pdfparser.org", + "keywords": [ + "extract", + "parse", + "parser", + "pdf", + "text" + ], + "time": "2024-08-16T06:48:03+00:00" + }, { "name": "smarty/smarty", "version": "v5.4.1", @@ -16526,17 +16563,17 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.2", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/squizlabs/php_codesniffer/squizlabs-php_codesniffer-86e5f5dd9a840c46810ebe5ff1885581c42a3017-zip-c71194.zip", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", - "shasum": "23add5e22cd8de64c91cc5cba2c8c07f4b7970eb" + "url": "https://composer.tiki.org/dist/squizlabs/php_codesniffer/squizlabs-php_codesniffer-62d32998e820bddc40f99f8251958aed187a5c9c-zip-101dd1.zip", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", + "shasum": "aa053fa2087ae8d5c3f21410d0b15981a26c5600" }, "require": { "ext-simplexml": "*", @@ -16596,7 +16633,7 @@ "type": "open_collective" } ], - "time": "2024-07-21T23:26:44+00:00" + "time": "2024-09-18T10:38:58+00:00" }, { "name": "stevegrunwell/phpunit-markup-assertions", View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4eb7b5e2b9d98f8c92dd0596600cae2b07ff41b3 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4eb7b5e2b9d98f8c92dd0596600cae2b07ff41b3 You're receiving this email because of your account on gitlab.com. |
From: mercihabam@users.sourceforge.net - 2024-09-19 08:55:13
|
Revision: 86600 http://sourceforge.net/p/tikiwiki/code/86600 Author: "mercihabam" Date: 2024-09-19 08:55:12 +0000 (Thu, 19 Sep 2024) Log Message: ----------- [REF] wikiplugin-convene: replace the jQuery date time picker with the Vue datetime-picker component --- * Move jq to js files * Add transition to when the position change * Remove the form solution * [ENH] wikiplugin-convene: replace jquery date time picker by date time picker component See merge request tikiwiki/tiki!5707 Modified Paths: -------------- trunk/lib/jquery_tiki/wikiplugin-convene.js trunk/templates/wiki-plugins/wikiplugin_convene.tpl Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-19 07:36:02 UTC (rev 86599) +++ trunk 2024-09-19 08:55:12 UTC (rev 86600) Property changes on: trunk ___________________________________________________________________ Deleted: subgit:lock:41d089188fbf47108801037e72694b22ad960355 ## -1 +0,0 ## -2024-09-19T07:36:37.627 \ No newline at end of property Added: subgit:lock:46b0ee731522c5e68cc4decc274e14a3f53f0360 ## -0,0 +1 ## +2024-09-19T08:55:11.369 \ No newline at end of property Modified: trunk/lib/jquery_tiki/wikiplugin-convene.js =================================================================== --- trunk/lib/jquery_tiki/wikiplugin-convene.js 2024-09-19 07:36:02 UTC (rev 86599) +++ trunk/lib/jquery_tiki/wikiplugin-convene.js 2024-09-19 08:55:12 UTC (rev 86600) @@ -6,6 +6,16 @@ this.each(function () { let $this = $(this); + $(document).ready(function() { + $(document).on('focus', '.inputAddDate', function() { + $('.divAddDate > :first-child').addClass('absolute'); + }); + + $(document).on('blur', '.inputAddDate', function() { + $('.divAddDate > :first-child').removeClass('absolute'); + }); + }); + let convene = $.extend({ updateUsersVotes: function () { let data = {}, dateFromData, dataComments = {}, comment; @@ -74,7 +84,6 @@ if (!date) { return; } - date = Date.parseUnix(date); if (getCurrentDateTime()>date) { $("#tikifeedback").showError( @@ -234,23 +243,14 @@ }; let initConvene = function () { - $('.conveneAddDate', $this).clickModal({ - title: tr("Add Date"), - content: $('<input type="text" style="width: 100%;" focus />') - .datetimepicker({ - changeMonth: jqueryTiki.changeMonth, - changeYear: jqueryTiki.changeYear, - }), - buttons: [ - { - text: tr("Add"), - type: "primary", - onClick: function () { - convene.addDate($(this).find('input').first().val()); - $.closeModal(); - } - } - ] + $('.conveneAddDate', $this).on('click', function () { + const fieldName = $(this).data('field'); + const dateValue = $(`input[name="${fieldName}"]`).val(); + if (dateValue && !isNaN(dateValue)) { + convene.addDate(dateValue); + } else { + alert(tr("Please select a valid date.")); + } }); $('.conveneDeleteDate', $this) Modified: trunk/templates/wiki-plugins/wikiplugin_convene.tpl =================================================================== --- trunk/templates/wiki-plugins/wikiplugin_convene.tpl 2024-09-19 07:36:02 UTC (rev 86599) +++ trunk/templates/wiki-plugins/wikiplugin_convene.tpl 2024-09-19 08:55:12 UTC (rev 86600) @@ -12,7 +12,22 @@ <td class="align-middle"> {if not $locked} {if $canEdit} - <input type="button" class="conveneAddDate btn btn-primary btn-sm" value="Add Date"> + <style> + .divAddDate > :first-child { + transition: all 0.5s ease; + position: relative; + } + .divAddDate > :first-child.absolute { + position: absolute; + transform: translate(2px, 0); + z-index: 99; + } + </style> + {assign var="defautDate" value=$smarty.now+86400} + <div style="display: flex; justify-content: space-around; flex-wrap: wrap;" class="divAddDate"> + <span class="inputAddDate">{jscalendar date=$defautDate fieldname="conveneAddDate" showtime='y' showtimezone="n"}</span> + <button type="button" class="conveneAddDate btn btn-primary btn-sm" data-field="conveneAddDate">Add Date</button> + </div> {/if} {else} {icon name='lock'} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Merci J. (@mercihabam) <gi...@mg...> - 2024-09-19 08:55:08
|
Merci Jacob pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: 46b0ee73 by Joseph Lwanzo Kausi at 2024-09-19T08:54:47+00:00 [REF] wikiplugin-convene: replace the jQuery date time picker with the Vue datetime-picker component --- * Move jq to js files * Add transition to when the position change * Remove the form solution * [ENH] wikiplugin-convene: replace jquery date time picker by date time picker component See merge request tikiwiki/tiki!5707 - - - - - 2 changed files: - lib/jquery_tiki/wikiplugin-convene.js - templates/wiki-plugins/wikiplugin_convene.tpl Changes: ===================================== lib/jquery_tiki/wikiplugin-convene.js ===================================== @@ -6,6 +6,16 @@ $.fn.setupConvene = function (pluginParams) { this.each(function () { let $this = $(this); + $(document).ready(function() { + $(document).on('focus', '.inputAddDate', function() { + $('.divAddDate > :first-child').addClass('absolute'); + }); + + $(document).on('blur', '.inputAddDate', function() { + $('.divAddDate > :first-child').removeClass('absolute'); + }); + }); + let convene = $.extend({ updateUsersVotes: function () { let data = {}, dateFromData, dataComments = {}, comment; @@ -74,7 +84,6 @@ $.fn.setupConvene = function (pluginParams) { if (!date) { return; } - date = Date.parseUnix(date); if (getCurrentDateTime()>date) { $("#tikifeedback").showError( @@ -234,23 +243,14 @@ $.fn.setupConvene = function (pluginParams) { }; let initConvene = function () { - $('.conveneAddDate', $this).clickModal({ - title: tr("Add Date"), - content: $('<input type="text" style="width: 100%;" focus />') - .datetimepicker({ - changeMonth: jqueryTiki.changeMonth, - changeYear: jqueryTiki.changeYear, - }), - buttons: [ - { - text: tr("Add"), - type: "primary", - onClick: function () { - convene.addDate($(this).find('input').first().val()); - $.closeModal(); - } - } - ] + $('.conveneAddDate', $this).on('click', function () { + const fieldName = $(this).data('field'); + const dateValue = $(`input[name="${fieldName}"]`).val(); + if (dateValue && !isNaN(dateValue)) { + convene.addDate(dateValue); + } else { + alert(tr("Please select a valid date.")); + } }); $('.conveneDeleteDate', $this) ===================================== templates/wiki-plugins/wikiplugin_convene.tpl ===================================== @@ -12,7 +12,22 @@ <td class="align-middle"> {if not $locked} {if $canEdit} - <input type="button" class="conveneAddDate btn btn-primary btn-sm" value="Add Date"> + <style> + .divAddDate > :first-child { + transition: all 0.5s ease; + position: relative; + } + .divAddDate > :first-child.absolute { + position: absolute; + transform: translate(2px, 0); + z-index: 99; + } + </style> + {assign var="defautDate" value=$smarty.now+86400} + <div style="display: flex; justify-content: space-around; flex-wrap: wrap;" class="divAddDate"> + <span class="inputAddDate">{jscalendar date=$defautDate fieldname="conveneAddDate" showtime='y' showtimezone="n"}</span> + <button type="button" class="conveneAddDate btn btn-primary btn-sm" data-field="conveneAddDate">Add Date</button> + </div> {/if} {else} {icon name='lock'} View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/46b0ee731522c5e68cc4decc274e14a3f53f0360 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/46b0ee731522c5e68cc4decc274e14a3f53f0360 You're receiving this email because of your account on gitlab.com. |
From: mercihabam@users.sourceforge.net - 2024-09-19 07:36:42
|
Revision: 86599 http://sourceforge.net/p/tikiwiki/code/86599 Author: "mercihabam" Date: 2024-09-19 07:36:38 +0000 (Thu, 19 Sep 2024) Log Message: ----------- [ENH] Email folders Tracker Field: Save drafts in the respective field folder instead of having them in Cypht imap folder when they originated from a tracker --- * Redirect to the compose form instead of the msg detail page for a draft and allow its modification instead of creating a new file * Ensure the msg has the correct flag and the path is correctly captured * [ENH] Email folders Tracker Field: Save drafts in the respective field folder instead of having them in Cypht imap folder when they originated from a tracker See merge request tikiwiki/tiki!5817 Modified Paths: -------------- trunk/lib/core/Tracker/Field/EmailFolder.php trunk/lib/cypht/modules/tiki/setup.php trunk/lib/cypht/modules/tiki/tracker_modules.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-18 23:23:17 UTC (rev 86598) +++ trunk 2024-09-19 07:36:38 UTC (rev 86599) Property changes on: trunk ___________________________________________________________________ Deleted: subgit:lock:16e7d0369855a1f27f98f2ca5cd2152066d72764 ## -1 +0,0 ## -2024-09-18T23:23:47.299 \ No newline at end of property Added: subgit:lock:41d089188fbf47108801037e72694b22ad960355 ## -0,0 +1 ## +2024-09-19T07:36:37.627 \ No newline at end of property Modified: trunk/lib/core/Tracker/Field/EmailFolder.php =================================================================== --- trunk/lib/core/Tracker/Field/EmailFolder.php 2024-09-18 23:23:17 UTC (rev 86598) +++ trunk/lib/core/Tracker/Field/EmailFolder.php 2024-09-19 07:36:38 UTC (rev 86599) @@ -215,8 +215,15 @@ } else { $view_path .= '?'; } - $view_path .= "page=message&uid=" . $parsed_fields['fileId'] . "&list_path=tracker_folder_" . $parsed_fields['itemId'] . "_" . $parsed_fields['fieldId'] . "&list_parent=tracker_" . $parsed_fields['trackerId']; + + + if (in_array('Draft', $parsed_fields['flags'])) { + $view_path .= "page=compose&draft_id=" . $parsed_fields['fileId'] . "&list_path=tracker_folder_" . $parsed_fields['itemId'] . "_" . $parsed_fields['fieldId'] . "&list_parent=tracker_" . $parsed_fields['trackerId']; + } else { + $view_path .= "page=message&uid=" . $parsed_fields['fileId'] . "&list_path=tracker_folder_" . $parsed_fields['itemId'] . "_" . $parsed_fields['fieldId'] . "&list_parent=tracker_" . $parsed_fields['trackerId']; + } $parsed_fields['view_path'] = $view_path; + return $parsed_fields; } @@ -313,6 +320,8 @@ $this->deleteEmail($existing, $value['delete'], $value['skip_trash'] ?? false); } elseif (isset($value['archive'])) { $this->archiveEmail($existing, $value['archive']); + } elseif (isset($value['replace'])) { + $this->updateDraftEmail($value['replace']); } return [ 'value' => json_encode($existing) @@ -575,4 +584,16 @@ } } } + + protected function updateDraftEmail($file) + { + $filegallib = TikiLib::lib('filegal'); + $galleryId = (int) $this->getOption('galleryId'); + $galinfo = $filegallib->get_file_gallery($galleryId, false); + if (! $galinfo || empty($galinfo['galleryId'])) { + Feedback::error(tr('%0 field: Gallery #%1 not found', $this->getConfiguration('name'), $galleryId)); + return; + } + $filegallib->update_single_file($galinfo, $file['name'], $file['size'], $file['type'], $file['content'], $file['fileId']); + } } Modified: trunk/lib/cypht/modules/tiki/setup.php =================================================================== --- trunk/lib/cypht/modules/tiki/setup.php 2024-09-18 23:23:17 UTC (rev 86598) +++ trunk/lib/cypht/modules/tiki/setup.php 2024-09-19 07:36:38 UTC (rev 86599) @@ -121,10 +121,13 @@ add_handler('compose', 'tiki_save_sent', true, 'smtp', 'tiki_mark_as_answered', 'after'); add_handler('compose', 'tiki_archive_replied', true, 'smtp', 'tiki_save_sent', 'after'); add_handler('compose', 'check_path_redirect_after_sent', true, 'smtp', 'tiki_archive_replied', 'after'); +add_handler('compose', 'tiki_compose_from_draft', true, 'smtp', 'load_smtp_servers_from_config', 'after'); add_output('ajax_imap_message_content', 'add_move_to_trackers', true, 'imap', 'filter_message_headers', 'after'); add_output('ajax_imap_message_content', 'tiki_get_create_item_trackers_output', true, 'imap', 'filter_message_headers', 'after'); add_output('message_list', 'add_multiple_move_to_trackers', true, 'imap', 'imap_custom_controls', 'after'); add_output('message_list', 'add_multiple_item_to_trackers', true, 'imap', 'imap_custom_controls', 'after'); +add_handler('ajax_smtp_save_draft', 'tiki_presave_draft', true, 'smtp', 'smtp_save_draft', 'before'); +add_handler('ajax_smtp_save_draft', 'tiki_save_draft', true, 'smtp', 'smtp_save_draft', 'after'); setup_base_ajax_page('ajax_move_to_tracker', 'core'); add_handler('ajax_move_to_tracker', 'load_imap_servers_from_config', true, 'imap'); add_handler('ajax_move_to_tracker', 'imap_oauth2_token_check', true, 'imap'); Modified: trunk/lib/cypht/modules/tiki/tracker_modules.php =================================================================== --- trunk/lib/cypht/modules/tiki/tracker_modules.php 2024-09-18 23:23:17 UTC (rev 86598) +++ trunk/lib/cypht/modules/tiki/tracker_modules.php 2024-09-19 07:36:38 UTC (rev 86599) @@ -348,8 +348,109 @@ ]); } } +/** + * Prevent saving a draft message to IMAP if it originated from a tracker + * @subpackage tiki/handler + */ +class Hm_Handler_tiki_presave_draft extends Hm_Handler_Module +{ + public function process() + { + $path = $this->request->get['list_path']; + if (strstr($path, 'tracker_folder_')) { + $this->out('save_draft_to_imap', false); + } + } +} /** + * Save a draft message to EmailFolder field + * @subpackage tiki/handler + */ +class Hm_Handler_tiki_save_draft extends Hm_Handler_Module +{ + public function process() + { + $mime = $this->get('draft_mime'); + if (! $mime) { + return; + } + + $path = $this->request->get['list_path']; + if (! strstr($path, 'tracker_folder_')) { + return; + } + $path = str_replace('tracker_folder_', '', $path); + list ($itemId, $fieldId) = explode('_', $path); + + $trk = TikiLib::lib('trk'); + $item = $trk->get_item_info($itemId); + if (! $item) { + Hm_Msgs::add('ERRTracker item not found'); + return; + } + $field = $trk->get_field_info($fieldId); + if (! $field) { + Hm_Msgs::add('ERRTracker field not found'); + return; + } + + $fileId = $this->request->get['draft_id']; + + $headers = $mime->get_headers(); + $msg = "Flags: \Draft\r\n" . $mime->get_mime_msg(); + + $fileValue = [ + 'name' => ! empty($headers['Message-Id']) ? $headers['Message-Id'] : $headers['Subject'], + 'size' => strlen($msg), + 'type' => 'message/rfc822', + 'content' => $msg + ]; + + if ($fileId) { + $fileValue['fileId'] = $fileId; + $action = 'replace'; + } else { + $action = 'new'; + } + + $field['value'] = [ + 'folder' => 'draft', + $action => $fileValue + ]; + $trk->replace_item($item['trackerId'], $item['itemId'], [ + 'data' => [$field] + ]); + + if ($this->request->post['draft_notice']) { + Hm_Msgs::add('Draft saved'); + } + } +} + +class Hm_Handler_tiki_compose_from_draft extends Hm_Handler_Module +{ + public function process() + { + $draftId = $this->request->get['draft_id']; + $path = $this->request->get['list_path']; + if (! strstr($path, 'tracker_folder_') || ! $draftId) { + return; + } + + $file_object = Tiki\FileGallery\File::id($draftId); + $parsed_fields = (new Tiki\FileGallery\Manipulator\EmailParser($file_object))->run(); + $draft = []; + $draft['draft_to'] = $parsed_fields['recipient']; + $draft['draft_subject'] = $parsed_fields['subject']; + $draft['draft_body'] = $parsed_fields['body']; + $draft['draft_cc'] = ($parsed_fields['message_raw'])->getHeader('Cc'); + $draft['draft_bcc'] = ($parsed_fields['message_raw'])->getHeader('Bcc'); + $this->out('compose_draft', $draft); + } +} + +/** * Archive a replied message * @subpackage tiki/handler */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Merci J. (@mercihabam) <gi...@mg...> - 2024-09-19 07:36:28
|
Merci Jacob pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: 41d08918 by Merci Jacob at 2024-09-19T07:36:02+00:00 [ENH] Email folders Tracker Field: Save drafts in the respective field folder instead of having them in Cypht imap folder when they originated from a tracker --- * Redirect to the compose form instead of the msg detail page for a draft and allow its modification instead of creating a new file * Ensure the msg has the correct flag and the path is correctly captured * [ENH] Email folders Tracker Field: Save drafts in the respective field folder instead of having them in Cypht imap folder when they originated from a tracker See merge request tikiwiki/tiki!5817 - - - - - 3 changed files: - lib/core/Tracker/Field/EmailFolder.php - lib/cypht/modules/tiki/setup.php - lib/cypht/modules/tiki/tracker_modules.php Changes: ===================================== lib/core/Tracker/Field/EmailFolder.php ===================================== @@ -215,8 +215,15 @@ class Tracker_Field_EmailFolder extends Tracker_Field_Files implements \Tracker\ } else { $view_path .= '?'; } - $view_path .= "page=message&uid=" . $parsed_fields['fileId'] . "&list_path=tracker_folder_" . $parsed_fields['itemId'] . "_" . $parsed_fields['fieldId'] . "&list_parent=tracker_" . $parsed_fields['trackerId']; + + + if (in_array('Draft', $parsed_fields['flags'])) { + $view_path .= "page=compose&draft_id=" . $parsed_fields['fileId'] . "&list_path=tracker_folder_" . $parsed_fields['itemId'] . "_" . $parsed_fields['fieldId'] . "&list_parent=tracker_" . $parsed_fields['trackerId']; + } else { + $view_path .= "page=message&uid=" . $parsed_fields['fileId'] . "&list_path=tracker_folder_" . $parsed_fields['itemId'] . "_" . $parsed_fields['fieldId'] . "&list_parent=tracker_" . $parsed_fields['trackerId']; + } $parsed_fields['view_path'] = $view_path; + return $parsed_fields; } @@ -313,6 +320,8 @@ class Tracker_Field_EmailFolder extends Tracker_Field_Files implements \Tracker\ $this->deleteEmail($existing, $value['delete'], $value['skip_trash'] ?? false); } elseif (isset($value['archive'])) { $this->archiveEmail($existing, $value['archive']); + } elseif (isset($value['replace'])) { + $this->updateDraftEmail($value['replace']); } return [ 'value' => json_encode($existing) @@ -575,4 +584,16 @@ class Tracker_Field_EmailFolder extends Tracker_Field_Files implements \Tracker\ } } } + + protected function updateDraftEmail($file) + { + $filegallib = TikiLib::lib('filegal'); + $galleryId = (int) $this->getOption('galleryId'); + $galinfo = $filegallib->get_file_gallery($galleryId, false); + if (! $galinfo || empty($galinfo['galleryId'])) { + Feedback::error(tr('%0 field: Gallery #%1 not found', $this->getConfiguration('name'), $galleryId)); + return; + } + $filegallib->update_single_file($galinfo, $file['name'], $file['size'], $file['type'], $file['content'], $file['fileId']); + } } ===================================== lib/cypht/modules/tiki/setup.php ===================================== @@ -121,10 +121,13 @@ add_handler('compose', 'tiki_mark_as_answered', true, 'smtp', 'process_compose_f add_handler('compose', 'tiki_save_sent', true, 'smtp', 'tiki_mark_as_answered', 'after'); add_handler('compose', 'tiki_archive_replied', true, 'smtp', 'tiki_save_sent', 'after'); add_handler('compose', 'check_path_redirect_after_sent', true, 'smtp', 'tiki_archive_replied', 'after'); +add_handler('compose', 'tiki_compose_from_draft', true, 'smtp', 'load_smtp_servers_from_config', 'after'); add_output('ajax_imap_message_content', 'add_move_to_trackers', true, 'imap', 'filter_message_headers', 'after'); add_output('ajax_imap_message_content', 'tiki_get_create_item_trackers_output', true, 'imap', 'filter_message_headers', 'after'); add_output('message_list', 'add_multiple_move_to_trackers', true, 'imap', 'imap_custom_controls', 'after'); add_output('message_list', 'add_multiple_item_to_trackers', true, 'imap', 'imap_custom_controls', 'after'); +add_handler('ajax_smtp_save_draft', 'tiki_presave_draft', true, 'smtp', 'smtp_save_draft', 'before'); +add_handler('ajax_smtp_save_draft', 'tiki_save_draft', true, 'smtp', 'smtp_save_draft', 'after'); setup_base_ajax_page('ajax_move_to_tracker', 'core'); add_handler('ajax_move_to_tracker', 'load_imap_servers_from_config', true, 'imap'); add_handler('ajax_move_to_tracker', 'imap_oauth2_token_check', true, 'imap'); ===================================== lib/cypht/modules/tiki/tracker_modules.php ===================================== @@ -348,6 +348,107 @@ class Hm_Handler_tiki_save_sent extends Hm_Handler_Module ]); } } +/** + * Prevent saving a draft message to IMAP if it originated from a tracker + * @subpackage tiki/handler + */ +class Hm_Handler_tiki_presave_draft extends Hm_Handler_Module +{ + public function process() + { + $path = $this->request->get['list_path']; + if (strstr($path, 'tracker_folder_')) { + $this->out('save_draft_to_imap', false); + } + } +} + +/** + * Save a draft message to EmailFolder field + * @subpackage tiki/handler + */ +class Hm_Handler_tiki_save_draft extends Hm_Handler_Module +{ + public function process() + { + $mime = $this->get('draft_mime'); + if (! $mime) { + return; + } + + $path = $this->request->get['list_path']; + if (! strstr($path, 'tracker_folder_')) { + return; + } + $path = str_replace('tracker_folder_', '', $path); + list ($itemId, $fieldId) = explode('_', $path); + + $trk = TikiLib::lib('trk'); + $item = $trk->get_item_info($itemId); + if (! $item) { + Hm_Msgs::add('ERRTracker item not found'); + return; + } + $field = $trk->get_field_info($fieldId); + if (! $field) { + Hm_Msgs::add('ERRTracker field not found'); + return; + } + + $fileId = $this->request->get['draft_id']; + + $headers = $mime->get_headers(); + $msg = "Flags: \Draft\r\n" . $mime->get_mime_msg(); + + $fileValue = [ + 'name' => ! empty($headers['Message-Id']) ? $headers['Message-Id'] : $headers['Subject'], + 'size' => strlen($msg), + 'type' => 'message/rfc822', + 'content' => $msg + ]; + + if ($fileId) { + $fileValue['fileId'] = $fileId; + $action = 'replace'; + } else { + $action = 'new'; + } + + $field['value'] = [ + 'folder' => 'draft', + $action => $fileValue + ]; + $trk->replace_item($item['trackerId'], $item['itemId'], [ + 'data' => [$field] + ]); + + if ($this->request->post['draft_notice']) { + Hm_Msgs::add('Draft saved'); + } + } +} + +class Hm_Handler_tiki_compose_from_draft extends Hm_Handler_Module +{ + public function process() + { + $draftId = $this->request->get['draft_id']; + $path = $this->request->get['list_path']; + if (! strstr($path, 'tracker_folder_') || ! $draftId) { + return; + } + + $file_object = Tiki\FileGallery\File::id($draftId); + $parsed_fields = (new Tiki\FileGallery\Manipulator\EmailParser($file_object))->run(); + $draft = []; + $draft['draft_to'] = $parsed_fields['recipient']; + $draft['draft_subject'] = $parsed_fields['subject']; + $draft['draft_body'] = $parsed_fields['body']; + $draft['draft_cc'] = ($parsed_fields['message_raw'])->getHeader('Cc'); + $draft['draft_bcc'] = ($parsed_fields['message_raw'])->getHeader('Bcc'); + $this->out('compose_draft', $draft); + } +} /** * Archive a replied message View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/41d089188fbf47108801037e72694b22ad960355 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/41d089188fbf47108801037e72694b22ad960355 You're receiving this email because of your account on gitlab.com. |
From: marclaporte@users.sourceforge.net - 2024-09-18 23:23:51
|
Revision: 86598 http://sourceforge.net/p/tikiwiki/code/86598 Author: "marclaporte" Date: 2024-09-18 23:23:47 +0000 (Wed, 18 Sep 2024) Log Message: ----------- [UPD] Cypht: update composer lock to get latest cypht --- * [UPD] Cypht: update composer lock to get latest cypht See merge request tikiwiki/tiki!5842 Modified Paths: -------------- trunk/vendor_bundled/composer.lock Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-18 19:11:31 UTC (rev 86597) +++ trunk 2024-09-18 23:23:47 UTC (rev 86598) Property changes on: trunk ___________________________________________________________________ Added: subgit:lock:16e7d0369855a1f27f98f2ca5cd2152066d72764 ## -0,0 +1 ## +2024-09-18T23:23:47.299 \ No newline at end of property Deleted: subgit:lock:9271758c5235da9163d417e49bb2dcc518f122f4 ## -1 +0,0 ## -2024-09-18T19:03:31.159 \ No newline at end of property Modified: trunk/vendor_bundled/composer.lock =================================================================== --- trunk/vendor_bundled/composer.lock 2024-09-18 19:11:31 UTC (rev 86597) +++ trunk/vendor_bundled/composer.lock 2024-09-18 23:23:47 UTC (rev 86598) @@ -2239,13 +2239,13 @@ "source": { "type": "git", "url": "https://github.com/cypht-org/cypht.git", - "reference": "927877a55e37d9f183602ef199ef08608efde267" + "reference": "c52b2c2260f7ca6c3aa840b922497abff26622fb" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/jason-munro/cypht/jason-munro-cypht-927877a55e37d9f183602ef199ef08608efde267-zip-a56293.zip", - "reference": "927877a55e37d9f183602ef199ef08608efde267", - "shasum": "6813a88c2991ea5918ecb0a10abb91d4b0d24113" + "url": "https://composer.tiki.org/dist/jason-munro/cypht/jason-munro-cypht-c52b2c2260f7ca6c3aa840b922497abff26622fb-zip-a69c9c.zip", + "reference": "c52b2c2260f7ca6c3aa840b922497abff26622fb", + "shasum": "13bbf10d971364b348cee79771c296addad3e4c3" }, "require": { "bacon/bacon-qr-code": "^1.0.3 || ^2.0.0", @@ -2312,7 +2312,7 @@ "webmail", "webmail-client" ], - "time": "2024-09-14T11:31:20+00:00" + "time": "2024-09-18T11:18:31+00:00" }, { "name": "jean85/pretty-package-versions", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Marc L. (@marclaporte) <gi...@mg...> - 2024-09-18 23:23:42
|
Marc Laporte pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: 16e7d036 by Alfred Syatsukwa at 2024-09-18T23:23:17+00:00 [UPD] Cypht: update composer lock to get latest cypht --- * [UPD] Cypht: update composer lock to get latest cypht See merge request tikiwiki/tiki!5842 - - - - - 1 changed file: - vendor_bundled/composer.lock Changes: ===================================== vendor_bundled/composer.lock ===================================== @@ -2239,13 +2239,13 @@ "source": { "type": "git", "url": "https://github.com/cypht-org/cypht.git", - "reference": "927877a55e37d9f183602ef199ef08608efde267" + "reference": "c52b2c2260f7ca6c3aa840b922497abff26622fb" }, "dist": { "type": "zip", - "url": "https://composer.tiki.org/dist/jason-munro/cypht/jason-munro-cypht-927877a55e37d9f183602ef199ef08608efde267-zip-a56293.zip", - "reference": "927877a55e37d9f183602ef199ef08608efde267", - "shasum": "6813a88c2991ea5918ecb0a10abb91d4b0d24113" + "url": "https://composer.tiki.org/dist/jason-munro/cypht/jason-munro-cypht-c52b2c2260f7ca6c3aa840b922497abff26622fb-zip-a69c9c.zip", + "reference": "c52b2c2260f7ca6c3aa840b922497abff26622fb", + "shasum": "13bbf10d971364b348cee79771c296addad3e4c3" }, "require": { "bacon/bacon-qr-code": "^1.0.3 || ^2.0.0", @@ -2312,7 +2312,7 @@ "webmail", "webmail-client" ], - "time": "2024-09-14T11:31:20+00:00" + "time": "2024-09-18T11:18:31+00:00" }, { "name": "jean85/pretty-package-versions", View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/16e7d0369855a1f27f98f2ca5cd2152066d72764 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/16e7d0369855a1f27f98f2ca5cd2152066d72764 You're receiving this email because of your account on gitlab.com. |
From: benoitg@users.sourceforge.net - 2024-09-18 19:13:04
|
Revision: 86597 http://sourceforge.net/p/tikiwiki/code/86597 Author: "benoitg" Date: 2024-09-18 19:13:00 +0000 (Wed, 18 Sep 2024) Log Message: ----------- [BP][FIX] Picking a fix from Master to fix one problem: The trackerfilter form does not take into account the format --- * [FIX] Picking a fix from Master to fix one problem: The trackerfilter form does not take into account the format --- * [FIX] Picking a fix from Master to fix one problem: The trackerfilter form does not take into account the format See merge request tikiwiki/tiki!5833 (cherry picked from commit 8d018a83aa0aad537065a281591ddd5a683a85be) c2290a66 [FIX] Picking a fix from Master to fix one problem: The trackerfilter form... Co-authored-by: Joel Mpunga <joe...@gm...> See merge request tikiwiki/tiki!5840 Modified Paths: -------------- branches/26.x/lib/core/Tracker/Field/ItemLink.php branches/26.x/lib/trackers/trackerlib.php Property Changed: ---------------- branches/26.x/ Index: branches/26.x =================================================================== --- branches/26.x 2024-09-18 19:11:05 UTC (rev 86596) +++ branches/26.x 2024-09-18 19:13:00 UTC (rev 86597) Property changes on: branches/26.x ___________________________________________________________________ Added: subgit:lock:9ccb096febc38b47ec16e5c1341f6ddf30f04152 ## -0,0 +1 ## +2024-09-18T19:12:59.131 \ No newline at end of property Deleted: subgit:lock:f3db6433898d15eb4612ed1c333da3409f74326e ## -1 +0,0 ## -2024-08-23T07:38:18.385 \ No newline at end of property Modified: branches/26.x/lib/core/Tracker/Field/ItemLink.php =================================================================== --- branches/26.x/lib/core/Tracker/Field/ItemLink.php 2024-09-18 19:11:05 UTC (rev 86596) +++ branches/26.x/lib/core/Tracker/Field/ItemLink.php 2024-09-18 19:13:00 UTC (rev 86597) @@ -815,7 +815,9 @@ $displayFieldsList, $this->getOption('status', 'opc'), ' ', - true + true, + true, + $this->getOption('displayFieldsListFormat') ); $list = $this->handleDuplicates($list); } Modified: branches/26.x/lib/trackers/trackerlib.php =================================================================== --- branches/26.x/lib/trackers/trackerlib.php 2024-09-18 19:11:05 UTC (rev 86596) +++ branches/26.x/lib/trackers/trackerlib.php 2024-09-18 19:13:00 UTC (rev 86597) @@ -956,7 +956,7 @@ return $res; } - public function concat_all_items_from_fieldslist($trackerId, $fieldsId, $status = 'o', $separator = ' ', $strip_tags = false) + public function concat_all_items_from_fieldslist($trackerId, $fieldsId, $status = 'o', $separator = ' ', $list_mode = '', $strip_tags = false, $format = '') { if (is_string($fieldsId)) { $fieldsId = preg_split('/\|/', $fieldsId, -1, PREG_SPLIT_NO_EMPTY); @@ -963,28 +963,18 @@ } $res = []; $definition = Tracker_Definition::get($trackerId); - foreach ($fieldsId as $field) { - if ($myfield = $definition->getField($field)) { - $is_date = ($myfield['type'] == 'f'); - $is_trackerlink = ($myfield['type'] == 'r'); - $tmp = $this->get_all_items($trackerId, $field, $status); - $options = $myfield['options_map']; - foreach ($tmp as $key => $value) { - if ($is_date) { - $value = $this->date_format("%e/%m/%y", $value); - } - if ($is_trackerlink && $options['displayFieldsList'] && ! empty($options['displayFieldsList'][0])) { - $item = $this->get_tracker_item($key); - $itemId = $item[$field]; - $value = $this->concat_item_from_fieldslist($options['trackerId'], $itemId, $options['displayFieldsList'], $status, $separator, '', $strip_tags); - } - if (! empty($res[$key])) { - $res[$key] .= $separator . $value; - } else { - $res[$key] = $value; - } - } - } + $itemIds = $this->get_all_tracker_items($trackerId); + foreach ($itemIds as $itemId) { + $res[$itemId] = $this->concat_item_from_fieldslist( + $trackerId, + $itemId, + $fieldsId, + $status, + $separator, + $list_mode, + $strip_tags, + $format + ); } return $res; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Benoit G. (@b. <gi...@mg...> - 2024-09-18 19:11:47
|
Benoit Grégoire pushed to branch 26.x at Tiki Wiki CMS Groupware / Tiki Commits: 9ccb096f by Joel Mpunga at 2024-09-18T19:11:31+00:00 [BP][FIX] Picking a fix from Master to fix one problem: The trackerfilter form does not take into account the format --- * [FIX] Picking a fix from Master to fix one problem: The trackerfilter form does not take into account the format --- * [FIX] Picking a fix from Master to fix one problem: The trackerfilter form does not take into account the format See merge request tikiwiki/tiki!5833 (cherry picked from commit 8d018a83aa0aad537065a281591ddd5a683a85be) c2290a66 [FIX] Picking a fix from Master to fix one problem: The trackerfilter form... Co-authored-by: Joel Mpunga <joe...@gm...> See merge request tikiwiki/tiki!5840 - - - - - 2 changed files: - lib/core/Tracker/Field/ItemLink.php - lib/trackers/trackerlib.php Changes: ===================================== lib/core/Tracker/Field/ItemLink.php ===================================== @@ -815,7 +815,9 @@ class Tracker_Field_ItemLink extends \Tracker\Field\AbstractField implements \Tr $displayFieldsList, $this->getOption('status', 'opc'), ' ', - true + true, + true, + $this->getOption('displayFieldsListFormat') ); $list = $this->handleDuplicates($list); } ===================================== lib/trackers/trackerlib.php ===================================== @@ -956,35 +956,25 @@ class TrackerLib extends TikiLib return $res; } - public function concat_all_items_from_fieldslist($trackerId, $fieldsId, $status = 'o', $separator = ' ', $strip_tags = false) + public function concat_all_items_from_fieldslist($trackerId, $fieldsId, $status = 'o', $separator = ' ', $list_mode = '', $strip_tags = false, $format = '') { if (is_string($fieldsId)) { $fieldsId = preg_split('/\|/', $fieldsId, -1, PREG_SPLIT_NO_EMPTY); } $res = []; $definition = Tracker_Definition::get($trackerId); - foreach ($fieldsId as $field) { - if ($myfield = $definition->getField($field)) { - $is_date = ($myfield['type'] == 'f'); - $is_trackerlink = ($myfield['type'] == 'r'); - $tmp = $this->get_all_items($trackerId, $field, $status); - $options = $myfield['options_map']; - foreach ($tmp as $key => $value) { - if ($is_date) { - $value = $this->date_format("%e/%m/%y", $value); - } - if ($is_trackerlink && $options['displayFieldsList'] && ! empty($options['displayFieldsList'][0])) { - $item = $this->get_tracker_item($key); - $itemId = $item[$field]; - $value = $this->concat_item_from_fieldslist($options['trackerId'], $itemId, $options['displayFieldsList'], $status, $separator, '', $strip_tags); - } - if (! empty($res[$key])) { - $res[$key] .= $separator . $value; - } else { - $res[$key] = $value; - } - } - } + $itemIds = $this->get_all_tracker_items($trackerId); + foreach ($itemIds as $itemId) { + $res[$itemId] = $this->concat_item_from_fieldslist( + $trackerId, + $itemId, + $fieldsId, + $status, + $separator, + $list_mode, + $strip_tags, + $format + ); } return $res; } View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/9ccb096febc38b47ec16e5c1341f6ddf30f04152 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/9ccb096febc38b47ec16e5c1341f6ddf30f04152 You're receiving this email because of your account on gitlab.com. |
From: benoitg@users.sourceforge.net - 2024-09-18 19:11:32
|
Revision: 86596 http://sourceforge.net/p/tikiwiki/code/86596 Author: "benoitg" Date: 2024-09-18 19:11:30 +0000 (Wed, 18 Sep 2024) Log Message: ----------- [BP][FIX] Article Topics: Adding a topic without an image file showed an error --- * [FIX] Article Topics: Adding a topic without an image file showed an error --- See merge request tikiwiki/tiki!5734 (cherry picked from commit 5e384366497ba617ed42865cd12daef959ce0bea) ec3c3cdc [FIX] Article Topics : Adding topic without join an image file shows an error Co-authored-by: Joel Mpunga <joe...@gm...> See merge request tikiwiki/tiki!5744 Modified Paths: -------------- branches/27.x/tiki-admin_topics.php Property Changed: ---------------- branches/27.x/ Index: branches/27.x =================================================================== --- branches/27.x 2024-09-18 19:03:01 UTC (rev 86595) +++ branches/27.x 2024-09-18 19:11:30 UTC (rev 86596) Property changes on: branches/27.x ___________________________________________________________________ Added: subgit:lock:74988fd926f964a0e0e90c95cb38cadcea525d15 ## -0,0 +1 ## +2024-09-18T19:11:29.661 \ No newline at end of property Deleted: subgit:lock:8d018a83aa0aad537065a281591ddd5a683a85be ## -1 +0,0 ## -2024-09-18T18:32:31.178 \ No newline at end of property Modified: branches/27.x/tiki-admin_topics.php =================================================================== --- branches/27.x/tiki-admin_topics.php 2024-09-18 19:03:01 UTC (rev 86595) +++ branches/27.x/tiki-admin_topics.php 2024-09-18 19:11:30 UTC (rev 86596) @@ -35,7 +35,7 @@ $imgsize = $_FILES['userfile1']['size']; $imgname = $_FILES['userfile1']['name']; } else { - Feedback::error($taglinelib->uploaded_file_error($_FILES['userfile1']['error'])); + Feedback::error($artlib->uploaded_file_error($_FILES['userfile1']['error'])); } } if (! isset($data)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Benoit G. (@b. <gi...@mg...> - 2024-09-18 19:11:21
|
Benoit Grégoire pushed to branch 27.x at Tiki Wiki CMS Groupware / Tiki Commits: 74988fd9 by Joel Mpunga at 2024-09-18T19:11:05+00:00 [BP][FIX] Article Topics: Adding a topic without an image file showed an error --- * [FIX] Article Topics: Adding a topic without an image file showed an error --- See merge request tikiwiki/tiki!5734 (cherry picked from commit 5e384366497ba617ed42865cd12daef959ce0bea) ec3c3cdc [FIX] Article Topics : Adding topic without join an image file shows an error Co-authored-by: Joel Mpunga <joe...@gm...> See merge request tikiwiki/tiki!5744 - - - - - 1 changed file: - tiki-admin_topics.php Changes: ===================================== tiki-admin_topics.php ===================================== @@ -35,7 +35,7 @@ if (isset($_REQUEST["addtopic"])) { $imgsize = $_FILES['userfile1']['size']; $imgname = $_FILES['userfile1']['name']; } else { - Feedback::error($taglinelib->uploaded_file_error($_FILES['userfile1']['error'])); + Feedback::error($artlib->uploaded_file_error($_FILES['userfile1']['error'])); } } if (! isset($data)) { View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/74988fd926f964a0e0e90c95cb38cadcea525d15 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/74988fd926f964a0e0e90c95cb38cadcea525d15 You're receiving this email because of your account on gitlab.com. |
From: benoitg@users.sourceforge.net - 2024-09-18 19:03:35
|
Revision: 86595 http://sourceforge.net/p/tikiwiki/code/86595 Author: "benoitg" Date: 2024-09-18 19:03:31 +0000 (Wed, 18 Sep 2024) Log Message: ----------- [FIX] tiki-view_tracker_item.tpl: Prevents the history link from being visible... --- * Used item permision for tracker_item * [FIX] tiki-view_tracker_item.tpl: Prevents the history link from being visible to users who don't have the right to see item history See merge request tikiwiki/tiki!5764 Modified Paths: -------------- trunk/templates/tiki-view_tracker_item.tpl trunk/tiki-view_tracker_item.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-18 18:39:58 UTC (rev 86594) +++ trunk 2024-09-18 19:03:31 UTC (rev 86595) Property changes on: trunk ___________________________________________________________________ Added: subgit:lock:9271758c5235da9163d417e49bb2dcc518f122f4 ## -0,0 +1 ## +2024-09-18T19:03:31.159 \ No newline at end of property Deleted: subgit:lock:ecfc0b48e8399580e56ccbef5c153f95ec0258ae ## -1 +0,0 ## -2024-09-18T18:40:22.624 \ No newline at end of property Modified: trunk/templates/tiki-view_tracker_item.tpl =================================================================== --- trunk/templates/tiki-view_tracker_item.tpl 2024-09-18 18:39:58 UTC (rev 86594) +++ trunk/templates/tiki-view_tracker_item.tpl 2024-09-18 19:03:31 UTC (rev 86595) @@ -40,7 +40,7 @@ </li> {/if} - {if $item_info.logs.cant|default:null} + {if $item_info.logs.cant|default:null and $item_info.canViewHistory} <li class="dropdown-item"> <a href="tiki-tracker_view_history.php?itemId={$itemId}"> {icon name="history"} {tr}History{/tr} Modified: trunk/tiki-view_tracker_item.php =================================================================== --- trunk/tiki-view_tracker_item.php 2024-09-18 18:39:58 UTC (rev 86594) +++ trunk/tiki-view_tracker_item.php 2024-09-18 19:03:31 UTC (rev 86595) @@ -375,6 +375,10 @@ } } $item_info['logs'] = ['cant' => $trklib->item_has_history($item_info['itemId'])]; // only used to show history links, no need to load everything + +$itemObject = Tracker_Item::fromInfo($item_info); +$item_info['canViewHistory'] = $itemObject->canViewHistory(); + $smarty->assign_by_ref('item_info', $item_info); $smarty->assign('item', ['itemId' => $itemId, 'trackerId' => $trackerId]); $cat_objid = $itemId; @@ -381,7 +385,6 @@ $cat_type = 'trackeritem'; $tracker_info = $definition->getInformation(); -$itemObject = Tracker_Item::fromInfo($item_info); $tracker_info_value = fn($key) => array_key_exists($key, $tracker_info) ? $tracker_info[$key] : null; if (! isset($tracker_info["writerCanModify"]) or (isset($utid) and ($trackerId != $utid['usersTrackerId']))) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Benoit G. (@b. <gi...@mg...> - 2024-09-18 19:03:18
|
Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: 9271758c by Joseph Lwanzo Kausi at 2024-09-18T19:03:01+00:00 [FIX] tiki-view_tracker_item.tpl: Prevents the history link from being visible... --- * Used item permision for tracker_item * [FIX] tiki-view_tracker_item.tpl: Prevents the history link from being visible to users who don't have the right to see item history See merge request tikiwiki/tiki!5764 - - - - - 2 changed files: - templates/tiki-view_tracker_item.tpl - tiki-view_tracker_item.php Changes: ===================================== templates/tiki-view_tracker_item.tpl ===================================== @@ -40,7 +40,7 @@ </li> {/if} - {if $item_info.logs.cant|default:null} + {if $item_info.logs.cant|default:null and $item_info.canViewHistory} <li class="dropdown-item"> <a href="tiki-tracker_view_history.php?itemId={$itemId}"> {icon name="history"} {tr}History{/tr} ===================================== tiki-view_tracker_item.php ===================================== @@ -375,13 +375,16 @@ if (! isset($item_info)) { } } $item_info['logs'] = ['cant' => $trklib->item_has_history($item_info['itemId'])]; // only used to show history links, no need to load everything + +$itemObject = Tracker_Item::fromInfo($item_info); +$item_info['canViewHistory'] = $itemObject->canViewHistory(); + $smarty->assign_by_ref('item_info', $item_info); $smarty->assign('item', ['itemId' => $itemId, 'trackerId' => $trackerId]); $cat_objid = $itemId; $cat_type = 'trackeritem'; $tracker_info = $definition->getInformation(); -$itemObject = Tracker_Item::fromInfo($item_info); $tracker_info_value = fn($key) => array_key_exists($key, $tracker_info) ? $tracker_info[$key] : null; if (! isset($tracker_info["writerCanModify"]) or (isset($utid) and ($trackerId != $utid['usersTrackerId']))) { View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/9271758c5235da9163d417e49bb2dcc518f122f4 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/9271758c5235da9163d417e49bb2dcc518f122f4 You're receiving this email because of your account on gitlab.com. |
From: benoitg@users.sourceforge.net - 2024-09-18 18:40:26
|
Revision: 86594 http://sourceforge.net/p/tikiwiki/code/86594 Author: "benoitg" Date: 2024-09-18 18:40:23 +0000 (Wed, 18 Sep 2024) Log Message: ----------- [ENH] Add an option to add the Newsletter Unsubscribe to the email header --- * [ENH]Add an option to add the Newsletter Unsubscribe to the email header See merge request tikiwiki/tiki!5642 Modified Paths: -------------- trunk/lib/newsletters/nllib.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-18 18:35:36 UTC (rev 86593) +++ trunk 2024-09-18 18:40:23 UTC (rev 86594) Property changes on: trunk ___________________________________________________________________ Deleted: subgit:lock:6f44375ae870abe959fb61789c441e0379478113 ## -1 +0,0 ## -2024-09-18T18:36:02.590 \ No newline at end of property Added: subgit:lock:ecfc0b48e8399580e56ccbef5c153f95ec0258ae ## -0,0 +1 ## +2024-09-18T18:40:22.624 \ No newline at end of property Modified: trunk/lib/newsletters/nllib.php =================================================================== --- trunk/lib/newsletters/nllib.php 2024-09-18 18:35:36 UTC (rev 86593) +++ trunk/lib/newsletters/nllib.php 2024-09-18 18:40:23 UTC (rev 86594) @@ -1410,7 +1410,7 @@ return $emails; } - private function get_edition_mail($editionId, $target, $is_html = null, $replyTo = null, $sendFrom = null) + private function get_edition_mail($editionId, $target, $is_html = null, $replyTo = null, $sendFrom = null, $unsubscribeLink = null) { global $prefs, $base_url; static $mailcache = []; @@ -1542,6 +1542,9 @@ $zmail->getHeaders()->removeHeader('bcc'); $zmail->getHeaders()->get('content-type')->setType('multipart/alternative'); + if ($unsubscribeLink) { + $zmail->getHeaders()->addHeaderLine('List-Unsubscribe', '<' . $unsubscribeLink . '>'); + } $zmail->addTo($target['email']); @@ -1558,7 +1561,8 @@ $userlib = TikiLib::lib('user'); $smarty = TikiLib::lib('smarty'); $users = $this->get_all_subscribers($nl_info['nlId'], $nl_info['unsubMsg'] == 'y'); - + $url_unsub = parse_url($_SERVER["REQUEST_URI"]); + $url_unsubscribe = $tikilib->httpPrefix(true) . $url_unsub["path"]; if (empty($info['editionId'])) { $info['editionId'] = $this->replace_edition( $nl_info['nlId'], @@ -1662,6 +1666,8 @@ foreach ($users as $us) { $tikilib->clear_cache_user_preferences(); $email = $us['email']; + $code = $us['code']; + $url_unsub = $url_unsubscribe . '?unsubscribe=' . $code; if ($browser) { if (@ob_get_level() == 0) { @ob_start(); @@ -1676,7 +1682,8 @@ $us, $info['is_html'], $info['replyto'], - $info['sendfrom'] + $info['sendfrom'], + $url_unsub ); if (! $zmail) { continue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Benoit G. (@b. <gi...@mg...> - 2024-09-18 18:40:13
|
Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: ecfc0b48 by christer77 at 2024-09-18T18:39:58+00:00 [ENH] Add an option to add the Newsletter Unsubscribe to the email header --- * [ENH]Add an option to add the Newsletter Unsubscribe to the email header See merge request tikiwiki/tiki!5642 - - - - - 1 changed file: - lib/newsletters/nllib.php Changes: ===================================== lib/newsletters/nllib.php ===================================== @@ -1410,7 +1410,7 @@ class NlLib extends TikiLib return $emails; } - private function get_edition_mail($editionId, $target, $is_html = null, $replyTo = null, $sendFrom = null) + private function get_edition_mail($editionId, $target, $is_html = null, $replyTo = null, $sendFrom = null, $unsubscribeLink = null) { global $prefs, $base_url; static $mailcache = []; @@ -1542,6 +1542,9 @@ class NlLib extends TikiLib $zmail->getHeaders()->removeHeader('bcc'); $zmail->getHeaders()->get('content-type')->setType('multipart/alternative'); + if ($unsubscribeLink) { + $zmail->getHeaders()->addHeaderLine('List-Unsubscribe', '<' . $unsubscribeLink . '>'); + } $zmail->addTo($target['email']); @@ -1558,7 +1561,8 @@ class NlLib extends TikiLib $userlib = TikiLib::lib('user'); $smarty = TikiLib::lib('smarty'); $users = $this->get_all_subscribers($nl_info['nlId'], $nl_info['unsubMsg'] == 'y'); - + $url_unsub = parse_url($_SERVER["REQUEST_URI"]); + $url_unsubscribe = $tikilib->httpPrefix(true) . $url_unsub["path"]; if (empty($info['editionId'])) { $info['editionId'] = $this->replace_edition( $nl_info['nlId'], @@ -1662,6 +1666,8 @@ class NlLib extends TikiLib foreach ($users as $us) { $tikilib->clear_cache_user_preferences(); $email = $us['email']; + $code = $us['code']; + $url_unsub = $url_unsubscribe . '?unsubscribe=' . $code; if ($browser) { if (@ob_get_level() == 0) { @ob_start(); @@ -1676,7 +1682,8 @@ class NlLib extends TikiLib $us, $info['is_html'], $info['replyto'], - $info['sendfrom'] + $info['sendfrom'], + $url_unsub ); if (! $zmail) { continue; View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ecfc0b48e8399580e56ccbef5c153f95ec0258ae -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ecfc0b48e8399580e56ccbef5c153f95ec0258ae You're receiving this email because of your account on gitlab.com. |
From: benoitg@users.sourceforge.net - 2024-09-18 18:36:04
|
Revision: 86593 http://sourceforge.net/p/tikiwiki/code/86593 Author: "benoitg" Date: 2024-09-18 18:36:03 +0000 (Wed, 18 Sep 2024) Log Message: ----------- [ENH] ObjectLib: add calendar in list of supported type --- * [ENH] ObjectLib: add calendar in list of supported type See merge request tikiwiki/tiki!5838 Modified Paths: -------------- trunk/lib/objectlib.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2024-09-18 18:32:08 UTC (rev 86592) +++ trunk 2024-09-18 18:36:03 UTC (rev 86593) Property changes on: trunk ___________________________________________________________________ Added: subgit:lock:6f44375ae870abe959fb61789c441e0379478113 ## -0,0 +1 ## +2024-09-18T18:36:02.590 \ No newline at end of property Deleted: subgit:lock:f3a4c62cf9180f1470069c93d961725cc592d0e1 ## -1 +0,0 ## -2024-09-18T18:32:46.142 \ No newline at end of property Modified: trunk/lib/objectlib.php =================================================================== --- trunk/lib/objectlib.php 2024-09-18 18:32:08 UTC (rev 86592) +++ trunk/lib/objectlib.php 2024-09-18 18:36:03 UTC (rev 86593) @@ -228,6 +228,7 @@ public function getSelectorType($type) { $supported = [ + 'calendar' => 'calendar', 'category' => 'category', 'file_gallery' => 'file gallery', 'forum' => 'forum', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Benoit G. (@b. <gi...@mg...> - 2024-09-18 18:35:54
|
Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki Commits: 6f44375a by Joseph Lwanzo Kausi at 2024-09-18T18:35:36+00:00 [ENH] ObjectLib: add calendar in list of supported type --- * [ENH] ObjectLib: add calendar in list of supported type See merge request tikiwiki/tiki!5838 - - - - - 1 changed file: - lib/objectlib.php Changes: ===================================== lib/objectlib.php ===================================== @@ -228,6 +228,7 @@ class ObjectLib extends TikiLib public function getSelectorType($type) { $supported = [ + 'calendar' => 'calendar', 'category' => 'category', 'file_gallery' => 'file gallery', 'forum' => 'forum', View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/6f44375ae870abe959fb61789c441e0379478113 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/6f44375ae870abe959fb61789c441e0379478113 You're receiving this email because of your account on gitlab.com. |